|
 |
affdba |
From 85441817e9068de1267e945cfee1f8080c402fa7 Mon Sep 17 00:00:00 2001
|
|
|
affdba |
From: Martin Sehnoutka <msehnout@redhat.com>
|
|
|
affdba |
Date: Mon, 13 Mar 2017 10:38:54 +0100
|
|
|
affdba |
Subject: [PATCH] Backport dissect_gmr1_bcch modifications from upstream.
|
|
|
affdba |
|
|
|
affdba |
---
|
|
|
affdba |
epan/dissectors/packet-gmr1_bcch.c | 2 ++
|
|
|
affdba |
1 file changed, 2 insertions(+)
|
|
|
affdba |
|
|
|
affdba |
diff --git a/epan/dissectors/packet-gmr1_bcch.c b/epan/dissectors/packet-gmr1_bcch.c
|
|
|
affdba |
index f522bd2..6e9a6ed 100644
|
|
|
affdba |
--- a/epan/dissectors/packet-gmr1_bcch.c
|
|
|
affdba |
+++ b/epan/dissectors/packet-gmr1_bcch.c
|
|
|
affdba |
@@ -1048,6 +1048,7 @@ dissect_gmr1_bcch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|
|
affdba |
if (is_si1) {
|
|
|
affdba |
SystemInformation1_t *data;
|
|
|
affdba |
data = ep_new(SystemInformation1_t);
|
|
|
affdba |
+ data->SegmentType = array_length(SI1_SegmentChoice) - 1;
|
|
|
affdba |
csnStreamDissector(bcch_tree, &ar, CSNDESCR(SystemInformation1_t), tvb, data, ett_gmr1_bcch);
|
|
|
affdba |
col_append_fstr(
|
|
|
affdba |
pinfo->cinfo, COL_INFO,
|
|
|
affdba |
@@ -1057,6 +1058,7 @@ dissect_gmr1_bcch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|
|
affdba |
} else {
|
|
|
affdba |
SystemInformation2_t *data;
|
|
|
affdba |
data = ep_new(SystemInformation2_t);
|
|
|
affdba |
+ data->SegmentType = array_length(SI2_SegmentChoice) - 1;
|
|
|
affdba |
csnStreamDissector(bcch_tree, &ar, CSNDESCR(SystemInformation2_t), tvb, data, ett_gmr1_bcch);
|
|
|
affdba |
col_append_fstr(
|
|
|
affdba |
pinfo->cinfo, COL_INFO,
|
|
|
affdba |
--
|
|
|
affdba |
2.9.3
|
|
|
affdba |
|