From 2b348e7ff3b41f1beeb12ce21c1f9b8d08453cc2 Mon Sep 17 00:00:00 2001 From: Andrew Thompson Date: Thu, 22 Jan 2009 21:20:36 +0000 Subject: [PATCH] Tweak some stuff, make the registered process name an atom, return baduuid if the requested uuid isn't found git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11395 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- .../event_handlers/mod_erlang_event/ei_helpers.c | 2 +- .../event_handlers/mod_erlang_event/handle_msg.c | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/mod/event_handlers/mod_erlang_event/ei_helpers.c b/src/mod/event_handlers/mod_erlang_event/ei_helpers.c index 5b3bd47c65..7c7bc036be 100644 --- a/src/mod/event_handlers/mod_erlang_event/ei_helpers.c +++ b/src/mod/event_handlers/mod_erlang_event/ei_helpers.c @@ -167,7 +167,7 @@ switch_status_t initialise_ei(struct ei_cnode_s *ec) return SWITCH_STATUS_FALSE; } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ei initialized at %s\n", thisnodename); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "ei initialized node at %s\n", thisnodename); return SWITCH_STATUS_SUCCESS; } diff --git a/src/mod/event_handlers/mod_erlang_event/handle_msg.c b/src/mod/event_handlers/mod_erlang_event/handle_msg.c index 0ca38dd357..5a00d58fb6 100644 --- a/src/mod/event_handlers/mod_erlang_event/handle_msg.c +++ b/src/mod/event_handlers/mod_erlang_event/handle_msg.c @@ -523,28 +523,25 @@ static switch_status_t handle_msg_handlecall(listener_t *listener, int arity, ei if (arity != 3 || ei_decode_string(buf->buff, &buf->index, uuid_str) || - ei_decode_string(buf->buff, &buf->index, reg_name)) { + ei_decode_atom(buf->buff, &buf->index, reg_name)) { ei_x_encode_tuple_header(rbuf, 2); ei_x_encode_atom(rbuf, "error"); ei_x_encode_atom(rbuf, "badarg"); - } - else { + } else { switch_core_session_t *session; if (!switch_strlen_zero(uuid_str) && (session = switch_core_session_locate(uuid_str))) { /* create a new sesion list element and attach it to this listener */ if (attach_call_to_listener(listener,reg_name,session)) { ei_x_encode_atom(rbuf, "ok"); - } - else { + } else { ei_x_encode_tuple_header(rbuf, 2); ei_x_encode_atom(rbuf, "error"); ei_x_encode_atom(rbuf, "badsession"); } - } - else { + } else { ei_x_encode_tuple_header(rbuf, 2); ei_x_encode_atom(rbuf, "error"); - ei_x_encode_atom(rbuf, "badarg"); + ei_x_encode_atom(rbuf, "baduuid"); } } return SWITCH_STATUS_SUCCESS;