Changeset 7397 for trunk/libtransmission/fdlimit.c

Timestamp:

Dec 15, 2008, 12:17:08 AM (12 years ago)

Author:

charles

Message:

(trunk libT) add ipv6 support by jhujhiti. I think this is the largest user-contributed patch we've ever used... thanks jhujhiti :)

File:

• trunk/libtransmission/fdlimit.c (modified) (4 diffs)

trunk/libtransmission/fdlimit.c

@@ -451 +451 @@
 
 int
-tr_fdSocketCreate( int type )
+tr_fdSocketCreate( int domain, int type )
 {
     int s = -1;
@@ -458 +458 @@
 
     if( gFd->socketCount < getSocketMax( gFd ) )
-        if( ( s = socket( AF_INET, type, 0 ) ) < 0 )
+        if( ( s = socket( domain, type, 0 ) ) < 0 )
+        {
             tr_err( _( "Couldn't create socket: %s" ),
                    tr_strerror( sockerrno ) );
+            s = -sockerrno;
+        }
 
     if( s > -1 )
@@ -486 +489 @@
     if( gFd->socketCount < getSocketMax( gFd ) )
     {
-        len = sizeof( struct sockaddr );
+        len = sizeof( struct sockaddr_storage );
         s = accept( b, (struct sockaddr *) &sock, &len );
     }
@@ -504 +507 @@
             struct sockaddr_in6 * sock6 = (struct sockaddr_in6 *)&sock; 
             addr->type = TR_AF_INET6; 
-            memcpy( &addr->addr, &sock6->sin6_addr, 
-                    sizeof( struct sockaddr_in6 ) ); 
+            addr->addr.addr6 = sock6->sin6_addr;
             *port = sock6->sin6_port; 
         }