diff options
| author | pcadach <pcadach@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-25 21:26:12 +0000 |
|---|---|---|
| committer | pcadach <pcadach@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-25 21:26:12 +0000 |
| commit | 7137e5ccf083a0d3285ce401b562dc993b500722 (patch) | |
| tree | afc0c484e1294ed514769656d1f2966ab157cfca /channels/h323 | |
| parent | b4084dbed600221e0a9f67126630e61e37d71c70 (diff) | |
Fix ASN1 description of non-standard Cisco extensions
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@43635 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/h323')
| -rw-r--r-- | channels/h323/cisco-h225.asn | 2 | ||||
| -rw-r--r-- | channels/h323/cisco-h225.cxx | 10 | ||||
| -rw-r--r-- | channels/h323/cisco-h225.h | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/channels/h323/cisco-h225.asn b/channels/h323/cisco-h225.asn index c0eaeb623..1372e67d5 100644 --- a/channels/h323/cisco-h225.asn +++ b/channels/h323/cisco-h225.asn @@ -7,8 +7,8 @@ H323_UU_NonStdInfo ::= SEQUENCE protoParam ProtoParam OPTIONAL, commonParam CommonParam OPTIONAL, ..., - progIndParam ProgIndParam OPTIONAL, dummy1 OCTET STRING OPTIONAL, + progIndParam ProgIndParam OPTIONAL, callMgrParam CallMgrParam OPTIONAL, callSignallingParam CallSignallingParam OPTIONAL, dummy2 OCTET STRING OPTIONAL, diff --git a/channels/h323/cisco-h225.cxx b/channels/h323/cisco-h225.cxx index 1b52f4ca0..37adc4e87 100644 --- a/channels/h323/cisco-h225.cxx +++ b/channels/h323/cisco-h225.cxx @@ -739,10 +739,10 @@ void CISCO_H225_H323_UU_NonStdInfo::PrintOn(ostream & strm) const 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_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_progIndParam)) + strm << setw(indent+15) << "progIndParam = " << setprecision(indent) << m_progIndParam << '\n'; if (HasOptionalField(e_callMgrParam)) strm << setw(indent+15) << "callMgrParam = " << setprecision(indent) << m_callMgrParam << '\n'; if (HasOptionalField(e_callSignallingParam)) @@ -800,10 +800,10 @@ BOOL CISCO_H225_H323_UU_NonStdInfo::Decode(PASN_Stream & strm) return FALSE; if (HasOptionalField(e_commonParam) && !m_commonParam.Decode(strm)) return FALSE; - if (!KnownExtensionDecode(strm, e_progIndParam, m_progIndParam)) - return FALSE; if (!KnownExtensionDecode(strm, e_dummy1, m_dummy1)) return FALSE; + if (!KnownExtensionDecode(strm, e_progIndParam, m_progIndParam)) + return FALSE; if (!KnownExtensionDecode(strm, e_callMgrParam, m_callMgrParam)) return FALSE; if (!KnownExtensionDecode(strm, e_callSignallingParam, m_callSignallingParam)) @@ -827,8 +827,8 @@ void CISCO_H225_H323_UU_NonStdInfo::Encode(PASN_Stream & strm) const m_protoParam.Encode(strm); if (HasOptionalField(e_commonParam)) m_commonParam.Encode(strm); - KnownExtensionEncode(strm, e_progIndParam, m_progIndParam); KnownExtensionEncode(strm, e_dummy1, m_dummy1); + KnownExtensionEncode(strm, e_progIndParam, m_progIndParam); KnownExtensionEncode(strm, e_callMgrParam, m_callMgrParam); KnownExtensionEncode(strm, e_callSignallingParam, m_callSignallingParam); KnownExtensionEncode(strm, e_dummy2, m_dummy2); diff --git a/channels/h323/cisco-h225.h b/channels/h323/cisco-h225.h index db4e0af0b..7595b4b65 100644 --- a/channels/h323/cisco-h225.h +++ b/channels/h323/cisco-h225.h @@ -262,8 +262,8 @@ class CISCO_H225_H323_UU_NonStdInfo : public PASN_Sequence e_version, e_protoParam, e_commonParam, - e_progIndParam, e_dummy1, + e_progIndParam, e_callMgrParam, e_callSignallingParam, e_dummy2, @@ -273,8 +273,8 @@ class CISCO_H225_H323_UU_NonStdInfo : public PASN_Sequence PASN_Integer m_version; CISCO_H225_ProtoParam m_protoParam; CISCO_H225_CommonParam m_commonParam; - CISCO_H225_ProgIndParam m_progIndParam; PASN_OctetString m_dummy1; + CISCO_H225_ProgIndParam m_progIndParam; CISCO_H225_CallMgrParam m_callMgrParam; CISCO_H225_CallSignallingParam m_callSignallingParam; PASN_OctetString m_dummy2; |