dark/zerotiertspu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add a recv timeout to root

Browse source
This commit is contained in:
Adam Ierymenko 2019-09-16 18:03:17 -07:00
parent ade52bf81e
commit 9f5bccec30
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
3 changed files with 52 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

13
root/root.cpp
View file

@ -671,13 +671,20 @@ static int bindSocket(struct sockaddr *const bindAddr)
#endif
*/
#if defined(SO_REUSEPORT)
#ifdef SO_REUSEPORT
f = 1; setsockopt(s,SOL_SOCKET,SO_REUSEPORT,(void *)&f,sizeof(f));
#endif
#ifndef __LINUX__ // linux wants just SO_REUSEPORT
f = 1; setsockopt(s,SOL_SOCKET,SO_REUSEADDR,(void *)&f,sizeof(f));
#endif
#ifdef __LINUX__
struct timeval tv;
tv.tv_sec = 1;
tv.tv_usec = 0;
setsockopt(s,SOL_SOCKET,SO_RCVTIMEO,(const void *)&tv,sizeof(tv));
#endif
if (bind(s,bindAddr,(bindAddr->sa_family == AF_INET) ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6))) {
close(s);
//printf("%s\n",strerror(errno));
@ -911,7 +918,7 @@ int main(int argc,char **argv)
printf("WARNING: unexpected exception handling packet from %s: unknown exception" ZT_EOL_S,reinterpret_cast<const InetAddress *>(&in6)->toString(ipstr));
}
}
} else {
} else if ((errno != EAGAIN)&&(errno != EWOULDBLOCK)) {
break;
}
}
@ -940,7 +947,7 @@ int main(int argc,char **argv)
printf("WARNING: unexpected exception handling packet from %s: unknown exception" ZT_EOL_S,reinterpret_cast<const InetAddress *>(&in4)->toString(ipstr));
}
}
} else {
} else if ((errno != EAGAIN)&&(errno != EWOULDBLOCK)) {
break;
}
}