call update

diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index 355a331c38de973b9515cec9ea2e82b13555911b..cf0234a5df2f87927987738fbb16277d6840b1b3 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -757,21 +757,18 @@ void sofia_update_callee_id(switch_core_session_t *session, sofia_profile_t *pro
                }
        }
 
+       if (send) {
 
-       if (switch_event_create(&event, SWITCH_EVENT_CALL_UPDATE) == SWITCH_STATUS_SUCCESS) {
-               const char *uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE);
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Direction", "RECV");
-               if (uuid) {
-                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Bridged-To", uuid);
+               if (switch_event_create(&event, SWITCH_EVENT_CALL_UPDATE) == SWITCH_STATUS_SUCCESS) {
+                       const char *uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE);
+                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Direction", "RECV");
+                       if (uuid) {
+                               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Bridged-To", uuid);
+                       }
+                       switch_channel_event_set_data(channel, event);
+                       switch_event_fire(&event);
                }
-               switch_channel_event_set_data(channel, event);
-               switch_event_fire(&event);
-       }
 
-
-
-
-       if (send) {
                sofia_send_callee_id(session, NULL, NULL);
        }
 

diff --git a/src/switch_core_sqldb.c b/src/switch_core_sqldb.c
index 9551606e55b491c132124625f17524c93278aa39..e296d86fcd47ed2df45127ce8a10c6a464d9887c 100644 (file)
--- a/src/switch_core_sqldb.c
+++ b/src/switch_core_sqldb.c
@@ -1293,12 +1293,14 @@ static void core_event_handler(switch_event_t *event)
        case SWITCH_EVENT_CALL_UPDATE:
                {
                        new_sql() = switch_mprintf("update channels set callee_name='%q',callee_num='%q',callee_direction='%q',"
-                                                                          "cid_name='%q',cid_num='%q' where uuid='%s' and hostname='%q'",
+                                                                          "cid_name='%q',cid_num='%q',callee_name='%q',callee_num='%q' where uuid='%s' and hostname='%q'",
                                                                           switch_event_get_header_nil(event, "caller-callee-id-name"),
                                                                           switch_event_get_header_nil(event, "caller-callee-id-number"),
                                                                           switch_event_get_header_nil(event, "direction"),
                                                                           switch_event_get_header_nil(event, "caller-caller-id-name"),
                                                                           switch_event_get_header_nil(event, "caller-caller-id-number"),
+                                                                          switch_event_get_header_nil(event, "caller-callee-id-name"),
+                                                                          switch_event_get_header_nil(event, "caller-callee-id-number"),
                                                                           switch_event_get_header_nil(event, "unique-id"), 
                                                                           switch_core_get_switchname());
                }
@@ -1337,12 +1339,14 @@ static void core_event_handler(switch_event_t *event)
                                break;
                        case CS_ROUTING:
                                if ((extra_cols = parse_presence_data_cols(event))) {
-                                       new_sql() = switch_mprintf("update channels set state='%s',cid_name='%q',cid_num='%q',"
+                                       new_sql() = switch_mprintf("update channels set state='%s',cid_name='%q',cid_num='%q',callee_name='%q',callee_num='%q',"
                                                                                           "ip_addr='%s',dest='%q',dialplan='%q',context='%q',presence_id='%q',presence_data='%q',%s "
                                                                                           "where uuid='%s' and hostname='%q'",
                                                                                           switch_event_get_header_nil(event, "channel-state"),
                                                                                           switch_event_get_header_nil(event, "caller-caller-id-name"),
                                                                                           switch_event_get_header_nil(event, "caller-caller-id-number"),
+                                                                                          switch_event_get_header_nil(event, "caller-callee-id-name"),
+                                                                                          switch_event_get_header_nil(event, "caller-callee-id-number"),
                                                                                           switch_event_get_header_nil(event, "caller-network-addr"),
                                                                                           switch_event_get_header_nil(event, "caller-destination-number"),
                                                                                           switch_event_get_header_nil(event, "caller-dialplan"),
@@ -1353,12 +1357,14 @@ static void core_event_handler(switch_event_t *event)
                                                                                           switch_event_get_header_nil(event, "unique-id"), switch_core_get_switchname());
                                        free(extra_cols);
                                } else {
-                                       new_sql() = switch_mprintf("update channels set state='%s',cid_name='%q',cid_num='%q',"
+                                       new_sql() = switch_mprintf("update channels set state='%s',cid_name='%q',cid_num='%q',callee_name='%q',callee_num='%q',"
                                                                                           "ip_addr='%s',dest='%q',dialplan='%q',context='%q',presence_id='%q',presence_data='%q' "
                                                                                           "where uuid='%s' and hostname='%q'",
                                                                                           switch_event_get_header_nil(event, "channel-state"),
                                                                                           switch_event_get_header_nil(event, "caller-caller-id-name"),
                                                                                           switch_event_get_header_nil(event, "caller-caller-id-number"),
+                                                                                          switch_event_get_header_nil(event, "caller-callee-id-name"),
+                                                                                          switch_event_get_header_nil(event, "caller-callee-id-number"),
                                                                                           switch_event_get_header_nil(event, "caller-network-addr"),
                                                                                           switch_event_get_header_nil(event, "caller-destination-number"),
                                                                                           switch_event_get_header_nil(event, "caller-dialplan"),