Changeset 5279

Timestamp:

Mar 18, 2008, 2:15:19 AM (15 years ago)

Author:

charles

Message:

make the Port Forwarding error messages a little easier for beginners to understand

Location:

trunk/libtransmission

Files:

• natpmp.c (modified) (2 diffs)
• shared.c (modified) (1 diff)
• upnp.c (modified) (2 diffs)

trunk/libtransmission/natpmp.c

@@ -70 +70 @@
         tr_ndbg( getKey(), _( "%s succeeded (%d)" ), func, ret );
     else
-        tr_nerr( getKey(), _( "%s failed (%d): %s (%d)" ), func, ret, tr_strerror(errno), errno );
+        tr_ndbg( getKey(), _( "%s failed (%d): %s (%d)" ), func, ret, tr_strerror(errno), errno );
 }
 
@@ -110 +110 @@
 setErrorState( struct tr_natpmp * nat )
 {
-    tr_nerr( getKey(), _( "If your router supports NAT-PMP, please make sure NAT-PMP is enabled!" ) );
-    tr_nerr( getKey(), _( "NAT-PMP port forwarding unsuccessful, trying UPnP next" ) );
+    tr_ndbg( getKey(), _( "If your router supports NAT-PMP, please make sure NAT-PMP is enabled!" ) );
+    tr_ndbg( getKey(), _( "NAT-PMP port forwarding unsuccessful, trying UPnP next" ) );
     nat->state = TR_NATPMP_ERR;
 }

trunk/libtransmission/shared.c

@@ -96 +96 @@
         tr_ninf( getKey(), _( "State changed from \"%s\" to \"%s\"" ), getNatStateStr(s->natStatus), getNatStateStr(status) );
         s->natStatus = status;
+        if( status == TR_NAT_TRAVERSAL_ERROR )
+            tr_nerr( getKey(), _( "Port forwarding failed.  See debug messages for more information." ) );
     }
 }

trunk/libtransmission/upnp.c

@@ -89 +89 @@
         devlist = upnpDiscover( 2000, NULL, NULL );
         if( devlist == NULL ) {
-            tr_nerr( getKey(), _( "upnpDiscover failed (errno %d - %s)" ), errno, tr_strerror(errno) );
+            tr_ndbg( getKey(), _( "upnpDiscover failed (errno %d - %s)" ), errno, tr_strerror(errno) );
         }
         errno = 0;
         if( UPNP_GetValidIGD( devlist, &handle->urls, &handle->data, handle->lanaddr, sizeof(handle->lanaddr))) {
-            tr_ninf( getKey(), _( "Found Internet Gateway Device \"%s\"" ), handle->urls.controlURL );
-            tr_ninf( getKey(), _( "Local Address is \"%s\"" ), handle->lanaddr );
+            tr_ndbg( getKey(), _( "Found Internet Gateway Device \"%s\"" ), handle->urls.controlURL );
+            tr_ndbg( getKey(), _( "Local Address is \"%s\"" ), handle->lanaddr );
             handle->state = TR_UPNP_IDLE;
             handle->hasDiscovered = 1;
         } else {
             handle->state = TR_UPNP_ERR;
-            tr_nerr( getKey(), _( "UPNP_GetValidIGD failed (errno %d - %s)" ), errno, tr_strerror(errno) );
-            tr_nerr( getKey(), _( "If your router supports UPnP, please make sure UPnP is enabled!" ) );
+            tr_ndbg( getKey(), _( "UPNP_GetValidIGD failed (errno %d - %s)" ), errno, tr_strerror(errno) );
+            tr_ndbg( getKey(), _( "If your router supports UPnP, please make sure UPnP is enabled!" ) );
         }
         freeUPNPDevlist( devlist );
@@ -154 +154 @@
             handle->state = TR_UPNP_IDLE;
         } else {
-            tr_nerr( getKey(), _( "Port forwarding failed with error %d (%d - %s)" ), err, errno, tr_strerror(errno) );
-            tr_nerr( getKey(), _( "If your router supports UPnP, please make sure UPnP is enabled!" ) );
+            tr_ndbg( getKey(), _( "Port forwarding failed with error %d (%d - %s)" ), err, errno, tr_strerror(errno) );
+            tr_ndbg( getKey(), _( "If your router supports UPnP, please make sure UPnP is enabled!" ) );
             handle->port = -1;
             handle->state = TR_UPNP_ERR;