diff options
| author | Bill Meier <wmeier@newsguy.com> | 2014-04-01 20:36:58 -0400 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2014-04-02 00:44:54 +0000 |
| commit | 7f6a1cee54b0449d59a386049e54d8bbed31f320 (patch) | |
| tree | f29358ab33c52c1d09e916c0b0918248eb4f6e0c | |
| parent | 577f16a25c1595f1775cde4a36c9f937c5ad7823 (diff) | |
| download | wireshark-7f6a1cee54b0449d59a386049e54d8bbed31f320.tar.gz | |
packet-pdc.c: Add asterix protocol layer to base tree (not to PDC tree).
PDC capture file: See attachment to Bug #9746
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9746
Change-Id: I815779f4213d1caec3e1c8dc46506bcc8647bcbb
Reviewed-on: https://code.wireshark.org/review/914
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
| -rw-r--r-- | epan/dissectors/packet-pdc.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/epan/dissectors/packet-pdc.c b/epan/dissectors/packet-pdc.c index 62f0afe2cc..1e20ca3800 100644 --- a/epan/dissectors/packet-pdc.c +++ b/epan/dissectors/packet-pdc.c @@ -222,7 +222,7 @@ static int dissect_drmpdu(tvbuff_t *tvb, proto_tree *tree, guint16 offset) return (2); } -static int dissect_admpdu(tvbuff_t *tvb, proto_tree *tree, guint16 offset, packet_info *pinfo) +static int dissect_admpdu(tvbuff_t *tvb, proto_tree *parent_tree, proto_tree *tree, guint16 offset, packet_info *pinfo) { guint16 userDataLen; guint16 returnLen; @@ -243,14 +243,14 @@ static int dissect_admpdu(tvbuff_t *tvb, proto_tree *tree, guint16 offset, packe asterixTVB = tvb_new_subset(tvb, offset, userDataLen, userDataLen); if (asterix_handle != NULL) - call_dissector(asterix_handle, asterixTVB, pinfo, tree); + call_dissector(asterix_handle, asterixTVB, pinfo, parent_tree); return (returnLen); } return (2); } -static int dissect_dtmpdu(tvbuff_t *tvb, proto_tree *tree, guint16 offset, packet_info *pinfo) +static int dissect_dtmpdu(tvbuff_t *tvb, proto_tree *parent_tree, proto_tree *tree, guint16 offset, packet_info *pinfo) { guint16 userDataLen; guint16 returnLen; @@ -265,14 +265,14 @@ static int dissect_dtmpdu(tvbuff_t *tvb, proto_tree *tree, guint16 offset, packe asterixTVB = tvb_new_subset(tvb, offset + 2, userDataLen, userDataLen); if (asterix_handle != NULL) - call_dissector(asterix_handle, asterixTVB, pinfo, tree); + call_dissector(asterix_handle, asterixTVB, pinfo, parent_tree); return (returnLen); } return (2); } -static int dissect_edmpdu(tvbuff_t *tvb, proto_tree *tree, guint16 offset, packet_info *pinfo) +static int dissect_edmpdu(tvbuff_t *tvb, proto_tree *parent_tree, proto_tree *tree, guint16 offset, packet_info *pinfo) { guint16 userDataLen; guint16 returnLen; @@ -287,7 +287,7 @@ static int dissect_edmpdu(tvbuff_t *tvb, proto_tree *tree, guint16 offset, packe asterixTVB = tvb_new_subset(tvb, offset + 2, userDataLen, userDataLen); if (asterix_handle != NULL) - call_dissector(asterix_handle, asterixTVB, pinfo, tree); + call_dissector(asterix_handle, asterixTVB, pinfo, parent_tree); return (returnLen); } @@ -342,15 +342,15 @@ static int dissect_pdc_packet(tvbuff_t *tvb, proto_tree *tree, packet_info *pinf col_set_str(pinfo->cinfo, COL_INFO, "DRMPDU"); break; case DTMPDU: - length += dissect_dtmpdu(tvb, pdcPacketTree, length, pinfo); + length += dissect_dtmpdu(tvb, tree, pdcPacketTree, length, pinfo); col_set_str(pinfo->cinfo, COL_INFO, "DTMPDU"); break; case ADMPDU: - length += dissect_admpdu(tvb, pdcPacketTree, length, pinfo); + length += dissect_admpdu(tvb, tree, pdcPacketTree, length, pinfo); col_set_str(pinfo->cinfo, COL_INFO, "ADMPDU"); break; case EDMPDU: - length += dissect_edmpdu(tvb, pdcPacketTree, length, pinfo); + length += dissect_edmpdu(tvb, tree, pdcPacketTree, length, pinfo); col_set_str(pinfo->cinfo, COL_INFO, "EDMPDU"); break; case AKMPDU: |