Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv9377/channels
Modified Files:
chan_sip.c
Log Message:
don't replace CLID/CNAM when RPID is being generated (issue #5301)
Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.870
retrieving revision 1.871
diff -u -d -r1.870 -r1.871
--- chan_sip.c 28 Sep 2005 23:10:13 -0000 1.870
+++ chan_sip.c 29 Sep 2005 03:12:46 -0000 1.871
@@ -4630,8 +4630,8 @@
}
if (!l || (!ast_isphonenumber(l) && default_callerid[0]))
l = default_callerid;
- /* if user want's his callerid restricted */
- if ((p->callingpres & AST_PRES_RESTRICTION) != AST_PRES_ALLOWED) {
+ /* if we are not sending RPID and user wants his callerid restricted */
+ if (!ast_test_flag(p, SIP_SENDRPID) && ((p->callingpres &
AST_PRES_RESTRICTION) != AST_PRES_ALLOWED)) {
l = CALLERID_UNKNOWN;
n = l;
}
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
