Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-20 15:00:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #155 from G10h4ck/huns_socket

Browse source 
Respect passed parameters in unix_socket
This commit is contained in:
Cyril Soler 2015-10-23 14:52:55 -04:00
commit 4b402a48a5
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
libretroshare/src/pqi/pqinetwork.cc
View file

@ -858,16 +858,14 @@ int unix_close(int fd)
return ret; return ret;
} }
int unix_socket(int /*domain*/, int /*type*/, int /*protocol*/) int unix_socket(int domain, int type, int protocol)
{ {
int osock = socket(PF_INET, SOCK_STREAM, 0); int osock = socket(domain, type, protocol);
/******************* WINDOWS SPECIFIC PART ******************/
#ifdef WINDOWS_SYS // WINDOWS
#ifdef WINDOWS_SYS
#ifdef NET_DEBUG #ifdef NET_DEBUG
std::cerr << "unix_socket()" << std::endl; std::cerr << "unix_socket()" << std::endl;
#endif #endif // NET_DEBUG
if ((unsigned) osock == INVALID_SOCKET) if ((unsigned) osock == INVALID_SOCKET)
{ {
@ -875,8 +873,8 @@ int unix_socket(int /*domain*/, int /*type*/, int /*protocol*/)
osock = -1; osock = -1;
errno = WinToUnixError(WSAGetLastError()); errno = WinToUnixError(WSAGetLastError());
} }
#endif #endif // WINDOWS_SYS
/******************* WINDOWS SPECIFIC PART ******************/
return osock; return osock;
} }