miegl/glorytun
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix retry when kx fails

Browse Source
This commit is contained in:
angt
2015-12-12 12:19:09 +01:00
parent 0e319b068d
commit d526a3cfa5
1 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/main.c
View File

@@ -792,33 +792,30 @@ int main (int argc, char **argv)
long retry = 0;
while (!gt_close) {
sock.fd = listener?sk_accept(fd):sk_create(ai, sk_connect);
if (sock.fd==-1) {
if (retry<LONG_MAX)
retry++;
if (retry_count>=0 && retry>=retry_count+1) {
gt_log("couldn't %s (%d attempt%s)\n", listener?"listen":"connect",
(int)retry, (retry>1)?"s":"");
break;
}
if (retry_slope || retry_const) {
long usec = retry*retry_slope+retry_const;
if (retry_count>=0 && retry>=retry_count) {
gt_log("couldn't %s (%d attempt%s)\n",
listener?"listen":"connect",
(int)retry, (retry>1)?"s":"");
break;
}
if (usec>retry_limit)
usec = retry_limit;
if (usec<=0)
continue;
if (usleep(usec)==-1 && errno==EINVAL)
if (usec>0 && usleep(usec)==-1 && errno==EINVAL)
sleep(usec/1000000);
continue;
}
if (retry<LONG_MAX)
retry++;
sock.fd = listener?sk_accept(fd):sk_create(ai, sk_connect);
if (sock.fd==-1)
continue;
char *sockname = sk_get_name(sock.fd);
if (!sockname) {