update

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3051 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/endpoints/mod_dingaling/mod_dingaling.c b/src/mod/endpoints/mod_dingaling/mod_dingaling.c
index 05d6979c40a805debd916624f7362ef75eb2bc4a..de0b791e436047726d40dda4c9e4158189d99ece 100644 (file)
--- a/src/mod/endpoints/mod_dingaling/mod_dingaling.c
+++ b/src/mod/endpoints/mod_dingaling/mod_dingaling.c
@@ -1532,25 +1532,28 @@ static ldl_status handle_signalling(ldl_handle_t *handle, ldl_session_t *dlsessi
                switch(signal) {
                case LDL_SIGNAL_PRESENCE_IN:
                        if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) {
-                               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", profile->login);
-                               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", from);
-                               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", subject);
-                               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "show", msg);
+                               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", "jingle");
+                               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", profile->login);
+                               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s", from);
+                               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "%s", subject);
+                               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "show", "%s", msg);
                                switch_event_fire(&event);
                        }
                        break;
                case LDL_SIGNAL_PRESENCE_OUT:
                        if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_OUT) == SWITCH_STATUS_SUCCESS) {
-                               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", profile->login);
-                               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", from);
+                               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", "jingle");
+                               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", profile->login);
+                               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s", from);
                                switch_event_fire(&event);
                        }
                        break;
                case LDL_SIGNAL_MSG:
                        if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) {
-                               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", profile->login);
-                               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", from);
-                               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "subject", subject);
+                               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", "jingle");
+                               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", profile->login);
+                               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s", from);
+                               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "subject", "%s", subject);
                                if (msg) {
                                        switch_event_add_body(event, msg);
                                }
@@ -1564,19 +1567,19 @@ static ldl_status handle_signalling(ldl_handle_t *handle, ldl_session_t *dlsessi
                        break;
                case LDL_SIGNAL_LOGIN_SUCCESS:
                        if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, DL_EVENT_LOGIN_SUCCESS) == SWITCH_STATUS_SUCCESS) {
-                               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", profile->login);
+                               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", profile->login);
                                switch_event_fire(&event);
                        }
                        break;
                case LDL_SIGNAL_LOGIN_FAILURE:
                        if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, DL_EVENT_LOGIN_FAILURE) == SWITCH_STATUS_SUCCESS) {
-                               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", profile->login);
+                               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", profile->login);
                                switch_event_fire(&event);
                        }
                        break;
                case LDL_SIGNAL_CONNECTED:
                        if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, DL_EVENT_CONNECTED) == SWITCH_STATUS_SUCCESS) {
-                               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", profile->login);
+                               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", profile->login);
                                switch_event_fire(&event);
                        }
                        break;
@@ -1660,9 +1663,10 @@ static ldl_status handle_signalling(ldl_handle_t *handle, ldl_session_t *dlsessi
                }
 
                if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) {
-                       switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", profile->login);
-                       switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", from);
-                       switch_event_add_header(event, SWITCH_STACK_BOTTOM, "subject", subject);
+                       switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", "jingle");
+                       switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", profile->login);
+                       switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s", from);
+                       switch_event_add_header(event, SWITCH_STACK_BOTTOM, "subject", "%s", subject);
                        if (msg) {
                                switch_event_add_body(event, msg);
                        }

diff --git a/src/switch_ivr.c b/src/switch_ivr.c
index 318bfa7977cc0924d36e23ca2a318e6146c67291..3ac56d7e6d514008bd368a75f1646aa6e9680fd0 100644 (file)
--- a/src/switch_ivr.c
+++ b/src/switch_ivr.c
@@ -1968,7 +1968,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
                while ((!caller_channel || switch_channel_ready(caller_channel)) && 
                           check_channel_status(peer_channels, peer_sessions, and_argc, &idx, file, key) && ((time(NULL) - start) < (time_t)timelimit_sec)) {
 
-                       if (or_argc == 1 && and_argc == 1) { /* when there is only 1 channel to call and bridge */
+                       if (session && or_argc == 1 && and_argc == 1) { /* when there is only 1 channel to call and bridge */
                                switch_core_session_message_t *message = NULL;
                                if (switch_core_session_dequeue_message(peer_sessions[0], &message) == SWITCH_STATUS_SUCCESS) {
                                        switch_core_session_receive_message(session, message);