Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-06 21:58:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

attempt to fix socket problem on 32bits/64bits windows, by using the proper SOCKET type instead of int

Browse source
This commit is contained in:
csoler 2016-05-05 21:21:45 -04:00
parent 092345c3fb
commit b5ace406b9
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libretroshare/src/pqi/pqissllistener.cc
View file

@ -322,11 +322,12 @@ int pqissllistenbase::acceptconnection()
// can't be arsed making them all the time. // can't be arsed making them all the time.
struct sockaddr_storage remote_addr; struct sockaddr_storage remote_addr;
socklen_t addrlen = sizeof(remote_addr); socklen_t addrlen = sizeof(remote_addr);
int fd = accept(lsock, (struct sockaddr *) &remote_addr, &addrlen);
int err = 0;
/********************************** WINDOWS/UNIX SPECIFIC PART ******************/ /********************************** WINDOWS/UNIX SPECIFIC PART ******************/
#ifndef WINDOWS_SYS // ie UNIX #ifndef WINDOWS_SYS // ie UNIX
int fd = accept(lsock, (struct sockaddr *) &remote_addr, &addrlen);
int err = 0;
if (fd < 0) if (fd < 0)
{ {
pqioutput(PQL_DEBUG_ALL, pqissllistenzone, pqioutput(PQL_DEBUG_ALL, pqissllistenzone,
@ -347,7 +348,10 @@ int pqissllistenbase::acceptconnection()
/********************************** WINDOWS/UNIX SPECIFIC PART ******************/ /********************************** WINDOWS/UNIX SPECIFIC PART ******************/
#else //WINDOWS_SYS #else //WINDOWS_SYS
if ((unsigned) fd == INVALID_SOCKET) SOCKET fd = accept(lsock, (struct sockaddr *) &remote_addr, &addrlen);
int err = 0;
if (fd == INVALID_SOCKET)
{ {
pqioutput(PQL_DEBUG_ALL, pqissllistenzone, pqioutput(PQL_DEBUG_ALL, pqissllistenzone,
"pqissllistenbase::acceptconnnection() Nothing to Accept!"); "pqissllistenbase::acceptconnnection() Nothing to Accept!");