Changeset 4175

Timestamp:

Dec 15, 2007, 5:28:16 AM (15 years ago)

Author:

charles

Message:

add messages asking the user to check & make sure that port forwarding is enabled on their router

Location:

trunk/libtransmission

Files:

• natpmp.c (modified) (2 diffs)
• upnp.c (modified) (4 diffs)

trunk/libtransmission/natpmp.c

@@ -131 +131 @@
             nat->state = TR_NATPMP_IDLE;
         } else if( val != NATPMP_TRYAGAIN ) {
+            tr_err( KEY "If your router supports NAT-PMP, please make sure NAT-PMP is enabled!" );
             nat->state = TR_NATPMP_ERR;
         }
@@ -160 +161 @@
             nat->isMapped = 0;
         } else if( val != NATPMP_TRYAGAIN ) {
+            tr_err( KEY "If your router supports NAT-PMP, please make sure NAT-PMP is enabled!" );
             nat->state = TR_NATPMP_ERR;
         }

trunk/libtransmission/upnp.c

@@ -94 +94 @@
         errno = 0;
         if( UPNP_GetValidIGD( devlist, &handle->urls, &handle->data, handle->lanaddr, sizeof(handle->lanaddr))) {
-            tr_inf( KEY "found Internet Gateway Device '%s'", handle->urls.controlURL );
-            tr_inf( KEY "local LAN IP Address is '%s'", handle->lanaddr );
+            tr_inf( KEY "Found Internet Gateway Device '%s'", handle->urls.controlURL );
+            tr_inf( KEY "Local LAN IP Address is '%s'", handle->lanaddr );
             handle->state = TR_UPNP_IDLE;
             handle->hasDiscovered = 1;
@@ -101 +101 @@
             handle->state = TR_UPNP_ERR;
             tr_err( KEY "UPNP_GetValidIGD failed.  (errno %d - %s)", errno, strerror(errno) );
+            tr_err( KEY "If your router supports UPnP, please make sure UPnP is enabled!" );
         }
         freeUPNPDevlist( devlist );
@@ -118 +119 @@
                                 handle->data.servicetype,
                                 portStr, "TCP" );
-        tr_dbg( KEY "stopping port forwarding of '%s', service '%s'",
+        tr_dbg( KEY "Stopping port forwarding of '%s', service '%s'",
                 handle->urls.controlURL, handle->data.servicetype );
         handle->isMapped = 0;
@@ -142 +143 @@
                                                   portStr, portStr, handle->lanaddr,
                                                   "Transmission", "TCP" ) );
-        tr_inf( KEY "port forwarding via '%s', service '%s'.  (local address: %s:%d)",
+        tr_inf( KEY "Port forwarding via '%s', service '%s'.  (local address: %s:%d)",
                 handle->urls.controlURL, handle->data.servicetype, handle->lanaddr, port );
         if( handle->isMapped ) {
-            tr_inf( KEY "port forwarding successful!" );
+            tr_inf( KEY "Port forwarding successful!" );
             handle->port = port;
             handle->state = TR_UPNP_IDLE;
         } else {
-            tr_err( KEY "port forwarding failed (errno %d - %s)", errno, strerror(errno) );
+            tr_err( KEY "Port forwarding failed (errno %d - %s)", errno, strerror(errno) );
+            tr_err( KEY "If your router supports UPnP, please make sure UPnP is enabled!" );
             handle->port = -1;
             handle->state = TR_UPNP_ERR;