[svn-commits] pcadach: branch 1.4 r43635 - /branches/1.4/channels/h323/

[svn-commits at lists.digium.com]

Author: pcadach
Date: Mon Sep 25 16:26:12 2006
New Revision: 43635

URL: http://svn.digium.com/view/asterisk?rev=43635&view=rev
Log:
Fix ASN1 description of non-standard Cisco extensions

Modified:
    branches/1.4/channels/h323/cisco-h225.asn
    branches/1.4/channels/h323/cisco-h225.cxx
    branches/1.4/channels/h323/cisco-h225.h

Modified: branches/1.4/channels/h323/cisco-h225.asn
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/h323/cisco-h225.asn?rev=43635&r1=43634&r2=43635&view=diff
==============================================================================
--- branches/1.4/channels/h323/cisco-h225.asn (original)
+++ branches/1.4/channels/h323/cisco-h225.asn Mon Sep 25 16:26:12 2006
@@ -7,8 +7,8 @@
 	protoParam ProtoParam OPTIONAL,
 	commonParam CommonParam OPTIONAL,
 	...,
+	dummy1 OCTET STRING OPTIONAL,
 	progIndParam ProgIndParam OPTIONAL,
-	dummy1 OCTET STRING OPTIONAL,
 	callMgrParam CallMgrParam OPTIONAL,
 	callSignallingParam CallSignallingParam OPTIONAL,
 	dummy2 OCTET STRING OPTIONAL,

Modified: branches/1.4/channels/h323/cisco-h225.cxx
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/h323/cisco-h225.cxx?rev=43635&r1=43634&r2=43635&view=diff
==============================================================================
--- branches/1.4/channels/h323/cisco-h225.cxx (original)
+++ branches/1.4/channels/h323/cisco-h225.cxx Mon Sep 25 16:26:12 2006
@@ -739,10 +739,10 @@
     strm << setw(indent+13) << "protoParam = " << setprecision(indent) << m_protoParam << '\n';
   if (HasOptionalField(e_commonParam))
     strm << setw(indent+14) << "commonParam = " << setprecision(indent) << m_commonParam << '\n';
+  if (HasOptionalField(e_dummy1))
+    strm << setw(indent+9) << "dummy1 = " << setprecision(indent) << m_dummy1 << '\n';
   if (HasOptionalField(e_progIndParam))
     strm << setw(indent+15) << "progIndParam = " << setprecision(indent) << m_progIndParam << '\n';
-  if (HasOptionalField(e_dummy1))
-    strm << setw(indent+9) << "dummy1 = " << setprecision(indent) << m_dummy1 << '\n';
   if (HasOptionalField(e_callMgrParam))
     strm << setw(indent+15) << "callMgrParam = " << setprecision(indent) << m_callMgrParam << '\n';
   if (HasOptionalField(e_callSignallingParam))
@@ -800,9 +800,9 @@
     return FALSE;
   if (HasOptionalField(e_commonParam) && !m_commonParam.Decode(strm))
     return FALSE;
+  if (!KnownExtensionDecode(strm, e_dummy1, m_dummy1))
+    return FALSE;
   if (!KnownExtensionDecode(strm, e_progIndParam, m_progIndParam))
-    return FALSE;
-  if (!KnownExtensionDecode(strm, e_dummy1, m_dummy1))
     return FALSE;
   if (!KnownExtensionDecode(strm, e_callMgrParam, m_callMgrParam))
     return FALSE;
@@ -827,8 +827,8 @@
     m_protoParam.Encode(strm);
   if (HasOptionalField(e_commonParam))
     m_commonParam.Encode(strm);
+  KnownExtensionEncode(strm, e_dummy1, m_dummy1);
   KnownExtensionEncode(strm, e_progIndParam, m_progIndParam);
-  KnownExtensionEncode(strm, e_dummy1, m_dummy1);
   KnownExtensionEncode(strm, e_callMgrParam, m_callMgrParam);
   KnownExtensionEncode(strm, e_callSignallingParam, m_callSignallingParam);
   KnownExtensionEncode(strm, e_dummy2, m_dummy2);

Modified: branches/1.4/channels/h323/cisco-h225.h
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/h323/cisco-h225.h?rev=43635&r1=43634&r2=43635&view=diff
==============================================================================
--- branches/1.4/channels/h323/cisco-h225.h (original)
+++ branches/1.4/channels/h323/cisco-h225.h Mon Sep 25 16:26:12 2006
@@ -262,8 +262,8 @@
       e_version,
       e_protoParam,
       e_commonParam,
+      e_dummy1,
       e_progIndParam,
-      e_dummy1,
       e_callMgrParam,
       e_callSignallingParam,
       e_dummy2,
@@ -273,8 +273,8 @@
     PASN_Integer m_version;
     CISCO_H225_ProtoParam m_protoParam;
     CISCO_H225_CommonParam m_commonParam;
+    PASN_OctetString m_dummy1;
     CISCO_H225_ProgIndParam m_progIndParam;
-    PASN_OctetString m_dummy1;
     CISCO_H225_CallMgrParam m_callMgrParam;
     CISCO_H225_CallSignallingParam m_callSignallingParam;
     PASN_OctetString m_dummy2;