diff options
| author | Harald Welte <laforge@gnumonks.org> | 2016-10-26 22:38:20 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2018-03-12 11:29:39 +0100 |
| commit | b21bcb2b69c1f641cb8241da34b5f12752efdec4 (patch) | |
| tree | 39f7adca24150899e5b2e4c52e2f8fbf600b979b | |
| parent | a7cf245eb515c546e57037f37535d76c13d2afdc (diff) | |
HACK: Hand GPRS RLC payload to GPRS LLC dissector
this is an ugly hack, as there is no code for packet re-assembly
in betwween, i.e. we only get proper dissection if the LLC message
was fitting entirely into one RLC block. Nevertheless, sufficient to
see things like RAU, ATTACH, IDENTITY procedures.
Change-Id: I1fc488aa58353e5f4264b940f9f4c18987148a7d
| -rw-r--r-- | epan/dissectors/packet-gsm_rlcmac.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/epan/dissectors/packet-gsm_rlcmac.c b/epan/dissectors/packet-gsm_rlcmac.c index 35061c9da9..82af8eb36b 100644 --- a/epan/dissectors/packet-gsm_rlcmac.c +++ b/epan/dissectors/packet-gsm_rlcmac.c @@ -48,6 +48,7 @@ void proto_reg_handoff_gsm_rlcmac(void); static dissector_handle_t lte_rrc_dl_dcch_handle = NULL; static dissector_handle_t rrc_irat_ho_to_utran_cmd_handle = NULL; +static dissector_handle_t llc_handle = NULL; /* private typedefs */ typedef struct @@ -8520,7 +8521,7 @@ static guint8 dissect_gprs_data_segments(tvbuff_t *tvb, packet_info *pinfo, prot "data segment: LI[%d]=%d indicates: (Last segment of) LLC frame (%d octets)", i, li, li); data_tvb = tvb_new_subset_length(tvb, octet_offset, li); - call_data_dissector(data_tvb, pinfo, subtree); + call_dissector(llc_handle, data_tvb, pinfo, subtree); octet_offset += li; break; } @@ -8528,18 +8529,19 @@ static guint8 dissect_gprs_data_segments(tvbuff_t *tvb, packet_info *pinfo, prot } if (octet_offset < octet_length) { + data_tvb = tvb_new_subset_length(tvb, octet_offset, octet_length - octet_offset); /* if there is space left in the RLC Block, then it is a segment of LLC Frame without LI*/ if (more) { subtree = proto_tree_add_subtree_format(tree, tvb, octet_offset, octet_length - octet_offset, ett_data_segments, NULL, "data segment: LI not present: \n The Upper Layer PDU in the current RLC data block either fills the current RLC data block precisely \nor continues in the following in-sequence RLC data block"); + call_dissector(llc_handle, data_tvb, pinfo, subtree); } else { subtree = proto_tree_add_subtree(tree, tvb, octet_offset, octet_length - octet_offset, ett_data_segments, NULL, "Padding Octets"); + call_data_dissector(data_tvb, pinfo, subtree); } - data_tvb = tvb_new_subset_length(tvb, octet_offset, octet_length - octet_offset); - call_data_dissector(data_tvb, pinfo, subtree); octet_offset = octet_length; } return (octet_offset - initial_offset); @@ -8632,7 +8634,7 @@ static guint16 dissect_egprs_data_segments(tvbuff_t *tvb, packet_info *pinfo, pr "data segment: LI[%d]=%d indicates: (Last segment of) LLC frame (%d octets)", i, li, li); data_tvb = tvb_new_subset_length(tvb, octet_offset, li); - call_data_dissector(data_tvb, pinfo, subtree); + call_dissector(llc_handle, data_tvb, pinfo, subtree); octet_offset += li; break; } @@ -8644,7 +8646,7 @@ static guint16 dissect_egprs_data_segments(tvbuff_t *tvb, packet_info *pinfo, pr subtree = proto_tree_add_subtree(tree, tvb, octet_offset, octet_length - octet_offset, ett_data_segments, NULL, "data segment: LI not present: \n The Upper Layer PDU in the current RLC data block either fills the current RLC data block precisely \nor continues in the following in-sequence RLC data block"); data_tvb = tvb_new_subset_length(tvb, octet_offset, octet_length - octet_offset); - call_data_dissector(data_tvb, pinfo, subtree); + call_dissector(llc_handle, data_tvb, pinfo, subtree); octet_offset = octet_length; } return (octet_offset - initial_offset); @@ -18467,6 +18469,7 @@ void proto_reg_handoff_gsm_rlcmac(void) { lte_rrc_dl_dcch_handle = find_dissector("lte_rrc.dl_dcch"); rrc_irat_ho_to_utran_cmd_handle = find_dissector("rrc.irat.ho_to_utran_cmd"); + llc_handle = find_dissector("llcgprs"); } /* |