Changeset 7729

Timestamp:

Jan 16, 2009, 11:17:30 PM (12 years ago)

Author:

charles

Message:

(1.5x libT) fix IPv6 reported & solved by erdgeist. add debugging message to help track down any future problems.

Location:

branches/1.5x/libtransmission

Files:

• net.c (modified) (1 diff)
• peer-io.c (modified) (1 diff)
• peer-io.h (modified) (1 diff)

branches/1.5x/libtransmission/net.c

@@ -478 +478 @@
     if( addr->type == TR_AF_INET && IN_MULTICAST( htonl( addr->addr.addr4.s_addr ) ) )
         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;
 
-    if( ( s = createSocket( ( addr->type == TR_AF_INET ? AF_INET : AF_INET6 ),
-                            type ) ) < 0 )
+    if( ( s = createSocket( ( addr->type == TR_AF_INET ? AF_INET : AF_INET6 ), type ) ) < 0 )
         return s;
 

branches/1.5x/libtransmission/peer-io.c

@@ -396 +396 @@
 
     socket = tr_netOpenTCP( session, addr, port );
+    dbgmsg( NULL, "tr_netOpenTCP returned fd %d", socket );
 
     return socket < 0

branches/1.5x/libtransmission/peer-io.h

@@ -160 +160 @@
 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";
 }