kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-6171 mod_rayo: added support for normal/groupchat/headline message types for console testing

This commit is contained in:
Chris Rienzo 2014-01-31 11:36:14 -05:00
parent 4380453ac8
commit 360ef648b4
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/mod/event_handlers/mod_rayo/mod_rayo.c
View File

@ -4006,14 +4006,14 @@ static int alias_api(struct rayo_cmd_alias *alias, char *args, switch_stream_han
/** /**
* Send message from console * Send message from console
*/ */
static void send_console_message(struct rayo_client *client, const char *to, const char *message_str) static void send_console_message(struct rayo_client *client, const char *to, const char *type, const char *message_str)
{ {
iks *message = NULL, *x; iks *message = NULL, *x;
message = iks_new("message"); message = iks_new("message");
iks_insert_attrib(message, "to", to); iks_insert_attrib(message, "to", to);
iks_insert_attrib(message, "from", RAYO_JID(client)); iks_insert_attrib(message, "from", RAYO_JID(client));
iks_insert_attrib_printf(message, "id", "console-%i", RAYO_SEQ_NEXT(client)); iks_insert_attrib_printf(message, "id", "console-%i", RAYO_SEQ_NEXT(client));
iks_insert_attrib(message, "type", "chat"); iks_insert_attrib(message, "type", type);
x = iks_insert(message, "body"); x = iks_insert(message, "body");
iks_insert_cdata(x, message_str, strlen(message_str)); iks_insert_cdata(x, message_str, strlen(message_str));
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "\nSEND: to %s, %s\n", to, iks_string(iks_stack(message), message)); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "\nSEND: to %s, %s\n", to, iks_string(iks_stack(message), message));
@ -4025,10 +4025,10 @@ static void send_console_message(struct rayo_client *client, const char *to, con
*/ */
static int message_api(char *cmd, switch_stream_handle_t *stream) static int message_api(char *cmd, switch_stream_handle_t *stream)
{ {
char *argv[2] = { 0 }; char *argv[3] = { 0 };
if (!zstr(cmd)) { if (!zstr(cmd)) {
int argc = switch_separate_string(cmd, ' ', argv, sizeof(argv) / sizeof(argv[0])); int argc = switch_separate_string(cmd, ' ', argv, sizeof(argv) / sizeof(argv[0]));
if (argc != 2) { if (argc != 3) {
return 0; return 0;
} }
} else { } else {
@ -4036,7 +4036,7 @@ static int message_api(char *cmd, switch_stream_handle_t *stream)
} }
/* send message */ /* send message */
send_console_message(globals.console, argv[0], argv[1]); send_console_message(globals.console, argv[0], argv[1], argv[2]);
stream->write_function(stream, "+OK\n"); stream->write_function(stream, "+OK\n");
return 1; return 1;
@ -4383,8 +4383,11 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_rayo_load)
globals.console = rayo_console_client_create(); globals.console = rayo_console_client_create();
switch_console_set_complete("add rayo status"); switch_console_set_complete("add rayo status");
switch_console_set_complete("add rayo msg ::rayo::list_external"); switch_console_set_complete("add rayo msg ::rayo::list_all");
switch_console_set_complete("add rayo cmd ::rayo::list_all"); switch_console_set_complete("add rayo msg ::rayo::list_all chat");
switch_console_set_complete("add rayo msg ::rayo::list_all groupchat");
switch_console_set_complete("add rayo msg ::rayo::list_all headline");
switch_console_set_complete("add rayo msg ::rayo::list_all normal");
switch_console_set_complete("add rayo presence ::rayo::list_server online"); switch_console_set_complete("add rayo presence ::rayo::list_server online");
switch_console_set_complete("add rayo presence ::rayo::list_server offline"); switch_console_set_complete("add rayo presence ::rayo::list_server offline");
switch_console_add_complete_func("::rayo::list_all", list_all); switch_console_add_complete_func("::rayo::list_all", list_all);