[asterisk-commits] pcadach: trunk r44044 - in /trunk: ./ channels/h323/ast_h323.cxx

[asterisk-commits at lists.digium.com]

Author: pcadach
Date: Fri Sep 29 16:13:46 2006
New Revision: 44044

URL: http://svn.digium.com/view/asterisk?rev=44044&view=rev
Log:
Merged revisions 44034,44042-44043 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r44034 | pcadach | 2006-09-30 02:43:13 +0600 (Сбт, 30 Сен 2006) | 1 line

Fake display name by called number on incoming calls (until passing connected number/connected name is not implemented)
........
r44042 | pcadach | 2006-09-30 03:05:43 +0600 (Сбт, 30 Сен 2006) | 1 line

Set TON/PRESENTATION information more carefully when no CallingNumber IE available
........
r44043 | pcadach | 2006-09-30 03:09:10 +0600 (Сбт, 30 Сен 2006) | 1 line

Compile first, please
........

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=44044&r1=44043&r2=44044&view=diff
==============================================================================
--- trunk/channels/h323/ast_h323.cxx (original)
+++ trunk/channels/h323/ast_h323.cxx Fri Sep 29 16:13:46 2006
@@ -774,6 +774,16 @@
 			/* Construct fields back */
 			cd->type_of_number = (type << 4) | screening;
 			cd->presentation = (presentation << 5) | screening;
+		} else if (cd->call_source_e164[0]) {
+			cd->type_of_number = 0;		/* UNKNOWN */
+			cd->presentation = 0x03;	/* ALLOWED NETWORK NUMBER - Default */
+			if (setupPDU.GetQ931().HasIE(Q931::UserUserIE)) {
+				const H225_Setup_UUIE &setup_uuie = setupPDU.m_h323_uu_pdu.m_h323_message_body;
+				if (setup_uuie.HasOptionalField(H225_Setup_UUIE::e_presentationIndicator))
+					cd->presentation = (cd->presentation & 0x9f) | (((unsigned int)setup_uuie.m_presentationIndicator.GetTag()) << 5);
+				if (setup_uuie.HasOptionalField(H225_Setup_UUIE::e_screeningIndicator))
+					cd->presentation = (cd->presentation & 0xe0) | (((unsigned int)setup_uuie.m_screeningIndicator.GetValue()) & 0x1f);
+			}
 		} else {
 			cd->type_of_number = 0;		/* UNKNOWN */
 			cd->presentation = 0x43;	/* NUMBER NOT AVAILABLE */
@@ -791,6 +801,8 @@
 		}
 		else
 			cd->redirect_reason = -1;
+
+		SetDisplayName(cd->call_dest_e164);
 	}
 
 	/* Convert complex strings */