mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

(trunk libT) fix a minor bug in peer count tabulation

This commit is contained in:
Charles Kerr 2009-05-15 12:19:27 +00:00
parent 8807c286c0
commit 5bf4eb71ce
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libtransmission/net.c
View File

@ -326,7 +326,7 @@ tr_netOpenTCP( tr_session * session,
return -1; return -1;
if( evutil_make_socket_nonblocking( s ) < 0 ) { if( evutil_make_socket_nonblocking( s ) < 0 ) {
EVUTIL_CLOSESOCKET( s ); tr_netClose( s );
return -1; return -1;
} }
@ -394,13 +394,13 @@ tr_netBindTCP( const tr_address * addr, tr_port port, tr_bool suppressMsgs )
#ifdef IPV6_V6ONLY #ifdef IPV6_V6ONLY
if( addr->type == TR_AF_INET6 ) if( addr->type == TR_AF_INET6 )
if( setsockopt( fd, IPPROTO_IPV6, IPV6_V6ONLY, &optval, sizeof( optval ) ) == -1 ) if( setsockopt( fd, IPPROTO_IPV6, IPV6_V6ONLY, &optval, sizeof( optval ) ) == -1 )
if( EVUTIL_SOCKET_ERROR( ) != ENOPROTOOPT ) /* if the kernel doesn't support it, ignore it */ if( sockerr != ENOPROTOOPT ) /* if the kernel doesn't support it, ignore it */
return -EVUTIL_SOCKET_ERROR( ); return -sockerr;
#endif #endif
addrlen = setup_sockaddr( addr, htons( port ), &sock ); addrlen = setup_sockaddr( addr, htons( port ), &sock );
if( bind( fd, (struct sockaddr *) &sock, addrlen ) ) { if( bind( fd, (struct sockaddr *) &sock, addrlen ) ) {
const int err = EVUTIL_SOCKET_ERROR( ); const int err = sockerr;
if( !suppressMsgs ) if( !suppressMsgs )
tr_err( _( "Couldn't bind port %d on %s: %s" ), tr_err( _( "Couldn't bind port %d on %s: %s" ),
port, tr_ntop_non_ts( addr ), tr_strerror( err ) ); port, tr_ntop_non_ts( addr ), tr_strerror( err ) );
@ -413,7 +413,7 @@ tr_netBindTCP( const tr_address * addr, tr_port port, tr_bool suppressMsgs )
if( listen( fd, 128 ) == -1 ) { if( listen( fd, 128 ) == -1 ) {
EVUTIL_CLOSESOCKET( fd ); EVUTIL_CLOSESOCKET( fd );
return -EVUTIL_SOCKET_ERROR( ); return -sockerr;
} }
return fd; return fd;
@ -428,7 +428,7 @@ tr_netAccept( tr_session * session UNUSED,
int fd = tr_fdSocketAccept( b, addr, port ); int fd = tr_fdSocketAccept( b, addr, port );
if( fd>=0 && evutil_make_socket_nonblocking(fd)<0 ) { if( fd>=0 && evutil_make_socket_nonblocking(fd)<0 ) {
EVUTIL_CLOSESOCKET( fd ); tr_netClose( fd );
fd = -1; fd = -1;
} }