Changeset 12394

Timestamp:

Apr 28, 2011, 2:51:07 AM (12 years ago)

Author:

jordan

Message:

(trunk libT) #4212 "excessive UDP logfile entries in debug mode" -- fixed.

File:

• trunk/libtransmission/tr-udp.c (modified) (1 diff)

trunk/libtransmission/tr-udp.c

@@ -201 +201 @@
                   (struct sockaddr*)&from, &fromlen);
 
-    /* Test for the different packet types based on frequency:
-       µTP will be the most common, then DHT, then UDP trackers. */
-    if( rc > 0 )
-    {
-#ifdef WITH_UTP
-        if( ss->isUTPEnabled && tr_utpPacket( buf, rc, (struct sockaddr*)&from, fromlen, ss ) )
-        {
-            tr_ndbg( "UDP", "Handled uTP packet" );
-        }
-        else
-#endif
-        if( ss->isDHTEnabled && ( *buf == 'd' ) ) /* DHT */
-        {
-            buf[rc] = '\0'; /* required by the DHT code */
-            tr_dhtCallback( buf, rc, (struct sockaddr*)&from, fromlen, sv );
-            tr_ndbg( "UDP", "Handled DHT packet" );
-        }
-        else if( tau_handle_message( ss, buf, rc ) )
-        {
-            tr_ndbg( "UDP", "Handled UDP tracker packet" );
-        }
-        else
-        {
-            tr_ndbg( "UDP", "Unexpected UDP packet" );
+    /* Since most packets we receive here are µTP, make quick inline
+       checks for the other protocols.  The logic is as follows:
+       - all DHT packets start with 'd';
+       - all UDP tracker packets start with a 32-bit (!) "action", which
+         is between 0 and 3;
+       - the above cannot be µTP packets, since these start with a 4-bit
+         version number (1). */
+    if(rc > 0) {
+        if( buf[0] == 'd' ) {
+            buf[rc] = '\0';     /* required by the DHT code */
+            tr_dhtCallback(buf, rc, (struct sockaddr*)&from, fromlen, sv);
+        } else if( rc >= 8 &&
+                   buf[0] == 0 && buf[1] == 0 && buf[2] == 0 && buf[3] <= 3 ) {
+            rc = tau_handle_message( ss, buf, rc );
+            if( !rc )
+                tr_ndbg("UDP", "Couldn't parse UDP tracker packet.");
+        } else {
+            rc = tr_utpPacket(buf, rc, (struct sockaddr*)&from, fromlen, ss);
+            if( !rc )
+                tr_ndbg("UDP", "Unexpected UDP packet");
         }
     }