[svn-commits] pcadach: trunk r44287 - in /trunk: ./ channels/h323/ast_h323.cxx

[svn-commits at lists.digium.com]

Author: pcadach
Date: Tue Oct  3 13:47:38 2006
New Revision: 44287

URL: http://svn.digium.com/view/asterisk?rev=44287&view=rev
Log:
Merged revisions 44283,44286 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r44283 | pcadach | 2006-10-04 00:30:48 +0600 (Срд, 04 Окт 2006) | 1 line

Fix preparation of type and presentation of calling number
........
r44286 | pcadach | 2006-10-04 00:42:20 +0600 (Срд, 04 Окт 2006) | 1 line

Change default presentation indicator to "user provided not screened" if octet 3a missed in CallingPartyNumber IE
........

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?rev=44287&r1=44286&r2=44287&view=diff
==============================================================================
--- trunk/channels/h323/ast_h323.cxx (original)
+++ trunk/channels/h323/ast_h323.cxx Tue Oct  3 13:47:38 2006
@@ -770,9 +770,9 @@
 		unsigned plan, type, screening, presentation;
 
 		/* Fetch presentation and type information about calling party's number */
-		if (setupPDU.GetQ931().GetCallingPartyNumber(sourceName, &plan, &type, &presentation, &screening, 2, 3)) {
+		if (setupPDU.GetQ931().GetCallingPartyNumber(sourceName, &plan, &type, &presentation, &screening, 0, 0)) {
 			/* Construct fields back */
-			cd->type_of_number = (type << 4) | screening;
+			cd->type_of_number = (type << 4) | plan;
 			cd->presentation = (presentation << 5) | screening;
 		} else if (cd->call_source_e164[0]) {
 			cd->type_of_number = 0;		/* UNKNOWN */