Changeset 5243
- Timestamp:
- Mar 13, 2008, 3:53:18 AM (15 years ago)
- Location:
- trunk
- Files:
-
- 12 edited
-
gtk/msgwin.c (modified) (1 diff)
-
libtransmission/fastresume.c (modified) (7 diffs)
-
libtransmission/natpmp.c (modified) (5 diffs)
-
libtransmission/peer-msgs.c (modified) (1 diff)
-
libtransmission/shared.c (modified) (4 diffs)
-
libtransmission/torrent.c (modified) (3 diffs)
-
libtransmission/tracker.c (modified) (4 diffs)
-
libtransmission/transmission.h (modified) (1 diff)
-
libtransmission/upnp.c (modified) (3 diffs)
-
libtransmission/utils.c (modified) (7 diffs)
-
libtransmission/utils.h (modified) (1 diff)
-
libtransmission/verify.c (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/gtk/msgwin.c
r5227 r5243 111 111 } 112 112 113 line = g_strdup_printf( "%02i:%02i:%02i %s\n", tm->tm_hour, tm->tm_min, tm->tm_sec, ii->message ); 113 line = ( ii->name != NULL ) 114 ? g_strdup_printf( "%02i:%02i:%02i [%s] %s\n", tm->tm_hour, tm->tm_min, tm->tm_sec, ii->name, ii->message ) 115 : g_strdup_printf( "%02i:%02i:%02i %s\n", tm->tm_hour, tm->tm_min, tm->tm_sec, ii->message ); 114 116 len = strlen( line ); 115 117 -
trunk/libtransmission/fastresume.c
r5224 r5243 189 189 file = fopen( path, "wb+" ); 190 190 if( !file ) { 191 tr_ err(_( "Couldn't open \"%s\": %s" ), path, tr_strerror( errno ) );191 tr_torerr( tor, _( "Couldn't open \"%s\": %s" ), path, tr_strerror( errno ) ); 192 192 return; 193 193 } … … 324 324 325 325 fclose( file ); 326 327 /*tr_dbg( "Wrote resume file for \"%s\"", tor->info.name );*/328 326 } 329 327 … … 420 418 else { 421 419 tr_torrentSetFileChecked( tor, i, FALSE ); 422 tr_ dbg( _( "Torrent \"%s\" needs to be verified" ), tor->info.files[i].name);420 tr_tordbg( tor, _( "Torrent needs to be verified" ) ); 423 421 } 424 422 } … … 543 541 } 544 542 545 tr_ dbg(_( "Loaded %i peers from resume file" ), count );543 tr_tordbg( tor, _( "Loaded %i peers from resume file" ), count ); 546 544 ret = TR_FR_PEERS; 547 545 } … … 589 587 case FR_ID_MAX_PEERS: ret |= parseConnections( tor, buf, len ); break; 590 588 case FR_ID_DESTINATION: ret |= parseDestination( tor, buf, len ); break; 591 default: tr_ dbg(_( "Skipping unknown resume code %d" ), (int)id ); break;589 default: tr_tordbg( tor, _( "Skipping unknown resume code %d" ), (int)id ); break; 592 590 } 593 591 … … 633 631 if( !buf ) 634 632 /* %s is the torrent name */ 635 tr_ inf(_( "Couldn't read resume file for \"%s\"" ), tor->info.name );633 tr_torinf( tor, _( "Couldn't read resume file for \"%s\"" ), tor->info.name ); 636 634 else { 637 635 const uint8_t * walk = buf; … … 644 642 else 645 643 /* %s is the torrent name */ 646 tr_ inf(_( "Skipping invalid resume file for \"%s\"" ), tor->info.name );644 tr_torinf( tor, _( "Skipping invalid resume file for \"%s\"" ), tor->info.name ); 647 645 } 648 646 -
trunk/libtransmission/natpmp.c
r5224 r5243 66 66 { 67 67 if( ret==NATPMP_TRYAGAIN ) 68 tr_ dbg( _( "%s: %s responded 'try again'" ), getKey(), func );68 tr_ndbg( getKey(), _( "%s responded 'try again'" ), func ); 69 69 else if( ret >= 0 ) 70 tr_ dbg( _( "%s: %s succeeded (%d)" ), getKey(), func, ret );70 tr_ndbg( getKey(), _( "%s succeeded (%d)" ), func, ret ); 71 71 else 72 tr_ err( _( "%s: %s failed (%d): %s (%d)" ), getKey(), func, ret, tr_strerror(errno), errno );72 tr_nerr( getKey(), _( "%s failed (%d): %s (%d)" ), func, ret, tr_strerror(errno), errno ); 73 73 } 74 74 … … 110 110 setErrorState( struct tr_natpmp * nat ) 111 111 { 112 tr_ err( _( "%s: If your router supports NAT-PMP, please make sure NAT-PMP is enabled!" ), getKey() );113 tr_ err( _( "%s: NAT-PMP port forwarding unsuccessful, trying UPnP next" ), getKey() );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" ) ); 114 114 nat->state = TR_NATPMP_ERR; 115 115 } … … 137 137 logVal( "readnatpmpresponseorretry", val ); 138 138 if( val >= 0 ) { 139 tr_ inf( _( "%s: found public address %s" ), getKey(), inet_ntoa( response.publicaddress.addr ) );139 tr_ninf( getKey(), _( "found public address %s" ), inet_ntoa( response.publicaddress.addr ) ); 140 140 nat->state = TR_NATPMP_IDLE; 141 141 } else if( val != NATPMP_TRYAGAIN ) { … … 164 164 logVal( "readnatpmpresponseorretry", val ); 165 165 if( val >= 0 ) { 166 tr_ inf( _( "%s: no longer forwarding port %d" ), getKey(), nat->port );166 tr_ninf( getKey(), _( "no longer forwarding port %d" ), nat->port ); 167 167 nat->state = TR_NATPMP_IDLE; 168 168 nat->port = -1; … … 200 200 nat->renewTime = time( NULL ) + LIFETIME_SECS; 201 201 nat->port = resp.newportmapping.privateport; 202 tr_ inf( _( "%s: port %d forwarded successfully" ), getKey(), nat->port );202 tr_ninf( getKey(), _( "port %d forwarded successfully" ), nat->port ); 203 203 } else if( val != NATPMP_TRYAGAIN ) { 204 204 setErrorState( nat ); -
trunk/libtransmission/peer-msgs.c
r5225 r5243 973 973 { 974 974 const int n = sub->val.s.i / 6 ; 975 tr_ inf( _( "Torrent \"%s\" got %d peers from peer exchange" ), msgs->torrent->info.name, n );975 tr_torinf( msgs->torrent, _( "Got %d peers from peer exchange" ), n ); 976 976 tr_peerMgrAddPeers( msgs->handle->peerMgr, 977 977 msgs->torrent->info.hash, -
trunk/libtransmission/shared.c
r5226 r5243 94 94 status = tr_upnpPulse( s->upnp, port, isEnabled ); 95 95 if( status != s->natStatus ) { 96 tr_ inf( _( "%s: state changed from \"%s\" to \"%s\"" ), getKey(), getNatStateStr(s->natStatus), getNatStateStr(status) );96 tr_ninf( getKey(), _( "state changed from \"%s\" to \"%s\"" ), getNatStateStr(s->natStatus), getNatStateStr(status) ); 97 97 s->natStatus = status; 98 98 } … … 104 104 if( s->bindSocket >= 0 && ( s->bindPort != s->publicPort ) ) 105 105 { 106 tr_ inf( _( "%s: Closing port %d" ), getKey(), s->bindPort );106 tr_ninf( getKey(), _( "Closing port %d" ), s->bindPort ); 107 107 tr_netClose( s->bindSocket ); 108 108 s->bindSocket = -1; … … 115 115 socket = tr_netBindTCP( s->publicPort ); 116 116 if( socket >= 0 ) { 117 tr_ inf( _( "%s: Opened port %d to listen for incoming peer connections" ), getKey(), s->publicPort );117 tr_ninf( getKey(), _( "Opened port %d to listen for incoming peer connections" ), s->publicPort ); 118 118 s->bindPort = s->publicPort; 119 119 s->bindSocket = socket; 120 120 listen( s->bindSocket, 5 ); 121 121 } else { 122 tr_ err( _( "%s:Couldn't open port %d to listen for incoming peer connections (errno %d - %s)" ),123 getKey(),s->publicPort, errno, tr_strerror(errno) );122 tr_nerr( getKey(), _( "Couldn't open port %d to listen for incoming peer connections (errno %d - %s)" ), 123 s->publicPort, errno, tr_strerror(errno) ); 124 124 s->bindPort = -1; 125 125 s->bindSocket = -1; … … 158 158 else if( ( shared->natStatus == TR_NAT_TRAVERSAL_ERROR ) || ( shared->natStatus == TR_NAT_TRAVERSAL_UNMAPPED ) ) 159 159 { 160 tr_ dbg( _( "%s: stopped" ), getKey() );160 tr_ndbg( getKey(), _( "Stopped" ) ); 161 161 shared->h->shared = NULL; 162 162 tr_netClose( shared->bindSocket ); -
trunk/libtransmission/torrent.c
r5241 r5243 158 158 159 159 case TR_TRACKER_WARNING: 160 tr_ err(_( "Tracker warning: %s" ), event->text );160 tr_torerr( tor, _( "Tracker warning: %s" ), event->text ); 161 161 tor->error = TR_ERROR_TC_WARNING; 162 162 strlcpy( tor->errorString, event->text, sizeof(tor->errorString) ); … … 164 164 165 165 case TR_TRACKER_ERROR: 166 tr_ err(_( "Tracker error: %s" ), event->text );166 tr_torerr( tor, _( "Tracker error: %s" ), event->text ); 167 167 tor->error = TR_ERROR_TC_ERROR; 168 168 strlcpy( tor->errorString, event->text, sizeof(tor->errorString) ); … … 876 876 h->torrentCount--; 877 877 878 tr_ inf(_( "Closing torrent %s; %d torrents left" ),879 tor->info.name,h->torrentCount );878 tr_torinf( tor, _( "Closing torrent %s; %d torrents left" ), 879 h->torrentCount ); 880 880 881 881 tr_metainfoFree( inf ); -
trunk/libtransmission/tracker.c
r5173 r5243 263 263 event.peerCount = count; 264 264 event.peerCompact = peers; 265 tr_ dbg( "Torrent \"%s\"got %d new peers", t->name, count );265 tr_ndbg( t->name, "Torrent got %d new peers", t->name, count ); 266 266 if( count ) 267 267 tr_publisherPublish( t->publisher, t, &event ); … … 413 413 strlcpy( t->lastAnnounceResponse, req->response_code_line, sizeof( t->lastAnnounceResponse ) ); 414 414 415 tr_dbg( "Torrent \"%s\" tracker response: %s", 416 t->name, 417 ( req ? req->response_code_line : "(null)") ); 415 tr_ndbg( t->name, "tracker response: %s", 416 ( req ? req->response_code_line : "(null)") ); 418 417 419 418 if( req && ( req->response_code == HTTP_OK ) ) … … 574 573 strlcpy( t->lastScrapeResponse, req->response_code_line, sizeof( t->lastScrapeResponse ) ); 575 574 576 tr_dbg( "Got scrape response for '%s': %s", 577 t->name, 578 ( ( req && req->response_code_line ) ? req->response_code_line 579 : "(null)") ); 575 tr_ndbg( t->name, "Got scrape response: \"%s\"", 576 ( ( req && req->response_code_line ) ? req->response_code_line : "(null)") ); 580 577 581 578 if( req && ( req->response_code == HTTP_OK ) ) … … 613 610 t->scrapeIntervalSec = tmp->val.i; 614 611 615 tr_dbg( "Torrent '%s' scrape successful." 616 " Rescraping in %d seconds", 617 t->name, t->scrapeIntervalSec ); 612 tr_ndbg( t->name, "Scrape successful. Rescraping in %d seconds.", 613 t->scrapeIntervalSec ); 618 614 619 615 nextScrapeSec = t->scrapeIntervalSec; -
trunk/libtransmission/transmission.h
r5185 r5243 160 160 typedef struct tr_msg_list 161 161 { 162 uint8_t level; 163 time_t when; 164 char * message; 165 const char * file; 166 int line; 162 /* TR_MSG_ERR, TR_MSG_INF, or TR_MSG_DBG */ 163 uint8_t level; 164 165 /* Time the message was generated */ 166 time_t when; 167 168 /* The torrent associated with this message, 169 * or a module name such as "Port Forwarding" for non-torrent messages, 170 * or NULL. */ 171 char * name; 172 173 /* The message */ 174 char * message; 175 176 /* The source file where this message originated */ 177 const char * file; 178 179 /* The line number in the source file where this message originated */ 180 int line; 181 182 /* linked list of messages */ 167 183 struct tr_msg_list * next; 168 184 } -
trunk/libtransmission/upnp.c
r5226 r5243 89 89 devlist = upnpDiscover( 2000, NULL, NULL ); 90 90 if( devlist == NULL ) { 91 tr_ err( _( "%s: upnpDiscover failed (errno %d - %s)" ), getKey(), errno, tr_strerror(errno) );91 tr_nerr( getKey(), _( "upnpDiscover failed (errno %d - %s)" ), errno, tr_strerror(errno) ); 92 92 } 93 93 errno = 0; 94 94 if( UPNP_GetValidIGD( devlist, &handle->urls, &handle->data, handle->lanaddr, sizeof(handle->lanaddr))) { 95 tr_ inf( _( "%s: Found Internet Gateway Device \"%s\"" ), getKey(), handle->urls.controlURL );96 tr_ inf( _( "%s: Local Address is \"%s\"" ), getKey(), handle->lanaddr );95 tr_ninf( getKey(), _( "Found Internet Gateway Device \"%s\"" ), handle->urls.controlURL ); 96 tr_ninf( getKey(), _( "Local Address is \"%s\"" ), handle->lanaddr ); 97 97 handle->state = TR_UPNP_IDLE; 98 98 handle->hasDiscovered = 1; 99 99 } else { 100 100 handle->state = TR_UPNP_ERR; 101 tr_ err( _( "%s: UPNP_GetValidIGD failed (errno %d - %s)" ), getKey(), errno, tr_strerror(errno) );102 tr_ err( _( "%s: If your router supports UPnP, please make sure UPnP is enabled!" ), getKey() );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!" ) ); 103 103 } 104 104 freeUPNPDevlist( devlist ); … … 118 118 handle->data.servicetype, 119 119 portStr, "TCP" ); 120 tr_ dbg( _( "%s:Stopping port forwarding of \"%s\", service \"%s\"" ),121 getKey(),handle->urls.controlURL, handle->data.servicetype );120 tr_ndbg( getKey(), _( "Stopping port forwarding of \"%s\", service \"%s\"" ), 121 handle->urls.controlURL, handle->data.servicetype ); 122 122 handle->isMapped = 0; 123 123 handle->state = TR_UPNP_IDLE; … … 147 147 handle->isMapped = !err; 148 148 } 149 tr_ inf( _( "%s:Port forwarding via \"%s\", service \"%s\". (local address: %s:%d)" ),150 getKey(),handle->urls.controlURL, handle->data.servicetype, handle->lanaddr, port );149 tr_ninf( getKey(), _( "Port forwarding via \"%s\", service \"%s\". (local address: %s:%d)" ), 150 handle->urls.controlURL, handle->data.servicetype, handle->lanaddr, port ); 151 151 if( handle->isMapped ) { 152 tr_ inf( _( "%s: Port forwarding successful!" ), getKey() );152 tr_ninf( getKey(), _( "Port forwarding successful!" ) ); 153 153 handle->port = port; 154 154 handle->state = TR_UPNP_IDLE; 155 155 } else { 156 tr_ err( _( "%s: Port forwarding failed with error %d (%d - %s)" ), getKey(), err, errno, tr_strerror(errno) );157 tr_ err( _( "%s: If your router supports UPnP, please make sure UPnP is enabled!" ), getKey() );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!" ) ); 158 158 handle->port = -1; 159 159 handle->state = TR_UPNP_ERR; -
trunk/libtransmission/utils.c
r5226 r5243 117 117 } 118 118 119 int tr_getMessageLevel( void ) 119 int 120 tr_getMessageLevel( void ) 120 121 { 121 122 int ret; … … 129 130 } 130 131 131 void tr_setMessageQueuing( int enabled ) 132 void 133 tr_setMessageQueuing( int enabled ) 132 134 { 133 135 tr_msgInit(); … … 137 139 } 138 140 139 tr_msg_list * tr_getQueuedMessages( void ) 141 tr_msg_list * 142 tr_getQueuedMessages( void ) 140 143 { 141 144 tr_msg_list * ret; … … 151 154 } 152 155 153 void tr_freeMessageList( tr_msg_list * list ) 156 void 157 tr_freeMessageList( tr_msg_list * list ) 154 158 { 155 159 tr_msg_list * next; … … 159 163 next = list->next; 160 164 free( list->message ); 165 free( list->name ); 161 166 free( list ); 162 167 list = next; … … 193 198 194 199 void 195 tr_msg( const char * file, int line, int level, const char * fmt, ... ) 200 tr_msg( const char * file, int line, int level, 201 const char * name, 202 const char * fmt, ... ) 196 203 { 197 204 FILE * fp; … … 230 237 newmsg->file = file; 231 238 newmsg->line = line; 239 newmsg->name = tr_strdup( name ); 232 240 233 241 *messageQueueTail = newmsg; -
trunk/libtransmission/utils.h
r5202 r5243 44 44 #endif 45 45 46 #define tr_err( a... ) tr_msg( __FILE__, __LINE__, TR_MSG_ERR, ## a ) 47 #define tr_inf( a... ) tr_msg( __FILE__, __LINE__, TR_MSG_INF, ## a ) 48 #define tr_dbg( a... ) tr_msg( __FILE__, __LINE__, TR_MSG_DBG, ## a ) 49 void tr_msg ( const char * file, int line, int level, const char * msg, ... ); 46 #define tr_nerr( n, a... ) tr_msg( __FILE__, __LINE__, TR_MSG_ERR, n, ## a ) 47 #define tr_ninf( n, a... ) tr_msg( __FILE__, __LINE__, TR_MSG_INF, n, ## a ) 48 #define tr_ndbg( n, a... ) tr_msg( __FILE__, __LINE__, TR_MSG_DBG, n, ## a ) 49 50 #define tr_torerr( tor, a... ) tr_msg( __FILE__, __LINE__, TR_MSG_ERR, tor->info.name, ## a ) 51 #define tr_torinf( tor, a... ) tr_msg( __FILE__, __LINE__, TR_MSG_INF, tor->info.name, ## a ) 52 #define tr_tordbg( tor, a... ) tr_msg( __FILE__, __LINE__, TR_MSG_DBG, tor->info.name, ## a ) 53 54 #define tr_err( a... ) tr_msg( __FILE__, __LINE__, TR_MSG_ERR, NULL, ## a ) 55 #define tr_inf( a... ) tr_msg( __FILE__, __LINE__, TR_MSG_INF, NULL, ## a ) 56 #define tr_dbg( a... ) tr_msg( __FILE__, __LINE__, TR_MSG_DBG, NULL, ## a ) 57 void tr_msg ( const char * file, int line, int level, const char * torrent, const char * msg, ... ); 50 58 FILE* tr_getLog( void ); 51 59 -
trunk/libtransmission/verify.c
r5221 r5243 126 126 tor->verifyState = TR_VERIFY_NOW; 127 127 128 tr_ inf( _( "Verifying torrent \"%s\"" ), tor->info.name);128 tr_torinf( tor, _( "Verifying torrent" ) ); 129 129 for( i=0; i<tor->info.fileCount && !stopCurrent; ++i ) 130 130 checkFile( tor, i, &stopCurrent ); … … 158 158 struct verify_node * node; 159 159 160 tr_ inf( _( "Queueing \"%s\" for verification" ), tor->info.name);160 tr_torinf( tor, _( "Queued for verification" ) ); 161 161 162 162 node = tr_new( struct verify_node, 1 );
Note: See TracChangeset
for help on using the changeset viewer.
