Changeset 946:5d9229144cac in freeDiameter
- Timestamp:
- Feb 12, 2013, 8:38:32 PM (11 years ago)
- Branch:
- default
- Phase:
- public
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
include/freeDiameter/libfdproto.h
r941 r946 260 260 261 261 262 #define STD_TRACE_FMT_STRING "thread %s in %s@%s:%d: " 262 263 /************* 263 264 The general debug macro, each call results in two lines of debug messages (change the macro for more compact output) … … 267 268 #define TRACE_DEBUG(level,format,args... ) { \ 268 269 if ( TRACE_BOOL(level) ) { \ 269 char __buf[25]; \270 270 const char * __thn = ((char *)pthread_getspecific(fd_log_thname) ?: "unnamed"); \ 271 fd_log(level, "\t | tid:%-20s\t%s\tin %s@%s:%d\n" \ 272 "\t%s|%*s" format, \ 273 __thn, fd_log_time(NULL, __buf, sizeof(__buf)), __PRETTY_FUNCTION__, __FILE__, __LINE__,\ 274 (level < FULL)?"@":" ",level, "", ## args); \ 271 fd_log(level, STD_TRACE_FMT_STRING format, \ 272 __thn, __PRETTY_FUNCTION__, __FILE__, __LINE__, ## args); \ 275 273 } \ 276 274 } … … 280 278 if ( TRACE_BOOL(level) ) { \ 281 279 if (fd_g_debug_lvl > FULL) { \ 282 char __buf[25]; \283 280 const char * __thn = ((char *)pthread_getspecific(fd_log_thname) ?: "unnamed"); \ 284 fd_log(level, "\t | tid:%-20s\t%s\tin %s@%s:%d\n" \ 285 "\t%s|%*s" format, \ 286 __thn, fd_log_time(NULL, __buf, sizeof(__buf)), __PRETTY_FUNCTION__, __FILE__, __LINE__,\ 287 (level < FULL)?"@":" ",level, "", ## args); \ 281 fd_log(level, STD_TRACE_FMT_STRING format, \ 282 __thn, __PRETTY_FUNCTION__, __FILE__, __LINE__, ## args); \ 288 283 } else { \ 289 284 fd_log(level, format, ## args); \ … … 321 316 #define TRACE_DEBUG_BUFFER(level, prefix, buf, bufsz, suffix ) { \ 322 317 if ( TRACE_BOOL(level) ) { \ 323 char __ts[25]; \324 318 int __i; \ 325 319 size_t __sz = (size_t)(bufsz); \ 326 320 uint8_t * __buf = (uint8_t *)(buf); \ 327 321 char * __thn = ((char *)pthread_getspecific(fd_log_thname) ?: "unnamed"); \ 328 fd_log(level, "\t | tid:%-20s\t%s\tin %s@%s:%d\n" \ 329 "\t%s|%*s" prefix , \ 330 __thn, fd_log_time(NULL, __ts, sizeof(__ts)), __PRETTY_FUNCTION__, __FILE__, __LINE__, \ 331 (level < FULL)?"@":" ",level, ""); \ 322 fd_log(level, STD_TRACE_FMT_STRING prefix, \ 323 __thn, __PRETTY_FUNCTION__, __FILE__, __LINE__); \ 332 324 for (__i = 0; __i < __sz; __i++) { \ 333 325 fd_log(level, "%02.2hhx", __buf[__i]); \ … … 350 342 351 343 /* Dump one sockaddr Node information */ 352 #define sSA_DUMP_NODE( sa, flag ) {\344 #define sSA_DUMP_NODE( buf, bufsize, sa, flag ) { \ 353 345 sSA * __sa = (sSA *)(sa); \ 354 346 char __addrbuf[INET6_ADDRSTRLEN]; \ … … 362 354 flag); \ 363 355 if (__rc) \ 364 fd_log_debug("%s", (char *)gai_strerror(__rc)); \356 snprintf(buf, bufsize, "%s", gai_strerror(__rc)); \ 365 357 else \ 366 fd_log_debug("%s", &__addrbuf[0]);\358 snprintf(buf, bufsize, "%s", &__addrbuf[0]); \ 367 359 } else { \ 368 fd_log_debug("(NULL / ANY)");\360 snprintf(buf, bufsize, "(NULL / ANY)"); \ 369 361 } \ 370 362 } 371 363 /* Same but with the port (service) also */ 372 #define sSA_DUMP_NODE_SERV( sa, flag ) {\364 #define sSA_DUMP_NODE_SERV( buf, bufsize, sa, flag ) { \ 373 365 sSA * __sa = (sSA *)(sa); \ 374 366 char __addrbuf[INET6_ADDRSTRLEN]; \ … … 383 375 flag); \ 384 376 if (__rc) \ 385 fd_log_debug("%s", (char *)gai_strerror(__rc));\377 snprintf(buf, bufsize, "%s", gai_strerror(__rc)); \ 386 378 else \ 387 fd_log_debug("[%s]:%s", &__addrbuf[0],&__servbuf[0]);\379 snprintf(buf, bufsize, "[%s]:%s", &__addrbuf[0],&__servbuf[0]); \ 388 380 } else { \ 389 fd_log_debug("(NULL / ANY)");\381 snprintf(buf, bufsize,"(NULL / ANY)"); \ 390 382 } \ 391 383 } … … 394 386 #define TRACE_DEBUG_sSA(level, prefix, sa, flags, suffix ) { \ 395 387 if ( TRACE_BOOL(level) ) { \ 396 char __buf[25];\388 char buf[1024]; \ 397 389 char * __thn = ((char *)pthread_getspecific(fd_log_thname) ?: "unnamed"); \ 398 fd_log(level, "\t | tid:%-20s\t%s\tin %s@%s:%d\n" \ 399 "\t%s|%*s" prefix , \ 400 __thn, fd_log_time(NULL, __buf, sizeof(__buf)), __PRETTY_FUNCTION__, __FILE__, __LINE__,\ 401 (level < FULL)?"@":" ",level, ""); \ 402 sSA_DUMP_NODE_SERV( sa, flags ); \ 403 fd_log(level, suffix); \ 390 sSA_DUMP_NODE_SERV(buf, sizeof(buf), sa, flags ); \ 391 fd_log(level, STD_TRACE_FMT_STRING "%s%s%s", \ 392 __thn, __PRETTY_FUNCTION__, __FILE__, __LINE__, prefix, buf, suffix); \ 404 393 } \ 405 394 } -
libfdcore/cnxctx.c
r896 r946 229 229 230 230 if (TRACE_BOOL(INFO)) { 231 fd_log_debug("%s : accepted new client [", fd_cnx_getid(serv));232 sSA_DUMP_NODE( &ss, NI_NUMERICHOST );233 fd_log_debug(" ].\n");231 char buf[1024]; 232 sSA_DUMP_NODE( buf, sizeof(buf), &ss, NI_NUMERICHOST ); 233 fd_log_debug("%s : accepted new client [%s].\n", fd_cnx_getid(serv), buf); 234 234 } 235 235 … … 312 312 313 313 if (TRACE_BOOL(INFO)) { 314 fd_log_debug("Connection established to server '");315 sSA_DUMP_NODE_SERV( sa, NI_NUMERICSERV);316 fd_log_debug(" ' (TCP:%d).\n", sock);314 char buf[1024]; 315 sSA_DUMP_NODE_SERV( buf, sizeof(buf), sa, NI_NUMERICSERV); 316 fd_log_debug("Connection established to server '%s' (TCP:%d).\n", buf, sock); 317 317 } 318 318 … … 404 404 405 405 if (TRACE_BOOL(INFO)) { 406 fd_log_debug("Connection established to server '");407 sSA_DUMP_NODE_SERV( &primary, NI_NUMERICSERV);408 fd_log_debug(" ' (SCTP:%d, %d/%d streams).\n", sock, cnx->cc_sctp_para.str_in, cnx->cc_sctp_para.str_out);406 char buf[1024]; 407 sSA_DUMP_NODE_SERV( buf, sizeof(buf), &primary, NI_NUMERICSERV); 408 fd_log_debug("Connection established to server '%s' (SCTP:%d, %d/%d streams).\n", buf, sock, cnx->cc_sctp_para.str_in, cnx->cc_sctp_para.str_out); 409 409 } 410 410 -
libfdcore/config.c
r897 r946 352 352 fd_list_unlink(&ep->chain); 353 353 if (TRACE_BOOL(INFO)) { 354 fd_log_debug("Info: Removing local address conflicting with the flags no_IP / no_IP6 : ");355 sSA_DUMP_NODE( &ep->sa, NI_NUMERICHOST );356 fd_log_debug(" \n");354 char buf[1024]; 355 sSA_DUMP_NODE( buf, sizeof(buf), &ep->sa, NI_NUMERICHOST ); 356 fd_log_debug("Info: Removing local address conflicting with the flags no_IP / no_IP6 : %s\n", buf); 357 357 } 358 358 free(ep); -
libfdcore/endpoints.c
r740 r946 59 59 60 60 if (TRACE_BOOL(ANNOYING + 1)) { 61 char buf[1024]; 62 sSA_DUMP_NODE_SERV( buf, sizeof(buf), sa, NI_NUMERICHOST | NI_NUMERICSERV ); 61 63 TRACE_DEBUG(ANNOYING, " DEBUG:fd_ep_add_merge Current list:"); 62 64 fd_ep_dump( 4, list ); 63 65 TRACE_DEBUG(ANNOYING, " DEBUG:fd_ep_add_merge Adding:"); 64 fd_log_debug(" "); 65 sSA_DUMP_NODE_SERV( sa, NI_NUMERICHOST | NI_NUMERICSERV ); 66 fd_log_debug(" {%s%s%s%s}\n", 66 fd_log_debug(" %s {%s%s%s%s}\n", buf, 67 67 (flags & EP_FL_CONF) ? "C" : "-", 68 68 (flags & EP_FL_DISC) ? "D" : "-", … … 336 336 void fd_ep_dump_one( char * prefix, struct fd_endpoint * ep, char * suffix ) 337 337 { 338 if (prefix) 339 fd_log_debug("%s", prefix); 340 341 sSA_DUMP_NODE_SERV( &ep->sa, NI_NUMERICHOST | NI_NUMERICSERV ); 342 fd_log_debug(" {%s%s%s%s}", 338 char buf[1024]; 339 340 sSA_DUMP_NODE_SERV( buf, sizeof(buf), &ep->sa, NI_NUMERICHOST | NI_NUMERICSERV ); 341 fd_log_debug("%s%s {%s%s%s%s}%s", prefix ?: "", buf, 343 342 (ep->flags & EP_FL_CONF) ? "C" : "-", 344 343 (ep->flags & EP_FL_DISC) ? "D" : "-", 345 344 (ep->flags & EP_FL_ADV) ? "A" : "-", 346 345 (ep->flags & EP_FL_LL) ? "L" : "-", 347 (ep->flags & EP_FL_PRIMARY) ? "P" : "-"); 348 if (suffix) 349 fd_log_debug("%s", suffix); 346 (ep->flags & EP_FL_PRIMARY) ? "P" : "-", 347 suffix ?: ""); 350 348 } 351 349 -
libfdcore/sctp.c
r894 r946 909 909 } 910 910 if (TRACE_BOOL(SCTP_LEVEL)) { 911 char buf[1024]; 912 sSA_DUMP_NODE_SERV(buf, sizeof(buf), &status.sstat_primary.spinfo_address, NI_NUMERICHOST | NI_NUMERICSERV ); 911 913 fd_log_debug( "SCTP_STATUS : sstat_state : %i\n" , status.sstat_state); 912 914 fd_log_debug( " sstat_rwnd : %u\n" , status.sstat_rwnd); … … 916 918 fd_log_debug( " sstat_outstrms : %hu\n", status.sstat_outstrms); 917 919 fd_log_debug( " sstat_fragmentation_point : %u\n" , status.sstat_fragmentation_point); 918 fd_log_debug( " sstat_primary.spinfo_address : "); 919 sSA_DUMP_NODE_SERV(&status.sstat_primary.spinfo_address, NI_NUMERICHOST | NI_NUMERICSERV ); 920 fd_log_debug( "\n" ); 920 fd_log_debug( " sstat_primary.spinfo_address : %s\n" , buf); 921 921 fd_log_debug( " sstat_primary.spinfo_state : %d\n" , status.sstat_primary.spinfo_state); 922 922 fd_log_debug( " sstat_primary.spinfo_cwnd : %u\n" , status.sstat_primary.spinfo_cwnd);
Note: See TracChangeset
for help on using the changeset viewer.