diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 47d09536b37..904e8a7205a 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -436,8 +436,9 @@ KILL_TIMEOUT "exit_timeout"|"ser_kill_timeout" MAX_WLOOPS "max_while_loops" PVBUFSIZE "pv_buffer_size" PVBUFSLOTS "pv_buffer_slots" -HTTP_REPLY_PARSE "http_reply_hack"|"http_reply_parse" -VERSION_TABLE_CFG "version_table" +HTTP_REPLY_PARSE "http_reply_hack"|"http_reply_parse" +VERSION_TABLE_CFG "version_table" +VERBOSE_STARTUP "verbose_startup" SERVER_ID "server_id" @@ -916,6 +917,8 @@ IMPORTFILE "import_file" {HTTP_REPLY_PARSE} { count(); yylval.strval=yytext; return HTTP_REPLY_PARSE; } {VERSION_TABLE_CFG} { count(); yylval.strval=yytext; return VERSION_TABLE_CFG;} +{VERBOSE_STARTUP} { count(); yylval.strval=yytext; + return VERBOSE_STARTUP; } {SERVER_ID} { count(); yylval.strval=yytext; return SERVER_ID;} {MAX_RECURSIVE_LEVEL} { count(); yylval.strval=yytext; return MAX_RECURSIVE_LEVEL;} {MAX_BRANCHES_PARAM} { count(); yylval.strval=yytext; return MAX_BRANCHES_PARAM;} diff --git a/src/core/cfg.y b/src/core/cfg.y index 067b0f0deea..bde7e74cc96 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -476,6 +476,7 @@ extern char *default_routename; %token PVBUFSLOTS %token HTTP_REPLY_PARSE %token VERSION_TABLE_CFG +%token VERBOSE_STARTUP %token CFG_DESCRIPTION %token SERVER_ID %token MAX_RECURSIVE_LEVEL @@ -1547,7 +1548,10 @@ assign_stm: | PVBUFSLOTS EQUAL error { yyerror("number expected"); } | HTTP_REPLY_PARSE EQUAL NUMBER { http_reply_parse=$3; } | HTTP_REPLY_PARSE EQUAL error { yyerror("boolean value expected"); } + | VERBOSE_STARTUP EQUAL NUMBER { ksr_verbose_startup=$3; } + | VERBOSE_STARTUP EQUAL error { yyerror("boolean value expected"); } | SERVER_ID EQUAL NUMBER { server_id=$3; } + | SERVER_ID EQUAL error { yyerror("number expected"); } | MAX_RECURSIVE_LEVEL EQUAL NUMBER { set_max_recursive_level($3); } | MAX_BRANCHES_PARAM EQUAL NUMBER { sr_dst_max_branches = $3; } | LATENCY_LOG EQUAL intno { default_core_cfg.latency_log=$3; } diff --git a/src/core/globals.h b/src/core/globals.h index 2a844a5c8a4..d0cf9e88546 100644 --- a/src/core/globals.h +++ b/src/core/globals.h @@ -202,6 +202,7 @@ extern int rt_timer2_policy; /* "slow" timer, SCHED_OTHER */ extern int http_reply_parse; extern int _sr_ip_free_bind; +extern int ksr_verbose_startup; #ifdef USE_DNS_CACHE extern int dns_cache_init; /* if 0, the DNS cache is not initialized at startup */ diff --git a/src/core/route.c b/src/core/route.c index 63e4f83c289..fdc042ff675 100644 --- a/src/core/route.c +++ b/src/core/route.c @@ -2082,7 +2082,7 @@ static int fix_rl(struct route_list* rt) { int i; int ret; - + for(i=0;iidx; i++){ if(rt->rlist[i]){ if ((ret=fix_actions(rt->rlist[i]))!=0){ @@ -2100,7 +2100,7 @@ static int fix_rl(struct route_list* rt) int fix_rls() { int ret; - + if ((ret=fix_rl(&main_rt))!=0) return ret; if ((ret=fix_rl(&onreply_rt))!=0) @@ -2122,7 +2122,7 @@ int fix_rls() static void print_rl(struct route_list* rt, char* name) { int j; - + for(j=0; jentries; j++){ if (rt->rlist[j]==0){ if ((j==0) && (rt==&main_rt)) @@ -2139,6 +2139,7 @@ static void print_rl(struct route_list* rt, char* name) /* debug function, prints routing tables */ void print_rls() { + if(!ksr_verbose_startup) return; print_rl(&main_rt, ""); print_rl(&onreply_rt, "onreply"); print_rl(&failure_rt, "failure"); diff --git a/src/core/udp_server.c b/src/core/udp_server.c index 76ed978460b..52621623626 100644 --- a/src/core/udp_server.c +++ b/src/core/udp_server.c @@ -158,7 +158,8 @@ int probe_max_receive_buffer( int udp_sock ) if (phase==1) break; else { phase=1; optval >>=1; continue; } } - LM_DBG("trying SO_RCVBUF: %d\n", optval ); + if(ksr_verbose_startup) + LM_DBG("trying SO_RCVBUF: %d\n", optval); if (setsockopt( udp_sock, SOL_SOCKET, SO_RCVBUF, (void*)&optval, sizeof(optval)) ==-1){ /* Solaris returns -1 if asked size too big; Linux ignores */ @@ -180,8 +181,9 @@ int probe_max_receive_buffer( int udp_sock ) LM_ERR("getsockopt: %s\n", strerror(errno)); return -1; } else { - LM_DBG("setting SO_RCVBUF; set=%d,verify=%d\n", - optval, voptval); + if(ksr_verbose_startup) + LM_DBG("setting SO_RCVBUF; set=%d,verify=%d\n", + optval, voptval); if (voptval