Changeset 11926 for trunk/libtransmission/tr-udp.c

Timestamp:

Feb 18, 2011, 12:35:56 AM (11 years ago)

Author:

jch

Message:

Push testig for UTP enabled further down.

There's no need to test for DHT/uTP being enabled in tr-udp. The DHT
will silently discard any packets directed at the wrong session (see the
beginning of dhtCallback). As to uTP, we need to grok uTP packets
to close any remaining connections after we disabled uTP, so it's better
to participate in uTP, just reject any incoming connections.

File:

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

trunk/libtransmission/tr-udp.c

@@ -136 +136 @@
         return;
 
-    if((buf[0] == 'd') && tr_sessionIsDHTEnabled(ss)) {
+    if( buf[0] == 'd' ) {
         /* DHT packet. */
         buf[rc] = '\0';
         tr_dhtCallback(buf, rc, (struct sockaddr*)&from, fromlen, sv);
-    } else if(tr_sessionIsUTPEnabled(ss)){
+    } else {
         rc = tr_utpPacket(buf, rc, (struct sockaddr*)&from, fromlen, ss);
         if(!rc)