Changeset 902 for branches/nat-traversal/libtransmission/natpmp.c

Timestamp:

Sep 24, 2006, 7:41:05 AM (17 years ago)

Author:

joshe

Message:

Treat a couple more NAT-PMP errors as temporary.

File:

• branches/nat-traversal/libtransmission/natpmp.c (modified) (14 diffs)

branches/nat-traversal/libtransmission/natpmp.c

@@ -59 +59 @@
     unsigned int         adding : 1;
     unsigned int         nobodyhome : 1;
-    unsigned int         portused : 1;
+    unsigned int         tmpfail : 1;
     int                  fd;
     int                  delay;
@@ -77 +77 @@
 #define PMP_STATE_FAILED        5
 #define PMP_STATE_NOBODYHOME    6
-#define PMP_STATE_PORTUSED      7
+#define PMP_STATE_TMPFAIL       7
     char               state;
     unsigned int       active : 1;
@@ -110 +110 @@
 static tr_tristate_t
 readrequest( uint8_t * buf, int len, int adding, int port,
-             tr_natpmp_uptime_t * uptime, uint64_t * renew, int * used );
+             tr_natpmp_uptime_t * uptime, uint64_t * renew, int * tmpfail );
 
 tr_natpmp_t *
@@ -200 +200 @@
             case PMP_STATE_FAILED:
             case PMP_STATE_NOBODYHOME:
-            case PMP_STATE_PORTUSED:
+            case PMP_STATE_TMPFAIL:
                 break;
             default:
@@ -238 +238 @@
                 break;
             case PMP_STATE_FAILED:
-            case PMP_STATE_PORTUSED:
+            case PMP_STATE_TMPFAIL:
                 ret = TR_NAT_TRAVERSAL_ERROR;
                 break;
@@ -294 +294 @@
         {
             case PMP_STATE_IDLE:
-            case PMP_STATE_PORTUSED:
+            case PMP_STATE_TMPFAIL:
                 if( 0 < pmp->newport )
                 {
+                    tr_dbg( "nat-pmp state %s -> add with port %i",
+                            ( PMP_STATE_IDLE == pmp->state ? "idle" : "err" ),
+                            pmp->newport );
                     pmp->state = PMP_STATE_ADDING;
-                    tr_dbg( "nat-pmp state %s -> add with port %i",
-                            ( PMP_STATE_IDLE == pmp->state ? "idle" : "used" ),
-                            pmp->newport );
                 }
                 break;
@@ -338 +338 @@
                                 tr_dbg( "nat-pmp state add -> nobodyhome on pulse" );
                             }
-                            else if( pmp->req->portused )
+                            else if( pmp->req->tmpfail )
                             {
-                                pmp->state = PMP_STATE_PORTUSED;
-                                tr_dbg( "nat-pmp state add -> used on pulse" );
+                                pmp->state = PMP_STATE_TMPFAIL;
+                                tr_dbg( "nat-pmp state add -> err on pulse" );
                                 if( pmp->req->port == pmp->newport )
                                 {
@@ -390 +390 @@
                                 tr_dbg( "nat-pmp state del -> nobodyhome on pulse" );
                             }
+                            else if( pmp->req->tmpfail )
+                            {
+                                pmp->state = PMP_STATE_TMPFAIL;
+                                tr_dbg( "nat-pmp state del -> err on pulse" );
+                                pmp->mappedport = -1;
+                            }
                             else
                             {
@@ -526 +532 @@
     struct sockaddr_in sin;
     uint8_t            buf[16];
-    int                res, used;
+    int                res, tmpfail;
     uint64_t           now;
     tr_tristate_t      ret;
@@ -571 +577 @@
 
     ret = readrequest( buf, res, req->adding, req->port, req->uptime, renew,
-                       &used );
-    req->portused = ( used ? 1 : 0 );
+                       &tmpfail );
+    req->tmpfail = ( tmpfail ? 1 : 0 );
     return ret;
 }
@@ -681 +687 @@
 static tr_tristate_t
 readrequest( uint8_t * buf, int len, int adding, int port,
-             tr_natpmp_uptime_t * uptime, uint64_t * renew, int * used )
+             tr_natpmp_uptime_t * uptime, uint64_t * renew, int * tmpfail )
 {
     uint8_t            version, opcode, wantedopcode;
@@ -687 +693 @@
     uint32_t           seconds, lifetime;
 
-    assert( !adding || NULL != used );
-    if( NULL != used )
-    {
-        *used = 0;
+    assert( !adding || NULL != tmpfail );
+    if( NULL != tmpfail )
+    {
+        *tmpfail = 0;
     }
     if( 4 > len )
@@ -719 +725 @@
         return TR_ERROR;
     }
-    if( PMP_RESPCODE_OK != rescode )
-    {
-        tr_err( "bad nat-pmp result code %hu", rescode );
-        return TR_ERROR;
+    switch( rescode )
+    {
+        case PMP_RESPCODE_OK:
+            break;
+        case PMP_RESPCODE_REFUSED:
+        case PMP_RESPCODE_NETDOWN:
+        case PMP_RESPCODE_NOMEM:
+            if( NULL != tmpfail )
+            {
+                *tmpfail = 1;
+            }
+            /* fallthrough */
+        default:
+            tr_err( "bad nat-pmp result code %hu", rescode );
+            return TR_ERROR;
     }
 
@@ -764 +781 @@
             if( port != pubport )
             {
-                *used = 1;
+                *tmpfail = 1;
                 /* XXX should just start announcing the pub port we're given */
                 return TR_ERROR;