From: Mark Spencer <markster@digium.com>
Date: Wed, 12 Oct 2005 05:12:43 +0000 (+0000)
Subject: Don't override calling presentation if *name* is present (bug #5405)
X-Git-Tag: 1.2.0-beta2~173
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4d9210f70553ae1ce56e95ee81bdca2035b003a7;p=thirdparty%2Fasterisk.git

Don't override calling presentation if *name* is present (bug #5405)


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

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 371a8a8e10..4dae850b8f 100755
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -2909,7 +2909,10 @@ static int iax2_call(struct ast_channel *c, char *dest, int timeout)
 		iax_ie_append_str(&ied, IAX_IE_CALLING_NUMBER, l);
 		iax_ie_append_byte(&ied, IAX_IE_CALLINGPRES, c->cid.cid_pres);
 	} else {
-		iax_ie_append_byte(&ied, IAX_IE_CALLINGPRES, AST_PRES_NUMBER_NOT_AVAILABLE);
+		if (n)
+			iax_ie_append_byte(&ied, IAX_IE_CALLINGPRES, c->cid.cid_pres);
+		else
+			iax_ie_append_byte(&ied, IAX_IE_CALLINGPRES, AST_PRES_NUMBER_NOT_AVAILABLE);
 	}
 
 	iax_ie_append_byte(&ied, IAX_IE_CALLINGTON, c->cid.cid_ton);