Preston_PLB/freeswitch
1
0
Fork 0
forked from Mirrors/freeswitch
Code Pull Requests Activity

tweak

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@198 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2005-12-23 03:12:39 +00:00
parent f52b45c2c9
commit f3d53dfa7b
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/mod/mod_xmpp_event/mod_xmpp_event.c
View File

@ -143,7 +143,6 @@ int on_result (struct session *sess, ikspak *pak)
int on_stream (struct session *sess, int type, iks *node)
{
sess->counter = opt_timeout;
//iks *x;
switch (type) {
case IKS_NODE_START:
@ -206,7 +205,6 @@ int on_stream (struct session *sess, int type, iks *node)
int on_msg (void *user_data, ikspak *pak)
{
switch_event *event;
char *cmd = iks_find_cdata (pak->x, "body");
char *arg = NULL;
char retbuf[1024] = "";
@ -224,17 +222,6 @@ int on_msg (void *user_data, ikspak *pak)
switch_api_execute(cmd, arg, retbuf, sizeof(retbuf));
if (switch_event_create(&event, SWITCH_EVENT_API) == SWITCH_STATUS_SUCCESS) {
if (cmd) {
switch_event_add_header(event, "re_command", cmd);
}
if (arg) {
switch_event_add_header(event, "re_command_arg", arg);
}
switch_event_add_body(event, retbuf);
switch_event_fire(&event);
}
return 0;
}
@ -276,6 +263,7 @@ static void xmpp_connect (char *jabber_id, char *pass)
{
while (RUNNING == 1) {
int e;
memset (&globals.session, 0, sizeof (globals.session));
globals.session.parser = iks_stream_new (IKS_NS_CLIENT, &globals.session, (iksStreamHook *) on_stream);
if (globals.debug) iks_set_log_hook (globals.session.parser, (iksLogHook *) on_log);
@ -364,8 +352,6 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_load(switch_loadable_module_inte
return SWITCH_STATUS_FALSE;
}
/* indicate that the module should continue to be loaded */
return SWITCH_STATUS_SUCCESS;
}

20
src/switch_loadable_module.c
View File

@ -410,13 +410,27 @@ SWITCH_DECLARE(int) loadable_module_get_codecs_sorted(switch_memory_pool *pool,
SWITCH_DECLARE(switch_status) switch_api_execute(char *cmd, char *arg, char *retbuf, size_t len)
{
switch_api_interface *api;
switch_status status;
switch_event *event;
if ((api = loadable_module_get_api_interface(cmd))) {
api->function(arg, retbuf, len);
status = api->function(arg, retbuf, len);
} else {
status = SWITCH_STATUS_FALSE;
snprintf(retbuf, len, "INVALID COMMAND [%s]", cmd);
return SWITCH_STATUS_FALSE;
}
return SWITCH_STATUS_SUCCESS;
if (switch_event_create(&event, SWITCH_EVENT_API) == SWITCH_STATUS_SUCCESS) {
if (cmd) {
switch_event_add_header(event, "re_command", cmd);
}
if (arg) {
switch_event_add_header(event, "re_command_arg", arg);
}
switch_event_add_body(event, retbuf);
switch_event_fire(&event);
}
return status;
}