From: Tilghman Lesher Date: Tue, 21 Sep 2010 15:27:10 +0000 (+0000) Subject: Merged revisions 287893 via svnmerge from X-Git-Tag: 11.0.0-beta1~2298 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9b4cfb0d28156f5aaca019a4d1cd97bcd6cf5820;p=thirdparty%2Fasterisk.git 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 ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@287894 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 6b4e281c9d..31bfc1dead 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -10058,7 +10058,7 @@ static int add_rpid(struct sip_request *req, struct sip_pvt *p) const char *fromdomain; const char *privacy = NULL; const char *screen = NULL; - const char *anonymous_string = "\"Anonymous\" "; + const char *anonymous_string = "\"Anonymous\" "; if (!ast_test_flag(&p->flags[0], SIP_SENDRPID)) { return 0; @@ -14018,7 +14018,7 @@ static int get_pai(struct sip_pvt *p, struct sip_request *req) return 0; } *end++ = '\0'; - if (!strncasecmp(uri, "anonymous@anonymous.invalid", 27)) { + if (!strncasecmp(uri, "sip:anonymous@anonymous.invalid", 31)) { callingpres = AST_PRES_PROHIB_USER_NUMBER_NOT_SCREENED; /*XXX Assume no change in cid_num. Perhaps it should be * blanked?