]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Tweak some stuff, make the registered process name an atom, return baduuid if the...
authorAndrew Thompson <andrew@hijacked.us>
Thu, 22 Jan 2009 21:20:36 +0000 (21:20 +0000)
committerAndrew Thompson <andrew@hijacked.us>
Thu, 22 Jan 2009 21:20:36 +0000 (21:20 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11395 d0543943-73ff-0310-b7d9-9358b9ac24b2

src/mod/event_handlers/mod_erlang_event/ei_helpers.c
src/mod/event_handlers/mod_erlang_event/handle_msg.c

index 5b3bd47c65d27d84b1656ad44b1e1ed13ff37205..7c7bc036be1001333bc1b66ab6ba1670e72504fe 100644 (file)
@@ -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;
 }
 
index 0ca38dd3577af90ce3857bbf1aed7c7b9a39e280..5a00d58fb6bb0f5f295a0513c00fa5d298eaeb59 100644 (file)
@@ -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;