diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-09-26 22:20:08 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-09-26 22:20:08 +0000 |
| commit | 0d99058ca1b4b51fe1cf8e124c4310f6dd90b4a5 (patch) | |
| tree | bc25241a0da9687760fcbe9420de1ef3d609f8c4 /packet-h450.c | |
| parent | 544eaadd5fbdf9bdb5dcace4c43f6a9d75b0672c (diff) | |
From Tomas Kukosa:
1) string tables for t35CountryCode, t35Extension and
h221ManufacturerCode were moved into the new file t35.c
because they are common for more dissectors
2) the dissect_h245_NonStandardParameter_with_extension_marker()
was moved from h245 to h225 and renamed to
dissect_h225_NonStandardParameter() because the
NonStandardData type is different for H.225.0 and H.245
3) type of the "h245.nsp.object" dissector table was changed from
FT_UINT32 to FT_STRING, so it can select a dissector based on
an OID rather than the Adler-32 hash of an OID
4) the "h225.nsp.object" and "h225.nsp.h221" dissector tables
were created
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@8550 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-h450.c')
| -rw-r--r-- | packet-h450.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/packet-h450.c b/packet-h450.c index 5f5ae8273b..66b53ef104 100644 --- a/packet-h450.c +++ b/packet-h450.c @@ -125,6 +125,7 @@ static int hf_h4501_ROS = -1; static int hf_h4501_rosApdus = -1; static int hf_h4501_ServiceApdus = -1; +static int hf_h4502_nonStandardData = -1; static int hf_h4502_DummyArg = -1; static int hf_h4502_CallIdentity = -1; static int hf_h4502_CTInitiateArg = -1; @@ -351,6 +352,14 @@ NOT_DECODED_YET("H.450.1 ExtensionSeq"); } +static int +dissect_h4502_nonStandardData(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) +{ + offset = dissect_h225_NonStandardParameter(tvb, offset, pinfo, tree, + hf_h4502_nonStandardData); + return offset; +} + static const value_string Extension_vals[] = { { 0, "extensionSeq" }, { 1, "nonStandardData" }, @@ -360,7 +369,7 @@ static per_choice_t Extension_choice[] = { { 0, "extensionSeq", NO_EXTENSIONS, dissect_h4501_ExtensionSeq }, { 1, "nonStandardData", NO_EXTENSIONS, - dissect_h245_NonStandardParameter_with_extension_marker }, + dissect_h4502_nonStandardData }, { 0, NULL, 0, NULL } }; static int @@ -1109,6 +1118,9 @@ proto_register_h4501(void) { &hf_h4501_H225InformationElement, { "H225InformationElement", "h4501.H225InformationElement", FT_BYTES, BASE_HEX, NULL, 0, "H225InformationElement", HFILL }}, + { &hf_h4502_nonStandardData, + { "nonStandardData", "h4502.nonStandardData", FT_NONE, BASE_NONE, + NULL, 0, "NonStandardParameter SEQUENCE", HFILL }}, { &hf_h4502_DummyArg, { "DummyArg", "h4502.DummyArg", FT_NONE, BASE_NONE, NULL, 0, "DummyArg sequence of", HFILL }}, |