Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-11 15:50:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

rebased patch 0002-Respect-passed-parameters-in-unix_socket.patch to new IPv6 branch

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-IPv6-2@8234 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2015-05-14 12:36:27 +00:00
parent 87f932f3a4
commit 9ed1f2f466
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

@ -850,16 +850,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)
{ {
@ -867,8 +865,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;
} }