part 2 of other cid patch

diff --git a/src/include/switch_channel.h b/src/include/switch_channel.h
index 14706d441ae03b0051bcdb71ac714028c2b5e32d..4eac1643b8506cb26ae0ace07763c2cb7eb30189 100644 (file)
--- a/src/include/switch_channel.h
+++ b/src/include/switch_channel.h
@@ -603,6 +603,7 @@ SWITCH_DECLARE(void) switch_channel_event_set_extended_data(_In_ switch_channel_
 SWITCH_DECLARE(char *) switch_channel_expand_variables_check(switch_channel_t *channel, const char *in, switch_event_t *var_list, switch_event_t *api_list, uint32_t recur);
 #define switch_channel_expand_variables(_channel, _in) switch_channel_expand_variables_check(_channel, _in, NULL, NULL, 0)
 
+#define switch_channel_inbound_display(_channel) (switch_channel_direction(_channel) == SWITCH_CALL_DIRECTION_INBOUND || switch_channel_test_flag(_channel, CF_DIALPLAN))
 
 SWITCH_DECLARE(char *) switch_channel_build_param_string(_In_ switch_channel_t *channel, _In_opt_ switch_caller_profile_t *caller_profile,
                                                                                                                 _In_opt_ const char *prefix);

diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index 4f30bb334fd56c4b35c456ba6961a8a7944433fa..42593e40505d1476de3820db8a29d95f8efea735 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -787,20 +787,38 @@ void sofia_send_callee_id(switch_core_session_t *session, const char *name, cons
        switch_caller_profile_t *caller_profile = switch_channel_get_caller_profile(channel);
 
 
-       if (zstr(name)) {
-               name = caller_profile->callee_id_name;
-       }
-
-       if (zstr(number)) {
-               number = caller_profile->callee_id_number;
-       }
-
-       if (zstr(name)) {
-               name = number;
-       }
-
-       if (zstr(number)) {
-               number = caller_profile->destination_number;
+       if (switch_channel_inbound_display(channel)) {
+               if (zstr(name)) {
+                       name = caller_profile->caller_id_name;
+               }
+               
+               if (zstr(number)) {
+                       number = caller_profile->caller_id_number;
+               }
+               
+               if (zstr(name)) {
+                       name = number;
+               }
+               
+               if (zstr(number)) {
+                       name = number = "UNKNOWN";
+               }
+       } else {
+               if (zstr(name)) {
+                       name = caller_profile->callee_id_name;
+               }
+               
+               if (zstr(number)) {
+                       number = caller_profile->callee_id_number;
+               }
+               
+               if (zstr(name)) {
+                       name = number;
+               }
+               
+               if (zstr(number)) {
+                       number = caller_profile->destination_number;
+               }
        }
 
        if ((uuid = switch_channel_get_partner_uuid(channel)) && (session_b = switch_core_session_locate(uuid))) {
@@ -843,7 +861,7 @@ void sofia_update_callee_id(switch_core_session_t *session, sofia_profile_t *pro
        }
 
 
-       if (switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_INBOUND) {
+       if (switch_channel_inbound_display(channel)) {
                name_var = "caller_id_name";
                num_var = "caller_id_number";
                ename_var = "effective_caller_id_name";
@@ -935,7 +953,7 @@ void sofia_update_callee_id(switch_core_session_t *session, sofia_profile_t *pro
 
        caller_profile = switch_channel_get_caller_profile(channel);
 
-       if (switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_INBOUND) {
+       if (switch_channel_inbound_display(channel)) {
 
                if (!strcmp(caller_profile->caller_id_name, name) && !strcmp(caller_profile->caller_id_number, number)) {
                        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "%s Same Caller ID \"%s\" <%s>\n", switch_channel_get_name(channel), name, number);