Changeset 4102

Timestamp:

Dec 9, 2007, 12:28:34 AM (14 years ago)

Author:

charles

Message:

finish the `shared' update: bind & listen the incoming port.
better logging in network code.

Location:

trunk/libtransmission

Files:

• net.c (modified) (2 diffs)
• shared.c (modified) (2 diffs)

trunk/libtransmission/net.c

@@ -157 +157 @@
     if( ( s = createSocket( type, 1 ) ) < 0 )
     {
+        tr_err( "Couldn't create socket of type %d", type );
         return -1;
     }
@@ -177 +178 @@
         return -1;
     }
-
+     
+    tr_inf( "Bound socket %d to port %d", port, s );
     return s;
 }

trunk/libtransmission/shared.c

@@ -94 +94 @@
 
 static void
-checkForIncomingPeers( tr_shared * s )
-{
-    for( ;; )
+incomingPeersPulse( tr_shared * s )
+{
+    if( s->bindSocket >= 0 && ( s->bindPort != s->publicPort ) )
+    {
+        tr_inf( NATKEY "closing port %d", s->bindPort );
+        tr_netClose( s->bindSocket );
+        s->bindSocket = -1;
+    }
+
+    if( s->bindPort != s->publicPort )
+    {
+        int socket;
+        errno = 0;
+        socket = tr_netBindTCP( s->publicPort );
+        if( socket >= 0 ) {
+            tr_inf( NATKEY "opened port %d to listen for incoming peer connections", s->publicPort );
+            s->bindPort = s->publicPort;
+            s->bindSocket = socket;
+            listen( s->bindSocket, 5 );
+        } else {
+            tr_err( NATKEY "unable to open port %d to listen for incoming peer connections (errno is %d - %s)",
+                    s->publicPort, errno, strerror(errno) );
+            s->bindPort = -1;
+            s->bindSocket = -1;
+        }
+    }
+    
+    for( ;; ) /* check for new incoming peer connections */    
     {
         int socket;
@@ -123 +148 @@
     if( !shared->isShuttingDown )
     {
-        checkForIncomingPeers( shared );
+        incomingPeersPulse( shared );
     }
     else if( ( shared->natStatus == TR_NAT_TRAVERSAL_ERROR ) || ( shared->natStatus == TR_NAT_TRAVERSAL_UNMAPPED ) )