Changeset 5279


Ignore:
Timestamp:
Mar 18, 2008, 2:15:19 AM (14 years ago)
Author:
charles
Message:

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

Location:
trunk/libtransmission
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/libtransmission/natpmp.c

    r5243 r5279  
    7070        tr_ndbg( getKey(), _( "%s succeeded (%d)" ), func, ret );
    7171    else
    72         tr_nerr( getKey(), _( "%s failed (%d): %s (%d)" ), func, ret, tr_strerror(errno), errno );
     72        tr_ndbg( getKey(), _( "%s failed (%d): %s (%d)" ), func, ret, tr_strerror(errno), errno );
    7373}
    7474
     
    110110setErrorState( struct tr_natpmp * nat )
    111111{
    112     tr_nerr( getKey(), _( "If your router supports NAT-PMP, please make sure NAT-PMP is enabled!" ) );
    113     tr_nerr( getKey(), _( "NAT-PMP port forwarding unsuccessful, trying UPnP next" ) );
     112    tr_ndbg( getKey(), _( "If your router supports NAT-PMP, please make sure NAT-PMP is enabled!" ) );
     113    tr_ndbg( getKey(), _( "NAT-PMP port forwarding unsuccessful, trying UPnP next" ) );
    114114    nat->state = TR_NATPMP_ERR;
    115115}
  • trunk/libtransmission/shared.c

    r5266 r5279  
    9696        tr_ninf( getKey(), _( "State changed from \"%s\" to \"%s\"" ), getNatStateStr(s->natStatus), getNatStateStr(status) );
    9797        s->natStatus = status;
     98        if( status == TR_NAT_TRAVERSAL_ERROR )
     99            tr_nerr( getKey(), _( "Port forwarding failed.  See debug messages for more information." ) );
    98100    }
    99101}
  • trunk/libtransmission/upnp.c

    r5243 r5279  
    8989        devlist = upnpDiscover( 2000, NULL, NULL );
    9090        if( devlist == NULL ) {
    91             tr_nerr( getKey(), _( "upnpDiscover failed (errno %d - %s)" ), errno, tr_strerror(errno) );
     91            tr_ndbg( getKey(), _( "upnpDiscover failed (errno %d - %s)" ), errno, tr_strerror(errno) );
    9292        }
    9393        errno = 0;
    9494        if( UPNP_GetValidIGD( devlist, &handle->urls, &handle->data, handle->lanaddr, sizeof(handle->lanaddr))) {
    95             tr_ninf( getKey(), _( "Found Internet Gateway Device \"%s\"" ), handle->urls.controlURL );
    96             tr_ninf( getKey(), _( "Local Address is \"%s\"" ), handle->lanaddr );
     95            tr_ndbg( getKey(), _( "Found Internet Gateway Device \"%s\"" ), handle->urls.controlURL );
     96            tr_ndbg( getKey(), _( "Local Address is \"%s\"" ), handle->lanaddr );
    9797            handle->state = TR_UPNP_IDLE;
    9898            handle->hasDiscovered = 1;
    9999        } else {
    100100            handle->state = TR_UPNP_ERR;
    101             tr_nerr( getKey(), _( "UPNP_GetValidIGD failed (errno %d - %s)" ), errno, tr_strerror(errno) );
    102             tr_nerr( getKey(), _( "If your router supports UPnP, please make sure UPnP is enabled!" ) );
     101            tr_ndbg( getKey(), _( "UPNP_GetValidIGD failed (errno %d - %s)" ), errno, tr_strerror(errno) );
     102            tr_ndbg( getKey(), _( "If your router supports UPnP, please make sure UPnP is enabled!" ) );
    103103        }
    104104        freeUPNPDevlist( devlist );
     
    154154            handle->state = TR_UPNP_IDLE;
    155155        } else {
    156             tr_nerr( getKey(), _( "Port forwarding failed with error %d (%d - %s)" ), err, errno, tr_strerror(errno) );
    157             tr_nerr( getKey(), _( "If your router supports UPnP, please make sure UPnP is enabled!" ) );
     156            tr_ndbg( getKey(), _( "Port forwarding failed with error %d (%d - %s)" ), err, errno, tr_strerror(errno) );
     157            tr_ndbg( getKey(), _( "If your router supports UPnP, please make sure UPnP is enabled!" ) );
    158158            handle->port = -1;
    159159            handle->state = TR_UPNP_ERR;
Note: See TracChangeset for help on using the changeset viewer.