diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2005-01-08 16:38:13 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2005-01-08 16:38:13 +0000 |
| commit | d787b13c7c27656373c7f6f3d0e663288a59fe75 (patch) | |
| tree | 2dc8e975f38b158e780de6acea9714a6bcd48d12 /epan/dissectors/packet-h225.c | |
| parent | 45aa6d1949840e2590bbb586dc1a0934d99c48eb (diff) | |
Reinsert dissection of h450 messages
svn path=/trunk/; revision=12994
Diffstat (limited to 'epan/dissectors/packet-h225.c')
| -rw-r--r-- | epan/dissectors/packet-h225.c | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c index 6636bab24d..ab3ceab87e 100644 --- a/epan/dissectors/packet-h225.c +++ b/epan/dissectors/packet-h225.c @@ -124,7 +124,7 @@ static int hf_h225_setupAcknowledge = -1; /* SetupAcknowledge_UUIE */ static int hf_h225_notify = -1; /* Notify_UUIE */ static int hf_h225_nonStandardData = -1; /* NonStandardParameter */ static int hf_h225_h4501SupplementaryService = -1; /* SEQUNCE_OF_OCTET_STRING */ -static int hf_h225_h4501SupplementaryService_item = -1; /* OCTET_STRING */ +static int hf_h225_h4501SupplementaryService_item = -1; /* T_h4501SupplementaryService_item */ static int hf_h225_h245Tunneling = -1; /* BOOLEAN */ static int hf_h225_h245Control = -1; /* H245Control */ static int hf_h225_nonStandardControl = -1; /* SEQUNCE_OF_NonStandardParameter */ @@ -2119,9 +2119,6 @@ dissect_h225_OCTET_STRING(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, pro return offset; } -static int dissect_h4501SupplementaryService_item(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - return dissect_h225_OCTET_STRING(tvb, offset, pinfo, tree, hf_h225_h4501SupplementaryService_item); -} static int dissect_messageContent_item(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { return dissect_h225_OCTET_STRING(tvb, offset, pinfo, tree, hf_h225_messageContent_item); } @@ -5845,6 +5842,27 @@ static int dissect_h323_message_body(tvbuff_t *tvb, int offset, packet_info *pin static int +dissect_h225_T_h4501SupplementaryService_item(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { + + tvbuff_t *h4501_tvb; + guint32 h4501_offset=0; + guint32 h4501_len=0; + + offset=dissect_per_octet_string(tvb, offset, pinfo, tree, -1, -1, -1, &h4501_offset, &h4501_len); + + if(h4501_len){ + h4501_tvb = tvb_new_subset(tvb, h4501_offset, h4501_len, h4501_len); + call_dissector(h4501_handle, h4501_tvb, pinfo, tree); + } + + return offset; +} +static int dissect_h4501SupplementaryService_item(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { + return dissect_h225_T_h4501SupplementaryService_item(tvb, offset, pinfo, tree, hf_h225_h4501SupplementaryService_item); +} + + +static int dissect_h225_SEQUNCE_OF_OCTET_STRING(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_index, ett_h225_SEQUNCE_OF_OCTET_STRING, dissect_h4501SupplementaryService_item); @@ -6282,7 +6300,6 @@ dissect_h225_RequestSeqNum(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, pr offset = dissect_per_constrained_integer(tvb, offset, pinfo, tree, hf_index, 1U, 65535U, &(h225_pi.requestSeqNum), NULL, FALSE); - return offset; } static int dissect_requestSeqNum(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { |