From 2663881c378913d5c9cd123c469e1bb29a5e39be Mon Sep 17 00:00:00 2001 From: Darien Spencer Date: Sun, 15 Oct 2017 21:57:06 +0300 Subject: [PATCH] rlc: Fix bug in 'RLC over UDP' dissector Reassembly of AM/UM packets doesn't work when the URNTI tag is missing and the default value of 0 is kept. This patch makes the default value 1 for those cases. Bug: 14129 Change-Id: Id13121b5de63da4318214871b8963ceef5d28cf0 Reviewed-on: https://code.wireshark.org/review/23930 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin --- epan/dissectors/packet-umts_rlc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/epan/dissectors/packet-umts_rlc.c b/epan/dissectors/packet-umts_rlc.c index 00f553fe90..9d1ab2f0ab 100644 --- a/epan/dissectors/packet-umts_rlc.c +++ b/epan/dissectors/packet-umts_rlc.c @@ -2701,6 +2701,10 @@ dissect_rlc_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data rlcInfoAlreadySet = TRUE; } + /* Setting non-zero UE-ID for RLC reassembly to work, might be + * overriden if the optional URNTI tag is present */ + rlci->ueid[fpi->cur_tb] = 1; + /* Read conditional/optional fields */ while (tag != RLC_PAYLOAD_TAG) { /* Process next tag */