Changeset 4154 for trunk/libtransmission/upnp.c

Timestamp:

Dec 13, 2007, 6:56:22 PM (15 years ago)

Author:

charles

Message:

take pea_'s suggestion of not sending out natpmp/upnp discover messages until port forwarding is enabled

File:

• trunk/libtransmission/upnp.c (modified) (3 diffs)

trunk/libtransmission/upnp.c

@@ -57 +57 @@
 {
     tr_upnp * ret = tr_new0( tr_upnp, 1 );
+    ret->state = TR_UPNP_DISCOVER;
     ret->port = -1;
     return ret;
@@ -81 +82 @@
     int ret;
 
-    if( handle->state == TR_UPNP_IDLE )
-    {
-        if( !handle->hasDiscovered )
-            handle->state = TR_UPNP_DISCOVER;
-    }
-
-    if( handle->state == TR_UPNP_DISCOVER )
+    if( isEnabled && ( handle->state == TR_UPNP_DISCOVER ) )
     {
         struct UPNPDev * devlist;
@@ -158 +153 @@
     }
 
-    if( handle->state == TR_UPNP_ERR )
-        ret = TR_NAT_TRAVERSAL_ERROR;
-    else if( ( handle->state == TR_UPNP_IDLE ) && handle->isMapped )
-        ret = TR_NAT_TRAVERSAL_MAPPED;
-    else if( ( handle->state == TR_UPNP_IDLE ) && !handle->isMapped )
-        ret = TR_NAT_TRAVERSAL_UNMAPPED;
-    else if( handle->state == TR_UPNP_MAP )
-        ret = TR_NAT_TRAVERSAL_MAPPING;
-    else if( handle->state == TR_UPNP_UNMAP )
-        ret = TR_NAT_TRAVERSAL_UNMAPPING;
+    switch( handle->state )
+    {
+        case TR_UPNP_DISCOVER: ret = TR_NAT_TRAVERSAL_UNMAPPED; break;
+        case TR_UPNP_MAP:      ret = TR_NAT_TRAVERSAL_MAPPING; break;
+        case TR_UPNP_UNMAP:    ret = TR_NAT_TRAVERSAL_UNMAPPING; break;
+        case TR_UPNP_IDLE:     ret = handle->isMapped ? TR_NAT_TRAVERSAL_MAPPED
+                                                      : TR_NAT_TRAVERSAL_UNMAPPED; break;
+        default:               ret = TR_NAT_TRAVERSAL_ERROR; break;
+    }
+
     return ret;
 }