Changeset 4155

Timestamp:

Dec 13, 2007, 7:28:51 PM (14 years ago)

Author:

charles

Message:

follow Chinstrap's suggestion of waiting a small interval between sending nat commands as per the nat spec

File:

• trunk/libtransmission/natpmp.c (modified) (6 diffs)

trunk/libtransmission/natpmp.c

@@ -29 +29 @@
 
 #define LIFETIME_SECS 3600
+#define COMMAND_WAIT_SECS 8
 
 #define KEY "Port Mapping (NAT-PMP): "
@@ -51 +52 @@
     unsigned int hasDiscovered : 1;
     time_t renewTime;
+    time_t commandTime;
     tr_natpmp_state state;
     natpmp_t natpmp;
@@ -90 +92 @@
 }
 
+static int
+canSendCommand( const struct tr_natpmp * nat )
+{
+    return time(NULL) >= nat->commandTime;
+}
+
+static void
+setCommandTime( struct tr_natpmp * nat )
+{
+    nat->commandTime = time(NULL) + COMMAND_WAIT_SECS;
+}
+
 int
 tr_natpmpPulse( struct tr_natpmp * nat, int port, int isEnabled )
@@ -103 +117 @@
         nat->state = val < 0 ? TR_NATPMP_ERR : TR_NATPMP_RECV_PUB;
         nat->hasDiscovered = 1;
-    }
-
-    if( nat->state == TR_NATPMP_RECV_PUB )
+        setCommandTime( nat );
+    }
+
+    if( ( nat->state == TR_NATPMP_RECV_PUB ) && canSendCommand( nat ) )
     {
         natpmpresp_t response;
@@ -124 +139 @@
     }
 
-    if( nat->state == TR_NATPMP_SEND_UNMAP )
+    if( ( nat->state == TR_NATPMP_SEND_UNMAP ) && canSendCommand( nat ) )
     {
         const int val = sendnewportmappingrequest( &nat->natpmp, NATPMP_PROTOCOL_TCP, nat->port, nat->port, 0 );
         logVal( "sendnewportmappingrequest", val );
         nat->state = val < 0 ? TR_NATPMP_ERR : TR_NATPMP_RECV_UNMAP;
+        setCommandTime( nat );
     }
 
@@ -155 +171 @@
     }
 
-    if( nat->state == TR_NATPMP_SEND_MAP )
+    if( ( nat->state == TR_NATPMP_SEND_MAP ) && canSendCommand( nat ) )
     {
         const int val = sendnewportmappingrequest( &nat->natpmp, NATPMP_PROTOCOL_TCP, port, port, LIFETIME_SECS );
         logVal( "sendnewportmappingrequest", val );
         nat->state = val < 0 ? TR_NATPMP_ERR : TR_NATPMP_RECV_MAP;
+        setCommandTime( nat );
     }