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

Merge pull request #2575 from csoler/v0.6-FriendServer2

Browse source 
Fixing FriendServer
This commit is contained in:
csoler 2022-01-31 21:06:25 +01:00 • committed by GitHub
commit 37c781aa9f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libretroshare

@ -1 +1 @@
Subproject commit 47548627adddc444a5d36368bd7a5f5baeed17ba Subproject commit 55efaf9c730859ef3fc5c6f6049595c1225f9204

4
retroshare-friendserver/src/network.cc
View file

@ -134,7 +134,9 @@ bool FsNetworkInterface::checkForNewConnections()
if(clintConnt < 0) if(clintConnt < 0)
{ {
if(errno == EWOULDBLOCK) int err = rs_socket_error();
if(err == EWOULDBLOCK || err == EAGAIN)
;//RsErr()<< "Incoming connection with nothing to read!" << std::endl; ;//RsErr()<< "Incoming connection with nothing to read!" << std::endl;
else else
RsErr()<< "Error when accepting connection." << std::endl; RsErr()<< "Error when accepting connection." << std::endl;