Browse Source

Display v4 addresses in v4 mode nicer

dynamic-accesslists
erdgeist 16 years ago
parent
commit
2a94892890
  1. 2
      opentracker.c
  2. 2
      ot_accesslist.c
  3. 4
      ot_stats.c

2
opentracker.c

@ -257,7 +257,7 @@ static int64_t ot_try_bind( ot_ip6 ip, uint16_t port, PROTO_FLAG proto ) {
char *protos[] = {"TCP","UDP","UDP mcast"}; char *protos[] = {"TCP","UDP","UDP mcast"};
char _debug[512]; char _debug[512];
int off = snprintf( _debug, sizeof(_debug), "Binding socket type %s to address [", protos[proto] ); int off = snprintf( _debug, sizeof(_debug), "Binding socket type %s to address [", protos[proto] );
off += fmt_ip6( _debug+off, ip); off += fmt_ip6c( _debug+off, ip);
snprintf( _debug + off, sizeof(_debug)-off, "]:%d...", port); snprintf( _debug + off, sizeof(_debug)-off, "]:%d...", port);
fputs( _debug, stderr ); fputs( _debug, stderr );
#endif #endif

2
ot_accesslist.c

@ -119,7 +119,7 @@ int accesslist_blessip( ot_ip6 ip, ot_permissions permissions ) {
{ {
char _debug[512]; char _debug[512];
int off = snprintf( _debug, sizeof(_debug), "Blessing ip address " ); int off = snprintf( _debug, sizeof(_debug), "Blessing ip address " );
off += fmt_ip6(_debug+off, ip ); off += fmt_ip6c(_debug+off, ip );
if( permissions & OT_PERMISSION_MAY_STAT ) off += snprintf( _debug+off, 512-off, " may_fetch_stats" ); if( permissions & OT_PERMISSION_MAY_STAT ) off += snprintf( _debug+off, 512-off, " may_fetch_stats" );
if( permissions & OT_PERMISSION_MAY_LIVESYNC ) off += snprintf( _debug+off, 512-off, " may_sync_live" ); if( permissions & OT_PERMISSION_MAY_LIVESYNC ) off += snprintf( _debug+off, 512-off, " may_sync_live" );

4
ot_stats.c

@ -603,7 +603,7 @@ void stats_issue_event( ot_status_event event, PROTO_FLAG proto, uintptr_t event
ot_ip6 *ip = (ot_ip6*)event_data; /* ugly hack to transfer ip to stats */ ot_ip6 *ip = (ot_ip6*)event_data; /* ugly hack to transfer ip to stats */
char _debug[512]; char _debug[512];
int off = snprintf( _debug, sizeof(_debug), "[%08d] scrp: ", (unsigned int)(g_now_seconds - ot_start_time)/60 ); int off = snprintf( _debug, sizeof(_debug), "[%08d] scrp: ", (unsigned int)(g_now_seconds - ot_start_time)/60 );
off += fmt_ip6( _debug+off, *ip ); off += fmt_ip6c( _debug+off, *ip );
off += snprintf( _debug+off, sizeof(_debug)-off, " - FULL SCRAPE\n" ); off += snprintf( _debug+off, sizeof(_debug)-off, " - FULL SCRAPE\n" );
write( 2, _debug, off ); write( 2, _debug, off );
ot_full_scrape_request_count++; ot_full_scrape_request_count++;
@ -614,7 +614,7 @@ void stats_issue_event( ot_status_event event, PROTO_FLAG proto, uintptr_t event
ot_ip6 *ip = (ot_ip6*)event_data; /* ugly hack to transfer ip to stats */ ot_ip6 *ip = (ot_ip6*)event_data; /* ugly hack to transfer ip to stats */
char _debug[512]; char _debug[512];
int off = snprintf( _debug, sizeof(_debug), "[%08d] scrp: ", (unsigned int)(g_now_seconds - ot_start_time)/60 ); int off = snprintf( _debug, sizeof(_debug), "[%08d] scrp: ", (unsigned int)(g_now_seconds - ot_start_time)/60 );
off += fmt_ip6(_debug+off, *ip ); off += fmt_ip6c(_debug+off, *ip );
off += snprintf( _debug+off, sizeof(_debug)-off, " - FULL SCRAPE\n" ); off += snprintf( _debug+off, sizeof(_debug)-off, " - FULL SCRAPE\n" );
write( 2, _debug, off ); write( 2, _debug, off );
ot_full_scrape_request_count++; ot_full_scrape_request_count++;

Loading…
Cancel
Save