kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ASN1 description of non-standard Cisco extensions

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@43635 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Paul Cadach
2006-09-25 21:26:12 +00:00
parent b2b256eeef
commit f1018ee8bb
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
channels/h323/cisco-h225.asn
View File

@@ -7,8 +7,8 @@ H323_UU_NonStdInfo ::= SEQUENCE
protoParam ProtoParam OPTIONAL, protoParam ProtoParam OPTIONAL,
commonParam CommonParam OPTIONAL, commonParam CommonParam OPTIONAL,
..., ...,
progIndParam ProgIndParam OPTIONAL,
dummy1 OCTET STRING OPTIONAL, dummy1 OCTET STRING OPTIONAL,
progIndParam ProgIndParam OPTIONAL,
callMgrParam CallMgrParam OPTIONAL, callMgrParam CallMgrParam OPTIONAL,
callSignallingParam CallSignallingParam OPTIONAL, callSignallingParam CallSignallingParam OPTIONAL,
dummy2 OCTET STRING OPTIONAL, dummy2 OCTET STRING OPTIONAL,

10
channels/h323/cisco-h225.cxx
View File

@@ -739,10 +739,10 @@ void CISCO_H225_H323_UU_NonStdInfo::PrintOn(ostream & strm) const
strm << setw(indent+13) << "protoParam = " << setprecision(indent) << m_protoParam << '\n'; strm << setw(indent+13) << "protoParam = " << setprecision(indent) << m_protoParam << '\n';
if (HasOptionalField(e_commonParam)) if (HasOptionalField(e_commonParam))
strm << setw(indent+14) << "commonParam = " << setprecision(indent) << m_commonParam << '\n'; 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)) if (HasOptionalField(e_dummy1))
strm << setw(indent+9) << "dummy1 = " << setprecision(indent) << m_dummy1 << '\n'; 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)) if (HasOptionalField(e_callMgrParam))
strm << setw(indent+15) << "callMgrParam = " << setprecision(indent) << m_callMgrParam << '\n'; strm << setw(indent+15) << "callMgrParam = " << setprecision(indent) << m_callMgrParam << '\n';
if (HasOptionalField(e_callSignallingParam)) if (HasOptionalField(e_callSignallingParam))
@@ -800,10 +800,10 @@ BOOL CISCO_H225_H323_UU_NonStdInfo::Decode(PASN_Stream & strm)
return FALSE; return FALSE;
if (HasOptionalField(e_commonParam) && !m_commonParam.Decode(strm)) if (HasOptionalField(e_commonParam) && !m_commonParam.Decode(strm))
return FALSE; return FALSE;
if (!KnownExtensionDecode(strm, e_progIndParam, m_progIndParam))
return FALSE;
if (!KnownExtensionDecode(strm, e_dummy1, m_dummy1)) if (!KnownExtensionDecode(strm, e_dummy1, m_dummy1))
return FALSE; return FALSE;
if (!KnownExtensionDecode(strm, e_progIndParam, m_progIndParam))
return FALSE;
if (!KnownExtensionDecode(strm, e_callMgrParam, m_callMgrParam)) if (!KnownExtensionDecode(strm, e_callMgrParam, m_callMgrParam))
return FALSE; return FALSE;
if (!KnownExtensionDecode(strm, e_callSignallingParam, m_callSignallingParam)) 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); m_protoParam.Encode(strm);
if (HasOptionalField(e_commonParam)) if (HasOptionalField(e_commonParam))
m_commonParam.Encode(strm); m_commonParam.Encode(strm);
KnownExtensionEncode(strm, e_progIndParam, m_progIndParam);
KnownExtensionEncode(strm, e_dummy1, m_dummy1); KnownExtensionEncode(strm, e_dummy1, m_dummy1);
KnownExtensionEncode(strm, e_progIndParam, m_progIndParam);
KnownExtensionEncode(strm, e_callMgrParam, m_callMgrParam); KnownExtensionEncode(strm, e_callMgrParam, m_callMgrParam);
KnownExtensionEncode(strm, e_callSignallingParam, m_callSignallingParam); KnownExtensionEncode(strm, e_callSignallingParam, m_callSignallingParam);
KnownExtensionEncode(strm, e_dummy2, m_dummy2); KnownExtensionEncode(strm, e_dummy2, m_dummy2);

4
channels/h323/cisco-h225.h
View File

@@ -262,8 +262,8 @@ class CISCO_H225_H323_UU_NonStdInfo : public PASN_Sequence
e_version, e_version,
e_protoParam, e_protoParam,
e_commonParam, e_commonParam,
e_progIndParam,
e_dummy1, e_dummy1,
e_progIndParam,
e_callMgrParam, e_callMgrParam,
e_callSignallingParam, e_callSignallingParam,
e_dummy2, e_dummy2,
@@ -273,8 +273,8 @@ class CISCO_H225_H323_UU_NonStdInfo : public PASN_Sequence
PASN_Integer m_version; PASN_Integer m_version;
CISCO_H225_ProtoParam m_protoParam; CISCO_H225_ProtoParam m_protoParam;
CISCO_H225_CommonParam m_commonParam; CISCO_H225_CommonParam m_commonParam;
CISCO_H225_ProgIndParam m_progIndParam;
PASN_OctetString m_dummy1; PASN_OctetString m_dummy1;
CISCO_H225_ProgIndParam m_progIndParam;
CISCO_H225_CallMgrParam m_callMgrParam; CISCO_H225_CallMgrParam m_callMgrParam;
CISCO_H225_CallSignallingParam m_callSignallingParam; CISCO_H225_CallSignallingParam m_callSignallingParam;
PASN_OctetString m_dummy2; PASN_OctetString m_dummy2;