diff --git a/daemon/cli.c b/daemon/cli.c index 2079f8d65..999c7b673 100644 --- a/daemon/cli.c +++ b/daemon/cli.c @@ -60,6 +60,7 @@ static void cli_incoming_set_controltos(str *instr, struct streambuf *replybuffe static void cli_incoming_params_start(str *instr, struct streambuf *replybuffer); static void cli_incoming_params_current(str *instr, struct streambuf *replybuffer); static void cli_incoming_params_diff(str *instr, struct streambuf *replybuffer); +static void cli_incoming_params_revert(str *instr, struct streambuf *replybuffer); static void cli_incoming_list_numsessions(str *instr, struct streambuf *replybuffer); static void cli_incoming_list_maxsessions(str *instr, struct streambuf *replybuffer); @@ -133,6 +134,7 @@ static const cli_handler_t cli_params_handlers[] = { { "start", cli_incoming_params_start }, { "current", cli_incoming_params_current }, { "diff", cli_incoming_params_diff }, + { "revert", cli_incoming_params_revert }, { NULL, }, }; @@ -222,17 +224,17 @@ static void cli_incoming_params_start(str *instr, struct streambuf *replybuffer) GList *s; struct intf_config *ifa; - streambuf_printf(replybuffer, "table = %d\nmax-sessions = %d\ntimeout = %d\nsilent-timeout = %d\nfinal-timeout = %d\n" - "offer-timeout = %d\n" + streambuf_printf(replybuffer, "log-level = %d\ntable = %d\nmax-sessions = %d\ntimeout = %d\nsilent-timeout = %d\n" + "final-timeout = %d\noffer-timeout = %d\n" "delete-delay = %d\nredis-expires = %d\ntos = %d\ncontrol-tos = %d\ngraphite-interval = %d\nredis-num-threads = %d\n" "homer-protocol = %d\nhomer-id = %d\nno-fallback = %d\nport-min = %d\nport-max = %d\nredis = %s:%d/%d\n" "redis-write = %s:%d/%d\nno-redis-required = %d\nnum-threads = %d\nxmlrpc-format = %d\nlog_format = %d\n" "redis_allowed_errors = %d\nredis_disable_time = %d\nredis_cmd_timeout = %d\nredis_connect_timeout = %d\n" "max-cpu = %.1f\n" "max-load = %.2f\n", - initial_rtpe_config.kernel_table, initial_rtpe_config.max_sessions, initial_rtpe_config.timeout, - initial_rtpe_config.silent_timeout, initial_rtpe_config.final_timeout, initial_rtpe_config.offer_timeout, - initial_rtpe_config.delete_delay, + initial_rtpe_config.common.log_level, initial_rtpe_config.kernel_table, initial_rtpe_config.max_sessions, + initial_rtpe_config.timeout, initial_rtpe_config.silent_timeout, initial_rtpe_config.final_timeout, + initial_rtpe_config.offer_timeout, initial_rtpe_config.delete_delay, initial_rtpe_config.redis_expires_secs, initial_rtpe_config.default_tos, initial_rtpe_config.control_tos, initial_rtpe_config.graphite_interval, initial_rtpe_config.redis_num_threads, initial_rtpe_config.homer_protocol, initial_rtpe_config.homer_id, initial_rtpe_config.no_fallback, initial_rtpe_config.port_min, initial_rtpe_config.port_max, @@ -270,17 +272,16 @@ static void cli_incoming_params_current(str *instr, struct streambuf *replybuffe GList *c; struct intf_config *ifa; - streambuf_printf(replybuffer, "table = %d\nmax-sessions = %d\ntimeout = %d\nsilent-timeout = %d\nfinal-timeout = %d\n" - "offer-timeout = %d\n" + streambuf_printf(replybuffer, "log-level = %d\ntable = %d\nmax-sessions = %d\ntimeout = %d\nsilent-timeout = %d\n" + "final-timeout = %d\noffer-timeout = %d\n" "delete-delay = %d\nredis-expires = %d\ntos = %d\ncontrol-tos = %d\ngraphite-interval = %d\nredis-num-threads = %d\n" "homer-protocol = %d\nhomer-id = %d\nno-fallback = %d\nport-min = %d\nport-max = %d\nredis-db = %d\n" "redis-write-db = %d\nno-redis-required = %d\nnum-threads = %d\nxmlrpc-format = %d\nlog_format = %d\n" "redis_allowed_errors = %d\nredis_disable_time = %d\nredis_cmd_timeout = %d\nredis_connect_timeout = %d\n" "max-cpu = %.1f\n" "max-load = %.2f\n", - rtpe_config.kernel_table, rtpe_config.max_sessions, rtpe_config.timeout, rtpe_config.silent_timeout, - rtpe_config.final_timeout, - rtpe_config.offer_timeout, + rtpe_config.common.log_level, rtpe_config.kernel_table, rtpe_config.max_sessions, rtpe_config.timeout, + rtpe_config.silent_timeout, rtpe_config.final_timeout, rtpe_config.offer_timeout, rtpe_config.delete_delay, rtpe_config.redis_expires_secs, rtpe_config.default_tos, rtpe_config.control_tos, rtpe_config.graphite_interval, rtpe_config.redis_num_threads, rtpe_config.homer_protocol, rtpe_config.homer_id, rtpe_config.no_fallback, rtpe_config.port_min, rtpe_config.port_max, @@ -311,105 +312,39 @@ static void cli_incoming_params_current(str *instr, struct streambuf *replybuffe sockaddr_print_buf(&rtpe_config.cli_listen_ep.address), rtpe_config.cli_listen_ep.port); } -static void int_diff_print(int start_param, int current_param, char* param, struct streambuf *replybuffer) { - if(start_param != current_param) { - streambuf_printf(replybuffer, "%s\n", param); +static void int_diff_print(int start_param, int* current_param, char* param, struct streambuf *replybuffer, char* option) { + if(start_param != (*current_param)) { + if (strcmp(option, "diff") == 0) { + streambuf_printf(replybuffer, "%s: %d => %d\n", param, start_param, *current_param); + } else if(strcmp(option, "revert") == 0) { + *current_param = start_param; + } } } -static void str_diff_print(char* start_param, char* current_param, char* param, struct streambuf *replybuffer) { - if(start_param && current_param) { - if (strcmp(start_param , current_param) != 0) { - streambuf_printf(replybuffer, "%s\n", param); - } - } else if(start_param || current_param) { - streambuf_printf(replybuffer, "%s\n", param); - } +static void cli_incoming_diff_or_revert(struct streambuf *replybuffer, char* option) { + int_diff_print(initial_rtpe_config.common.log_level, (int*)&rtpe_config.common.log_level, "log-level", replybuffer, option); + int_diff_print(initial_rtpe_config.max_sessions, &rtpe_config.max_sessions, "max-sessions", replybuffer, option); + int_diff_print(initial_rtpe_config.timeout, &rtpe_config.timeout, "timeout", replybuffer, option); + int_diff_print(initial_rtpe_config.silent_timeout, &rtpe_config.silent_timeout, "silent-timeout", replybuffer, option); + int_diff_print(initial_rtpe_config.final_timeout, &rtpe_config.final_timeout, "final-timeout", replybuffer, option); + int_diff_print(initial_rtpe_config.control_tos, &rtpe_config.control_tos, "control-tos", replybuffer, option); + int_diff_print(initial_rtpe_config.redis_allowed_errors, &rtpe_config.redis_allowed_errors, "redis_allowed_errors", replybuffer, option); + int_diff_print(initial_rtpe_config.redis_disable_time, &rtpe_config.redis_disable_time, "redis_disable_time", replybuffer, option); + int_diff_print(initial_rtpe_config.redis_cmd_timeout, &rtpe_config.redis_cmd_timeout, "redis_cmd_timeout", replybuffer, option); + int_diff_print(initial_rtpe_config.redis_connect_timeout, &rtpe_config.redis_connect_timeout, "redis_connect_timeout-db", replybuffer, option); } -static void cli_incoming_params_diff(str *instr, struct streambuf *replybuffer) { - int count = 0; - GList *s; - GList *c; - struct intf_config* ifa; - struct intf_config* ifa2; - - int_diff_print(initial_rtpe_config.kernel_table, rtpe_config.kernel_table, "table", replybuffer); - int_diff_print(initial_rtpe_config.max_sessions, rtpe_config.max_sessions, "max-sessions", replybuffer); - int_diff_print(initial_rtpe_config.cpu_limit, rtpe_config.cpu_limit, "max-cpu", replybuffer); - int_diff_print(initial_rtpe_config.load_limit, rtpe_config.load_limit, "max-load", replybuffer); - int_diff_print(initial_rtpe_config.timeout, rtpe_config.timeout, "timeout", replybuffer); - int_diff_print(initial_rtpe_config.silent_timeout, rtpe_config.silent_timeout, "silent-timeout", replybuffer); - int_diff_print(initial_rtpe_config.final_timeout, rtpe_config.final_timeout, "final-timeout", replybuffer); - int_diff_print(initial_rtpe_config.offer_timeout, rtpe_config.offer_timeout, "offer-timeout", replybuffer); - int_diff_print(initial_rtpe_config.delete_delay, rtpe_config.delete_delay, "delete-delay", replybuffer); - int_diff_print(initial_rtpe_config.redis_expires_secs, rtpe_config.redis_expires_secs, "redis-expires", replybuffer); - int_diff_print(initial_rtpe_config.default_tos, rtpe_config.default_tos, "default-tos", replybuffer); - int_diff_print(initial_rtpe_config.control_tos, rtpe_config.control_tos, "control-tos", replybuffer); - int_diff_print(initial_rtpe_config.fmt, rtpe_config.fmt, "xmlrpc-fmt", replybuffer); - int_diff_print(initial_rtpe_config.log_format, rtpe_config.log_format, "log_format", replybuffer); - int_diff_print(initial_rtpe_config.graphite_interval, rtpe_config.graphite_interval, "graphite-interval", replybuffer); - int_diff_print(initial_rtpe_config.redis_num_threads, rtpe_config.redis_num_threads, "redis-num-threads", replybuffer); - int_diff_print(initial_rtpe_config.homer_protocol, rtpe_config.homer_protocol, "homer-protocol", replybuffer); - int_diff_print(initial_rtpe_config.homer_id, rtpe_config.homer_id, "homer-id", replybuffer); - int_diff_print(initial_rtpe_config.no_fallback, rtpe_config.no_fallback, "no_fallback", replybuffer); - int_diff_print(initial_rtpe_config.port_min, rtpe_config.port_min, "port-min", replybuffer); - int_diff_print(initial_rtpe_config.port_max, rtpe_config.port_max, "port-max", replybuffer); - int_diff_print(initial_rtpe_config.redis_db, rtpe_config.redis_db, "redis-db", replybuffer); - int_diff_print(initial_rtpe_config.redis_write_db, rtpe_config.redis_write_db, "redis-write-db", replybuffer); - int_diff_print(initial_rtpe_config.no_redis_required, rtpe_config.no_redis_required, "no-redis-required", replybuffer); - int_diff_print(initial_rtpe_config.num_threads, rtpe_config.num_threads, "num-threads", replybuffer); - int_diff_print(initial_rtpe_config.redis_allowed_errors, rtpe_config.redis_allowed_errors, "redis_allowed_errors", replybuffer); - int_diff_print(initial_rtpe_config.redis_disable_time, rtpe_config.redis_disable_time, "redis_disable_time", replybuffer); - int_diff_print(initial_rtpe_config.redis_cmd_timeout, rtpe_config.redis_cmd_timeout, "redis_cmd_timeout", replybuffer); - int_diff_print(initial_rtpe_config.redis_connect_timeout, rtpe_config.redis_connect_timeout, "redis_connect_timeout-db", replybuffer); - - int_diff_print(initial_rtpe_config.tcp_listen_ep.port, rtpe_config.tcp_listen_ep.port, "listen-tcp port", replybuffer); - int_diff_print(initial_rtpe_config.udp_listen_ep.port, rtpe_config.udp_listen_ep.port, "listen-udp port", replybuffer); - int_diff_print(initial_rtpe_config.ng_listen_ep.port, rtpe_config.ng_listen_ep.port, "listen-ng port", replybuffer); - int_diff_print(initial_rtpe_config.cli_listen_ep.port, rtpe_config.cli_listen_ep.port, "listen-cli port", replybuffer); - int_diff_print(initial_rtpe_config.graphite_ep.port, rtpe_config.graphite_ep.port, "graphite port", replybuffer); - int_diff_print(initial_rtpe_config.redis_ep.port, rtpe_config.redis_ep.port, "redis port", replybuffer); - int_diff_print(initial_rtpe_config.redis_write_ep.port, rtpe_config.redis_write_ep.port, "redis-write port", replybuffer); - int_diff_print(initial_rtpe_config.homer_ep.port, rtpe_config.homer_ep.port, "homer port", replybuffer); - - for(s = initial_rtpe_config.interfaces.head, c=rtpe_config.interfaces.head, count = 0; s && c ; s = s->next, c = c->next, count++) { - ifa = s->data; - ifa2 = c->data; +static void cli_incoming_params_diff(str *instr, struct streambuf *replybuffer) { - if(ifa->name.s && ifa2->name.s) { - if(strcmp(ifa->name.s, ifa2->name.s) != 0 || strcmp(sockaddr_print_buf(&(ifa->local_address.addr)), sockaddr_print_buf(&(ifa2->local_address.addr))) != 0) { - streambuf_printf(replybuffer,"interface[%d]\n",count); - } - } else if (ifa->name.s || ifa2->name.s) { - if(ifa->name.len != ifa2->name.len) { - streambuf_printf(replybuffer,"interface[%d]\n",count); - } - } - } + cli_incoming_diff_or_revert(replybuffer, "diff"); +} - for (s = initial_rtpe_config.redis_subscribed_keyspaces.head, c = rtpe_config.redis_subscribed_keyspaces.head, count = 0; s && c ; s = s->next, c = c->next, count++) { - if(GPOINTER_TO_UINT(s->data) != GPOINTER_TO_UINT(c->data)) { - streambuf_printf(replybuffer,"keyspace[%d]\n",count); - } - } +static void cli_incoming_params_revert(str *instr, struct streambuf *replybuffer) { - str_diff_print(sockaddr_print_buf(&initial_rtpe_config.tcp_listen_ep.address), sockaddr_print_buf(&rtpe_config.tcp_listen_ep.address), "listen-tcp ip", replybuffer); - str_diff_print(sockaddr_print_buf(&initial_rtpe_config.udp_listen_ep.address), sockaddr_print_buf(&rtpe_config.udp_listen_ep.address), "listen-udp ip", replybuffer); - str_diff_print(sockaddr_print_buf(&initial_rtpe_config.ng_listen_ep.address), sockaddr_print_buf(&rtpe_config.ng_listen_ep.address), "listen-ng ip", replybuffer); - str_diff_print(sockaddr_print_buf(&initial_rtpe_config.cli_listen_ep.address), sockaddr_print_buf(&rtpe_config.cli_listen_ep.address), "listen-cli ip", replybuffer); - str_diff_print(sockaddr_print_buf(&initial_rtpe_config.graphite_ep.address), sockaddr_print_buf(&rtpe_config.graphite_ep.address), "graphite ip", replybuffer); - str_diff_print(sockaddr_print_buf(&initial_rtpe_config.redis_ep.address), sockaddr_print_buf(&rtpe_config.redis_ep.address), "redis ip", replybuffer); - str_diff_print(sockaddr_print_buf(&initial_rtpe_config.redis_write_ep.address), sockaddr_print_buf(&rtpe_config.redis_write_ep.address), "redis-write ip", replybuffer); - str_diff_print(sockaddr_print_buf(&initial_rtpe_config.homer_ep.address), sockaddr_print_buf(&rtpe_config.homer_ep.address), "homer ip", replybuffer); - - str_diff_print(initial_rtpe_config.b2b_url, rtpe_config.b2b_url, "b2b-url", replybuffer); - str_diff_print(initial_rtpe_config.spooldir, rtpe_config.spooldir, "rec-dir", replybuffer); - str_diff_print(initial_rtpe_config.rec_method, rtpe_config.rec_method, "rec-method", replybuffer); - str_diff_print(initial_rtpe_config.rec_format, rtpe_config.rec_format, "rec-format", replybuffer); + cli_incoming_diff_or_revert(replybuffer, "revert"); } - static void cli_incoming_list_totals(str *instr, struct streambuf *replybuffer) { struct timeval avg, calls_dur_iv; u_int64_t num_sessions, min_sess_iv, max_sess_iv; diff --git a/daemon/main.c b/daemon/main.c index 08113e5a9..a1f9ac441 100644 --- a/daemon/main.c +++ b/daemon/main.c @@ -490,6 +490,7 @@ void fill_initial_rtpe_cfg(struct rtpengine_config* ini_rtpe_cfg) { ini_rtpe_cfg->redis_disable_time = rtpe_config.redis_disable_time; ini_rtpe_cfg->redis_cmd_timeout = rtpe_config.redis_cmd_timeout; ini_rtpe_cfg->redis_connect_timeout = rtpe_config.redis_connect_timeout; + ini_rtpe_cfg->common.log_level = rtpe_config.common.log_level; ini_rtpe_cfg->graphite_ep = rtpe_config.graphite_ep; ini_rtpe_cfg->tcp_listen_ep = rtpe_config.tcp_listen_ep; diff --git a/utils/rtpengine-ctl b/utils/rtpengine-ctl index ee9e2d308..9be75495a 100755 --- a/utils/rtpengine-ctl +++ b/utils/rtpengine-ctl @@ -114,6 +114,7 @@ sub showusage { print " start : lists the initial values of all the configuration file parameters\n"; print " current : lists the present values of all the configuration file parameters\n"; print " diff : compares initial and present values of all the configuration file parameters and lists the updated parameters\n"; + print " revert : reverts the values of all the configuration file parameters to their initial values\n"; print "\n"; print " ksadd [ keyspace ]\n"; print " keyspace : subscribe to 'keyspace' database\n";