Merged revisions 44283,44286 via svnmerge from
authorPaul Cadach <paul@odt.east.telecom.kz>
Tue, 3 Oct 2006 18:47:38 +0000 (18:47 +0000)
committerPaul Cadach <paul@odt.east.telecom.kz>
Tue, 3 Oct 2006 18:47:38 +0000 (18:47 +0000)
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
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44287 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/h323/ast_h323.cxx

index 21be3e6..f574482 100644 (file)
@@ -770,9 +770,9 @@ void MyH323Connection::SetCallDetails(void *callDetails, const H323SignalPDU &se
                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 */