aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2016-10-26 22:38:20 +0200
committerHarald Welte <laforge@gnumonks.org>2017-01-07 13:29:52 +0100
commitb11ee92a30c92f00663225d8e3e5867fe7ffeeeb (patch)
tree8a0a4dfc051925395cc0df2b0e85f845587ae87f
parent270c4e66fee78aa1a79f6b3ff4dc445a2521e6dd (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.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/epan/dissectors/packet-gsm_rlcmac.c b/epan/dissectors/packet-gsm_rlcmac.c
index d4b50f0747..03d08686b9 100644
--- a/epan/dissectors/packet-gsm_rlcmac.c
+++ b/epan/dissectors/packet-gsm_rlcmac.c
@@ -60,6 +60,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
@@ -8212,7 +8213,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;
}
@@ -8231,7 +8232,7 @@ static guint8 dissect_gprs_data_segments(tvbuff_t *tvb, packet_info *pinfo, prot
subtree = proto_tree_add_subtree(tree, tvb, octet_offset, octet_length - octet_offset, ett_data_segments, NULL, "Padding Octets");
}
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);
@@ -8324,7 +8325,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;
}
@@ -8336,7 +8337,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);
@@ -17716,6 +17717,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");
}
/*