missed a spot

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

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c
index adbfeef7e4f41010d85fd2195ef4e95fd9c37cfd..df6b42fab48fdd360206a75d03dd22625f3541fa 100644 (file)
--- a/src/mod/endpoints/mod_sofia/mod_sofia.c
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.c
@@ -182,14 +182,14 @@ char *generate_pai_str(switch_core_session_t *session)
        const char *ua = switch_channel_get_variable(tech_pvt->channel, "sip_user_agent");
        char *pai = NULL;
 
-       if (!(callee_name = switch_channel_get_variable(tech_pvt->channel, "sip_callee_id_name"))) {
+       if (zstr((callee_name = switch_channel_get_variable(tech_pvt->channel, "effective_callee_id_name"))) &&
+               zstr((callee_name = switch_channel_get_variable(tech_pvt->channel, "sip_callee_id_name")))) {
                callee_name = switch_channel_get_variable(tech_pvt->channel, "callee_id_name");
        }
 
-       if (zstr((callee_number = switch_channel_get_variable(tech_pvt->channel, "sip_callee_id_number")))) {
-               if (zstr((callee_number = switch_channel_get_variable(tech_pvt->channel, "callee_id_number")))) {
-                       callee_number = tech_pvt->caller_profile->destination_number;
-               }
+       if (zstr((callee_number = switch_channel_get_variable(tech_pvt->channel, "origination_callee_id_number"))) &&
+               zstr((callee_number = switch_channel_get_variable(tech_pvt->channel, "sip_callee_id_number")))) {
+               callee_number = tech_pvt->caller_profile->destination_number;
        }
 
        if (zstr(callee_name) && !zstr(callee_number)) {