Merged revisions 206939 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r206939 | dvossel | 2009-07-17 11:13:22 -0500 (Fri, 17 Jul 2009) | 20 lines

  Merged revisions 206938 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r206938 | dvossel | 2009-07-17 11:05:06 -0500 (Fri, 17 Jul 2009) | 14 lines

    SIP incorrect From: header information when callpres is prohib

    Some ITSP make use of the "Anonymous" display name to detect a
    requirement to withhold caller id across the PSTN. This does
    not work if the display name is "Unknown".

    (closes issue #14465)
    Reported by: Nick_Lewis
    Patches:
          chan_sip.c-callerpres.patch uploaded by Nick (license 657)
          chan_sip.c-callerpres_trunk.patch uploaded by dvossel (license 671)
    Tested by: Nick_Lewis, dvossel
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@206941 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 502d395a98e704292f8bb05ceb1a929f4eb4a800..53d448a05e17e0e6436846d958dd7dcfdc27266e 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -247,7 +247,8 @@ static int default_expiry = DEFAULT_DEFAULT_EXPIRY;
 #define MAX(a,b) ((a) > (b) ? (a) : (b))
 #endif
 
-#define CALLERID_UNKNOWN        "Unknown"
+#define CALLERID_UNKNOWN             "Anonymous"
+#define FROMDOMAIN_INVALID           "anonymous.invalid"
 
 #define DEFAULT_MAXMS                2000             /*!< Qualification: Must be faster than 2 seconds by default */
 #define DEFAULT_QUALIFYFREQ          60 * 1000        /*!< Qualification: How often to check for the host to be up */
@@ -9575,6 +9576,7 @@ static void initreqprep(struct sip_request *req, struct sip_pvt *p, int sipmetho
        char tmp_l[SIPBUFSIZE/2];       /* build a local copy of 'l' if needed */
        const char *l = NULL;   /* XXX what is this, exactly ? */
        const char *n = NULL;   /* XXX what is this, exactly ? */
+       const char *d = NULL;   /* domain in from header */
        const char *urioptions = "";
        int ourport;
 
@@ -9600,6 +9602,7 @@ static void initreqprep(struct sip_request *req, struct sip_pvt *p, int sipmetho
 
        snprintf(p->lastmsg, sizeof(p->lastmsg), "Init: %s", sip_methods[sipmethod].text);
 
+       d = S_OR(p->fromdomain, ast_inet_ntoa(p->ourip.sin_addr));
        if (p->owner) {
                l = p->owner->cid.cid_num;
                n = p->owner->cid.cid_name;
@@ -9609,6 +9612,7 @@ static void initreqprep(struct sip_request *req, struct sip_pvt *p, int sipmetho
            ((p->callingpres & AST_PRES_RESTRICTION) != AST_PRES_ALLOWED)) {
                l = CALLERID_UNKNOWN;
                n = l;
+               d = FROMDOMAIN_INVALID;
        }
        if (ast_strlen_zero(l))
                l = default_callerid;
@@ -9635,9 +9639,9 @@ static void initreqprep(struct sip_request *req, struct sip_pvt *p, int sipmetho
 
        ourport = ntohs(p->ourip.sin_port);
        if (!sip_standard_port(p->socket.type, ourport) && ast_strlen_zero(p->fromdomain))
-               snprintf(from, sizeof(from), "\"%s\" <sip:%s@%s:%d>;tag=%s", n, l, ast_inet_ntoa(p->ourip.sin_addr), ourport, p->tag);
+               snprintf(from, sizeof(from), "\"%s\" <sip:%s@%s:%d>;tag=%s", n, l, d, ourport, p->tag);
        else
-               snprintf(from, sizeof(from), "\"%s\" <sip:%s@%s>;tag=%s", n, l, S_OR(p->fromdomain, ast_inet_ntoa(p->ourip.sin_addr)), p->tag);
+               snprintf(from, sizeof(from), "\"%s\" <sip:%s@%s>;tag=%s", n, l, d, p->tag);
 
        /* If we're calling a registered SIP peer, use the fullcontact to dial to the peer */
        if (!ast_strlen_zero(p->fullcontact)) {