# HG changeset patch # User Sebastien Decugis # Date 1243322148 -32400 # Node ID f8509d27e453348725eb1cf6a921075d6abc3dae # Parent 96204f7c4185ce426753e4112fd66dd5094529c9 Clean up on traces diff -r 96204f7c4185 -r f8509d27e453 extensions/radius_gw/rgw_extensions.c --- a/extensions/radius_gw/rgw_extensions.c Tue May 26 16:07:07 2009 +0900 +++ b/extensions/radius_gw/rgw_extensions.c Tue May 26 16:15:48 2009 +0900 @@ -280,7 +280,7 @@ CHECK_POSIX_DO( pthread_mutex_lock(&ext_mtx), ); if ( ! rg_list_is_empty( &ext_list ) ) - log_debug(" RADIUS gateway list of registered sub-extensions:\n"); + log_debug(" --- List of registered sub-extensions:\n"); for (ptr = ext_list.next; ptr != &ext_list; ptr = ptr->next) { char * codes = NULL; @@ -297,7 +297,7 @@ } } - log_debug(" %-15s ( %-20s) - types: %s%s, codes: %s\n", + log_debug(" %-25s ( %-25s ) - types: %s%s, codes: %s\n", ext->extname, basename(ext->conffile), ext->type & RGW_EXT_TYPE_AUTH ? "Au" : " ", @@ -309,14 +309,13 @@ CHECK_POSIX_DO( pthread_mutex_unlock(&ext_mtx), ); - /* Dump the list of accelerators */ if ( ! TRACE_BOOL(FULL + 1) ) return; CHECK_POSIX_DO( pthread_mutex_lock(&ext_mtx), ); if ( !rg_list_is_empty( &ext_accel_auth ) || !rg_list_is_empty( &ext_accel_acct )) - log_debug(" RADIUS gateway sub-extensions accelerators:\n"); + log_debug(" --- Accelerators:\n"); for (ptraccel = ext_accel_auth.next; ptraccel != &ext_accel_auth; ptraccel = ptraccel->next) { struct ext_accel * accel = (struct ext_accel *)ptraccel; diff -r 96204f7c4185 -r f8509d27e453 extensions/radius_gw/sub_debug.c --- a/extensions/radius_gw/sub_debug.c Tue May 26 16:07:07 2009 +0900 +++ b/extensions/radius_gw/sub_debug.c Tue May 26 16:15:48 2009 +0900 @@ -93,7 +93,7 @@ size_t i; auth = &(msg->hdr->authenticator[0]); - log_debug("--- Dump method 1:\n"); + log_debug(" --- Dump method 1:\n"); log_debug(" id: %02hhx, code: %hhd (%s)\n", msg->hdr->identifier, msg->hdr->code, rgw_msg_code_str(msg->hdr->code)); log_debug(" auth: %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx\n", @@ -108,7 +108,7 @@ /* If we need to dump the value, it's better to call directly radius_msg_dump instead... */ } - log_debug("--- Dump method 2:\n"); + log_debug(" --- Dump method 2:\n"); radius_msg_dump(msg); } @@ -121,21 +121,21 @@ if (!rad_req) { log_debug(" RADIUS request: NULL pointer\n"); } else { - log_debug(" RADIUS request (%p) DUMP:", rad_req); + log_debug(" RADIUS request (%p) DUMP:\n", rad_req); debug_dump_radius(rad_req); } if (!rad_ans || ! *rad_ans) { log_debug(" RADIUS answer: NULL pointer\n"); } else { - log_debug(" RADIUS answer (%p) DUMP:", *rad_ans); + log_debug(" RADIUS answer (%p) DUMP:\n", *rad_ans); debug_dump_radius(*rad_ans); } if (!diam_fw || ! *diam_fw) { log_debug(" Diameter message: NULL pointer\n"); } else { - log_debug(" Diameter message (%p) DUMP:", *diam_fw); + log_debug(" Diameter message (%p) DUMP:\n", *diam_fw); (*cs->waaad_msg_dump_walk)(0, *diam_fw); } @@ -153,14 +153,14 @@ if (!diam_ans || ! *diam_ans) { log_debug(" Diameter message: NULL pointer\n"); } else { - log_debug(" Diameter message (%p) DUMP:", *diam_ans); + log_debug(" Diameter message (%p) DUMP:\n", *diam_ans); debug_dump_diameter(*diam_ans); } if (!rad_fw || ! *rad_fw) { log_debug(" RADIUS answer: NULL pointer\n"); } else { - log_debug(" RADIUS answer (%p) DUMP:", *rad_fw); + log_debug(" RADIUS answer (%p) DUMP:\n", *rad_fw); debug_dump_radius(*rad_fw); }