aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2018-04-12 15:11:29 +0200
committerPascal Quantin <pascal.quantin@gmail.com>2018-04-13 16:25:10 +0000
commit5f4ffa2c76eff731b4082e7879d7313416aca67c (patch)
tree3ea948a8c9615915c07e1d7b3682016e97923fe8
parent0b62dce0054bf8c63a8f96cea2cbf29c6e1721a0 (diff)
UMTS RLC: add expert info for unknown / missing UDP framing tags
Change-Id: I29dbeaf0d90bab4c10b4674bfa983f7f5f26027b Reviewed-on: https://code.wireshark.org/review/26909 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-rw-r--r--epan/dissectors/packet-umts_rlc.c23
1 files changed, 21 insertions, 2 deletions
diff --git a/epan/dissectors/packet-umts_rlc.c b/epan/dissectors/packet-umts_rlc.c
index bd39bf0faf..fec5c31445 100644
--- a/epan/dissectors/packet-umts_rlc.c
+++ b/epan/dissectors/packet-umts_rlc.c
@@ -144,6 +144,8 @@ static expert_field ei_rlc_header_only = EI_INIT;
static expert_field ei_rlc_ciphered_data = EI_INIT;
static expert_field ei_rlc_no_per_frame_data = EI_INIT;
static expert_field ei_rlc_incomplete_sequence = EI_INIT;
+static expert_field ei_rlc_unknown_udp_framing_tag = EI_INIT;
+static expert_field ei_rlc_missing_udp_framing_tag = EI_INIT;
static dissector_handle_t ip_handle;
static dissector_handle_t rrc_handle;
@@ -2641,6 +2643,19 @@ dissect_rlc_dch_unknown(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi
return tvb_captured_length(tvb);
}
+static void
+report_heur_error(proto_tree *tree, packet_info *pinfo, expert_field *eiindex,
+ tvbuff_t *tvb, gint start, gint length)
+{
+ proto_item *ti;
+ proto_tree *subtree;
+
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "RLC");
+ col_clear(pinfo->cinfo, COL_INFO);
+ ti = proto_tree_add_item(tree, proto_umts_rlc, tvb, 0, -1, ENC_NA);
+ subtree = proto_item_add_subtree(ti, ett_rlc);
+ proto_tree_add_expert(subtree, pinfo, eiindex, tvb, start, length);
+}
/* Heuristic dissector looks for supported framing protocol (see wiki page) */
static gboolean
@@ -2739,13 +2754,15 @@ dissect_rlc_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
continue;
default:
/* It must be a recognised tag */
- return FALSE;
+ report_heur_error(tree, pinfo, &ei_rlc_unknown_udp_framing_tag, tvb, offset-1, 1);
+ return TRUE;
}
}
if ((channelTypePresent == FALSE) && (rlcModePresent == FALSE)) {
/* Conditional fields are missing */
- return FALSE;
+ report_heur_error(tree, pinfo, &ei_rlc_missing_udp_framing_tag, tvb, 0, offset);
+ return TRUE;
}
/* Store info in packet if needed */
@@ -3022,6 +3039,8 @@ proto_register_rlc(void)
{ &ei_rlc_ciphered_data, { "rlc.ciphered_data", PI_UNDECODED, PI_WARN, "Cannot dissect RLC frame because it is ciphered", EXPFILL }},
{ &ei_rlc_no_per_frame_data, { "rlc.no_per_frame_data", PI_PROTOCOL, PI_WARN, "Can't dissect RLC frame because no per-frame info was attached!", EXPFILL }},
{ &ei_rlc_incomplete_sequence, { "rlc.incomplete_sequence", PI_MALFORMED, PI_ERROR, "Error: Incomplete sequence", EXPFILL }},
+ { &ei_rlc_unknown_udp_framing_tag, { "rlc.unknown_udp_framing_tag", PI_UNDECODED, PI_WARN, "Unknown UDP framing tag, aborting dissection", EXPFILL }},
+ { &ei_rlc_missing_udp_framing_tag, { "rlc.missing_udp_framing_tag", PI_UNDECODED, PI_WARN, "Missing UDP framing conditional tag, aborting dissection", EXPFILL }}
};
proto_umts_rlc = proto_register_protocol("Radio Link Control", "RLC", "rlc");