Changeset 1356 for trunk/libtransmission/natpmp.c

Timestamp:

Jan 14, 2007, 12:00:21 PM (15 years ago)

Author:

titer

Message:

Merge io branch into trunk

File:

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

trunk/libtransmission/natpmp.c

@@ -332 +332 @@
                     switch( pulsereq( pmp->req, &pmp->renew ) )
                     {
-                        case TR_ERROR:
+                        case TR_NET_ERROR:
                             if( pmp->req->nobodyhome )
                             {
@@ -354 +354 @@
                             killreq( &pmp->req );
                             break;
-                        case TR_OK:
+                        case TR_NET_OK:
                             pmp->mappedport = pmp->req->port;
                             killreq( &pmp->req );
@@ -362 +362 @@
                             tr_inf( "nat-pmp mapped port %i", pmp->mappedport );
                             break;
-                        case TR_WAIT:
+                        case TR_NET_WAIT:
                             break;
                     }
@@ -384 +384 @@
                     switch( pulsereq( pmp->req, &pmp->renew ) )
                     {
-                        case TR_ERROR:
+                        case TR_NET_ERROR:
                             if( pmp->req->nobodyhome )
                             {
@@ -403 +403 @@
                             killreq( &pmp->req );
                             break;
-                        case TR_OK:
+                        case TR_NET_OK:
                             tr_dbg( "nat-pmp state del -> idle with port %i",
                                     pmp->req->port);
@@ -411 +411 @@
                             pmp->state = PMP_STATE_IDLE;
                             break;
-                        case TR_WAIT:
+                        case TR_NET_WAIT:
                             break;
                     }
@@ -542 +542 @@
         tr_dbg( "nat-pmp request timed out" );
         req->nobodyhome = 1;
-        return TR_ERROR;
+        return TR_NET_ERROR;
     }
 
@@ -549 +549 @@
         if( sendrequest( req->adding, req->fd, req->port ) )
         {
-            return TR_ERROR;
+            return TR_NET_ERROR;
         }
         req->delay *= 2;
@@ -558 +558 @@
     if( TR_NET_BLOCK & res )
     {
-        return TR_WAIT;
+        return TR_NET_WAIT;
     }
     else if( TR_NET_CLOSE & res )
@@ -571 +571 @@
             tr_inf( "error reading nat-pmp response (%s)", strerror( errno ) );
         }
-        return TR_ERROR;
+        return TR_NET_ERROR;
     }
 
@@ -636 +636 @@
     }
 
-    if( TR_OK == readrequest( buf, res, 0, -1, &pmp->uptime, &pmp->renew, NULL ) &&
+    if( TR_NET_OK == readrequest( buf, res, 0, -1, &pmp->uptime, &pmp->renew, NULL ) &&
         PMP_STATE_NOBODYHOME == pmp->state )
     {
@@ -701 +701 @@
     {
         tr_err( "read truncated %i byte nat-pmp response packet", len );
-        return TR_ERROR;
+        return TR_NET_ERROR;
     }
     version      = buf[0];
@@ -711 +711 @@
     {
         tr_dbg( "nat-pmp ignoring request packet" );
-        return TR_WAIT;
+        return TR_NET_WAIT;
     }
     opcode = PMP_OPCODE_FROM_RESPONSE( opcode );
@@ -718 +718 @@
     {
         tr_err( "bad nat-pmp version %hhu", buf[0] );
-        return TR_ERROR;
+        return TR_NET_ERROR;
     }
     if( wantedopcode != opcode )
     {
         tr_err( "bad nat-pmp opcode %hhu", opcode );
-        return TR_ERROR;
+        return TR_NET_ERROR;
     }
     switch( rescode )
@@ -739 +739 @@
         default:
             tr_err( "bad nat-pmp result code %hu", rescode );
-            return TR_ERROR;
+            return TR_NET_ERROR;
     }
 
@@ -745 +745 @@
     {
         tr_err( "read truncated %i byte nat-pmp response packet", len );
-        return TR_ERROR;
+        return TR_NET_ERROR;
     }
     seconds = PMP_FROMBUF32( buf + 4 );
@@ -754 +754 @@
         tr_inf( "detected nat-pmp device reset" );
         /* XXX should reset retry counter here */
-        return TR_WAIT;
+        return TR_NET_WAIT;
     }
 
@@ -763 +763 @@
         {
             tr_err( "read truncated %i byte nat-pmp response packet", len );
-            return TR_ERROR;
+            return TR_NET_ERROR;
         }
         privport = PMP_FROMBUF16( buf + 8 );
@@ -774 +774 @@
             tr_dbg( "nat-pmp ignoring message for port %i, expected port %i",
                     privport, port );
-            return TR_WAIT;
+            return TR_NET_WAIT;
         }
 
@@ -783 +783 @@
                 *tmpfail = 1;
                 /* XXX should just start announcing the pub port we're given */
-                return TR_ERROR;
+                return TR_NET_ERROR;
             }
             tr_dbg( "nat-pmp set renew to half of %u", lifetime );
@@ -790 +790 @@
     }
 
-    return TR_OK;
-}
+    return TR_NET_OK;
+}