From 410b6ebd1fe6a1e64b88434a0bbf177d93c3ce72 Mon Sep 17 00:00:00 2001 From: Brian West Date: Fri, 23 Oct 2009 15:50:51 +0000 Subject: [PATCH] tweak to display stuff git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15210 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/mod/endpoints/mod_sofia/mod_sofia.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c index 27de205de0..2f2cca3788 100644 --- a/src/mod/endpoints/mod_sofia/mod_sofia.c +++ b/src/mod/endpoints/mod_sofia/mod_sofia.c @@ -185,13 +185,17 @@ char *generate_pai_str(switch_core_session_t *session) callee_name = switch_channel_get_variable(tech_pvt->channel, "callee_id_name"); } - if (!(callee_number = switch_channel_get_variable(tech_pvt->channel, "sip_callee_id_number"))) { - if (!(callee_number = switch_channel_get_variable(tech_pvt->channel, "callee_id_number"))) { + if (switch_strlen_zero((callee_number = switch_channel_get_variable(tech_pvt->channel, "sip_callee_id_number")))) { + if (switch_strlen_zero((callee_number = switch_channel_get_variable(tech_pvt->channel, "callee_id_number")))) { callee_number = tech_pvt->caller_profile->destination_number; } } - if (callee_name && callee_number) { + if (switch_strlen_zero(callee_name) && !switch_strlen_zero(callee_number)) { + callee_name = callee_number; + } + + if (!switch_strlen_zero(callee_name) && !switch_strlen_zero(callee_number)) { pai = switch_core_session_sprintf(tech_pvt->session, "P-Asserted-Identity: \"%s\" <%s>\nX-FS-Display-Name: %s\nX-FS-Display-Number: %s\n", callee_name, callee_number, callee_name, callee_number); }