mirror of
https://github.com/transmission/transmission
synced 2025-03-04 10:38:13 +00:00
(trunk libT) fix IPv6 reported & solved by erdgeist. add debugging message to help track down any future problems.
This commit is contained in:
parent
f48e62a9cf
commit
d95a45b701
3 changed files with 4 additions and 4 deletions
|
@ -477,11 +477,10 @@ tr_netOpenTCP( tr_session * session,
|
||||||
/* don't try to connect to multicast addresses */
|
/* don't try to connect to multicast addresses */
|
||||||
if( addr->type == TR_AF_INET && IN_MULTICAST( htonl( addr->addr.addr4.s_addr ) ) )
|
if( addr->type == TR_AF_INET && IN_MULTICAST( htonl( addr->addr.addr4.s_addr ) ) )
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
if( addr->type == TR_AF_INET6 && ( addr->addr.addr6.s6_addr[0] & 0xff ) )
|
if( addr->type == TR_AF_INET6 && ( addr->addr.addr6.s6_addr[0] == 0xff ) )
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
if( ( s = createSocket( ( addr->type == TR_AF_INET ? AF_INET : AF_INET6 ),
|
if( ( s = createSocket( ( addr->type == TR_AF_INET ? AF_INET : AF_INET6 ), type ) ) < 0 )
|
||||||
type ) ) < 0 )
|
|
||||||
return s;
|
return s;
|
||||||
|
|
||||||
setSndBuf( session, s );
|
setSndBuf( session, s );
|
||||||
|
|
|
@ -395,6 +395,7 @@ tr_peerIoNewOutgoing( tr_session * session,
|
||||||
assert( torrentHash );
|
assert( torrentHash );
|
||||||
|
|
||||||
socket = tr_netOpenTCP( session, addr, port );
|
socket = tr_netOpenTCP( session, addr, port );
|
||||||
|
dbgmsg( NULL, "tr_netOpenTCP returned fd %d", socket );
|
||||||
|
|
||||||
return socket < 0
|
return socket < 0
|
||||||
? NULL
|
? NULL
|
||||||
|
|
|
@ -159,7 +159,7 @@ const char* tr_peerIoAddrStr( const struct tr_address * addr,
|
||||||
|
|
||||||
static TR_INLINE const char* tr_peerIoGetAddrStr( const tr_peerIo * io )
|
static TR_INLINE const char* tr_peerIoGetAddrStr( const tr_peerIo * io )
|
||||||
{
|
{
|
||||||
return tr_peerIoAddrStr( &io->addr, io->port );
|
return tr_isPeerIo( io ) ? tr_peerIoAddrStr( &io->addr, io->port ) : "error";
|
||||||
}
|
}
|
||||||
|
|
||||||
const struct tr_address * tr_peerIoGetAddress( const tr_peerIo * io,
|
const struct tr_address * tr_peerIoGetAddress( const tr_peerIo * io,
|
||||||
|
|
Loading…
Add table
Reference in a new issue