[svn-commits] file: trunk r103824 - in /trunk: ./ channels/h323/ast_h323.cxx

[SVN commits to the Digium repositories]

Author: file
Date: Tue Feb 19 14:31:15 2008
New Revision: 103824

URL: http://svn.digium.com/view/asterisk?view=rev&rev=103824
Log:
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)

........

Modified:
    trunk/   (props changed)
    trunk/channels/h323/ast_h323.cxx

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/h323/ast_h323.cxx
URL: http://svn.digium.com/view/asterisk/trunk/channels/h323/ast_h323.cxx?view=diff&rev=103824&r1=103823&r2=103824
==============================================================================
--- trunk/channels/h323/ast_h323.cxx (original)
+++ trunk/channels/h323/ast_h323.cxx Tue Feb 19 14:31:15 2008
@@ -731,7 +731,8 @@
 		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 @@
 	/* 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());