[asterisk-commits] tilghman: trunk r287894 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue Sep 21 10:27:10 2010
New Revision: 287894

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=287894
Log:
Merged revisions 287893 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r287893 | tilghman | 2010-09-21 10:24:47 -0500 (Tue, 21 Sep 2010) | 9 lines
  
  Anonymous callerid needs a "sip:" uri prefix.
  
  (closes issue #17981)
   Reported by: avalentin
   Patches: 
         sip-anonymous-aastra.patch uploaded by avalentin (license 1107)
         (plus an additional fix by me)
   Tested by: avalentin
........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=287894&r1=287893&r2=287894
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Tue Sep 21 10:27:10 2010
@@ -10058,7 +10058,7 @@
 	const char *fromdomain;
 	const char *privacy = NULL;
 	const char *screen = NULL;
-	const char *anonymous_string = "\"Anonymous\" <anonymous at anonymous.invalid>";
+	const char *anonymous_string = "\"Anonymous\" <sip:anonymous at anonymous.invalid>";
 
 	if (!ast_test_flag(&p->flags[0], SIP_SENDRPID)) {
 		return 0;
@@ -14018,7 +14018,7 @@
 		return 0;
 	}
 	*end++ = '\0';
-	if (!strncasecmp(uri, "anonymous at anonymous.invalid", 27)) {
+	if (!strncasecmp(uri, "sip:anonymous at anonymous.invalid", 31)) {
 		callingpres = AST_PRES_PROHIB_USER_NUMBER_NOT_SCREENED;
 		/*XXX Assume no change in cid_num. Perhaps it should be
 		 * blanked?