MT#55283 refactor CLI structures with macros

No functional change.

Change-Id: I8fa9b9d6ee61aafadf01016bd2ed64be6cdbfef8
pull/1907/head
Richard Fuchs 3 months ago
parent 05cafe6c5c
commit 8e50664fa1

@ -135,134 +135,138 @@ static void cli_incoming_media_evict_players(str *instr, struct cli_writer *cw,
#endif #endif
static const cli_handler_t cli_set_handlers[] = { #define HANDLER_START(n) static const cli_handler_t n[] = {
{ "maxopenfiles", cli_incoming_set_maxopenfiles, NULL }, #define HANDLER_CMD(c, f) { .cmd = c, .handler = f, },
{ "maxsessions", cli_incoming_set_maxsessions, NULL }, #define HANDLER_GENERIC(c, h) { .cmd = c, .handler = cli_generic_handler, .next = h, },
{ "maxcpu", cli_incoming_set_maxcpu , NULL }, #define HANDLER_END { NULL, } };
{ "maxload", cli_incoming_set_maxload, NULL },
{ "maxbw", cli_incoming_set_maxbw , NULL }, HANDLER_START(cli_set_handlers)
{ "timeout", cli_incoming_set_timeout, NULL }, HANDLER_CMD("maxopenfiles", cli_incoming_set_maxopenfiles)
{ "silenttimeout", cli_incoming_set_silenttimeout, NULL }, HANDLER_CMD("maxsessions", cli_incoming_set_maxsessions)
{ "offertimeout", cli_incoming_set_offertimeout, NULL }, HANDLER_CMD("maxcpu", cli_incoming_set_maxcpu)
{ "finaltimeout", cli_incoming_set_finaltimeout, NULL }, HANDLER_CMD("maxload", cli_incoming_set_maxload)
{ "loglevel", cli_incoming_set_loglevel, NULL }, HANDLER_CMD("maxbw", cli_incoming_set_maxbw)
{ "redisallowederrors", cli_incoming_set_redisallowederrors, NULL }, HANDLER_CMD("timeout", cli_incoming_set_timeout)
{ "redisdisabletime", cli_incoming_set_redisdisabletime, NULL }, HANDLER_CMD("silenttimeout", cli_incoming_set_silenttimeout)
{ "redisdisable", cli_incoming_set_redisdisable, NULL }, HANDLER_CMD("offertimeout", cli_incoming_set_offertimeout)
{ "redisconnecttimeout",cli_incoming_set_redisconnecttimeout, NULL }, HANDLER_CMD("finaltimeout", cli_incoming_set_finaltimeout)
{ "rediscmdtimeout", cli_incoming_set_rediscmdtimeout, NULL }, HANDLER_CMD("loglevel", cli_incoming_set_loglevel)
{ "controltos", cli_incoming_set_controltos, NULL }, HANDLER_CMD("redisallowederrors", cli_incoming_set_redisallowederrors)
{ "deletedelay", cli_incoming_set_deletedelay , NULL }, HANDLER_CMD("redisdisabletime", cli_incoming_set_redisdisabletime)
{ NULL, }, HANDLER_CMD("redisdisable", cli_incoming_set_redisdisable)
}; HANDLER_CMD("redisconnecttimeout", cli_incoming_set_redisconnecttimeout)
static const cli_handler_t cli_list_handlers[] = { HANDLER_CMD("rediscmdtimeout", cli_incoming_set_rediscmdtimeout)
{ "numsessions", cli_incoming_list_numsessions, NULL }, HANDLER_CMD("controltos", cli_incoming_set_controltos)
{ "sessions", cli_incoming_list_sessions, NULL }, HANDLER_CMD("deletedelay", cli_incoming_set_deletedelay)
{ "totals", cli_incoming_list_totals, NULL }, HANDLER_END
{ "counters", cli_incoming_list_counters, NULL },
{ "maxopenfiles", cli_incoming_list_maxopenfiles, NULL }, HANDLER_START(cli_list_handlers)
{ "maxsessions", cli_incoming_list_maxsessions, NULL }, HANDLER_CMD("numsessions", cli_incoming_list_numsessions)
{ "maxcpu", cli_incoming_list_maxcpu, NULL }, HANDLER_CMD("sessions", cli_incoming_list_sessions)
{ "maxload", cli_incoming_list_maxload, NULL }, HANDLER_CMD("totals", cli_incoming_list_totals)
{ "maxbw", cli_incoming_list_maxbw , NULL }, HANDLER_CMD("counters", cli_incoming_list_counters)
{ "timeout", cli_incoming_list_timeout, NULL }, HANDLER_CMD("maxopenfiles", cli_incoming_list_maxopenfiles)
{ "silenttimeout", cli_incoming_list_silenttimeout, NULL }, HANDLER_CMD("maxsessions", cli_incoming_list_maxsessions)
{ "offertimeout", cli_incoming_list_offertimeout, NULL }, HANDLER_CMD("maxcpu", cli_incoming_list_maxcpu)
{ "finaltimeout", cli_incoming_list_finaltimeout, NULL }, HANDLER_CMD("maxload", cli_incoming_list_maxload)
{ "loglevels", cli_incoming_list_loglevels, NULL }, HANDLER_CMD("maxbw", cli_incoming_list_maxbw )
{ "loglevel", cli_incoming_list_loglevel, NULL }, HANDLER_CMD("timeout", cli_incoming_list_timeout)
{ "redisallowederrors", cli_incoming_list_redisallowederrors, NULL }, HANDLER_CMD("silenttimeout", cli_incoming_list_silenttimeout)
{ "redisdisabletime", cli_incoming_list_redisdisabletime, NULL }, HANDLER_CMD("offertimeout", cli_incoming_list_offertimeout)
{ "redisconnecttimeout",cli_incoming_list_redisconnecttimeout, NULL }, HANDLER_CMD("finaltimeout", cli_incoming_list_finaltimeout)
{ "rediscmdtimeout", cli_incoming_list_rediscmdtimeout, NULL }, HANDLER_CMD("loglevels", cli_incoming_list_loglevels)
{ "controltos", cli_incoming_list_controltos, NULL }, HANDLER_CMD("loglevel", cli_incoming_list_loglevel)
{ "deletedelay", cli_incoming_list_deletedelay, NULL }, HANDLER_CMD("redisallowederrors", cli_incoming_list_redisallowederrors)
{ "interfaces", cli_incoming_list_interfaces, NULL }, HANDLER_CMD("redisdisabletime", cli_incoming_list_redisdisabletime)
{ "jsonstats", cli_incoming_list_jsonstats, NULL }, HANDLER_CMD("redisconnecttimeout", cli_incoming_list_redisconnecttimeout)
{ "transcoders", cli_incoming_list_transcoders, NULL }, HANDLER_CMD("rediscmdtimeout", cli_incoming_list_rediscmdtimeout)
{ NULL, }, HANDLER_CMD("controltos", cli_incoming_list_controltos)
}; HANDLER_CMD("deletedelay", cli_incoming_list_deletedelay)
static const cli_handler_t cli_call_handlers[] = { HANDLER_CMD("interfaces", cli_incoming_list_interfaces)
{ "info", cli_incoming_call_info, NULL }, HANDLER_CMD("jsonstats", cli_incoming_list_jsonstats)
{ "terminate", cli_incoming_call_terminate, NULL }, HANDLER_CMD("transcoders", cli_incoming_list_transcoders)
{ "debug", cli_incoming_call_debug, NULL }, HANDLER_END
{ "tag", cli_incoming_call_tag, NULL },
{ NULL, }, HANDLER_START(cli_call_handlers)
}; HANDLER_CMD("info", cli_incoming_call_info)
static const cli_handler_t cli_tag_handlers[] = { HANDLER_CMD("terminate", cli_incoming_call_terminate)
{ "info", cli_incoming_tag_info, NULL }, HANDLER_CMD("debug", cli_incoming_call_debug)
HANDLER_CMD("tag", cli_incoming_call_tag)
HANDLER_END
HANDLER_START(cli_tag_handlers)
HANDLER_CMD("info", cli_incoming_tag_info)
#ifdef WITH_TRANSCODING #ifdef WITH_TRANSCODING
{ "delay", cli_incoming_tag_delay, NULL }, HANDLER_CMD("delay", cli_incoming_tag_delay)
{ "detect-dtmf", cli_incoming_tag_detdtmf, NULL }, HANDLER_CMD("detect-dtmf", cli_incoming_tag_detdtmf)
#endif #endif
{ NULL, }, HANDLER_END
};
static const cli_handler_t cli_params_handlers[] = { HANDLER_START(cli_params_handlers)
{ "start", cli_incoming_params_start, NULL }, HANDLER_CMD("start", cli_incoming_params_start)
{ "current", cli_incoming_params_current, NULL }, HANDLER_CMD("current", cli_incoming_params_current)
{ "diff", cli_incoming_params_diff, NULL }, HANDLER_CMD("diff", cli_incoming_params_diff)
{ "revert", cli_incoming_params_revert, NULL }, HANDLER_CMD("revert", cli_incoming_params_revert)
{ NULL, }, HANDLER_END
};
#ifdef WITH_TRANSCODING #ifdef WITH_TRANSCODING
static const cli_handler_t cli_media_list_handlers[] = { HANDLER_START(cli_media_list_handlers)
{ "files", cli_incoming_media_list_files, NULL }, HANDLER_CMD("files", cli_incoming_media_list_files)
{ "dbs", cli_incoming_media_list_dbs, NULL }, HANDLER_CMD("dbs", cli_incoming_media_list_dbs)
{ "caches", cli_incoming_media_list_caches, NULL }, HANDLER_CMD("caches", cli_incoming_media_list_caches)
{ "players", cli_incoming_media_list_players, NULL }, HANDLER_CMD("players", cli_incoming_media_list_players)
{ NULL, }, HANDLER_END
};
static const cli_handler_t cli_media_add_handlers[] = { HANDLER_START(cli_media_add_handlers)
{ "file", cli_incoming_media_add_file, NULL }, HANDLER_CMD("file", cli_incoming_media_add_file)
{ "db", cli_incoming_media_add_db, NULL }, HANDLER_CMD("db", cli_incoming_media_add_db)
{ "cache", cli_incoming_media_add_cache, NULL }, HANDLER_CMD("cache", cli_incoming_media_add_cache)
{ NULL, }, HANDLER_END
};
static const cli_handler_t cli_media_reload_handlers[] = { HANDLER_START(cli_media_reload_handlers)
{ "file", cli_incoming_media_reload_file, NULL }, HANDLER_CMD("file", cli_incoming_media_reload_file)
{ "files", cli_incoming_media_reload_files, NULL }, HANDLER_CMD("files", cli_incoming_media_reload_files)
{ "db", cli_incoming_media_reload_db, NULL }, HANDLER_CMD("db", cli_incoming_media_reload_db)
{ "dbs", cli_incoming_media_reload_dbs, NULL }, HANDLER_CMD("dbs", cli_incoming_media_reload_dbs)
{ "cache", cli_incoming_media_reload_cache, NULL }, HANDLER_CMD("cache", cli_incoming_media_reload_cache)
{ "caches", cli_incoming_media_reload_caches, NULL }, HANDLER_CMD("caches", cli_incoming_media_reload_caches)
{ NULL, }, HANDLER_END
};
static const cli_handler_t cli_media_evict_handlers[] = { HANDLER_START(cli_media_evict_handlers)
{ "file", cli_incoming_media_evict_file, NULL }, HANDLER_CMD("file", cli_incoming_media_evict_file)
{ "files", cli_incoming_media_evict_files, NULL }, HANDLER_CMD("files", cli_incoming_media_evict_files)
{ "db", cli_incoming_media_evict_db, NULL }, HANDLER_CMD("db", cli_incoming_media_evict_db)
{ "dbs", cli_incoming_media_evict_dbs, NULL }, HANDLER_CMD("dbs", cli_incoming_media_evict_dbs)
{ "cache", cli_incoming_media_evict_cache, NULL }, HANDLER_CMD("cache", cli_incoming_media_evict_cache)
{ "caches", cli_incoming_media_evict_caches, NULL }, HANDLER_CMD("caches", cli_incoming_media_evict_caches)
{ "players", cli_incoming_media_evict_players, NULL }, HANDLER_CMD("players", cli_incoming_media_evict_players)
{ NULL, }, HANDLER_END
};
static const cli_handler_t cli_media_handlers[] = { HANDLER_START(cli_media_handlers)
{ "list", cli_generic_handler, cli_media_list_handlers }, HANDLER_GENERIC("list", cli_media_list_handlers)
{ "add", cli_generic_handler, cli_media_add_handlers }, HANDLER_GENERIC("add", cli_media_add_handlers)
{ "reload", cli_generic_handler, cli_media_reload_handlers }, HANDLER_GENERIC("reload", cli_media_reload_handlers)
{ "evict", cli_generic_handler, cli_media_evict_handlers }, HANDLER_GENERIC("evict", cli_media_evict_handlers)
{ NULL, }, HANDLER_END
};
#endif #endif
static const cli_handler_t cli_top_handlers[] = { HANDLER_START(cli_top_handlers)
{ "list", cli_generic_handler, cli_list_handlers }, HANDLER_GENERIC("list", cli_list_handlers)
{ "terminate", cli_incoming_terminate, NULL }, HANDLER_CMD("terminate", cli_incoming_terminate)
{ "set", cli_generic_handler, cli_set_handlers }, HANDLER_GENERIC("set", cli_set_handlers)
{ "get", cli_generic_handler, cli_list_handlers }, HANDLER_GENERIC("get", cli_list_handlers)
{ "params", cli_generic_handler, cli_params_handlers }, HANDLER_GENERIC("params", cli_params_handlers)
{ "ksadd", cli_incoming_ksadd, NULL }, HANDLER_CMD("ksadd", cli_incoming_ksadd)
{ "ksrm", cli_incoming_ksrm, NULL }, HANDLER_CMD("ksrm", cli_incoming_ksrm)
{ "kslist", cli_incoming_kslist, NULL }, HANDLER_CMD("kslist", cli_incoming_kslist)
{ "active", cli_incoming_active, NULL }, HANDLER_CMD("active", cli_incoming_active)
{ "standby", cli_incoming_standby, NULL }, HANDLER_CMD("standby", cli_incoming_standby)
{ "debug", cli_incoming_debug, NULL }, HANDLER_CMD("debug", cli_incoming_debug)
{ "call", cli_incoming_call, NULL }, HANDLER_CMD("call", cli_incoming_call)
#ifdef WITH_TRANSCODING #ifdef WITH_TRANSCODING
{ "media", cli_generic_handler, cli_media_handlers }, HANDLER_GENERIC("media", cli_media_handlers)
#endif #endif
{ NULL, }, HANDLER_END
};
static void cli_list_call_info(struct cli_writer *cw, call_t *c); static void cli_list_call_info(struct cli_writer *cw, call_t *c);

Loading…
Cancel
Save