Mercurial > hg > freeDiameter

comparison libfdcore/peers.c @ 974:2091bf698fb1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove newlines from fd_log_debug, TRACE_DEBUG, TRACE_ERROR, and TRACE_DEBUG_ERROR (as far as sed could find them) with manual fixing afterwards.
author Thomas Klausner <tk@giga.or.at>
date Thu, 14 Mar 2013 18:14:35 +0100
parents ce3cacbbccc9
children 357c2f892d24
comparison
equal deleted inserted replaced
973:60949d03d17a 974:2091bf698fb1
402 } 402 }
403 403
404 /* Dump info of one peer */ 404 /* Dump info of one peer */
405 void fd_peer_dump(struct fd_peer * peer, int details) 405 void fd_peer_dump(struct fd_peer * peer, int details)
406 { 406 {
407 char buf[1024];
407 if (peer->p_eyec != EYEC_PEER) { 408 if (peer->p_eyec != EYEC_PEER) {
408 fd_log_debug(" Invalid peer @ %p !\n", peer); 409 fd_log_debug(" Invalid peer @ %p !", peer);
409 return; 410 return;
410 } 411 }
411 412
412 fd_log_debug("> %s\t%s\t[%dsr]", STATE_STR(fd_peer_getstate(peer)), peer->p_hdr.info.pi_diamid, peer->p_sr.cnt); 413 snprintf(buf, sizeof(buf), "> %s\t%s\t[%dsr]", STATE_STR(fd_peer_getstate(peer)), peer->p_hdr.info.pi_diamid, peer->p_sr.cnt);
413 if (details > INFO) { 414 if (details > INFO) {
414 fd_log_debug("\t(rlm:%s)", peer->p_hdr.info.runtime.pir_realm ?: "<unknown>"); 415 snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\t(rlm:%s)", peer->p_hdr.info.runtime.pir_realm ?: "<unknown>");
415 if (peer->p_hdr.info.runtime.pir_prodname) 416 if (peer->p_hdr.info.runtime.pir_prodname)
416 fd_log_debug("\t['%s' %u]", peer->p_hdr.info.runtime.pir_prodname, peer->p_hdr.info.runtime.pir_firmrev); 417 snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\t['%s' %u]", peer->p_hdr.info.runtime.pir_prodname, peer->p_hdr.info.runtime.pir_firmrev);
417 } 418 }
418 fd_log_debug("\n"); 419 fd_log_debug(buf);
419 if (details > FULL) { 420 if (details > FULL) {
420 /* Dump all info */ 421 /* Dump all info */
421 fd_log_debug("\tEntry origin : %s\n", peer->p_dbgorig?: "not set"); 422 fd_log_debug("\tEntry origin : %s", peer->p_dbgorig?: "not set");
422 fd_log_debug("\tConfig flags : %s%s%s%s%s - %s%s%s\n", 423 fd_log_debug("\tConfig flags : %s%s%s%s%s - %s%s%s",
423 peer->p_hdr.info.config.pic_flags.pro3 == PI_P3_DEFAULT ? "" : 424 peer->p_hdr.info.config.pic_flags.pro3 == PI_P3_DEFAULT ? "" :
424 (peer->p_hdr.info.config.pic_flags.pro3 == PI_P3_IP ? "IP." : "IPv6."), 425 (peer->p_hdr.info.config.pic_flags.pro3 == PI_P3_IP ? "IP." : "IPv6."),
425 peer->p_hdr.info.config.pic_flags.pro4 == PI_P4_DEFAULT ? "" : 426 peer->p_hdr.info.config.pic_flags.pro4 == PI_P4_DEFAULT ? "" :
426 (peer->p_hdr.info.config.pic_flags.pro4 == PI_P4_TCP ? "TCP." : "SCTP."), 427 (peer->p_hdr.info.config.pic_flags.pro4 == PI_P4_TCP ? "TCP." : "SCTP."),
427 peer->p_hdr.info.config.pic_flags.alg ? "PrefTCP." : "", 428 peer->p_hdr.info.config.pic_flags.alg ? "PrefTCP." : "",
428 peer->p_hdr.info.config.pic_flags.sec & PI_SEC_NONE ? "NoTLSok" :"", 429 peer->p_hdr.info.config.pic_flags.sec & PI_SEC_NONE ? "NoTLSok" :"",
429 peer->p_hdr.info.config.pic_flags.sec & PI_SEC_TLS_OLD ? "OldTLS" :"", 430 peer->p_hdr.info.config.pic_flags.sec & PI_SEC_TLS_OLD ? "OldTLS" :"",
430 peer->p_hdr.info.config.pic_flags.exp ? "Expire." : "", 431 peer->p_hdr.info.config.pic_flags.exp ? "Expire." : "",
431 peer->p_hdr.info.config.pic_flags.persist ? "Persist." : "" 432 peer->p_hdr.info.config.pic_flags.persist ? "Persist." : ""
432 ); 433 );
433 fd_log_debug("\tLifetime : %d sec\n", peer->p_hdr.info.config.pic_lft); 434 fd_log_debug("\tLifetime : %d sec", peer->p_hdr.info.config.pic_lft);
434 } 435 }
435 } 436 }
436 437
437 /* Dump the list of peers */ 438 /* Dump the list of peers */
438 void fd_peer_dump_list(int details) 439 void fd_peer_dump_list(int details)
439 { 440 {
440 struct fd_list * li; 441 struct fd_list * li;
441 442
442 fd_log_debug("Dumping list of peers :\n"); 443 fd_log_debug("Dumping list of peers :");
443 CHECK_FCT_DO( pthread_rwlock_rdlock(&fd_g_peers_rw), /* continue */ ); 444 CHECK_FCT_DO( pthread_rwlock_rdlock(&fd_g_peers_rw), /* continue */ );
444 445
445 for (li = fd_g_peers.next; li != &fd_g_peers; li = li->next) { 446 for (li = fd_g_peers.next; li != &fd_g_peers; li = li->next) {
446 struct fd_peer * np = (struct fd_peer *)li->o; 447 struct fd_peer * np = (struct fd_peer *)li->o;
447 fd_peer_dump(np, details); 448 fd_peer_dump(np, details);
"Welcome to our mercurial repository"