Changeset 40

Timestamp:

Jan 22, 2006, 2:06:42 AM (17 years ago)

Author:

joshe

Message:

More random debug stuff, also actually change the port right away via the gtk prefs.

Location:

branches/oneport

Files:

• gtk/prefs.c (modified) (2 diffs)
• libtransmission/inout.c (modified) (1 diff)
• libtransmission/net.c (modified) (1 diff)
• libtransmission/tracker.c (modified) (1 diff)
• libtransmission/transmission.c (modified) (11 diffs)
• libtransmission/utils.h (modified) (1 diff)

branches/oneport/gtk/prefs.c

@@ -162 +162 @@
     cf_setpref(PREF_PORT, strnum, NULL);
     g_free(strnum);
-    /* XXX should I change the port here?  is it even possible? */
 
     /* save uselimit pref */
@@ -181 +180 @@
     }
 
+    tr_setBindPort(data->tr, gtk_spin_button_get_value_as_int(data->port));
     setlimit(data->tr);
   }

branches/oneport/libtransmission/inout.c

@@ -391 +391 @@
     {
         /* Should not happen */
-        tr_err( "readOrWriteBytes: offset out of range" );
+        tr_err( "readOrWriteBytes: offset out of range (off=%llu files=%i i=%i)",
+                offset, inf->fileCount, i);
+        for(i = 0; i < inf->fileCount; i++)
+          tr_err( "file %i %lld %s", i, inf->files[i].length, inf->files[i].name );
         goto fail;
     }

branches/oneport/libtransmission/net.c

@@ -134 +134 @@
                sizeof( struct sockaddr_in ) ) )
     {
-        tr_err( "Could not bind port %d", port );
+        tr_err( "Could not bind port %d: %s", port, strerror(errno) );
         tr_netClose( s );
         return -1;

branches/oneport/libtransmission/tracker.c

@@ -359 +359 @@
     if( i >= tc->pos - 18 )
     {
-        tr_err( "Tracker: no dictionary in answer (%s)",
-                tc->tor->info.trackerAddress );
+        //tr_err( "Tracker: no dictionary in answer (%s)",
+        //        tc->tor->info.trackerAddress );
         // printf( "%s\n", tc->buf );
         return;

branches/oneport/libtransmission/transmission.c

@@ -101 +101 @@
     int ii, sock;
 
+    printf("changing port from %i to %i\n", h->bindPort, port);
+
     if( h->bindPort == port )
       return;
@@ -632 +634 @@
     uint8_t     * hash;
 #ifdef PORT_DEBUG
-    int           oldsocket;
+    int           oldport, oldsocket;
     int           oldPeerCount;
     tr_peer_t   * oldPeers[TR_MAX_PEER_COUNT];
@@ -648 +650 @@
 
 #ifdef PORT_DEBUG
+    oldport = h->bindPort;
     oldsocket = h->bindSocket;
 #endif
@@ -678 +681 @@
             if( tr_peerRead( NULL, h->acceptPeers[ii] ) )
             {
-                printf( "failed to read from peer on new port\n" );
+                printf( "failed to read from peer on new port %i\n", h->bindPort );
                 tr_peerDestroy( h->fdlimit, h->acceptPeers[ii] );
                 goto removePeer;
@@ -690 +693 @@
                                      SHA_DIGEST_LENGTH ) )
                     {
-                        printf( "got peer on new port for \"%s\"\n",
-                                h->torrents[jj]->info.name );
+                        printf( "got peer on new port %i for \"%s\"\n",
+                                h->bindPort, h->torrents[jj]->info.name );
                         tr_peerAttach( h->torrents[jj], h->acceptPeers[ii] );
                         tr_lockUnlock( &h->torrents[jj]->lock );
@@ -698 +701 @@
                     tr_lockUnlock( &h->torrents[jj]->lock );
                 }
-                printf( "failed to match hash for peer on new port\n" );
+                printf( "failed to match hash for peer on new port %i\n", h->bindPort );
                 tr_peerDestroy( h->fdlimit, h->acceptPeers[ii] );
                 goto removePeer;
@@ -711 +714 @@
 
 #ifdef PORT_DEBUG
+        if( oldsocket != h->bindSocket) {
         /* Check for incoming connections */
         if( oldsocket > -1 &&
@@ -734 +738 @@
             if( tr_peerRead( NULL, oldPeers[ii] ) )
             {
-                printf( "failed to read from peer on old port\n" );
+                printf( "failed to read from peer on old port %i\n", oldport );
                 tr_peerDestroy( h->fdlimit, oldPeers[ii] );
                 goto removeOldPeer;
@@ -746 +750 @@
                                      SHA_DIGEST_LENGTH ) )
                     {
-                        printf( "got peer on old port for \"%s\"\n",
-                                h->torrents[jj]->info.name );
+                        printf( "got peer on old port %i for \"%s\"\n",
+                                oldport, h->torrents[jj]->info.name );
                         tr_lockUnlock( &h->torrents[jj]->lock );
                         goto removeOldPeer;
@@ -753 +757 @@
                     tr_lockUnlock( &h->torrents[jj]->lock );
                 }
-                printf( "failed to match hash for peer on old port\n" );
+                printf( "failed to match hash for peer on old port %i\n", oldport );
                 tr_peerDestroy( h->fdlimit, oldPeers[ii] );
                 goto removeOldPeer;
@@ -764 +768 @@
                      ( oldPeerCount - ii ) * sizeof( tr_peer_t * ) );
         }
+        }
 #endif
 

branches/oneport/libtransmission/utils.h

@@ -30 +30 @@
 #define tr_inf( a... ) tr_msg( TR_MSG_INF, ## a )
 #define tr_dbg( a... ) tr_msg( TR_MSG_DBG, ## a )
-void tr_msg  ( int level, char * msg, ... );
+void tr_msg  ( int level, char * msg, ... ) __attribute__ ((format (printf, 2, 3)));
 
 int  tr_rand ( int );