diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/auloop/auloop.c | 4 | ||||
| -rw-r--r-- | modules/contact/contact.c | 4 | ||||
| -rw-r--r-- | modules/debug_cmd/debug_cmd.c | 5 | ||||
| -rw-r--r-- | modules/gtk/gtk_mod.c | 4 | ||||
| -rw-r--r-- | modules/menu/menu.c | 19 | ||||
| -rw-r--r-- | modules/natbd/natbd.c | 4 | ||||
| -rw-r--r-- | modules/presence/presence.c | 4 | ||||
| -rw-r--r-- | modules/vidloop/vidloop.c | 4 | ||||
| -rw-r--r-- | modules/zrtp/zrtp.c | 4 |
9 files changed, 31 insertions, 21 deletions
diff --git a/modules/auloop/auloop.c b/modules/auloop/auloop.c index 5d1d9e8..1a830ce 100644 --- a/modules/auloop/auloop.c +++ b/modules/auloop/auloop.c @@ -370,14 +370,14 @@ static int module_init(void) { conf_get_str(conf_cur(), "auloop_codec", aucodec, sizeof(aucodec)); - return cmd_register(cmdv, ARRAY_SIZE(cmdv)); + return cmd_register(baresip_commands(), cmdv, ARRAY_SIZE(cmdv)); } static int module_close(void) { auloop_stop(NULL, NULL); - cmd_unregister(cmdv); + cmd_unregister(baresip_commands(), cmdv); return 0; } diff --git a/modules/contact/contact.c b/modules/contact/contact.c index bc2f09e..918d9a3 100644 --- a/modules/contact/contact.c +++ b/modules/contact/contact.c @@ -207,7 +207,7 @@ static int module_init(void) if (err) return err; - err = cmd_register(cmdv, ARRAY_SIZE(cmdv)); + err = cmd_register(baresip_commands(), cmdv, ARRAY_SIZE(cmdv)); if (err) return err; @@ -220,7 +220,7 @@ static int module_init(void) static int module_close(void) { - cmd_unregister(cmdv); + cmd_unregister(baresip_commands(), cmdv); list_flush(contact_list(baresip_contacts())); return 0; diff --git a/modules/debug_cmd/debug_cmd.c b/modules/debug_cmd/debug_cmd.c index 0d6c375..ad3e463 100644 --- a/modules/debug_cmd/debug_cmd.c +++ b/modules/debug_cmd/debug_cmd.c @@ -82,7 +82,8 @@ static int module_init(void) start_ticks = tmr_jiffies(); (void)time(&start_time); - err = cmd_register(debugcmdv, ARRAY_SIZE(debugcmdv)); + err = cmd_register(baresip_commands(), + debugcmdv, ARRAY_SIZE(debugcmdv)); return err; } @@ -90,7 +91,7 @@ static int module_init(void) static int module_close(void) { - cmd_unregister(debugcmdv); + cmd_unregister(baresip_commands(), debugcmdv); return 0; } diff --git a/modules/gtk/gtk_mod.c b/modules/gtk/gtk_mod.c index 7397b9f..840909b 100644 --- a/modules/gtk/gtk_mod.c +++ b/modules/gtk/gtk_mod.c @@ -993,7 +993,7 @@ static int module_init(void) return err; #endif - err = cmd_register(cmdv, ARRAY_SIZE(cmdv)); + err = cmd_register(baresip_commands(), cmdv, ARRAY_SIZE(cmdv)); if (err) return err; @@ -1009,7 +1009,7 @@ static int module_init(void) static int module_close(void) { - cmd_unregister(cmdv); + cmd_unregister(baresip_commands(), cmdv); if (mod_obj.run) { gdk_threads_enter(); gtk_main_quit(); diff --git a/modules/menu/menu.c b/modules/menu/menu.c index 619e88c..0366471 100644 --- a/modules/menu/menu.c +++ b/modules/menu/menu.c @@ -392,6 +392,13 @@ static int cmd_ua_next(struct re_printf *pf, void *unused) } +static int print_commands(struct re_printf *pf, void *unused) +{ + (void)unused; + return cmd_print(pf, baresip_commands()); +} + + static int cmd_print_calls(struct re_printf *pf, void *unused) { (void)unused; @@ -406,7 +413,7 @@ static const struct cmd cmdv[] = { {"hangup", 'b', 0, "Hangup call", cmd_hangup }, {"callstat", 'c', 0, "Call status", ua_print_call_status }, {"dial", 'd', CMD_PRM, "Dial", dial_handler }, -{"help", 'h', 0, "Help menu", cmd_print }, +{"help", 'h', 0, "Help menu", print_commands }, {"listcalls", 'l', 0, "List active calls", cmd_print_calls }, {"options", 'o', CMD_PRM, "Options", options_command }, {"reginfo", 'r', 0, "Registration info", ua_print_reg_status }, @@ -713,12 +720,14 @@ static const struct cmd callcmdv[] = { static void menu_set_incall(bool incall) { + struct commands *commands = baresip_commands(); + /* Dynamic menus */ if (incall) { - (void)cmd_register(callcmdv, ARRAY_SIZE(callcmdv)); + (void)cmd_register(commands, callcmdv, ARRAY_SIZE(callcmdv)); } else { - cmd_unregister(callcmdv); + cmd_unregister(commands, callcmdv); } } @@ -980,7 +989,7 @@ static int module_init(void) tmr_init(&tmr_alert); statmode = STATMODE_CALL; - err = cmd_register(cmdv, ARRAY_SIZE(cmdv)); + err = cmd_register(baresip_commands(), cmdv, ARRAY_SIZE(cmdv)); err |= uag_event_register(ua_event_handler, NULL); err |= message_init(message_handler, NULL); @@ -996,7 +1005,7 @@ static int module_close(void) message_close(); uag_event_unregister(ua_event_handler); - cmd_unregister(cmdv); + cmd_unregister(baresip_commands(), cmdv); menu_set_incall(false); tmr_cancel(&tmr_alert); diff --git a/modules/natbd/natbd.c b/modules/natbd/natbd.c index 3c45ba4..a90e264 100644 --- a/modules/natbd/natbd.c +++ b/modules/natbd/natbd.c @@ -461,7 +461,7 @@ static int module_init(void) uint32_t interval = 3600; int err; - err = cmd_register(cmdv, ARRAY_SIZE(cmdv)); + err = cmd_register(baresip_commands(), cmdv, ARRAY_SIZE(cmdv)); if (err) return err; @@ -493,7 +493,7 @@ static int module_close(void) for (i=0; i<ARRAY_SIZE(natbdv); i++) natbdv[i] = mem_deref(natbdv[i]); - cmd_unregister(cmdv); + cmd_unregister(baresip_commands(), cmdv); return 0; } diff --git a/modules/presence/presence.c b/modules/presence/presence.c index bfde2cd..9fcdf83 100644 --- a/modules/presence/presence.c +++ b/modules/presence/presence.c @@ -87,7 +87,7 @@ static int module_init(void) if (err) return err; - err = cmd_register(cmdv, ARRAY_SIZE(cmdv)); + err = cmd_register(baresip_commands(), cmdv, ARRAY_SIZE(cmdv)); if (err) return err; @@ -103,7 +103,7 @@ static int module_close(void) { uag_event_unregister(event_handler); - cmd_unregister(cmdv); + cmd_unregister(baresip_commands(), cmdv); publisher_close(); diff --git a/modules/vidloop/vidloop.c b/modules/vidloop/vidloop.c index a9f44fa..c4a596a 100644 --- a/modules/vidloop/vidloop.c +++ b/modules/vidloop/vidloop.c @@ -476,14 +476,14 @@ static const struct cmd cmdv[] = { static int module_init(void) { - return cmd_register(cmdv, ARRAY_SIZE(cmdv)); + return cmd_register(baresip_commands(), cmdv, ARRAY_SIZE(cmdv)); } static int module_close(void) { vidloop_stop(NULL, NULL); - cmd_unregister(cmdv); + cmd_unregister(baresip_commands(), cmdv); return 0; } diff --git a/modules/zrtp/zrtp.c b/modules/zrtp/zrtp.c index 9688545..20dfb84 100644 --- a/modules/zrtp/zrtp.c +++ b/modules/zrtp/zrtp.c @@ -385,13 +385,13 @@ static int module_init(void) debug(" zid: %w\n", zrtp_config.zid, sizeof(zrtp_config.zid)); - return cmd_register(cmdv, ARRAY_SIZE(cmdv)); + return cmd_register(baresip_commands(), cmdv, ARRAY_SIZE(cmdv)); } static int module_close(void) { - cmd_unregister(cmdv); + cmd_unregister(baresip_commands(), cmdv); menc_unregister(&menc_zrtp); if (zrtp_global) { |