[Spce-user] NGCP-2.2.13_Proxy.cfg.tt2_Caller-ID_Name_Patch

[Skyler]

Hi,

 This fix is for the caller name display. Its diffed from the latest
proxy.cfg.tt2 2.2.13 release.

 This also includes the fix for reminder calls being displayed as
'asterisk' which happens as a result of allowing name display after the
recent 2.2.13 reminder patch.


--Skyler



*** proxy.cfg.tt2       2011-09-06 13:21:07.000000000 -0400
--- proxy.cfg.customtt.tt2      2011-09-07 09:57:14.000000000 -0400
***************
*** 725,731 ****
                if(subst_uri('/^sip:(.+)__AT__(.+)@.+$/sip:\1@\2/'))
                  {
                          xlog("L_INFO", "Replaced reminder uri and to -
M=$rm R=$ru F=$fu T=$tu IP=$avp(s:ip):$avp(s:port) ($si:$sp) ID=$ci\n");
!                 }
                $(avp(s:tmp)[*]) = 0;
                $var(fU) = $fU;
                xlog("L_INFO", "Voicebox caller is '$var(fU)' - M=$rm R=
$ru F=$fu T=$tu IP=$avp(s:ip):$avp(s:port) ($si:$sp) ID=$ci\n");
--- 725,732 ----
                if(subst_uri('/^sip:(.+)__AT__(.+)@.+$/sip:\1@\2/'))
                  {
                          xlog("L_INFO", "Replaced reminder uri and to -
M=$rm R=$ru F=$fu T=$tu IP=$avp(s:ip):$avp(s:port) ($si:$sp) ID=$ci\n");
!                       uac_replace_from("[% reminder.sip_fromuser %
]","");
!               }
                $(avp(s:tmp)[*]) = 0;
                $var(fU) = $fU;
                xlog("L_INFO", "Voicebox caller is '$var(fU)' - M=$rm R=
$ru F=$fu T=$tu IP=$avp(s:ip):$avp(s:port) ($si:$sp) ID=$ci\n");
***************
*** 2154,2161 ****
                          {
                                remove_hf("P-Asserted-Identity");
                          }
-                       append_hf("P-Asserted-Identity: <
$var(caller_cli_uri)>\r\n");
-                       uac_replace_from("$var(caller_cli)",
"$var(caller_cli_uri)");
                }
                else if($var(to_pstn) == 1 || $avp(s:to_voicebox) == 1)
                {
--- 2155,2160 ----
***************
*** 2201,2211 ****
                                uac_replace_from("Anonymous",
"$var(caller_cli_uri)");
                                append_hf("Privacy: id\r\n");
                        }
-                       else
-                       {
-                               xlog("L_INFO", "Setting From to
'$var(caller_cli_uri)' - M=$rm R=$ru F=$fu T=$tu IP=$avp(s:ip):
$avp(s:port) ($si:$sp) ID=$ci\n");
-                               uac_replace_from("$var(caller_cli)",
"$var(caller_cli_uri)");
-                       }
                }
        }

--- 2200,2205 ----