From 749f1e1963817135701a6290efd09756cbddd868 Mon Sep 17 00:00:00 2001
From: Joshua Colp <jcolp@digium.com>
Date: Tue, 19 Feb 2008 20:28:08 +0000
Subject: [PATCH] Send CallerID Name in setup message. (closes issue #11241)
 Reported by: tusar Patches:       h323id_as_callerid_name.patch uploaded by
 tusar (license 344)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@103823 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 channels/h323/ast_h323.cxx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/channels/h323/ast_h323.cxx b/channels/h323/ast_h323.cxx
index f037a88872..83c1a8464f 100644
--- a/channels/h323/ast_h323.cxx
+++ b/channels/h323/ast_h323.cxx
@@ -718,7 +718,8 @@ void MyH323Connection::SetCallOptions(void *o, BOOL isIncoming)
 		fastStartState = (opts->fastStart ? FastStartInitiate : FastStartDisabled);
 		h245Tunneling = (opts->h245Tunneling ? TRUE : FALSE);
 	} else {
-		SetLocalPartyName(PString(opts->cid_num));
+		sourceE164 = PString(opts->cid_num);
+		SetLocalPartyName(PString(opts->cid_name));
 		SetDisplayName(PString(opts->cid_name));
 		if (opts->redirect_reason >= 0) {
 			rdnis = PString(opts->cid_rdnis);
@@ -1247,7 +1248,7 @@ BOOL MyH323Connection::OnSendSignalSetup(H323SignalPDU & setupPDU)
 	/* OpenH323 will build calling party information with default
 	   type and presentation information, so build it to be recorded
 	   by embedding routines */
-	setupPDU.GetQ931().SetCallingPartyNumber(GetLocalPartyName(), (cid_ton >> 4) & 0x07,
+	setupPDU.GetQ931().SetCallingPartyNumber(sourceE164, (cid_ton >> 4) & 0x07,
 			cid_ton & 0x0f, (cid_presentation >> 5) & 0x03, cid_presentation & 0x1f);
 	setupPDU.GetQ931().SetDisplayName(GetDisplayName());