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

update 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@10158 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2008-10-26 21:08:22 +00:00
parent ae124bfb4f
commit 6b48e82663
1 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/mod/event_handlers/mod_event_socket/mod_event_socket.c
View File

@ -1048,15 +1048,43 @@ static switch_status_t parse_command(listener_t *listener, switch_event_t **even
switch_snprintf(reply, reply_len, "+OK"); switch_snprintf(reply, reply_len, "+OK");
goto done; goto done;
} else if (listener->session && !strncasecmp(cmd, "sendmsg", 7)) { } else if (listener->session && !strncasecmp(cmd, "sendmsg", 7)) {
if (switch_test_flag(listener, LFLAG_ASYNC)) { char *uuid = cmd + 8;
if ((status = switch_core_session_queue_private_event(listener->session, event)) == SWITCH_STATUS_SUCCESS) { switch_core_session_t *session = NULL;
if (uuid) {
while (*uuid == ' ') {
uuid++;
}
if (*uuid == '\r' || *uuid == '\n') {
uuid = NULL;
} else {
strip_cr(uuid);
}
}
if (!uuid) {
uuid = switch_event_get_header(*event, "session-id");
}
if (uuid && (session = switch_core_session_locate(uuid))) {
if ((status = switch_core_session_queue_private_event(session, event)) == SWITCH_STATUS_SUCCESS) {
switch_snprintf(reply, reply_len, "+OK"); switch_snprintf(reply, reply_len, "+OK");
} else { } else {
switch_snprintf(reply, reply_len, "-ERR memory error"); switch_snprintf(reply, reply_len, "-ERR memory error");
} }
switch_core_session_rwunlock(session);
} else { } else {
switch_ivr_parse_event(listener->session, *event); if (switch_test_flag(listener, LFLAG_ASYNC)) {
switch_snprintf(reply, reply_len, "+OK"); if ((status = switch_core_session_queue_private_event(listener->session, event)) == SWITCH_STATUS_SUCCESS) {
switch_snprintf(reply, reply_len, "+OK");
} else {
switch_snprintf(reply, reply_len, "-ERR memory error");
}
} else {
switch_ivr_parse_event(listener->session, *event);
switch_snprintf(reply, reply_len, "+OK");
}
} }
goto done; goto done;
} else if (!strncasecmp(cmd, "getvar", 6)) { } else if (!strncasecmp(cmd, "getvar", 6)) {
@ -1173,8 +1201,8 @@ static switch_status_t parse_command(listener_t *listener, switch_event_t **even
if (!uuid) { if (!uuid) {
uuid = switch_event_get_header(*event, "session-id"); uuid = switch_event_get_header(*event, "session-id");
} }
if ((session = switch_core_session_locate(uuid))) { if (uuid && (session = switch_core_session_locate(uuid))) {
if ((status = switch_core_session_queue_private_event(session, event)) == SWITCH_STATUS_SUCCESS) { if ((status = switch_core_session_queue_private_event(session, event)) == SWITCH_STATUS_SUCCESS) {
switch_snprintf(reply, reply_len, "+OK"); switch_snprintf(reply, reply_len, "+OK");
} else { } else {
@ -1182,7 +1210,7 @@ static switch_status_t parse_command(listener_t *listener, switch_event_t **even
} }
switch_core_session_rwunlock(session); switch_core_session_rwunlock(session);
} else { } else {
switch_snprintf(reply, reply_len, "-ERR invalid session id [%s]", uuid); switch_snprintf(reply, reply_len, "-ERR invalid session id [%s]", switch_str_nil(uuid));
} }
goto done; goto done;