Changeset 974:2091bf698fb1 in freeDiameter for extensions
- Timestamp:
- Mar 15, 2013, 2:14:35 AM (11 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- extensions
- Files:
-
- 60 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/_sample/sample.c
r740 r974 87 87 fd_dict_dump_object(example_avp_avp); 88 88 } 89 TRACE_DEBUG(INFO, "'Example-AVP' created without error \n");89 TRACE_DEBUG(INFO, "'Example-AVP' created without error"); 90 90 91 91 /* Call the c++ function */ -
extensions/acl_wl/aw_conf.l
r965 r974 96 96 <*>[[:alnum:]]+ | /* This rule is only useful to print a complete token in error messages */ 97 97 <*>. { 98 TRACE_ERROR("Unrecognized text on line %d col %d: '%s'. \n", yylloc->first_line, yylloc->first_column, yytext);98 TRACE_ERROR("Unrecognized text on line %d col %d: '%s'.", yylloc->first_line, yylloc->first_column, yytext); 99 99 return LEX_ERROR; 100 100 } -
extensions/acl_wl/aw_conf.y
r961 r974 74 74 if (aw_confin == NULL) { 75 75 ret = errno; 76 fd_log_debug("Unable to open extension configuration file %s for reading: %s \n", conffile, strerror(ret));76 fd_log_debug("Unable to open extension configuration file %s for reading: %s", conffile, strerror(ret)); 77 77 TRACE_DEBUG (INFO, "Error occurred, message logged -- configuration file."); 78 78 return ret; … … 102 102 103 103 if (ploc->first_line != ploc->last_line) 104 fd_log_debug("%s:%d.%d-%d.%d : %s \n", conffile, ploc->first_line, ploc->first_column, ploc->last_line, ploc->last_column, s);104 fd_log_debug("%s:%d.%d-%d.%d : %s", conffile, ploc->first_line, ploc->first_column, ploc->last_line, ploc->last_column, s); 105 105 else if (ploc->first_column != ploc->last_column) 106 fd_log_debug("%s:%d.%d-%d : %s \n", conffile, ploc->first_line, ploc->first_column, ploc->last_column, s);106 fd_log_debug("%s:%d.%d-%d : %s", conffile, ploc->first_line, ploc->first_column, ploc->last_column, s); 107 107 else 108 fd_log_debug("%s:%d.%d : %s \n", conffile, ploc->first_line, ploc->first_column, s);108 fd_log_debug("%s:%d.%d : %s", conffile, ploc->first_line, ploc->first_column, s); 109 109 } 110 110 -
extensions/acl_wl/aw_tree.c
r741 r974 116 116 117 117 #if 0 118 fd_log_debug("Parsed name %s as: \n", name);118 fd_log_debug("Parsed name %s as:", name); 119 119 for (i=0; i<=l; i++) 120 fd_log_debug(" str[%d] len: %d, v:%.*s \n", i, result->label[i].len, result->label[i].len, result->label[i].str);120 fd_log_debug(" str[%d] len: %d, v:%.*s", i, result->label[i].len, result->label[i].len, result->label[i].str); 121 121 #endif /* 0 */ 122 122 return 0; … … 179 179 for (li = sub->next; li != sub; li = li->next) { 180 180 struct tree_item * ti = (struct tree_item *)li; 181 fd_log_debug("%*s%s", indent * 2, "", ti->str?:"*"); 181 char buf[1024]; 182 snprintf(buf, sizeof(buf), "%*s%s", indent * 2, "", ti->str?:"*"); 182 183 if (ti->leaf) 183 fd_log_debug(" (flag:%x)", ti->flags);184 fd_log_debug(" \n");184 snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), " (flag:%x)", ti->flags); 185 fd_log_debug("%s", buf); 185 186 tree_dump(&ti->children, indent + 1); 186 187 } … … 190 191 void aw_tree_dump(void) 191 192 { 192 fd_log_debug("[acl_wl] tree dump:\n(root)\n"); 193 fd_log_debug("[acl_wl] tree dump:"); 194 fd_log_debug("(root)"); 193 195 tree_dump(&tree_root, 1); 194 fd_log_debug("[acl_wl] end of dump \n");196 fd_log_debug("[acl_wl] end of dump"); 195 197 } 196 198 … … 208 210 CHECK_FCT_DO( parse_name(name, &sn), 209 211 { 210 fd_log_debug("The name '%s' contains too many labels, try a generic (*) or recompile with bigger AW_TREE_MAXDEPTH value (cur: %d) \n", name, AW_TREE_MAXDEPTH);212 fd_log_debug("The name '%s' contains too many labels, try a generic (*) or recompile with bigger AW_TREE_MAXDEPTH value (cur: %d)", name, AW_TREE_MAXDEPTH); 211 213 return EINVAL; 212 214 } ); … … 229 231 ti = (struct tree_item *)(senti->next); 230 232 if (ti->str == NULL) { 231 fd_log_debug("[acl_wl] Warning: entry '%s' is superseeded by a generic entry at label %d, ignoring. \n", name, lbl + 1);233 fd_log_debug("[acl_wl] Warning: entry '%s' is superseeded by a generic entry at label %d, ignoring.", name, lbl + 1); 232 234 return 0; 233 235 } … … 275 277 if (sn.label[0].str[0] == '*') { 276 278 if (!FD_IS_LIST_EMPTY(senti)) { 277 fd_log_debug("[acl_wl] Warning: entry '%s' overwrites previous more detailed entries, these are deleted. \n", name);279 fd_log_debug("[acl_wl] Warning: entry '%s' overwrites previous more detailed entries, these are deleted.", name); 278 280 delete_tree(senti); 279 281 } … … 286 288 ti = (struct tree_item *)(senti->next); 287 289 if (ti->str == NULL) { 288 fd_log_debug("[acl_wl] Warning: entry '%s' is superseeded by a generic entry at label 1, ignoring. \n", name);290 fd_log_debug("[acl_wl] Warning: entry '%s' is superseeded by a generic entry at label 1, ignoring.", name); 289 291 return 0; 290 292 } … … 310 312 /* We already had this label */ 311 313 if (ti->leaf) { 312 fd_log_debug("[acl_wl] Warning: entry '%s' is duplicated, merging the flags. \n", name);314 fd_log_debug("[acl_wl] Warning: entry '%s' is duplicated, merging the flags.", name); 313 315 ti->flags |= flags; 314 316 return 0; -
extensions/app_acct/acct_conf.l
r741 r974 81 81 if (ret != 1) { 82 82 /* No matching: an error occurred */ 83 fd_log_debug("Unable to convert the value '%s' to a valid number: %s \n", yytext, strerror(errno));83 fd_log_debug("Unable to convert the value '%s' to a valid number: %s", yytext, strerror(errno)); 84 84 return LEX_ERROR; /* trig an error in yacc parser */ 85 85 /* Maybe we could REJECT instead of failing here? */ … … 93 93 yylval->string = strdup(yytext+1); 94 94 if (!yylval->string) { 95 fd_log_debug("Unable to copy the string '%s': %s \n", yytext, strerror(errno));95 fd_log_debug("Unable to copy the string '%s': %s", yytext, strerror(errno)); 96 96 TRACE_DEBUG(INFO, "strdup failed"); 97 97 return LEX_ERROR; /* trig an error in yacc parser */ … … 137 137 /* Unrecognized sequence, if it did not match any previous pattern */ 138 138 [^[:space:]"*=>;\n]+ { 139 fd_log_debug("Unrecognized text on line %d col %d: '%s'. \n", yylloc->first_line, yylloc->first_column, yytext);139 fd_log_debug("Unrecognized text on line %d col %d: '%s'.", yylloc->first_line, yylloc->first_column, yytext); 140 140 return LEX_ERROR; 141 141 } -
extensions/app_acct/acct_conf.y
r808 r974 83 83 84 84 if ( ! acct_config->conninfo) { 85 fd_log_debug("[app_acct] ERROR: 'ConnInfo' is missing in file '%s'. \n"85 fd_log_debug("[app_acct] ERROR: 'ConnInfo' is missing in file '%s'." 86 86 " You can specify 'ConnInfo=\"\";' to use default parameters.\n", conffile); 87 87 return EINVAL; 88 88 } 89 89 if ( ! acct_config->tablename) { 90 fd_log_debug("[app_acct] ERROR: 'Table' value is missing in file '%s'. \n", conffile);90 fd_log_debug("[app_acct] ERROR: 'Table' value is missing in file '%s'.", conffile); 91 91 return EINVAL; 92 92 } … … 97 97 struct fd_list * li; 98 98 99 fd_log_debug("[app_acct] Configuration dump: \n");100 fd_log_debug(" Database: \n");101 fd_log_debug(" ConnInfo ...... : '%s' \n", acct_config->conninfo ?: "<null>");102 fd_log_debug(" Table name .... : '%s' \n", acct_config->tablename ?: "<null>");103 fd_log_debug(" Timestamp field : '%s' \n", acct_config->tsfield ?: "<null>");104 fd_log_debug(" Server name fld : '%s' \n", acct_config->srvnfield ?: "<null>");105 fd_log_debug(" AVPs that will be saved to the database: \n");99 fd_log_debug("[app_acct] Configuration dump:"); 100 fd_log_debug(" Database:"); 101 fd_log_debug(" ConnInfo ...... : '%s'", acct_config->conninfo ?: "<null>"); 102 fd_log_debug(" Table name .... : '%s'", acct_config->tablename ?: "<null>"); 103 fd_log_debug(" Timestamp field : '%s'", acct_config->tsfield ?: "<null>"); 104 fd_log_debug(" Server name fld : '%s'", acct_config->srvnfield ?: "<null>"); 105 fd_log_debug(" AVPs that will be saved to the database:"); 106 106 for (li = acct_config->avps.next; li != &acct_config->avps; li = li->next) { 107 107 struct acct_conf_avp * a = (struct acct_conf_avp *)li; … … 112 112 fd_log_debug("field '%s' ", a->field?:a->avpname); 113 113 } 114 fd_log_debug("as ::%s \n", diam2db_types_mapping[a->avptype]);115 } 116 fd_log_debug("[app_acct] Complete. \n");114 fd_log_debug("as ::%s", diam2db_types_mapping[a->avptype]); 115 } 116 fd_log_debug("[app_acct] Complete."); 117 117 return 0; 118 118 } … … 158 158 if (acct_confin == NULL) { 159 159 ret = errno; 160 fd_log_debug("Unable to open extension configuration file %s for reading: %s \n", conffile, strerror(ret));160 fd_log_debug("Unable to open extension configuration file %s for reading: %s", conffile, strerror(ret)); 161 161 return ret; 162 162 } … … 180 180 181 181 if (ploc->first_line != ploc->last_line) 182 fd_log_debug("%s:%d.%d-%d.%d : %s \n", conffile, ploc->first_line, ploc->first_column, ploc->last_line, ploc->last_column, s);182 fd_log_debug("%s:%d.%d-%d.%d : %s", conffile, ploc->first_line, ploc->first_column, ploc->last_line, ploc->last_column, s); 183 183 else if (ploc->first_column != ploc->last_column) 184 fd_log_debug("%s:%d.%d-%d : %s \n", conffile, ploc->first_line, ploc->first_column, ploc->last_column, s);184 fd_log_debug("%s:%d.%d-%d : %s", conffile, ploc->first_line, ploc->first_column, ploc->last_column, s); 185 185 else 186 fd_log_debug("%s:%d.%d : %s \n", conffile, ploc->first_line, ploc->first_column, s);186 fd_log_debug("%s:%d.%d : %s", conffile, ploc->first_line, ploc->first_column, s); 187 187 } 188 188 -
extensions/app_acct/acct_db.c
r871 r974 79 79 80 80 CHECK_PARAMS_DO( PQisthreadsafe() == 1, { 81 fd_log_debug("You PostGreSQL installation is not thread-safe! \n");81 fd_log_debug("You PostGreSQL installation is not thread-safe!"); 82 82 return EINVAL; 83 83 } ); … … 88 88 /* Check to see that the backend connection was successfully made */ 89 89 if (PQstatus(conn) != CONNECTION_OK) { 90 fd_log_debug("Connection to database failed: %s \n", PQerrorMessage(conn));90 fd_log_debug("Connection to database failed: %s", PQerrorMessage(conn)); 91 91 acct_db_free(); 92 92 return EINVAL; 93 93 } 94 94 if (PQprotocolVersion(conn) < 3) { 95 fd_log_debug("Database protocol version is too old, version 3 is required for prepared statements. \n");95 fd_log_debug("Database protocol version is too old, version 3 is required for prepared statements."); 96 96 acct_db_free(); 97 97 return EINVAL; … … 194 194 ADD_EXTEND(");"); 195 195 196 TRACE_DEBUG(FULL, "Preparing the following SQL statement: \n%s\n", sql);196 TRACE_DEBUG(FULL, "Preparing the following SQL statement: '%s'", sql); 197 197 res = PQprepare(conn, stmt, sql, emptyrecords.nball, NULL); 198 198 if (PQresultStatus(res) != PGRES_COMMAND_OK) { -
extensions/app_acct/acct_records.c
r741 r974 126 126 /* Check at least one AVP was mapped */ 127 127 if (records->nball == records->nbunmap) { 128 fd_log_debug("The received ACR does not contain any AVP from the configuration file. \n"128 fd_log_debug("The received ACR does not contain any AVP from the configuration file." 129 129 "This is an invalid situation. Please fix your configuration file.\n" 130 130 "One way to ensure this does not happen is to include Session-Id in the database.\n"); … … 137 137 struct acct_record_item * r = (struct acct_record_item *)(li->o); 138 138 if (r->param->required && (r->index <= 1)) { 139 fd_log_debug("The received ACR does not contain the required AVP '%s'. \n", r->param->avpname);139 fd_log_debug("The received ACR does not contain the required AVP '%s'.", r->param->avpname); 140 140 acct_rec_empty(records); 141 141 return EINVAL; -
extensions/app_diameap/diameap.l
- Property exe deleted
-
extensions/app_diameap/diameap.y
r565 r974 124 124 if (fl == NULL) { 125 125 int ret = errno; 126 TRACE_DEBUG(INFO, "Unable to open %s plugin file %s for reading: %s \n", $3, infile, strerror(ret));126 TRACE_DEBUG(INFO, "Unable to open %s plugin file %s for reading: %s", $3, infile, strerror(ret)); 127 127 yyerror (&yylloc, config, "Error adding EAP Plugin"); 128 128 YYERROR; -
extensions/app_diameap/diameap_eap.c
- Property exe deleted
-
extensions/app_diameap/diameap_eap.h
- Property exe deleted
-
extensions/app_diameap/diameap_eappacket.c
r425 r974 186 186 return; 187 187 188 fd_log_debug("------------- Dump EAP Packet------------- \n");188 fd_log_debug("------------- Dump EAP Packet-------------"); 189 189 int i; 190 190 fd_log_debug("\t -Code : "); … … 194 194 { 195 195 case 1: 196 fd_log_debug("Request \n");196 fd_log_debug("Request"); 197 197 break; 198 198 case 2: 199 fd_log_debug("Response \n");199 fd_log_debug("Response"); 200 200 break; 201 201 case 3: 202 fd_log_debug("Success \n");202 fd_log_debug("Success"); 203 203 break; 204 204 case 4: 205 fd_log_debug("Failure \n");205 fd_log_debug("Failure"); 206 206 break; 207 207 default: 208 fd_log_debug("Error (EAP Code value [%d] not allowed) \n",code);208 fd_log_debug("Error (EAP Code value [%d] not allowed)",code); 209 209 break; 210 210 } 211 211 u8 id; 212 212 CHECK_FCT_DO(diameap_eap_get_identifier(eappacket,&id),return); 213 fd_log_debug("\t -Identifier : %x \n", id);213 fd_log_debug("\t -Identifier : %x ", id); 214 214 u16 length; 215 215 CHECK_FCT_DO(diameap_eap_get_length(eappacket,&length),return); 216 fd_log_debug("\t -Length : %d \n", (unsigned int)length);216 fd_log_debug("\t -Length : %d ", (unsigned int)length); 217 217 if (eappacket.length > 4) 218 218 { 219 219 eap_type type; 220 220 CHECK_FCT_DO(diameap_eap_get_type(eappacket,&type),return); 221 fd_log_debug("\t -Type : %d \n", type);221 fd_log_debug("\t -Type : %d ", type); 222 222 } 223 223 if (eappacket.length > 5) 224 224 { 225 fd_log_debug("\t -Data : "); 225 char buf[1024]; 226 snprintf(buf, sizeof(buf), "\t -Data : "); 226 227 for (i = 5; i < eappacket.length && i < 30; i++) 227 228 { 228 fd_log_debug("%02x ", G8(eappacket.data + i));229 snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "%02x ", G8(eappacket.data + i)); 229 230 } 230 231 if(i+1<eappacket.length) 231 fd_log_debug("[...] (len=%d)",(unsigned int) length);232 fd_log_debug(" \n");233 } 234 fd_log_debug("-------------End Dump EAP Packet------------- \n");232 snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "[...] (len=%d)",(unsigned int) length); 233 fd_log_debug("%s", buf); 234 } 235 fd_log_debug("-------------End Dump EAP Packet-------------"); 235 236 } 236 237 -
extensions/app_diameap/diameap_init.c
r565 r974 368 368 return; 369 369 370 fd_log_debug( 371 "-------- DiamEAP extension : Configuration parameters (Dump) -------------\n"); 372 fd_log_debug("\t-Configuration file.....: %s\n", diameap_config->conffile); 373 fd_log_debug("\t-EAP Application Id.....: %u\n", 370 fd_log_debug("-------- DiamEAP extension : Configuration parameters (Dump) -------------"); 371 fd_log_debug("\t-Configuration file.....: %s", diameap_config->conffile); 372 fd_log_debug("\t-EAP Application Id.....: %u", 374 373 diameap_config->application_id); 375 fd_log_debug("\t-EAP Application Command: %u \n",374 fd_log_debug("\t-EAP Application Command: %u", 376 375 diameap_config->command_code); 377 fd_log_debug("\t-EAP Application Vendor.: %u \n", diameap_config->vendor_id);378 fd_log_debug("\t-Max invalid EAP packets: %u \n", diameap_config->max_invalid_eap_packet);379 fd_log_debug("\t-Multi-Round Timeout....: %u \n", diameap_config->multi_round_time_out);376 fd_log_debug("\t-EAP Application Vendor.: %u", diameap_config->vendor_id); 377 fd_log_debug("\t-Max invalid EAP packets: %u", diameap_config->max_invalid_eap_packet); 378 fd_log_debug("\t-Multi-Round Timeout....: %u", diameap_config->multi_round_time_out); 380 379 if (diameap_config->db.user) 381 380 { 382 fd_log_debug("\t-MySQL Database Params..: \n\t\tUser .......:%s\n",383 384 fd_log_debug("\t\tServer .....:%s \n", diameap_config->db.server);385 fd_log_debug("\t\tDatabase....:%s \n", diameap_config->db.database);386 } 387 388 fd_log_debug("\t-EAP Method Plugins.....: \n");381 fd_log_debug("\t-MySQL Database Params..:"); 382 fd_log_debug("\t\tUser .......:%s", diameap_config->db.user); 383 fd_log_debug("\t\tServer .....:%s", diameap_config->db.server); 384 fd_log_debug("\t\tDatabase....:%s", diameap_config->db.database); 385 } 386 387 fd_log_debug("\t-EAP Method Plugins.....: "); 389 388 diameap_plugin_dump(); 390 389 391 fd_log_debug( 392 "-------- DiamEAP extension : Configuration parameters (End) ---------------\n"); 390 fd_log_debug("-------- DiamEAP extension : Configuration parameters (End) ---------------"); 393 391 } 394 392 -
extensions/app_diameap/diameap_plugins.c
r610 r974 76 76 { 77 77 struct plugin * plugin = (struct plugin *) pl; 78 fd_log_debug("\t\t - %s plugin \t [Type: %i, Vendor: %i] %sloaded \n", plugin->methodname,78 fd_log_debug("\t\t - %s plugin \t [Type: %i, Vendor: %i] %sloaded", plugin->methodname, 79 79 plugin->methodtype,plugin->vendor, plugin->handler ? "" : "not "); 80 80 } -
extensions/app_diameap/plugins.h
- Property exe deleted
-
extensions/app_diameap/plugins/eap_identity/eap_identity.c
- Property exe deleted
-
extensions/app_diameap/plugins/eap_tls/eaptls.l
- Property exe deleted
-
extensions/app_diameap/plugins/eap_tls/eaptls.y
- Property exe deleted
-
extensions/app_radgw/radius.c
r972 r974 320 320 auth = &(msg->radius.hdr->authenticator[0]); 321 321 322 fd_log_debug("------ RADIUS msg dump ------- \n");323 fd_log_debug(" id : 0x%02hhx, code : %hhd (%s), length : %d \n", msg->radius.hdr->identifier, msg->radius.hdr->code, rgw_msg_code_str(msg->radius.hdr->code), ntohs(msg->radius.hdr->length));324 fd_log_debug(" auth: %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx \n",322 fd_log_debug("------ RADIUS msg dump -------"); 323 fd_log_debug(" id : 0x%02hhx, code : %hhd (%s), length : %d", msg->radius.hdr->identifier, msg->radius.hdr->code, rgw_msg_code_str(msg->radius.hdr->code), ntohs(msg->radius.hdr->length)); 324 fd_log_debug(" auth: %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx", 325 325 auth[0], auth[1], auth[2], auth[3], auth[4], auth[5], auth[6], auth[7]); 326 fd_log_debug(" %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx \n",326 fd_log_debug(" %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx", 327 327 auth[8], auth[9], auth[10], auth[11], auth[12], auth[13], auth[14], auth[15]); 328 328 for (i = 0; i < msg->radius.attr_used; i++) { … … 332 332 } 333 333 if (has_meta && msg->ps_nb) { 334 fd_log_debug("---- hidden attributes: \n");334 fd_log_debug("---- hidden attributes:"); 335 335 for (i = msg->ps_first; i < msg->ps_first + msg->ps_nb; i++) { 336 336 struct radius_attr_hdr *attr = (struct radius_attr_hdr *)(msg->radius.buf + msg->radius.attr_pos[i]); … … 339 339 } 340 340 } 341 fd_log_debug("----------------------------- \n");341 fd_log_debug("-----------------------------"); 342 342 } 343 343 … … 527 527 msg_len = ntohs(hdr->length); 528 528 if (msg_len < sizeof(*hdr) || msg_len > len) { 529 TRACE_DEBUG(INFO, "Invalid RADIUS message length \n");529 TRACE_DEBUG(INFO, "Invalid RADIUS message length"); 530 530 return EINVAL; 531 531 } 532 532 533 533 if (msg_len < len) { 534 TRACE_DEBUG(INFO, "Ignored %lu extra bytes after RADIUS message \n",534 TRACE_DEBUG(INFO, "Ignored %lu extra bytes after RADIUS message", 535 535 (unsigned long) len - msg_len); 536 536 } -
extensions/app_radgw/rgw_clients.c
r965 r974 983 983 984 984 if (!FD_IS_LIST_EMPTY(&cli_ip)) 985 fd_log_debug(" RADIUS IP clients list: \n");985 fd_log_debug(" RADIUS IP clients list:"); 986 986 dump_cli_list(&cli_ip); 987 987 988 988 if (!FD_IS_LIST_EMPTY(&cli_ip6)) 989 fd_log_debug(" RADIUS IPv6 clients list: \n");989 fd_log_debug(" RADIUS IPv6 clients list:"); 990 990 dump_cli_list(&cli_ip6); 991 991 -
extensions/app_radgw/rgw_conf.l
r741 r974 89 89 yylval->string = strdup(yytext+1); 90 90 if (yylval->string == NULL) { 91 fd_log_debug("Unable to allocate memory: %s \n", strerror(errno));91 fd_log_debug("Unable to allocate memory: %s", strerror(errno)); 92 92 return LEX_ERROR; /* trig an error in yacc parser */ 93 93 } … … 111 111 if (ret != 1) { 112 112 /* No matching: an error occurred */ 113 fd_log_debug("Unable to convert the value '%s' to a valid number: %s \n", yytext, strerror(errno));113 fd_log_debug("Unable to convert the value '%s' to a valid number: %s", yytext, strerror(errno)); 114 114 return LEX_ERROR; /* trig an error in yacc parser */ 115 115 /* Maybe we could REJECT instead of failing here? */ … … 133 133 work = strdup(yytext); 134 134 if ( work == NULL ) { 135 fd_log_debug("Unable to allocate memory: %s \n", strerror(errno));135 fd_log_debug("Unable to allocate memory: %s", strerror(errno)); 136 136 return LEX_ERROR; /* trig an error in yacc parser */ 137 137 } … … 141 141 port++; 142 142 if (sscanf(port, "%hu]", &p) != 1) { 143 fd_log_debug("'%s' is not a valid port: %s \n", port, strerror(errno));143 fd_log_debug("'%s' is not a valid port: %s", port, strerror(errno)); 144 144 free(work); 145 145 return LEX_ERROR; /* trig an error in yacc parser */ … … 153 153 sin6 = malloc(sizeof(struct sockaddr_in6)); 154 154 if (sin6 == NULL) { 155 fd_log_debug("Unable to allocate memory: %s \n", strerror(errno));155 fd_log_debug("Unable to allocate memory: %s", strerror(errno)); 156 156 free(work); 157 157 return LEX_ERROR; /* trig an error in yacc parser */ … … 161 161 sin6->sin6_family = AF_INET6; 162 162 if (inet_pton(AF_INET6, work, &sin6->sin6_addr) != 1) { 163 fd_log_debug("'%s' is not a valid IPv6 address: %s \n", work, strerror(errno));163 fd_log_debug("'%s' is not a valid IPv6 address: %s", work, strerror(errno)); 164 164 free(work); 165 165 free(sin6); … … 173 173 sin = malloc(sizeof(struct sockaddr_in)); 174 174 if (sin == NULL) { 175 fd_log_debug("Unable to allocate memory: %s \n", strerror(errno));175 fd_log_debug("Unable to allocate memory: %s", strerror(errno)); 176 176 free(work); 177 177 return LEX_ERROR; /* trig an error in yacc parser */ … … 181 181 sin->sin_family = AF_INET; 182 182 if (inet_pton(AF_INET, work, &sin->sin_addr) != 1) { 183 fd_log_debug("'%s' is not a valid IP address: %s \n", work, strerror(errno));183 fd_log_debug("'%s' is not a valid IP address: %s", work, strerror(errno)); 184 184 free(work); 185 185 free(sin); … … 213 213 if (ret != 1) { 214 214 /* No matching: an error occurred */ 215 fd_log_debug("Unable to convert the value '%s' to a valid number: %s \n", yytext, strerror(errno));215 fd_log_debug("Unable to convert the value '%s' to a valid number: %s", yytext, strerror(errno)); 216 216 return LEX_ERROR; /* trig an error in yacc parser */ 217 217 /* Maybe we could REJECT instead of failing here? */ … … 227 227 sin = malloc(sizeof(struct sockaddr_in)); 228 228 if (sin == NULL) { 229 fd_log_debug("Unable to allocate memory: %s \n", strerror(errno));229 fd_log_debug("Unable to allocate memory: %s", strerror(errno)); 230 230 return LEX_ERROR; /* trig an error in yacc parser */ 231 231 } … … 234 234 sin->sin_family = AF_INET; 235 235 if (inet_pton(AF_INET, yytext, &sin->sin_addr) != 1) { 236 fd_log_debug("'%s' is not a valid IP address: %s \n", yytext, strerror(errno));236 fd_log_debug("'%s' is not a valid IP address: %s", yytext, strerror(errno)); 237 237 free(sin); 238 238 return LEX_ERROR; /* trig an error in yacc parser */ … … 247 247 sin6 = malloc(sizeof(struct sockaddr_in6)); 248 248 if (sin6 == NULL) { 249 fd_log_debug("Unable to allocate memory: %s \n", strerror(errno));249 fd_log_debug("Unable to allocate memory: %s", strerror(errno)); 250 250 return LEX_ERROR; /* trig an error in yacc parser */ 251 251 } … … 254 254 sin6->sin6_family = AF_INET6; 255 255 if (inet_pton(AF_INET6, yytext, &sin6->sin6_addr) != 1) { 256 fd_log_debug("'%s' is not a valid IPv6 address: %s \n", yytext, strerror(errno));256 fd_log_debug("'%s' is not a valid IPv6 address: %s", yytext, strerror(errno)); 257 257 free(sin6); 258 258 return LEX_ERROR; /* trig an error in yacc parser */ … … 271 271 /* Unrecognized character */ 272 272 <*>. { 273 fd_log_debug("Unrecognized text on line %d col %d: '%s'. \n", yylloc->first_line, yylloc->first_column, yytext);273 fd_log_debug("Unrecognized text on line %d col %d: '%s'.", yylloc->first_line, yylloc->first_column, yytext); 274 274 return LEX_ERROR; 275 275 } -
extensions/app_radgw/rgw_conf.y
r741 r974 69 69 if (rgw_confin == NULL) { 70 70 ret = errno; 71 fd_log_debug("Unable to open extension configuration file %s for reading: %s \n", conffile, strerror(ret));71 fd_log_debug("Unable to open extension configuration file %s for reading: %s", conffile, strerror(ret)); 72 72 return ret; 73 73 } … … 91 91 { 92 92 if (ploc->first_line != ploc->last_line) 93 fd_log_debug("%s:%d.%d-%d.%d : %s \n", conffile, ploc->first_line, ploc->first_column, ploc->last_line, ploc->last_column, s);93 fd_log_debug("%s:%d.%d-%d.%d : %s", conffile, ploc->first_line, ploc->first_column, ploc->last_line, ploc->last_column, s); 94 94 else if (ploc->first_column != ploc->last_column) 95 fd_log_debug("%s:%d.%d-%d : %s \n", conffile, ploc->first_line, ploc->first_column, ploc->last_column, s);95 fd_log_debug("%s:%d.%d-%d : %s", conffile, ploc->first_line, ploc->first_column, ploc->last_column, s); 96 96 else 97 fd_log_debug("%s:%d.%d : %s \n", conffile, ploc->first_line, ploc->first_column, s);97 fd_log_debug("%s:%d.%d : %s", conffile, ploc->first_line, ploc->first_column, s); 98 98 } 99 99 … … 111 111 rez = realloc(buf, buf_rsz); 112 112 if (rez == NULL) { 113 fd_log_debug("Error on memory allocation: %s \n", strerror(errno));113 fd_log_debug("Error on memory allocation: %s", strerror(errno)); 114 114 return 0; 115 115 } … … 198 198 if (fd == NULL) { 199 199 int ret = errno; 200 TRACE_DEBUG(INFO, "Unable to open file %s for reading: %s \n", fname, strerror(ret));200 TRACE_DEBUG(INFO, "Unable to open file %s for reading: %s", fname, strerror(ret)); 201 201 yyerror (&yylloc, conffile, "Error adding plugin"); 202 202 YYERROR; -
extensions/app_radgw/rgw_plugins.c
r741 r974 188 188 if (new->dlo == NULL) { 189 189 /* An error occured */ 190 fd_log_debug("Loading of plugin '%s' failed: \n %s\n", plgfile, dlerror());190 fd_log_debug("Loading of plugin '%s' failed: %s", plgfile, dlerror()); 191 191 goto error; 192 192 } … … 196 196 if (new->descriptor == NULL) { 197 197 /* An error occured */ 198 fd_log_debug("Unable to resolve 'rgwp_descriptor' in plugin '%s': \n %s\n", plgfile, dlerror());198 fd_log_debug("Unable to resolve 'rgwp_descriptor' in plugin '%s': %s", plgfile, dlerror()); 199 199 goto error; 200 200 } … … 206 206 CHECK_FCT_DO( (*(new->descriptor->rgwp_conf_parse))(conffile, &new->cs), 207 207 { 208 fd_log_debug("An error occurred while parsing configuration file '%s' in plugin '%s', aborting... \n", conffile, plgfile);208 fd_log_debug("An error occurred while parsing configuration file '%s' in plugin '%s', aborting...", conffile, plgfile); 209 209 goto error; 210 210 } ); … … 266 266 267 267 if ( ! FD_IS_LIST_EMPTY( &plg_list ) ) 268 fd_log_debug("[app_radgw] --- List of registered plugins: \n");268 fd_log_debug("[app_radgw] --- List of registered plugins:"); 269 269 for (ptr = plg_list.next; ptr != &plg_list; ptr = ptr->next) { 270 270 char buf[1024]; 271 271 plg = (struct plg_descr *)ptr; 272 272 273 fd_log_debug(" %-25s ( %p ) - types: %s%s, codes: ",274 275 276 277 273 snprintf(buf, sizeof(buf), " %-25s ( %p ) - types: %s%s, codes: ", 274 plg->descriptor->rgwp_name, 275 plg->cs, 276 plg->type & RGW_PLG_TYPE_AUTH ? "Au" : " ", 277 plg->type & RGW_PLG_TYPE_ACCT ? "Ac" : " "); 278 278 279 279 if (plg->cc) { … … 281 281 282 282 for (i = 0; i < plg->cc_len; i++) { 283 fd_log_debug("%02hhx ", plg->cc[i]);283 snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "%02hhx ", plg->cc[i]); 284 284 } 285 fd_log_debug(" \n");285 fd_log_debug("%s", buf); 286 286 } else { 287 fd_log_debug(" *\n");287 fd_log_debug("%s*", buf); 288 288 } 289 289 } … … 297 297 CHECK_POSIX_DO( pthread_rwlock_rdlock(&plg_lock), ); 298 298 if ( !FD_IS_LIST_EMPTY( &plg_accel_auth ) || !FD_IS_LIST_EMPTY( &plg_accel_acct )) 299 fd_log_debug(" --- Accelerators: \n");299 fd_log_debug(" --- Accelerators:"); 300 300 301 301 for (ptraccel = plg_accel_auth.next; ptraccel != &plg_accel_auth; ptraccel = ptraccel->next) { 302 302 struct plg_accel * accel = (struct plg_accel *)ptraccel; 303 fd_log_debug(" auth, code %02hhu: \n", accel->ccode);303 fd_log_debug(" auth, code %02hhu:", accel->ccode); 304 304 305 305 for (ptr = accel->plugins.next; ptr != &accel->plugins; ptr = ptr->next) { 306 306 struct plg_accel_item * item = (struct plg_accel_item *)ptr; 307 fd_log_debug(" %-15s (%p) \n", item->plg->descriptor->rgwp_name, item->plg->cs);307 fd_log_debug(" %-15s (%p)", item->plg->descriptor->rgwp_name, item->plg->cs); 308 308 } 309 309 } 310 310 for (ptraccel = plg_accel_acct.next; ptraccel != &plg_accel_acct; ptraccel = ptraccel->next) { 311 311 struct plg_accel * accel = (struct plg_accel *)ptraccel; 312 fd_log_debug(" acct, code %02hhu: \n", accel->ccode);312 fd_log_debug(" acct, code %02hhu:", accel->ccode); 313 313 314 314 for (ptr = accel->plugins.next; ptr != &accel->plugins; ptr = ptr->next) { 315 315 struct plg_accel_item * item = (struct plg_accel_item *)ptr; 316 fd_log_debug(" %-15s (%p) \n", item->plg->descriptor->rgwp_name, item->plg->cs);316 fd_log_debug(" %-15s (%p)", item->plg->descriptor->rgwp_name, item->plg->cs); 317 317 } 318 318 } … … 380 380 if (ret > 0) { 381 381 /* Critical error, log and exit */ 382 TRACE_DEBUG(NONE, "An error occurred while handling a RADIUS message from '%s': %s \n", rgw_clients_id(cli), strerror(ret));382 TRACE_DEBUG(NONE, "An error occurred while handling a RADIUS message from '%s': %s", rgw_clients_id(cli), strerror(ret)); 383 383 return ret; 384 384 } … … 436 436 if (ret > 0) { 437 437 /* Critical error, log and exit */ 438 fd_log_debug("[app_radgw] An error occurred while handling a DIAMETER answer to a converted RADIUS request, turn on DEBUG for details: %s \n", strerror(ret));438 fd_log_debug("[app_radgw] An error occurred while handling a DIAMETER answer to a converted RADIUS request, turn on DEBUG for details: %s", strerror(ret)); 439 439 return ret; 440 440 } -
extensions/app_radgw/rgw_servers.c
r965 r974 52 52 return; 53 53 54 fd_log_debug(" auth server: \n");55 fd_log_debug(" disabled..... : %s \n", rgw_servers.auth_serv.disabled ? "TRUE":"false");56 fd_log_debug(" IP disabled.. : %s \n", rgw_servers.auth_serv.ip_disabled ? "TRUE":"false");57 fd_log_debug(" IPv6 disabled : %s \n", rgw_servers.auth_serv.ip6_disabled ? "TRUE":"false");58 fd_log_debug(" port......... : %hu \n", ntohs(rgw_servers.auth_serv.port));54 fd_log_debug(" auth server:"); 55 fd_log_debug(" disabled..... : %s", rgw_servers.auth_serv.disabled ? "TRUE":"false"); 56 fd_log_debug(" IP disabled.. : %s", rgw_servers.auth_serv.ip_disabled ? "TRUE":"false"); 57 fd_log_debug(" IPv6 disabled : %s", rgw_servers.auth_serv.ip6_disabled ? "TRUE":"false"); 58 fd_log_debug(" port......... : %hu", ntohs(rgw_servers.auth_serv.port)); 59 59 inet_ntop(AF_INET, &rgw_servers.auth_serv.ip_endpoint,ipstr,sizeof(ipstr)); 60 fd_log_debug(" IP bind...... : %s \n", ipstr);60 fd_log_debug(" IP bind...... : %s", ipstr); 61 61 inet_ntop(AF_INET6, &rgw_servers.auth_serv.ip6_endpoint,ipstr,sizeof(ipstr)); 62 fd_log_debug(" IPv6 bind.... : %s \n", ipstr);63 64 fd_log_debug(" acct server: \n");65 fd_log_debug(" disabled..... : %s \n", rgw_servers.acct_serv.disabled ? "TRUE":"false");66 fd_log_debug(" IP disabled.. : %s \n", rgw_servers.acct_serv.ip_disabled ? "TRUE":"false");67 fd_log_debug(" IPv6 disabled : %s \n", rgw_servers.acct_serv.ip6_disabled ? "TRUE":"false");68 fd_log_debug(" port......... : %hu \n", ntohs(rgw_servers.acct_serv.port));62 fd_log_debug(" IPv6 bind.... : %s", ipstr); 63 64 fd_log_debug(" acct server:"); 65 fd_log_debug(" disabled..... : %s", rgw_servers.acct_serv.disabled ? "TRUE":"false"); 66 fd_log_debug(" IP disabled.. : %s", rgw_servers.acct_serv.ip_disabled ? "TRUE":"false"); 67 fd_log_debug(" IPv6 disabled : %s", rgw_servers.acct_serv.ip6_disabled ? "TRUE":"false"); 68 fd_log_debug(" port......... : %hu", ntohs(rgw_servers.acct_serv.port)); 69 69 inet_ntop(AF_INET, &rgw_servers.acct_serv.ip_endpoint,ipstr,sizeof(ipstr)); 70 fd_log_debug(" IP bind...... : %s \n", ipstr);70 fd_log_debug(" IP bind...... : %s", ipstr); 71 71 inet_ntop(AF_INET6, &rgw_servers.acct_serv.ip6_endpoint,ipstr,sizeof(ipstr)); 72 fd_log_debug(" IPv6 bind.... : %s \n", ipstr);72 fd_log_debug(" IPv6 bind.... : %s", ipstr); 73 73 74 74 } -
extensions/app_radgw/rgw_worker.c
r767 r974 163 163 /* Check the created Diameter message -- it will be invalid if no callback has handled the RADIUS message */ 164 164 if ((diam_msg == NULL) || ( fd_msg_parse_rules(diam_msg, fd_g_config->cnf_dict, NULL) ) ) { 165 fd_log_debug("[radgw] No or invalid Diameter message was generated after processing the RADIUS command %hhd (%s). \n"165 fd_log_debug("[radgw] No or invalid Diameter message was generated after processing the RADIUS command %hhd (%s)." 166 166 " It may indicate a gateway configuration problem, or implementation issue in a plugin.\n", 167 167 msg->radius.hdr->code, rgw_msg_code_str(msg->radius.hdr->code)); … … 174 174 struct radius_attr_hdr *attr = (struct radius_attr_hdr *)(msg->radius.buf + msg->radius.attr_pos[a]); 175 175 pb++; 176 fd_log_debug("[radgw] No plugin available to handle attribute %hhd (%s) in command %hhd (%s)! Translation aborted. \n",176 fd_log_debug("[radgw] No plugin available to handle attribute %hhd (%s) in command %hhd (%s)! Translation aborted.", 177 177 attr->type, rgw_msg_attrtype_str(attr->type), 178 178 msg->radius.hdr->code, rgw_msg_code_str(msg->radius.hdr->code)); … … 193 193 rgw_clients_dispose(&cli); 194 194 195 TRACE_DEBUG(INFO, "%d problem(s) occurred while translating a RADIUS message, data discarded. \n", pb);195 TRACE_DEBUG(INFO, "%d problem(s) occurred while translating a RADIUS message, data discarded.", pb); 196 196 continue; 197 197 } … … 207 207 { 208 208 /* If an error occurs, log and destroy the data */ 209 fd_log_debug("An error occurred while sending Diameter message, please turn Debug on for detail. \n");209 fd_log_debug("An error occurred while sending Diameter message, please turn Debug on for detail."); 210 210 if (session) { 211 211 CHECK_FCT_DO( fd_sess_destroy(&session), ); -
extensions/app_radgw/rgwx_acct.c
r965 r974 1266 1266 1267 1267 default: 1268 fd_log_debug("[acct.rgwx] Received Diameter answer with error code '%d' from server '%.*s', session %.*s, not translating into Accounting-Response \n",1268 fd_log_debug("[acct.rgwx] Received Diameter answer with error code '%d' from server '%.*s', session %.*s, not translating into Accounting-Response", 1269 1269 ahdr->avp_value->u32, 1270 1270 oh->avp_value->os.len, oh->avp_value->os.data, … … 1273 1273 if (avp) { 1274 1274 CHECK_FCT( fd_msg_avp_hdr ( avp, &ahdr ) ); 1275 fd_log_debug("[acct.rgwx] Error-Message content: '%.*s' \n",1275 fd_log_debug("[acct.rgwx] Error-Message content: '%.*s'", 1276 1276 ahdr->avp_value->os.len, ahdr->avp_value->os.data); 1277 1277 } … … 1279 1279 if (avp) { 1280 1280 CHECK_FCT( fd_msg_avp_hdr ( avp, &ahdr ) ); 1281 fd_log_debug("[acct.rgwx] Error-Reporting-Host: '%.*s' \n",1281 fd_log_debug("[acct.rgwx] Error-Reporting-Host: '%.*s'", 1282 1282 ahdr->avp_value->os.len, ahdr->avp_value->os.data); 1283 1283 } 1284 1284 CHECK_FCT( fd_msg_search_avp (*diam_ans, cs->dict.Failed_AVP, &avp) ); 1285 1285 if (avp) { 1286 fd_log_debug("[acct.rgwx] Failed-AVP was included in the message. \n");1286 fd_log_debug("[acct.rgwx] Failed-AVP was included in the message."); 1287 1287 /* Dump its content ? */ 1288 1288 } -
extensions/app_radgw/rgwx_auth.c
r972 r974 1237 1237 /* In any case, the following is processed: */ 1238 1238 (*rad_fw)->hdr->code = RADIUS_CODE_ACCESS_REJECT; 1239 fd_log_debug("[auth.rgwx] Received Diameter answer with error code '%d' from server '%.*s', session %.*s, translating into Access-Reject \n",1239 fd_log_debug("[auth.rgwx] Received Diameter answer with error code '%d' from server '%.*s', session %.*s, translating into Access-Reject", 1240 1240 ahdr->avp_value->u32, 1241 1241 oh->avp_value->os.len, oh->avp_value->os.data, … … 1244 1244 if (avp_x) { 1245 1245 CHECK_FCT( fd_msg_avp_hdr ( avp_x, &ahdr ) ); 1246 fd_log_debug("[auth.rgwx] Error-Message content: '%.*s' \n",1246 fd_log_debug("[auth.rgwx] Error-Message content: '%.*s'", 1247 1247 ahdr->avp_value->os.len, ahdr->avp_value->os.data); 1248 1248 } … … 1250 1250 if (avp_x) { 1251 1251 CHECK_FCT( fd_msg_avp_hdr ( avp_x, &ahdr ) ); 1252 fd_log_debug("[auth.rgwx] Error-Reporting-Host: '%.*s' \n",1252 fd_log_debug("[auth.rgwx] Error-Reporting-Host: '%.*s'", 1253 1253 ahdr->avp_value->os.len, ahdr->avp_value->os.data); 1254 1254 } 1255 1255 CHECK_FCT( fd_msg_search_avp (*diam_ans, cs->dict.Failed_AVP, &avp_x) ); 1256 1256 if (avp_x) { 1257 fd_log_debug("[auth.rgwx] Failed-AVP was included in the message. \n");1257 fd_log_debug("[auth.rgwx] Failed-AVP was included in the message."); 1258 1258 /* Dump its content ? */ 1259 1259 } … … 1449 1449 /* We only check the value */ 1450 1450 if (ahdr->avp_value->u32 != 3) { 1451 fd_log_debug("[auth.rgwx] Received Diameter answer with Auth-Request-Type set to %d (%s) from server %.*s, session %.*s. \n"1451 fd_log_debug("[auth.rgwx] Received Diameter answer with Auth-Request-Type set to %d (%s) from server %.*s, session %.*s." 1452 1452 " This may cause interoperability problems with RADIUS.\n", 1453 1453 ahdr->avp_value->u32, … … 1614 1614 case DIAM_ATTR_NAS_FILTER_RULE: 1615 1615 /* This is not translatable to RADIUS */ 1616 fd_log_debug("[auth.rgwx] Received Diameter answer with non-translatable NAS-Filter-Rule AVP from '%.*s' (session: '%.*s'), ignoring. \n",1616 fd_log_debug("[auth.rgwx] Received Diameter answer with non-translatable NAS-Filter-Rule AVP from '%.*s' (session: '%.*s'), ignoring.", 1617 1617 oh->avp_value->os.len, oh->avp_value->os.data, 1618 1618 sid->avp_value->os.len, sid->avp_value->os.data); … … 1647 1647 case DIAM_ATTR_QOS_FILTER_RULE: 1648 1648 /* This is not translatable to RADIUS */ 1649 fd_log_debug("[auth.rgwx] Received Diameter answer with non-translatable QoS-Filter-Rule AVP from '%.*s' (session: '%.*s'), ignoring. \n",1649 fd_log_debug("[auth.rgwx] Received Diameter answer with non-translatable QoS-Filter-Rule AVP from '%.*s' (session: '%.*s'), ignoring.", 1650 1650 oh->avp_value->os.len, oh->avp_value->os.data, 1651 1651 sid->avp_value->os.len, sid->avp_value->os.data); … … 1856 1856 1857 1857 if (ahdr->avp_value->os.len != 64) { 1858 TRACE_DEBUG(INFO, "Received EAP-Master-Session-Key attribute with length %d != 64. \n", ahdr->avp_value->os.len)1858 TRACE_DEBUG(INFO, "Received EAP-Master-Session-Key attribute with length %d != 64.", ahdr->avp_value->os.len) 1859 1859 } 1860 1860 -
extensions/app_radgw/rgwx_debug.c
r740 r974 57 57 58 58 auth = &(msg->hdr->authenticator[0]); 59 fd_log_debug(" id : 0x%02hhx, code: %hhd (%s) \n", msg->hdr->identifier, msg->hdr->code, rgw_msg_code_str(msg->hdr->code));60 fd_log_debug(" auth: %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx \n",59 fd_log_debug(" id : 0x%02hhx, code: %hhd (%s)", msg->hdr->identifier, msg->hdr->code, rgw_msg_code_str(msg->hdr->code)); 60 fd_log_debug(" auth: %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx", 61 61 auth[0], auth[1], auth[2], auth[3], 62 62 auth[4], auth[5], auth[6], auth[7]); 63 fd_log_debug(" %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx \n",63 fd_log_debug(" %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx", 64 64 auth[8], auth[9], auth[10], auth[11], 65 65 auth[12], auth[13], auth[14], auth[15]); 66 66 for (i = 0; i < msg->attr_used; i++) { 67 67 struct radius_attr_hdr *attr = (struct radius_attr_hdr *)(msg->buf + msg->attr_pos[i]); 68 fd_log_debug(" - len:%3hhu, type:0x%02hhx (%s) \n", attr->length, attr->type, rgw_msg_attrtype_str(attr->type));68 fd_log_debug(" - len:%3hhu, type:0x%02hhx (%s)", attr->length, attr->type, rgw_msg_attrtype_str(attr->type)); 69 69 /* If we need to dump the value, it's better to call directly radius_msg_dump instead... */ 70 70 } … … 76 76 TRACE_ENTRY("%p %p %p %p %p %p", cs, session, rad_req, rad_ans, diam_fw, cli); 77 77 78 fd_log_debug("------------- RADIUS/Diameter Request Debug%s%s%s ------------- \n", cs ? " [" : "", cs ? (char *)cs : "", cs ? "]" : "");78 fd_log_debug("------------- RADIUS/Diameter Request Debug%s%s%s -------------", cs ? " [" : "", cs ? (char *)cs : "", cs ? "]" : ""); 79 79 80 80 if (!rad_req) { 81 fd_log_debug(" RADIUS request: NULL pointer \n");81 fd_log_debug(" RADIUS request: NULL pointer"); 82 82 } else { 83 fd_log_debug(" RADIUS request (%p) DUMP: \n", rad_req);83 fd_log_debug(" RADIUS request (%p) DUMP:", rad_req); 84 84 debug_dump_radius(rad_req); 85 85 } 86 86 87 87 if (!rad_ans || ! *rad_ans) { 88 fd_log_debug(" RADIUS answer: NULL pointer \n");88 fd_log_debug(" RADIUS answer: NULL pointer"); 89 89 } else { 90 fd_log_debug(" RADIUS answer (%p) DUMP: \n", *rad_ans);90 fd_log_debug(" RADIUS answer (%p) DUMP:", *rad_ans); 91 91 debug_dump_radius(*rad_ans); 92 92 } 93 93 94 94 if (!diam_fw || ! *diam_fw) { 95 fd_log_debug(" Diameter message: NULL pointer \n");95 fd_log_debug(" Diameter message: NULL pointer"); 96 96 } else { 97 fd_log_debug(" Diameter message (%p) DUMP: \n", *diam_fw);97 fd_log_debug(" Diameter message (%p) DUMP:", *diam_fw); 98 98 fd_msg_dump_walk(0, *diam_fw); 99 99 } 100 100 101 101 if (!session || ! *session) { 102 fd_log_debug(" Diameter session: NULL pointer \n");102 fd_log_debug(" Diameter session: NULL pointer"); 103 103 } else { 104 104 os0_t str; … … 106 106 CHECK_FCT( fd_sess_getsid(*session, &str, &str_len) ); 107 107 108 fd_log_debug(" Diameter session: %s \n", str);108 fd_log_debug(" Diameter session: %s", str); 109 109 } 110 110 111 fd_log_debug("=========== Debug%s%s%s complete ============= \n", cs ? " [" : "", cs ? (char *)cs : "", cs ? "]" : "");111 fd_log_debug("=========== Debug%s%s%s complete =============", cs ? " [" : "", cs ? (char *)cs : "", cs ? "]" : ""); 112 112 113 113 return 0; … … 119 119 TRACE_ENTRY("%p %p %p %p %p %p", cs, session, diam_ans, rad_fw, cli, stateful); 120 120 121 fd_log_debug("------------- RADIUS/Diameter Answer Debug%s%s%s ------------- \n", cs ? " [" : "", cs ? (char *)cs : "", cs ? "]" : "");121 fd_log_debug("------------- RADIUS/Diameter Answer Debug%s%s%s -------------", cs ? " [" : "", cs ? (char *)cs : "", cs ? "]" : ""); 122 122 123 123 if (!diam_ans || ! *diam_ans) { 124 fd_log_debug(" Diameter message: NULL pointer \n");124 fd_log_debug(" Diameter message: NULL pointer"); 125 125 } else { 126 fd_log_debug(" Diameter message (%p) DUMP: \n", *diam_ans);126 fd_log_debug(" Diameter message (%p) DUMP:", *diam_ans); 127 127 fd_msg_dump_walk(0, *diam_ans); 128 128 } 129 129 130 130 if (!rad_fw || ! *rad_fw) { 131 fd_log_debug(" RADIUS answer: NULL pointer \n");131 fd_log_debug(" RADIUS answer: NULL pointer"); 132 132 } else { 133 fd_log_debug(" RADIUS answer (%p) DUMP: \n", *rad_fw);133 fd_log_debug(" RADIUS answer (%p) DUMP:", *rad_fw); 134 134 debug_dump_radius(*rad_fw); 135 135 } 136 136 137 fd_log_debug("=========== Debug%s%s%s complete ============= \n", cs ? " [" : "", cs ? (char *)cs : "", cs ? "]" : "");137 fd_log_debug("=========== Debug%s%s%s complete =============", cs ? " [" : "", cs ? (char *)cs : "", cs ? "]" : ""); 138 138 return 0; 139 139 } -
extensions/app_radgw/rgwx_echodrop.c
r741 r974 60 60 TRACE_ENTRY("%p %p", conffile, state); 61 61 CHECK_PARAMS( state ); 62 CHECK_PARAMS_DO( conffile, { fd_log_debug("[echodrop.rgwx] The configuration file is not optional for this plugin. \n"); return EINVAL; } );62 CHECK_PARAMS_DO( conffile, { fd_log_debug("[echodrop.rgwx] The configuration file is not optional for this plugin."); return EINVAL; } ); 63 63 64 64 CHECK_MALLOC( new = malloc(sizeof(struct rgwp_config)) ); … … 82 82 char * act = (eca->action == ACT_ECHO) ? "ECHO" : "DROP"; 83 83 if (eca->ext) { 84 fd_log_debug(" %s Code: %hhu, Vendor: %u, Ext-Type: %hu \n", act, eca->code, eca->vendor_id, eca->extype);84 fd_log_debug(" %s Code: %hhu, Vendor: %u, Ext-Type: %hu", act, eca->code, eca->vendor_id, eca->extype); 85 85 continue; 86 86 } 87 87 if (eca->tlv) { 88 fd_log_debug(" %s Code: %hhu, Vendor: %u, Type: %hhu \n", act, eca->code, eca->vendor_id, eca->type);88 fd_log_debug(" %s Code: %hhu, Vendor: %u, Type: %hhu", act, eca->code, eca->vendor_id, eca->type); 89 89 continue; 90 90 } 91 91 if (eca->vsa) { 92 fd_log_debug(" %s Code: %hhu, Vendor: %u \n", act, eca->code, eca->vendor_id);93 continue; 94 } 95 fd_log_debug(" %s Code: %hhu \n", act, eca->code);92 fd_log_debug(" %s Code: %hhu, Vendor: %u", act, eca->code, eca->vendor_id); 93 continue; 94 } 95 fd_log_debug(" %s Code: %hhu", act, eca->code); 96 96 } 97 97 } … … 186 186 if (eca->ext) { 187 187 /* To be done */ 188 fd_log_debug("Extended attributes are not implemented yet! \n");188 fd_log_debug("Extended attributes are not implemented yet!"); 189 189 ASSERT(0); 190 190 continue; … … 219 219 CHECK_PARAMS_DO(*session, 220 220 { 221 fd_log_debug( "[echodrop.rgwx] The extension is configured to echo some attributes from this message, but no session object has been created for it (yet). \n"221 fd_log_debug( "[echodrop.rgwx] The extension is configured to echo some attributes from this message, but no session object has been created for it (yet)." 222 222 " Please check your configuration file and include a session-generating extension BEFORE calling echodrop.rgwx to echo attributes.\n" 223 223 " Please use debug.rgwx to retrieve more information.\n" ); -
extensions/app_radgw/rgwx_echodrop.l
r741 r974 71 71 if (ret != 1) { 72 72 /* No matching: an error occurred */ 73 fd_log_debug("[echodrop.rgwx] Unable to convert the value '%s' to a valid number: %s \n", yytext, strerror(errno));73 fd_log_debug("[echodrop.rgwx] Unable to convert the value '%s' to a valid number: %s", yytext, strerror(errno)); 74 74 return LEX_ERROR; /* trig an error in yacc parser */ 75 75 /* Maybe we could REJECT instead of failing here? */ … … 93 93 /* Unrecognized character */ 94 94 <*>. { 95 fd_log_debug("[echodrop.rgwx] Unrecognized text on line %d col %d: '%s'. \n", yylloc->first_line, yylloc->first_column, yytext);95 fd_log_debug("[echodrop.rgwx] Unrecognized text on line %d col %d: '%s'.", yylloc->first_line, yylloc->first_column, yytext); 96 96 return LEX_ERROR; 97 97 } -
extensions/app_radgw/rgwx_echodrop.y
r741 r974 78 78 if (rgwx_echodropin == NULL) { 79 79 ret = errno; 80 fd_log_debug("[echodrop.rgwx] Unable to open plugin configuration file %s for reading: %s \n", conffile, strerror(ret));80 fd_log_debug("[echodrop.rgwx] Unable to open plugin configuration file %s for reading: %s", conffile, strerror(ret)); 81 81 return ret; 82 82 } … … 97 97 { 98 98 if (ploc->first_line != ploc->last_line) 99 fd_log_debug("%s:%d.%d-%d.%d : %s \n", conffile, ploc->first_line, ploc->first_column, ploc->last_line, ploc->last_column, s);99 fd_log_debug("%s:%d.%d-%d.%d : %s", conffile, ploc->first_line, ploc->first_column, ploc->last_line, ploc->last_column, s); 100 100 else if (ploc->first_column != ploc->last_column) 101 fd_log_debug("%s:%d.%d-%d : %s \n", conffile, ploc->first_line, ploc->first_column, ploc->last_column, s);101 fd_log_debug("%s:%d.%d-%d : %s", conffile, ploc->first_line, ploc->first_column, ploc->last_column, s); 102 102 else 103 fd_log_debug("%s:%d.%d : %s \n", conffile, ploc->first_line, ploc->first_column, s);103 fd_log_debug("%s:%d.%d : %s", conffile, ploc->first_line, ploc->first_column, s); 104 104 } 105 105 -
extensions/app_radgw/rgwx_sip.c
r924 r974 803 803 default: 804 804 (*rad_fw)->hdr->code = RADIUS_CODE_ACCESS_REJECT; 805 fd_log_debug("[sip.rgwx] Received Diameter answer with error code '%d', session %.*s, translating into Access-Reject \n",805 fd_log_debug("[sip.rgwx] Received Diameter answer with error code '%d', session %.*s, translating into Access-Reject", 806 806 ahdr->avp_value->u32, 807 807 sid->avp_value->os.len, sid->avp_value->os.data); -
extensions/app_redirect/ard_conf.l
r740 r974 82 82 if (ret != 1) { 83 83 /* No matching: an error occurred */ 84 fd_log_debug("Unable to convert the value '%s' to a valid number: %s \n", yytext, strerror(errno));84 fd_log_debug("Unable to convert the value '%s' to a valid number: %s", yytext, strerror(errno)); 85 85 return TOK_LEX_ERROR; /* trig an error in yacc parser */ 86 86 /* Maybe we could REJECT instead of failing here? */ … … 94 94 CHECK_MALLOC_DO( yylval->tstring.str = strdup(yytext+2), 95 95 { 96 TRACE_DEBUG(INFO, "Unable to copy the string '%s': %s \n", yytext, strerror(errno));96 TRACE_DEBUG(INFO, "Unable to copy the string '%s': %s", yytext, strerror(errno)); 97 97 return TOK_LEX_ERROR; /* trig an error in yacc parser */ 98 98 } ); … … 107 107 CHECK_MALLOC_DO( yylval->tstring.str = strdup(yytext+1), 108 108 { 109 TRACE_DEBUG(INFO, "Unable to copy the string '%s': %s \n", yytext, strerror(errno));109 TRACE_DEBUG(INFO, "Unable to copy the string '%s': %s", yytext, strerror(errno)); 110 110 return TOK_LEX_ERROR; /* trig an error in yacc parser */ 111 111 } ); … … 134 134 /* Unrecognized sequence, if it did not match any previous pattern */ 135 135 [^[:space:]\":=;\n]+ { 136 fd_log_debug("Unrecognized text on line %d col %d: '%s'. \n", yylloc->first_line, yylloc->first_column, yytext);136 fd_log_debug("Unrecognized text on line %d col %d: '%s'.", yylloc->first_line, yylloc->first_column, yytext); 137 137 return TOK_LEX_ERROR; 138 138 } -
extensions/app_redirect/ard_conf.y
r740 r974 76 76 return; 77 77 78 fd_log_debug("app_redirect: configuration dump: \n");79 fd_log_debug(" default_redirect_cache_time : %u sec \n", ard_conf->default_rct);78 fd_log_debug("app_redirect: configuration dump:"); 79 fd_log_debug(" default_redirect_cache_time : %u sec", ard_conf->default_rct); 80 80 for (li = ard_conf->rules.next; li != &ard_conf->rules; li = li->next) { 81 81 ard_rule_dump(li->o); 82 82 } 83 fd_log_debug("app_redirect: end of configuration dump \n");83 fd_log_debug("app_redirect: end of configuration dump"); 84 84 } 85 85 -
extensions/app_redirect/ard_rules.c
r740 r974 54 54 { 55 55 struct fd_list * li; 56 fd_log_debug(" rule @%p: %s, %us \n", r, redir_type_str[r->type], r->rct);56 fd_log_debug(" rule @%p: %s, %us", r, redir_type_str[r->type], r->rct); 57 57 for (li = r->criteria.next; li != &r->criteria; li = li->next) { 58 58 struct ard_criteria * c = li->o; 59 fd_log_debug(" Criteria: ");60 59 switch (c->type) { 61 60 case FROM_ID: 62 fd_log_debug(" received from peer %s'%s'", c->is_regex?"REGEX":"", c->s);61 fd_log_debug(" Criteria: received from peer %s'%s'", c->is_regex?"REGEX":"", c->s); 63 62 break; 64 63 case FROM_REALM: 65 fd_log_debug(" received from realm %s'%s'", c->is_regex?"REGEX":"", c->s);64 fd_log_debug(" Criteria: received from realm %s'%s'", c->is_regex?"REGEX":"", c->s); 66 65 break; 67 66 case APP_ID: 68 fd_log_debug(" application id is %u", c->i);67 fd_log_debug(" Criteria: application id is %u", c->i); 69 68 break; 70 69 case AVP_INT: 71 fd_log_debug(" contains '%s' AVP with value '%d'", c->avp_info.avp_name, c->i);70 fd_log_debug(" Criteria: contains '%s' AVP with value '%d'", c->avp_info.avp_name, c->i); 72 71 break; 73 72 case AVP_STR: 74 fd_log_debug(" contains '%s' AVP with value %s'%s'", c->avp_info.avp_name, c->is_regex?"REGEX":"", c->s);73 fd_log_debug(" Criteria: contains '%s' AVP with value %s'%s'", c->avp_info.avp_name, c->is_regex?"REGEX":"", c->s); 75 74 break; 76 75 77 76 default: 78 fd_log_debug("invalid (%d)!", c->type); 79 } 80 fd_log_debug("\n"); 77 fd_log_debug(" Criteria: invalid (%d)!", c->type); 78 } 81 79 } 82 80 for (li = r->targets.next; li != &r->targets; li = li->next) { 83 81 struct ard_target * t = li->o; 84 fd_log_debug(" Redirect to: '%s' \n", t->s);82 fd_log_debug(" Redirect to: '%s'", t->s); 85 83 } 86 84 } -
extensions/app_sip/app_sip.l
r740 r974 79 79 if (ret != 1) { 80 80 /* No matching: an error occurred */ 81 fd_log_debug("Unable to convert the value '%s' to a valid number: %s \n", yytext, strerror(errno));81 fd_log_debug("Unable to convert the value '%s' to a valid number: %s", yytext, strerror(errno)); 82 82 return LEX_ERROR; /* trig an error in yacc parser */ 83 83 /* Maybe we could REJECT instead of failing here? */ … … 91 91 yylval->string = strdup(yytext+1); 92 92 if (!yylval->string) { 93 fd_log_debug("Unable to copy the string '%s': %s \n", yytext, strerror(errno));93 fd_log_debug("Unable to copy the string '%s': %s", yytext, strerror(errno)); 94 94 TRACE_DEBUG(INFO, "strdup failed"); 95 95 return LEX_ERROR; /* trig an error in yacc parser */ … … 156 156 /* Unrecognized sequence, if it did not match any previous pattern */ 157 157 [^[:space:]"*=>;\n]+ { 158 fd_log_debug("Unrecognized text on line %d col %d: '%s'. \n", yylloc->first_line, yylloc->first_column, yytext);158 fd_log_debug("Unrecognized text on line %d col %d: '%s'.", yylloc->first_line, yylloc->first_column, yytext); 159 159 return LEX_ERROR; 160 160 } -
extensions/app_sip/app_sip.y
r740 r974 72 72 if (app_sipin == NULL) { 73 73 ret = errno; 74 fd_log_debug("Unable to open extension configuration file %s for reading: %s \n", conffile, strerror(ret));74 fd_log_debug("Unable to open extension configuration file %s for reading: %s", conffile, strerror(ret)); 75 75 TRACE_DEBUG (INFO, "Error occurred, message logged -- configuration file."); 76 76 return ret; … … 98 98 99 99 if (ploc->first_line != ploc->last_line) 100 fd_log_debug("%s:%d.%d-%d.%d : %s \n", conffile, ploc->first_line, ploc->first_column, ploc->last_line, ploc->last_column, s);100 fd_log_debug("%s:%d.%d-%d.%d : %s", conffile, ploc->first_line, ploc->first_column, ploc->last_line, ploc->last_column, s); 101 101 else if (ploc->first_column != ploc->last_column) 102 fd_log_debug("%s:%d.%d-%d : %s \n", conffile, ploc->first_line, ploc->first_column, ploc->last_column, s);102 fd_log_debug("%s:%d.%d-%d : %s", conffile, ploc->first_line, ploc->first_column, ploc->last_column, s); 103 103 else 104 fd_log_debug("%s:%d.%d : %s \n", conffile, ploc->first_line, ploc->first_column, s);104 fd_log_debug("%s:%d.%d : %s", conffile, ploc->first_line, ploc->first_column, s); 105 105 } 106 106 -
extensions/dbg_interactive/dbg_interactive.c
r740 r974 61 61 CHECK_FCT_DO(fd_core_waitstartcomplete(), goto end); 62 62 63 fd_log_debug("\nStarting interactive python interpreter [experimental].\n"); 64 if (!arg) 65 fd_log_debug("Example syntax:\n >>> print cvar.fd_g_config.cnf_diamid\n '%s'\n", fd_g_config->cnf_diamid); 63 fd_log_debug("Starting interactive python interpreter [experimental]."); 64 if (!arg) { 65 fd_log_debug("Example syntax:"); 66 fd_log_debug(" >>> print cvar.fd_g_config.cnf_diamid"); 67 fd_log_debug(" '%s'", fd_g_config->cnf_diamid); 68 } 66 69 Py_Main(arg ? 2 : 1, dum); 67 70 -
extensions/dbg_monitor/dbg_monitor.c
r740 r974 61 61 #ifdef DEBUG 62 62 for (i++; i % 30; i++) { 63 fd_log_debug("[dbg_monitor] %ih%*im%*is \n", i/3600, 2, (i/60) % 60 , 2, i%60); /* This makes it easier to detect inactivity periods in the log file */63 fd_log_debug("[dbg_monitor] %ih%*im%*is", i/3600, 2, (i/60) % 60 , 2, i%60); /* This makes it easier to detect inactivity periods in the log file */ 64 64 sleep(1); 65 65 } … … 67 67 sleep(3600); /* 1 hour */ 68 68 #endif /* DEBUG */ 69 fd_log_debug("[dbg_monitor] Dumping current information \n");69 fd_log_debug("[dbg_monitor] Dumping current information"); 70 70 CHECK_FCT_DO(fd_event_send(fd_g_config->cnf_main_ev, FDEV_DUMP_QUEUES, 0, NULL), /* continue */); 71 71 CHECK_FCT_DO(fd_event_send(fd_g_config->cnf_main_ev, FDEV_DUMP_SERV, 0, NULL), /* continue */); … … 80 80 static void got_sig() 81 81 { 82 fd_log_debug("[dbg_monitor] Dumping extra information \n");82 fd_log_debug("[dbg_monitor] Dumping extra information"); 83 83 CHECK_FCT_DO(fd_event_send(fd_g_config->cnf_main_ev, FDEV_DUMP_DICT, 0, NULL), /* continue */); 84 84 CHECK_FCT_DO(fd_event_send(fd_g_config->cnf_main_ev, FDEV_DUMP_CONFIG, 0, NULL), /* continue */); -
extensions/dbg_rt/dbg_rt.c
r741 r974 48 48 TRACE_ENTRY("%p %p", cbdata, msg); 49 49 50 fd_log_debug("[dbg_rt] FWD routing message: %p \n", msg ? *msg : NULL);50 fd_log_debug("[dbg_rt] FWD routing message: %p", msg ? *msg : NULL); 51 51 if (msg) 52 52 fd_msg_dump_walk(INFO, *msg); … … 62 62 TRACE_ENTRY("%p %p %p", cbdata, msg, candidates); 63 63 64 fd_log_debug("[dbg_rt] OUT routing message: %p \n", msg);64 fd_log_debug("[dbg_rt] OUT routing message: %p", msg); 65 65 fd_msg_dump_walk(INFO, msg); 66 fd_log_debug("[dbg_rt] Current list of candidates (%p): (score - id) \n", msg);66 fd_log_debug("[dbg_rt] Current list of candidates (%p): (score - id)", msg); 67 67 68 68 for (li = candidates->next; li != candidates; li = li->next) { 69 69 struct rtd_candidate *c = (struct rtd_candidate *) li; 70 fd_log_debug("[dbg_rt] %d -\t%s \n", c->score, c->diamid);70 fd_log_debug("[dbg_rt] %d -\t%s", c->score, c->diamid); 71 71 } 72 72 -
extensions/dict_dcca/dict_dcca.c
- Property exe deleted
-
extensions/dict_legacy_xml/dict_lxml.l
r741 r974 80 80 CHECK_MALLOC_DO( yylval->string = strdup(yytext+1), 81 81 { 82 TRACE_DEBUG(INFO, "Unable to copy the string '%s': %s \n", yytext, strerror(errno));82 TRACE_DEBUG(INFO, "Unable to copy the string '%s': %s", yytext, strerror(errno)); 83 83 return LEX_ERROR; /* trig an error in yacc parser */ 84 84 } ); … … 92 92 /* Unrecognized sequence, if it did not match any previous pattern */ 93 93 [^[:space:]\";\n]+ { 94 fd_log_debug("Unrecognized text on line %d col %d: '%s'. \n", yylloc->first_line, yylloc->first_column, yytext);94 fd_log_debug("Unrecognized text on line %d col %d: '%s'.", yylloc->first_line, yylloc->first_column, yytext); 95 95 return LEX_ERROR; 96 96 } -
extensions/dict_legacy_xml/dict_lxml.y
r741 r974 72 72 if (dict_lxmlin == NULL) { 73 73 ret = errno; 74 fd_log_debug("Unable to open extension configuration file %s for reading: %s \n", conffile, strerror(ret));74 fd_log_debug("Unable to open extension configuration file %s for reading: %s", conffile, strerror(ret)); 75 75 TRACE_DEBUG (INFO, "Error occurred, message logged -- configuration file."); 76 76 return ret; … … 100 100 101 101 if (ploc->first_line != ploc->last_line) 102 fd_log_debug("%s:%d.%d-%d.%d : %s \n", conffile, ploc->first_line, ploc->first_column, ploc->last_line, ploc->last_column, s);102 fd_log_debug("%s:%d.%d-%d.%d : %s", conffile, ploc->first_line, ploc->first_column, ploc->last_line, ploc->last_column, s); 103 103 else if (ploc->first_column != ploc->last_column) 104 fd_log_debug("%s:%d.%d-%d : %s \n", conffile, ploc->first_line, ploc->first_column, ploc->last_column, s);104 fd_log_debug("%s:%d.%d-%d : %s", conffile, ploc->first_line, ploc->first_column, ploc->last_column, s); 105 105 else 106 fd_log_debug("%s:%d.%d : %s \n", conffile, ploc->first_line, ploc->first_column, s);106 fd_log_debug("%s:%d.%d : %s", conffile, ploc->first_line, ploc->first_column, s); 107 107 } 108 108 -
extensions/dict_legacy_xml/dict_lxml_xml.c
r740 r974 123 123 124 124 static void dump_vendor(struct t_vend * v) { 125 fd_log_debug(" Vendor %d:'%s' \n", v->id, (char *)v->name);125 fd_log_debug(" Vendor %d:'%s'", v->id, (char *)v->name); 126 126 } 127 127 … … 175 175 if (r->max != -1) 176 176 fd_log_debug("M:%d ", r->max); 177 fd_log_debug("%s \n", (char *)r->avpname);177 fd_log_debug("%s", (char *)r->avpname); 178 178 } 179 179 … … 241 241 static void dump_cmd(struct t_cmd * c) { 242 242 struct fd_list * li; 243 fd_log_debug(" Command %d %s: %s \n", c->code,243 fd_log_debug(" Command %d %s: %s", c->code, 244 244 c->fmask ? ( c->flags ? "[P=1]" : "[P=0]") : "", c->name); 245 245 for (li = c->reqrules_fixed.next; li != &c->reqrules_fixed; li = li->next) … … 325 325 326 326 static void dump_type(struct t_typedefn * t) { 327 fd_log_debug(" Type %s ", (char *)t->name);328 if (t->parent_name)329 fd_log_debug("(parent: %s)", (char *)t->parent_name);330 fd_log_debug("\n");327 fd_log_debug(" Type %s%s%s%s", (char *)t->name, 328 t->parent_name ? "(parent: " : "", 329 t->parent_name ? (char *)t->parent_name : "", 330 t->parent_name ? ")" : ""); 331 331 } 332 332 … … 361 361 362 362 static void dump_avptype(struct t_avptype * t) { 363 fd_log_debug(" data type: %s \n", t->type_name);363 fd_log_debug(" data type: %s", t->type_name); 364 364 } 365 365 … … 398 398 399 399 static void dump_enum(struct t_enum * e) { 400 fd_log_debug(" Value: %d == %s \n", e->code, e->name);400 fd_log_debug(" Value: %d == %s", e->code, e->name); 401 401 } 402 402 … … 469 469 static void dump_avp(struct t_avp * a) { 470 470 struct fd_list * li; 471 fd_log_debug(" AVP %d %s%s: %s \n", a->code,471 fd_log_debug(" AVP %d %s%s: %s", a->code, 472 472 a->fmask & AVP_FLAG_MANDATORY ? ( a->flags & AVP_FLAG_MANDATORY ? "[M=1]" : "[M=0]") : "", 473 473 a->fmask & AVP_FLAG_VENDOR ? ( a->flags & AVP_FLAG_VENDOR ? "[V=1]" : "[V=0]") : "", 474 474 a->name); 475 475 if (a->fmask & AVP_FLAG_VENDOR) 476 fd_log_debug(" vendor: %d \n", a->vendor);476 fd_log_debug(" vendor: %d", a->vendor); 477 477 for (li = a->type.next; li != &a->type; li = li->next) 478 478 dump_avptype((struct t_avptype *)li); … … 561 561 static void dump_appl(struct t_appl * a) { 562 562 struct fd_list * li; 563 fd_log_debug(" Application %d: %s \n", a->id, a->name);563 fd_log_debug(" Application %d: %s", a->id, a->name); 564 564 for (li = a->commands.next; li != &a->commands; li = li->next) 565 565 dump_cmd((struct t_cmd *)li); … … 1021 1021 TRACE_DEBUG(INFO, "Error encountered while parsing tag of:"); 1022 1022 if (data->cur_app) 1023 fd_log_debug(" Application: '%s' \n", data->cur_app->name);1023 fd_log_debug(" Application: '%s'", data->cur_app->name); 1024 1024 if (data->cur_cmd) 1025 fd_log_debug(" Command : '%s' \n", data->cur_cmd->name);1025 fd_log_debug(" Command : '%s'", data->cur_cmd->name); 1026 1026 if (data->cur_avp) 1027 fd_log_debug(" AVP : '%s' \n", data->cur_avp->name);1027 fd_log_debug(" AVP : '%s'", data->cur_avp->name); 1028 1028 } 1029 1029 return; -
extensions/rt_default/rtd_conf.l
r741 r974 82 82 if (ret != 1) { 83 83 /* No matching: an error occurred */ 84 fd_log_debug("Unable to convert the value '%s' to a valid number: %s \n", yytext, strerror(errno));84 fd_log_debug("Unable to convert the value '%s' to a valid number: %s", yytext, strerror(errno)); 85 85 return LEX_ERROR; /* trig an error in yacc parser */ 86 86 /* Maybe we could REJECT instead of failing here? */ … … 107 107 CHECK_MALLOC_DO( yylval->string = strdup(yytext+2), 108 108 { 109 TRACE_DEBUG(INFO, "Unable to copy the string '%s': %s \n", yytext, strerror(errno));109 TRACE_DEBUG(INFO, "Unable to copy the string '%s': %s", yytext, strerror(errno)); 110 110 return LEX_ERROR; /* trig an error in yacc parser */ 111 111 } ); … … 119 119 CHECK_MALLOC_DO( yylval->string = strdup(yytext+1), 120 120 { 121 TRACE_DEBUG(INFO, "Unable to copy the string '%s': %s \n", yytext, strerror(errno));121 TRACE_DEBUG(INFO, "Unable to copy the string '%s': %s", yytext, strerror(errno)); 122 122 return LEX_ERROR; /* trig an error in yacc parser */ 123 123 } ); … … 140 140 /* Unrecognized sequence, if it did not match any previous pattern */ 141 141 [^[:space:]\"*:=+;\n]+ { 142 fd_log_debug("Unrecognized text on line %d col %d: '%s'. \n", yylloc->first_line, yylloc->first_column, yytext);142 fd_log_debug("Unrecognized text on line %d col %d: '%s'.", yylloc->first_line, yylloc->first_column, yytext); 143 143 return LEX_ERROR; 144 144 } -
extensions/rt_default/rtd_conf.y
r741 r974 71 71 if (rtd_confin == NULL) { 72 72 ret = errno; 73 fd_log_debug("Unable to open extension configuration file %s for reading: %s \n", conffile, strerror(ret));73 fd_log_debug("Unable to open extension configuration file %s for reading: %s", conffile, strerror(ret)); 74 74 TRACE_DEBUG (INFO, "Error occurred, message logged -- configuration file."); 75 75 return ret; … … 99 99 100 100 if (ploc->first_line != ploc->last_line) 101 fd_log_debug("%s:%d.%d-%d.%d : %s \n", conffile, ploc->first_line, ploc->first_column, ploc->last_line, ploc->last_column, s);101 fd_log_debug("%s:%d.%d-%d.%d : %s", conffile, ploc->first_line, ploc->first_column, ploc->last_line, ploc->last_column, s); 102 102 else if (ploc->first_column != ploc->last_column) 103 fd_log_debug("%s:%d.%d-%d : %s \n", conffile, ploc->first_line, ploc->first_column, ploc->last_column, s);103 fd_log_debug("%s:%d.%d-%d : %s", conffile, ploc->first_line, ploc->first_column, ploc->last_column, s); 104 104 else 105 fd_log_debug("%s:%d.%d : %s \n", conffile, ploc->first_line, ploc->first_column, s);105 fd_log_debug("%s:%d.%d : %s", conffile, ploc->first_line, ploc->first_column, s); 106 106 } 107 107 -
extensions/rt_default/rtd_rules.c
r741 r974 158 158 static void dump_rule(int indent, struct rule * rule) 159 159 { 160 fd_log_debug("%*s%s%s%s += %d \n",160 fd_log_debug("%*s%s%s%s += %d", 161 161 indent, "", 162 162 rule->md.is_regex ? "[" : "'", … … 168 168 { 169 169 int i; 170 fd_log_debug("%*s%s%s%s : \n",170 fd_log_debug("%*s%s%s%s :", 171 171 indent, "", 172 172 target->md.is_regex ? "[" : "'", … … 176 176 if (! FD_IS_LIST_EMPTY(&target->rules[i])) { 177 177 struct fd_list * li; 178 fd_log_debug("%*s rules[%d]: \n",178 fd_log_debug("%*s rules[%d]:", 179 179 indent, "", i); 180 180 for (li = target->rules[i].next; li != &target->rules[i]; li = li->next) { … … 594 594 { 595 595 int i; 596 fd_log_debug("[rt_default] Dumping rules repository... \n");596 fd_log_debug("[rt_default] Dumping rules repository..."); 597 597 for (i = 0; i < RTD_TAR_MAX; i++) { 598 598 if (!FD_IS_LIST_EMPTY( &TARGETS[i] )) { 599 599 struct fd_list * li; 600 fd_log_debug(" Targets list %d: \n", i);600 fd_log_debug(" Targets list %d:", i); 601 601 for (li = TARGETS[i].next; li != &TARGETS[i]; li = li->next) { 602 602 dump_target(4, (struct target *)li); … … 605 605 } 606 606 607 fd_log_debug("[rt_default] End of dump \n");608 } 607 fd_log_debug("[rt_default] End of dump"); 608 } -
extensions/rt_ereg/rtereg_conf.l
r741 r974 81 81 CHECK_MALLOC_DO( yylval->string = strdup(yytext+1), 82 82 { 83 TRACE_DEBUG(INFO, "Unable to copy the string '%s': %s \n", yytext, strerror(errno));83 TRACE_DEBUG(INFO, "Unable to copy the string '%s': %s", yytext, strerror(errno)); 84 84 return LEX_ERROR; /* trig an error in yacc parser */ 85 85 } ); … … 96 96 if (ret != 1) { 97 97 /* No matching: an error occurred */ 98 fd_log_debug("Unable to convert the value '%s' to a valid number: %s \n", yytext, strerror(errno));98 fd_log_debug("Unable to convert the value '%s' to a valid number: %s", yytext, strerror(errno)); 99 99 return LEX_ERROR; /* trig an error in yacc parser */ 100 100 /* Maybe we could REJECT instead of failing here? */ … … 113 113 /* Unrecognized sequence, if it did not match any previous pattern */ 114 114 [^[:space:]\":=+;\n]+ { 115 fd_log_debug("Unrecognized text on line %d col %d: '%s'. \n", yylloc->first_line, yylloc->first_column, yytext);115 fd_log_debug("Unrecognized text on line %d col %d: '%s'.", yylloc->first_line, yylloc->first_column, yytext); 116 116 return LEX_ERROR; 117 117 } -
extensions/rt_ereg/rtereg_conf.y
r741 r974 68 68 if (rtereg_confin == NULL) { 69 69 ret = errno; 70 fd_log_debug("Unable to open extension configuration file %s for reading: %s \n", conffile, strerror(ret));70 fd_log_debug("Unable to open extension configuration file %s for reading: %s", conffile, strerror(ret)); 71 71 TRACE_DEBUG (INFO, "Error occurred, message logged -- configuration file."); 72 72 return ret; … … 96 96 97 97 if (ploc->first_line != ploc->last_line) 98 fd_log_debug("%s:%d.%d-%d.%d : %s \n", conffile, ploc->first_line, ploc->first_column, ploc->last_line, ploc->last_column, s);98 fd_log_debug("%s:%d.%d-%d.%d : %s", conffile, ploc->first_line, ploc->first_column, ploc->last_line, ploc->last_column, s); 99 99 else if (ploc->first_column != ploc->last_column) 100 fd_log_debug("%s:%d.%d-%d : %s \n", conffile, ploc->first_line, ploc->first_column, ploc->last_column, s);100 fd_log_debug("%s:%d.%d-%d : %s", conffile, ploc->first_line, ploc->first_column, ploc->last_column, s); 101 101 else 102 fd_log_debug("%s:%d.%d : %s \n", conffile, ploc->first_line, ploc->first_column, s);102 fd_log_debug("%s:%d.%d : %s", conffile, ploc->first_line, ploc->first_column, s); 103 103 } 104 104 -
extensions/test_acct/test_acct.c
r740 r974 73 73 CHECK_FCT( fd_msg_rescode_set( ans, "DIAMETER_SUCCESS", NULL, NULL, 1 ) ); 74 74 75 fd_log_debug("--------------Received the following Accounting message:-------------- \n");75 fd_log_debug("--------------Received the following Accounting message:--------------"); 76 76 77 77 CHECK_FCT( fd_sess_getsid ( sess, &s, &sl ) ); 78 fd_log_debug("Session: %.*s \n", (int)sl, s);78 fd_log_debug("Session: %.*s", (int)sl, s); 79 79 80 80 /* The AVPs that we copy in the answer */ … … 82 82 if (a) { 83 83 CHECK_FCT( fd_msg_avp_hdr( a, &h ) ); 84 fd_log_debug("Accounting-Record-Type: %d (%s) \n", h->avp_value->u32,84 fd_log_debug("Accounting-Record-Type: %d (%s)", h->avp_value->u32, 85 85 /* it would be better to search this in the dictionary, but it is only for debug, so ok */ 86 86 (h->avp_value->u32 == 1) ? "EVENT_RECORD" : … … 97 97 if (a) { 98 98 CHECK_FCT( fd_msg_avp_hdr( a, &h ) ); 99 fd_log_debug("Accounting-Record-Number: %d \n", h->avp_value->u32);99 fd_log_debug("Accounting-Record-Number: %d", h->avp_value->u32); 100 100 CHECK_FCT( fd_msg_avp_new ( tac_dict.Accounting_Record_Number, 0, &a ) ); 101 101 CHECK_FCT( fd_msg_avp_setvalue( a, h->avp_value ) ); … … 105 105 /* We may also dump other data from the message, such as Accounting session Id, number of packets, ... */ 106 106 107 fd_log_debug("---------------------------------------------------------------------- \n");107 fd_log_debug("----------------------------------------------------------------------"); 108 108 109 109 /* Send the answer */ -
extensions/test_app/ta_bench.c
r928 r974 236 236 237 237 /* Now, display the statistics */ 238 fd_log_debug( "------- app_test Benchmark result --------- \n");238 fd_log_debug( "------- app_test Benchmark result ---------"); 239 239 if (now.tv_nsec >= end_time.tv_nsec) { 240 fd_log_debug( " Executing for: %d.%06ld sec \n",240 fd_log_debug( " Executing for: %d.%06ld sec", 241 241 (int)(now.tv_sec + ta_conf->bench_duration - end_time.tv_sec), 242 242 (long)(now.tv_nsec - end_time.tv_nsec) / 1000); 243 243 } else { 244 fd_log_debug( " Executing for: %d.%06ld sec \n",244 fd_log_debug( " Executing for: %d.%06ld sec", 245 245 (int)(now.tv_sec + ta_conf->bench_duration - 1 - end_time.tv_sec), 246 246 (long)(now.tv_nsec + 1000000000 - end_time.tv_nsec) / 1000); 247 247 } 248 fd_log_debug( " %llu messages sent \n", end.nb_sent - start.nb_sent);249 fd_log_debug( " %llu error(s) received \n", end.nb_errs - start.nb_errs);250 fd_log_debug( " %llu answer(s) received \n", end.nb_recv - start.nb_recv);251 fd_log_debug( " Overall: \n");252 fd_log_debug( " fastest: %ld.%06ld sec. \n", end.shortest / 1000000, end.shortest % 1000000);253 fd_log_debug( " slowest: %ld.%06ld sec. \n", end.longest / 1000000, end.longest % 1000000);254 fd_log_debug( " Average: %ld.%06ld sec. \n", end.avg / 1000000, end.avg % 1000000);255 fd_log_debug( " Throughput: %llu messages / sec \n", (end.nb_recv - start.nb_recv) / (( now.tv_sec + ta_conf->bench_duration - end_time.tv_sec ) + ((now.tv_nsec - end_time.tv_nsec) / 1000000000)));256 fd_log_debug( "------------------------------------- \n");248 fd_log_debug( " %llu messages sent", end.nb_sent - start.nb_sent); 249 fd_log_debug( " %llu error(s) received", end.nb_errs - start.nb_errs); 250 fd_log_debug( " %llu answer(s) received", end.nb_recv - start.nb_recv); 251 fd_log_debug( " Overall:"); 252 fd_log_debug( " fastest: %ld.%06ld sec.", end.shortest / 1000000, end.shortest % 1000000); 253 fd_log_debug( " slowest: %ld.%06ld sec.", end.longest / 1000000, end.longest % 1000000); 254 fd_log_debug( " Average: %ld.%06ld sec.", end.avg / 1000000, end.avg % 1000000); 255 fd_log_debug( " Throughput: %llu messages / sec", (end.nb_recv - start.nb_recv) / (( now.tv_sec + ta_conf->bench_duration - end_time.tv_sec ) + ((now.tv_nsec - end_time.tv_nsec) / 1000000000))); 256 fd_log_debug( "-------------------------------------"); 257 257 258 258 } -
extensions/test_app/ta_conf.l
r740 r974 81 81 if (ret != 1) { 82 82 /* No matching: an error occurred */ 83 fd_log_debug("Unable to convert the value '%s' to a valid number: %s \n", yytext, strerror(errno));83 fd_log_debug("Unable to convert the value '%s' to a valid number: %s", yytext, strerror(errno)); 84 84 return LEX_ERROR; /* trig an error in yacc parser */ 85 85 /* Maybe we could REJECT instead of failing here? */ … … 93 93 yylval->string = strdup(yytext+1); 94 94 if (!yylval->string) { 95 fd_log_debug("Unable to copy the string '%s': %s \n", yytext, strerror(errno));95 fd_log_debug("Unable to copy the string '%s': %s", yytext, strerror(errno)); 96 96 TRACE_DEBUG(INFO, "strdup failed"); 97 97 return LEX_ERROR; /* trig an error in yacc parser */ … … 163 163 /* Unrecognized sequence, if it did not match any previous pattern */ 164 164 [^[:space:]"*=>;\n]+ { 165 fd_log_debug("Unrecognized text on line %d col %d: '%s'. \n", yylloc->first_line, yylloc->first_column, yytext);165 fd_log_debug("Unrecognized text on line %d col %d: '%s'.", yylloc->first_line, yylloc->first_column, yytext); 166 166 return LEX_ERROR; 167 167 } -
extensions/test_app/ta_conf.y
r740 r974 72 72 if (ta_confin == NULL) { 73 73 ret = errno; 74 fd_log_debug("Unable to open extension configuration file %s for reading: %s \n", conffile, strerror(ret));74 fd_log_debug("Unable to open extension configuration file %s for reading: %s", conffile, strerror(ret)); 75 75 TRACE_DEBUG (INFO, "Error occurred, message logged -- configuration file."); 76 76 return ret; … … 98 98 99 99 if (ploc->first_line != ploc->last_line) 100 fd_log_debug("%s:%d.%d-%d.%d : %s \n", conffile, ploc->first_line, ploc->first_column, ploc->last_line, ploc->last_column, s);100 fd_log_debug("%s:%d.%d-%d.%d : %s", conffile, ploc->first_line, ploc->first_column, ploc->last_line, ploc->last_column, s); 101 101 else if (ploc->first_column != ploc->last_column) 102 fd_log_debug("%s:%d.%d-%d : %s \n", conffile, ploc->first_line, ploc->first_column, ploc->last_column, s);102 fd_log_debug("%s:%d.%d-%d : %s", conffile, ploc->first_line, ploc->first_column, ploc->last_column, s); 103 103 else 104 fd_log_debug("%s:%d.%d : %s \n", conffile, ploc->first_line, ploc->first_column, s);104 fd_log_debug("%s:%d.%d : %s", conffile, ploc->first_line, ploc->first_column, s); 105 105 } 106 106 -
extensions/test_app/ta_serv.c
r741 r974 47 47 TRACE_ENTRY("%p %p %p %p", msg, avp, sess, act); 48 48 49 fd_log_debug("Unexpected message received! \n");49 fd_log_debug("Unexpected message received!"); 50 50 51 51 return ENOTSUP; -
extensions/test_app/test_app.c
r741 r974 72 72 if (!TRACE_BOOL(INFO)) 73 73 return; 74 fd_log_debug( "------- app_test configuration dump: --------- \n");75 fd_log_debug( " Vendor Id .......... : %u \n", ta_conf->vendor_id);76 fd_log_debug( " Application Id ..... : %u \n", ta_conf->appli_id);77 fd_log_debug( " Command Id ......... : %u \n", ta_conf->cmd_id);78 fd_log_debug( " AVP Id ............. : %u \n", ta_conf->avp_id);79 fd_log_debug( " Mode ............... : %s%s%s \n", ta_conf->mode & MODE_SERV ? "Serv" : "", ta_conf->mode & MODE_CLI ? "Cli" : "", ta_conf->mode & MODE_BENCH ? " (Benchmark)" : "");80 fd_log_debug( " Destination Realm .. : %s \n", ta_conf->dest_realm ?: "- none -");81 fd_log_debug( " Destination Host ... : %s \n", ta_conf->dest_host ?: "- none -");82 fd_log_debug( " Signal ............. : %i \n", ta_conf->signal);83 fd_log_debug( "------- /app_test configuration dump --------- \n");74 fd_log_debug( "------- app_test configuration dump: ---------"); 75 fd_log_debug( " Vendor Id .......... : %u", ta_conf->vendor_id); 76 fd_log_debug( " Application Id ..... : %u", ta_conf->appli_id); 77 fd_log_debug( " Command Id ......... : %u", ta_conf->cmd_id); 78 fd_log_debug( " AVP Id ............. : %u", ta_conf->avp_id); 79 fd_log_debug( " Mode ............... : %s%s%s", ta_conf->mode & MODE_SERV ? "Serv" : "", ta_conf->mode & MODE_CLI ? "Cli" : "", ta_conf->mode & MODE_BENCH ? " (Benchmark)" : ""); 80 fd_log_debug( " Destination Realm .. : %s", ta_conf->dest_realm ?: "- none -"); 81 fd_log_debug( " Destination Host ... : %s", ta_conf->dest_host ?: "- none -"); 82 fd_log_debug( " Signal ............. : %i", ta_conf->signal); 83 fd_log_debug( "------- /app_test configuration dump ---------"); 84 84 } 85 85 … … 107 107 108 108 /* Now, display everything */ 109 fd_log_debug( "------- app_test statistics --------- \n");109 fd_log_debug( "------- app_test statistics ---------"); 110 110 if (now.tv_nsec >= start.tv_nsec) { 111 fd_log_debug( " Executing for: %d.%06ld sec \n",111 fd_log_debug( " Executing for: %d.%06ld sec", 112 112 (int)(now.tv_sec - start.tv_sec), 113 113 (long)(now.tv_nsec - start.tv_nsec) / 1000); 114 114 } else { 115 fd_log_debug( " Executing for: %d.%06ld sec \n",115 fd_log_debug( " Executing for: %d.%06ld sec", 116 116 (int)(now.tv_sec - 1 - start.tv_sec), 117 117 (long)(now.tv_nsec + 1000000000 - start.tv_nsec) / 1000); … … 119 119 120 120 if (ta_conf->mode & MODE_SERV) { 121 fd_log_debug( " Server: %llu message(s) echoed \n", copy.nb_echoed);121 fd_log_debug( " Server: %llu message(s) echoed", copy.nb_echoed); 122 122 } 123 123 if (ta_conf->mode & MODE_CLI) { 124 fd_log_debug( " Client: \n");125 fd_log_debug( " %llu message(s) sent \n", copy.nb_sent);126 fd_log_debug( " %llu error(s) received \n", copy.nb_errs);127 fd_log_debug( " %llu answer(s) received \n", copy.nb_recv);128 fd_log_debug( " fastest: %ld.%06ld sec. \n", copy.shortest / 1000000, copy.shortest % 1000000);129 fd_log_debug( " slowest: %ld.%06ld sec. \n", copy.longest / 1000000, copy.longest % 1000000);130 fd_log_debug( " Average: %ld.%06ld sec. \n", copy.avg / 1000000, copy.avg % 1000000);124 fd_log_debug( " Client:"); 125 fd_log_debug( " %llu message(s) sent", copy.nb_sent); 126 fd_log_debug( " %llu error(s) received", copy.nb_errs); 127 fd_log_debug( " %llu answer(s) received", copy.nb_recv); 128 fd_log_debug( " fastest: %ld.%06ld sec.", copy.shortest / 1000000, copy.shortest % 1000000); 129 fd_log_debug( " slowest: %ld.%06ld sec.", copy.longest / 1000000, copy.longest % 1000000); 130 fd_log_debug( " Average: %ld.%06ld sec.", copy.avg / 1000000, copy.avg % 1000000); 131 131 } 132 fd_log_debug( "------------------------------------- \n");132 fd_log_debug( "-------------------------------------"); 133 133 } 134 134 -
extensions/test_netemul/test_netemul.l
r740 r974 78 78 if (ret != 1) { 79 79 /* No matching: an error occurred */ 80 fd_log_debug("Unable to convert the value '%s' to a valid float: %s \n", yytext, strerror(errno));80 fd_log_debug("Unable to convert the value '%s' to a valid float: %s", yytext, strerror(errno)); 81 81 return LEX_ERROR; /* trig an error in yacc parser */ 82 82 /* Maybe we could REJECT instead of failing here? */ … … 92 92 if (ret != 1) { 93 93 /* No matching: an error occurred */ 94 fd_log_debug("Unable to convert the value '%s' to a valid long: %s \n", yytext, strerror(errno));94 fd_log_debug("Unable to convert the value '%s' to a valid long: %s", yytext, strerror(errno)); 95 95 return LEX_ERROR; /* trig an error in yacc parser */ 96 96 /* Maybe we could REJECT instead of failing here? */ … … 113 113 /* Unrecognized sequence, if it did not match any previous pattern */ 114 114 [^[:space:][:digit:]=;%/\n]+ { 115 fd_log_debug("Unrecognized text on line %d col %d: '%s'. \n", yylloc->first_line, yylloc->first_column, yytext);115 fd_log_debug("Unrecognized text on line %d col %d: '%s'.", yylloc->first_line, yylloc->first_column, yytext); 116 116 return LEX_ERROR; 117 117 } -
extensions/test_netemul/test_netemul.y
r740 r974 68 68 if (test_netemulin == NULL) { 69 69 ret = errno; 70 fd_log_debug("Unable to open extension configuration file %s for reading: %s \n", conffile, strerror(ret));70 fd_log_debug("Unable to open extension configuration file %s for reading: %s", conffile, strerror(ret)); 71 71 TRACE_DEBUG (INFO, "Error occurred, message logged -- configuration file."); 72 72 return ret; … … 96 96 97 97 if (ploc->first_line != ploc->last_line) 98 fd_log_debug("%s:%d.%d-%d.%d : %s \n", conffile, ploc->first_line, ploc->first_column, ploc->last_line, ploc->last_column, s);98 fd_log_debug("%s:%d.%d-%d.%d : %s", conffile, ploc->first_line, ploc->first_column, ploc->last_line, ploc->last_column, s); 99 99 else if (ploc->first_column != ploc->last_column) 100 fd_log_debug("%s:%d.%d-%d : %s \n", conffile, ploc->first_line, ploc->first_column, ploc->last_column, s);100 fd_log_debug("%s:%d.%d-%d : %s", conffile, ploc->first_line, ploc->first_column, ploc->last_column, s); 101 101 else 102 fd_log_debug("%s:%d.%d : %s \n", conffile, ploc->first_line, ploc->first_column, s);102 fd_log_debug("%s:%d.%d : %s", conffile, ploc->first_line, ploc->first_column, s); 103 103 } 104 104 -
extensions/test_sip/test_sip.l
r740 r974 79 79 if (ret != 1) { 80 80 /* No matching: an error occurred */ 81 fd_log_debug("Unable to convert the value '%s' to a valid number: %s \n", yytext, strerror(errno));81 fd_log_debug("Unable to convert the value '%s' to a valid number: %s", yytext, strerror(errno)); 82 82 return LEX_ERROR; /* trig an error in yacc parser */ 83 83 /* Maybe we could REJECT instead of failing here? */ … … 91 91 yylval->string = strdup(yytext+1); 92 92 if (!yylval->string) { 93 fd_log_debug("Unable to copy the string '%s': %s \n", yytext, strerror(errno));93 fd_log_debug("Unable to copy the string '%s': %s", yytext, strerror(errno)); 94 94 TRACE_DEBUG(INFO, "strdup failed"); 95 95 return LEX_ERROR; /* trig an error in yacc parser */ … … 131 131 /* Unrecognized sequence, if it did not match any previous pattern */ 132 132 [^[:space:]"*=>;\n]+ { 133 fd_log_debug("Unrecognized text on line %d col %d: '%s'. \n", yylloc->first_line, yylloc->first_column, yytext);133 fd_log_debug("Unrecognized text on line %d col %d: '%s'.", yylloc->first_line, yylloc->first_column, yytext); 134 134 return LEX_ERROR; 135 135 } -
extensions/test_sip/test_sip.y
r740 r974 70 70 if (test_sipin == NULL) { 71 71 ret = errno; 72 fd_log_debug("Unable to open extension configuration file %s for reading: %s \n", conffile, strerror(ret));72 fd_log_debug("Unable to open extension configuration file %s for reading: %s", conffile, strerror(ret)); 73 73 TRACE_DEBUG (INFO, "Error occurred, message logged -- configuration file."); 74 74 return ret; … … 96 96 97 97 if (ploc->first_line != ploc->last_line) 98 fd_log_debug("%s:%d.%d-%d.%d : %s \n", conffile, ploc->first_line, ploc->first_column, ploc->last_line, ploc->last_column, s);98 fd_log_debug("%s:%d.%d-%d.%d : %s", conffile, ploc->first_line, ploc->first_column, ploc->last_line, ploc->last_column, s); 99 99 else if (ploc->first_column != ploc->last_column) 100 fd_log_debug("%s:%d.%d-%d : %s \n", conffile, ploc->first_line, ploc->first_column, ploc->last_column, s);100 fd_log_debug("%s:%d.%d-%d : %s", conffile, ploc->first_line, ploc->first_column, ploc->last_column, s); 101 101 else 102 fd_log_debug("%s:%d.%d : %s \n", conffile, ploc->first_line, ploc->first_column, s);102 fd_log_debug("%s:%d.%d : %s", conffile, ploc->first_line, ploc->first_column, s); 103 103 } 104 104
Note: See TracChangeset
for help on using the changeset viewer.