Merged revisions 103823 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r103823 | file | 2008-02-19 16:28:08 -0400 (Tue, 19 Feb 2008) | 6 lines

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/trunk@103824 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/h323/ast_h323.cxx

@@ -731,7 +731,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);
@@ -1260,7 +1261,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());