aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDavid M. Syzdek <david@syzdek.net>2022-03-21 18:25:26 -0800
committerDavid M. Syzdek <david@syzdek.net>2022-03-21 18:25:26 -0800
commit9846ffff5c60776a0f70361a6a81c9f190171aea (patch)
tree44a737e24c3e13f76c919fb9efbd973aaf6be1f9
parent6eddb0ccb5e2e47722e4e7c367cccde73d6f57f5 (diff)
downloadtinyrad-9846ffff5c60776a0f70361a6a81c9f190171aea.tar.gz
tinyrad-9846ffff5c60776a0f70361a6a81c9f190171aea.tar.bz2
tinyrad-9846ffff5c60776a0f70361a6a81c9f190171aea.tar.xz
tinyrad-9846ffff5c60776a0f70361a6a81c9f190171aea.zip
libtinyrad: adding missing debug statements to lconf.c
-rw-r--r--lib/libtinyrad/lconf.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/lib/libtinyrad/lconf.c b/lib/libtinyrad/lconf.c
index 1fc7c9e..f98b209 100644
--- a/lib/libtinyrad/lconf.c
+++ b/lib/libtinyrad/lconf.c
@@ -242,6 +242,8 @@ tinyrad_conf_environment(
242 char varname[64]; 242 char varname[64];
243 const TinyRadMap * opt; 243 const TinyRadMap * opt;
244 244
245 TinyRadDebugTrace();
246
245 for(pos = 0; ((tinyrad_conf_options[pos].map_name)); pos++) 247 for(pos = 0; ((tinyrad_conf_options[pos].map_name)); pos++)
246 { 248 {
247 opt = &tinyrad_conf_options[pos]; 249 opt = &tinyrad_conf_options[pos];
@@ -335,21 +337,26 @@ tinyrad_conf_opt(
335 assert( ((tr)) || ((dict)) ); 337 assert( ((tr)) || ((dict)) );
336 assert(value != NULL); 338 assert(value != NULL);
337 339
340 TinyRadDebugTrace();
341
338 tr = ( ((tr)) && (!(tr->opts & TRAD_STOPINIT)) ) ? tr : NULL; 342 tr = ( ((tr)) && (!(tr->opts & TRAD_STOPINIT)) ) ? tr : NULL;
339 dict = ( ((dict)) && (!(dict->opts & TRAD_STOPINIT)) ) ? dict : NULL; 343 dict = ( ((dict)) && (!(dict->opts & TRAD_STOPINIT)) ) ? dict : NULL;
340 344
341 switch(optid) 345 switch(optid)
342 { 346 {
343 case TRAD_CONF_BIND_ADDRESS: 347 case TRAD_CONF_BIND_ADDRESS:
348 TinyRadDebug(TRAD_DEBUG_ARGS, " == %s( tr, TRAD_CONF_BIND_ADDRESS, \"%s\" )", __func__, (((value)) ? value : "(null)"));
344 if ( (!(tr)) || ((tr->bind_sa)) || ((tr->bind_sa6)) || (!(value)) ) 349 if ( (!(tr)) || ((tr->bind_sa)) || ((tr->bind_sa6)) || (!(value)) )
345 return(TRAD_SUCCESS); 350 return(TRAD_SUCCESS);
346 return(tinyrad_set_option(tr, TRAD_OPT_SOCKET_BIND_ADDRESSES, value)); 351 return(tinyrad_set_option(tr, TRAD_OPT_SOCKET_BIND_ADDRESSES, value));
347 352
348 case TRAD_CONF_BUILTIN_DICTIONARY: 353 case TRAD_CONF_BUILTIN_DICTIONARY:
354 TinyRadDebug(TRAD_DEBUG_ARGS, " == %s( tr, TRAD_CONF_BUILTIN_DICTIONARY, \"%s\" )", __func__, (((value)) ? value : "(null)"));
349 tinyrad_conf_opt_bool(NULL, dict, TRAD_BUILTIN_DICT, value); 355 tinyrad_conf_opt_bool(NULL, dict, TRAD_BUILTIN_DICT, value);
350 return(TRAD_SUCCESS); 356 return(TRAD_SUCCESS);
351 357
352 case TRAD_CONF_DICTIONARY: 358 case TRAD_CONF_DICTIONARY:
359 TinyRadDebug(TRAD_DEBUG_ARGS, " == %s( tr, TRAD_CONF_DICTIONARY, \"%s\" )", __func__, (((value)) ? value : "(null)"));
353 if (!(dict)) 360 if (!(dict))
354 return(TRAD_SUCCESS); 361 return(TRAD_SUCCESS);
355 if ((dict->default_dictfile)) 362 if ((dict->default_dictfile))
@@ -359,6 +366,7 @@ tinyrad_conf_opt(
359 return(TRAD_SUCCESS); 366 return(TRAD_SUCCESS);
360 367
361 case TRAD_CONF_NETWORK_TIMEOUT: 368 case TRAD_CONF_NETWORK_TIMEOUT:
369 TinyRadDebug(TRAD_DEBUG_ARGS, " == %s( tr, TRAD_CONF_NETWORK_TIMEOUT, \"%s\" )", __func__, (((value)) ? value : "(null)"));
362 if ( (!(tr)) || ((tr->net_timeout)) || (!(value)) ) 370 if ( (!(tr)) || ((tr->net_timeout)) || (!(value)) )
363 return(TRAD_SUCCESS); 371 return(TRAD_SUCCESS);
364 if ((i = (int)strtoll(value, &endptr, 10)) < 1) 372 if ((i = (int)strtoll(value, &endptr, 10)) < 1)
@@ -369,6 +377,7 @@ tinyrad_conf_opt(
369 return(tinyrad_set_option(tr, TRAD_OPT_TIMEOUT, &tv)); 377 return(tinyrad_set_option(tr, TRAD_OPT_TIMEOUT, &tv));
370 378
371 case TRAD_CONF_PATHS: 379 case TRAD_CONF_PATHS:
380 TinyRadDebug(TRAD_DEBUG_ARGS, " == %s( tr, TRAD_CONF_PATHS, \"%s\" )", __func__, (((value)) ? value : "(null)"));
372 if ( (!(dict)) || ((dict->paths)) || (!(value)) ) 381 if ( (!(dict)) || ((dict->paths)) || (!(value)) )
373 return(TRAD_SUCCESS); 382 return(TRAD_SUCCESS);
374 if ((rc = tinyrad_strsplit(value, ':', &strs, &i)) != TRAD_SUCCESS) 383 if ((rc = tinyrad_strsplit(value, ':', &strs, &i)) != TRAD_SUCCESS)
@@ -382,20 +391,24 @@ tinyrad_conf_opt(
382 return(TRAD_SUCCESS); 391 return(TRAD_SUCCESS);
383 392
384 case TRAD_CONF_SECRET: 393 case TRAD_CONF_SECRET:
394 TinyRadDebug(TRAD_DEBUG_ARGS, " == %s( tr, TRAD_CONF_SECRET, \"%s\" )", __func__, (((value)) ? value : "(null)"));
385 if ( (!(tr)) || ((tr->secret)) || (!(value)) ) 395 if ( (!(tr)) || ((tr->secret)) || (!(value)) )
386 return(TRAD_SUCCESS); 396 return(TRAD_SUCCESS);
387 return(tinyrad_set_option(tr, TRAD_OPT_SECRET, value)); 397 return(tinyrad_set_option(tr, TRAD_OPT_SECRET, value));
388 398
389 case TRAD_CONF_SECRET_FILE: 399 case TRAD_CONF_SECRET_FILE:
400 TinyRadDebug(TRAD_DEBUG_ARGS, " == %s( tr, TRAD_CONF_SECRET_FILE, \"%s\" )", __func__, (((value)) ? value : "(null)"));
390 if ( (!(tr)) || ((tr->secret)) || (!(value)) ) 401 if ( (!(tr)) || ((tr->secret)) || (!(value)) )
391 return(TRAD_SUCCESS); 402 return(TRAD_SUCCESS);
392 return(tinyrad_set_option(tr, TRAD_OPT_SECRET_FILE, value)); 403 return(tinyrad_set_option(tr, TRAD_OPT_SECRET_FILE, value));
393 404
394 case TRAD_CONF_STOPINIT: 405 case TRAD_CONF_STOPINIT:
406 TinyRadDebug(TRAD_DEBUG_ARGS, " == %s( tr, TRAD_CONF_STOPINIT, \"%s\" )", __func__, (((value)) ? value : "(null)"));
395 tinyrad_conf_opt_bool(tr, dict, TRAD_STOPINIT, value); 407 tinyrad_conf_opt_bool(tr, dict, TRAD_STOPINIT, value);
396 return(TRAD_SUCCESS); 408 return(TRAD_SUCCESS);
397 409
398 case TRAD_CONF_TIMEOUT: 410 case TRAD_CONF_TIMEOUT:
411 TinyRadDebug(TRAD_DEBUG_ARGS, " == %s( tr, TRAD_CONF_TIMEOUT, \"%s\" )", __func__, (((value)) ? value : "(null)"));
399 if ( (!(tr)) || (tr->timeout != -1) || (!(value)) ) 412 if ( (!(tr)) || (tr->timeout != -1) || (!(value)) )
400 return(TRAD_SUCCESS); 413 return(TRAD_SUCCESS);
401 if ((i = (int)strtoll(value, &endptr, 10)) < 1) 414 if ((i = (int)strtoll(value, &endptr, 10)) < 1)
@@ -405,6 +418,7 @@ tinyrad_conf_opt(
405 return(tinyrad_set_option(tr, TRAD_OPT_TIMEOUT, &i)); 418 return(tinyrad_set_option(tr, TRAD_OPT_TIMEOUT, &i));
406 419
407 case TRAD_CONF_URI: 420 case TRAD_CONF_URI:
421 TinyRadDebug(TRAD_DEBUG_ARGS, " == %s( tr, TRAD_CONF_URI, \"%s\" )", __func__, (((value)) ? value : "(null)"));
408 if ( (!(tr)) || ((tr->trud)) || (!(value)) ) 422 if ( (!(tr)) || ((tr->trud)) || (!(value)) )
409 return(TRAD_SUCCESS); 423 return(TRAD_SUCCESS);
410 return(tinyrad_set_option(tr, TRAD_OPT_URI, value)); 424 return(tinyrad_set_option(tr, TRAD_OPT_URI, value));
@@ -426,6 +440,8 @@ tinyrad_conf_opt_bool(
426{ 440{
427 int boolean; 441 int boolean;
428 442
443 TinyRadDebugTrace();
444
429 if ( (!(tr)) && (!(dict)) ) 445 if ( (!(tr)) && (!(dict)) )
430 return(TRAD_SUCCESS); 446 return(TRAD_SUCCESS);
431 447
@@ -438,6 +454,8 @@ tinyrad_conf_opt_bool(
438 else if (!(strcasecmp(value, "no"))) boolean = TRAD_NO; 454 else if (!(strcasecmp(value, "no"))) boolean = TRAD_NO;
439 else return(TRAD_SUCCESS); 455 else return(TRAD_SUCCESS);
440 456
457 TinyRadDebug(TRAD_DEBUG_ARGS, " == %s( tr, %u, \"%s\" )", __func__, opt, ((boolean == TRAD_YES) ? "TRAD_YES" : "TRAD_NO"));
458
441 if ( ((dict)) && ( ((dict->opts | dict->opts_neg) & opt) != 0) ) 459 if ( ((dict)) && ( ((dict->opts | dict->opts_neg) & opt) != 0) )
442 { 460 {
443 switch(boolean) 461 switch(boolean)