bytemark/flexnbd-c
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch '12-fix-bind' into 'master'

Browse Source 
Attempt at fixing bind() bug

This will prevent the bind() wrapper to loop forever in some cases. I
could nor reproduce the issue, but this removes the only infinite loop I
could find.

Closes #12

See merge request !3
This commit is contained in:
James Carter
2016-10-04 15:41:37 +01:00
parent e3360a3a1b 76e0476113
commit 26a0a82f9d
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/sockutil.c
View File

@@ -100,7 +100,7 @@ int sock_try_bind( int fd, const struct sockaddr* sa )
{ {
int bind_result; int bind_result;
char s_address[256]; char s_address[256];
int retry = 1; int retry = 10;
sockaddr_address_string( sa, &s_address[0], 256 ); sockaddr_address_string( sa, &s_address[0], 256 );
@@ -126,8 +126,11 @@ int sock_try_bind( int fd, const struct sockaddr* sa )
* will cope with it. * will cope with it.
*/ */
case EADDRNOTAVAIL: case EADDRNOTAVAIL:
debug( "retrying" ); retry--;
sleep( 1 ); if (retry) {
debug( "retrying" );
sleep( 1 );
}
continue; continue;
case EADDRINUSE: case EADDRINUSE:
warn( "%s in use, giving up.", s_address ); warn( "%s in use, giving up.", s_address );