<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9240">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Remove the patches for Wireshark<br><br>GSMTAP support is already merged to the mainline, while the status<br>of SMSCB support is unknown. In any case, OsmocomBB is not a good<br>place for storing the patches for Wireshark, so let's remove them.<br><br>Change-Id: I448dc5a3dba3ecc6fc041861239dc23cca72b70b<br>---<br>D src/wireshark/gsmtap.patch<br>D src/wireshark/smscb.patch<br>2 files changed, 0 insertions(+), 1,188 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/40/9240/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/wireshark/gsmtap.patch b/src/wireshark/gsmtap.patch</span><br><span>deleted file mode 100644</span><br><span>index 019c8b4..0000000</span><br><span>--- a/src/wireshark/gsmtap.patch</span><br><span>+++ /dev/null</span><br><span>@@ -1,445 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Index: epan/dissectors/packet-gsmtap.c</span><br><span style="color: hsl(0, 100%, 40%);">-===================================================================</span><br><span>---- /dev/null</span><br><span style="color: hsl(0, 100%, 40%);">-+++ epan/dissectors/packet-gsmtap.c</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -0,0 +1,345 @@</span><br><span style="color: hsl(0, 100%, 40%);">-+/* packet-gsmtap.c</span><br><span style="color: hsl(0, 100%, 40%);">-+ * Routines for GSMTAP captures</span><br><span style="color: hsl(0, 100%, 40%);">-+ *</span><br><span style="color: hsl(0, 100%, 40%);">-+ * (C) 2008-2010 by Harald Welte <laforge@gnumonks.org></span><br><span style="color: hsl(0, 100%, 40%);">-+ *</span><br><span style="color: hsl(0, 100%, 40%);">-+ * $Id$</span><br><span style="color: hsl(0, 100%, 40%);">-+ *</span><br><span style="color: hsl(0, 100%, 40%);">-+ * Wireshark - Network traffic analyzer</span><br><span style="color: hsl(0, 100%, 40%);">-+ * By Gerald Combs <gerald@wireshark.org></span><br><span style="color: hsl(0, 100%, 40%);">-+ * Copyright 1998 Gerald Combs</span><br><span style="color: hsl(0, 100%, 40%);">-+ *</span><br><span style="color: hsl(0, 100%, 40%);">-+ * This program is free software; you can redistribute it and/or</span><br><span style="color: hsl(0, 100%, 40%);">-+ * modify it under the terms of the GNU General Public License</span><br><span style="color: hsl(0, 100%, 40%);">-+ * as published by the Free Software Foundation; either version 2</span><br><span style="color: hsl(0, 100%, 40%);">-+ * of the License, or (at your option) any later version.</span><br><span style="color: hsl(0, 100%, 40%);">-+ *</span><br><span style="color: hsl(0, 100%, 40%);">-+ * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(0, 100%, 40%);">-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(0, 100%, 40%);">-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(0, 100%, 40%);">-+ * GNU General Public License for more details.</span><br><span style="color: hsl(0, 100%, 40%);">-+ *</span><br><span style="color: hsl(0, 100%, 40%);">-+ * You should have received a copy of the GNU General Public License</span><br><span style="color: hsl(0, 100%, 40%);">-+ * along with this program; if not, write to the Free Software</span><br><span style="color: hsl(0, 100%, 40%);">-+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA</span><br><span style="color: hsl(0, 100%, 40%);">-+ * 02111-1307, USA.</span><br><span style="color: hsl(0, 100%, 40%);">-+ *</span><br><span style="color: hsl(0, 100%, 40%);">-+ */</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+/* GSMTAP is a generic header format for GSM protocol captures,</span><br><span style="color: hsl(0, 100%, 40%);">-+ * it uses the IANA-assigned UDP port number 4729 and carries</span><br><span style="color: hsl(0, 100%, 40%);">-+ * payload in various formats of GSM interfaces such as Um MAC</span><br><span style="color: hsl(0, 100%, 40%);">-+ * blocks or Um bursts.</span><br><span style="color: hsl(0, 100%, 40%);">-+ *</span><br><span style="color: hsl(0, 100%, 40%);">-+ * Example programs generating GSMTAP data are airprobe</span><br><span style="color: hsl(0, 100%, 40%);">-+ * (http://airprobe.org/) or OsmocomBB (http://bb.osmocom.org/)</span><br><span style="color: hsl(0, 100%, 40%);">-+ */</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+#ifdef HAVE_CONFIG_H</span><br><span style="color: hsl(0, 100%, 40%);">-+# include "config.h"</span><br><span style="color: hsl(0, 100%, 40%);">-+#endif</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+#include <glib.h></span><br><span style="color: hsl(0, 100%, 40%);">-+#include <epan/packet.h></span><br><span style="color: hsl(0, 100%, 40%);">-+#include <epan/prefs.h></span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+#include "packet-gsmtap.h"</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+static int proto_gsmtap = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+static int hf_gsmtap_version = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static int hf_gsmtap_hdrlen = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static int hf_gsmtap_type = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static int hf_gsmtap_timeslot = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static int hf_gsmtap_subslot = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static int hf_gsmtap_arfcn = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static int hf_gsmtap_uplink = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static int hf_gsmtap_noise_dbm = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static int hf_gsmtap_signal_dbm = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static int hf_gsmtap_frame_nr = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static int hf_gsmtap_burst_type = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static int hf_gsmtap_channel_type = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static int hf_gsmtap_antenna = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+static int hf_sacch_l1h_power_lev = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static int hf_sacch_l1h_fpc = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static int hf_sacch_l1h_ta = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+static gint ett_gsmtap = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+enum {</span><br><span style="color: hsl(0, 100%, 40%);">-+ GSMTAP_SUB_DATA = 0,</span><br><span style="color: hsl(0, 100%, 40%);">-+ GSMTAP_SUB_UM,</span><br><span style="color: hsl(0, 100%, 40%);">-+ GSMTAP_SUB_UM_LAPDM,</span><br><span style="color: hsl(0, 100%, 40%);">-+ GSMTAP_SUB_ABIS,</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ GSMTAP_SUB_MAX</span><br><span style="color: hsl(0, 100%, 40%);">-+};</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+static dissector_handle_t sub_handles[GSMTAP_SUB_MAX];</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+static const value_string gsmtap_bursts[] = {</span><br><span style="color: hsl(0, 100%, 40%);">-+ { GSMTAP_BURST_UNKNOWN, "UNKNOWN" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { GSMTAP_BURST_FCCH, "FCCH" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { GSMTAP_BURST_PARTIAL_SCH, "PARTIAL SCH" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { GSMTAP_BURST_SCH, "SCH" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { GSMTAP_BURST_CTS_SCH, "CTS SCH" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { GSMTAP_BURST_COMPACT_SCH, "COMPACT SCH" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { GSMTAP_BURST_NORMAL, "NORMAL" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { GSMTAP_BURST_DUMMY, "DUMMY" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { GSMTAP_BURST_ACCESS, "RACH" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { 0, NULL },</span><br><span style="color: hsl(0, 100%, 40%);">-+};</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+static const value_string gsmtap_channels[] = {</span><br><span style="color: hsl(0, 100%, 40%);">-+ { GSMTAP_CHANNEL_UNKNOWN, "UNKNOWN" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { GSMTAP_CHANNEL_BCCH, "BCCH" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { GSMTAP_CHANNEL_CCCH, "CCCH" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { GSMTAP_CHANNEL_RACH, "RACH" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { GSMTAP_CHANNEL_AGCH, "AGCH" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { GSMTAP_CHANNEL_PCH, "PCH" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { GSMTAP_CHANNEL_SDCCH, "SDCCH" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { GSMTAP_CHANNEL_SDCCH4, "SDCCH/4" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { GSMTAP_CHANNEL_SDCCH8, "SDCCH/8" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { GSMTAP_CHANNEL_TCH_F, "FACCH/F" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { GSMTAP_CHANNEL_TCH_H, "FACCH/H" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { GSMTAP_CHANNEL_ACCH|</span><br><span style="color: hsl(0, 100%, 40%);">-+ GSMTAP_CHANNEL_SDCCH, "LSACCH" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { GSMTAP_CHANNEL_ACCH|</span><br><span style="color: hsl(0, 100%, 40%);">-+ GSMTAP_CHANNEL_SDCCH4, "SACCH/4" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { GSMTAP_CHANNEL_ACCH|</span><br><span style="color: hsl(0, 100%, 40%);">-+ GSMTAP_CHANNEL_SDCCH8, "SACCH/8" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { GSMTAP_CHANNEL_ACCH|</span><br><span style="color: hsl(0, 100%, 40%);">-+ GSMTAP_CHANNEL_TCH_F, "SACCH/F" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { GSMTAP_CHANNEL_ACCH|</span><br><span style="color: hsl(0, 100%, 40%);">-+ GSMTAP_CHANNEL_TCH_F, "SACCH/H" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { 0, NULL },</span><br><span style="color: hsl(0, 100%, 40%);">-+};</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+static const value_string gsmtap_types[] = {</span><br><span style="color: hsl(0, 100%, 40%);">-+ { GSMTAP_TYPE_UM, "GSM Um (MS<->BTS)" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { GSMTAP_TYPE_ABIS, "GSM Abis (BTS<->BSC)" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { GSMTAP_TYPE_UM_BURST, "GSM Um burst (MS<->BTS)" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { 0, NULL },</span><br><span style="color: hsl(0, 100%, 40%);">-+};</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+/* dissect a SACCH L1 header which is included in the first 2 bytes</span><br><span style="color: hsl(0, 100%, 40%);">-+ * of every SACCH frame (according to TS 04.04) */</span><br><span style="color: hsl(0, 100%, 40%);">-+static void</span><br><span style="color: hsl(0, 100%, 40%);">-+dissect_sacch_l1h(tvbuff_t *tvb, proto_tree *tree)</span><br><span style="color: hsl(0, 100%, 40%);">-+{</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_item *ti;</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree *l1h_tree = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ if (!tree)</span><br><span style="color: hsl(0, 100%, 40%);">-+ return;</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ ti = proto_tree_add_protocol_format(tree, proto_gsmtap, tvb, 0, 2,</span><br><span style="color: hsl(0, 100%, 40%);">-+ "SACCH L1 Header, Power Level: %u, Timing Advance: %u",</span><br><span style="color: hsl(0, 100%, 40%);">-+ tvb_get_guint8(tvb, 0) & 0x1f,</span><br><span style="color: hsl(0, 100%, 40%);">-+ tvb_get_guint8(tvb, 1));</span><br><span style="color: hsl(0, 100%, 40%);">-+ l1h_tree = proto_item_add_subtree(ti, ett_gsmtap);</span><br><span style="color: hsl(0, 100%, 40%);">-+ /* Power Level */</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree_add_item(l1h_tree, hf_sacch_l1h_power_lev, tvb, 0, 1, FALSE);</span><br><span style="color: hsl(0, 100%, 40%);">-+ /* Fast Power Control */</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree_add_item(l1h_tree, hf_sacch_l1h_fpc, tvb, 0, 1, FALSE);</span><br><span style="color: hsl(0, 100%, 40%);">-+ /* Acutal Timing Advance */</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree_add_item(l1h_tree, hf_sacch_l1h_ta, tvb, 1, 1, FALSE);</span><br><span style="color: hsl(0, 100%, 40%);">-+}</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+/* dissect a GSMTAP header and hand payload off to respective dissector */</span><br><span style="color: hsl(0, 100%, 40%);">-+static void</span><br><span style="color: hsl(0, 100%, 40%);">-+dissect_gsmtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)</span><br><span style="color: hsl(0, 100%, 40%);">-+{</span><br><span style="color: hsl(0, 100%, 40%);">-+ int sub_handle, len, offset = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_item *ti;</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree *gsmtap_tree = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-+ tvbuff_t *payload_tvb, *l1h_tvb = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-+ guint8 hdr_len, type, sub_type;</span><br><span style="color: hsl(0, 100%, 40%);">-+ guint16 arfcn;</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ len = tvb_length(tvb);</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ hdr_len = tvb_get_guint8(tvb, offset + 1) <<2;</span><br><span style="color: hsl(0, 100%, 40%);">-+ type = tvb_get_guint8(tvb, offset + 2);</span><br><span style="color: hsl(0, 100%, 40%);">-+ sub_type = tvb_get_guint8(tvb, offset + 12);</span><br><span style="color: hsl(0, 100%, 40%);">-+ arfcn = tvb_get_ntohs(tvb, offset + 4);</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ /* In case of a SACCH, there is a two-byte L1 header in front</span><br><span style="color: hsl(0, 100%, 40%);">-+ * of the packet (see TS 04.04) */</span><br><span style="color: hsl(0, 100%, 40%);">-+ if (type == GSMTAP_TYPE_UM &&</span><br><span style="color: hsl(0, 100%, 40%);">-+ sub_type & GSMTAP_CHANNEL_ACCH) {</span><br><span style="color: hsl(0, 100%, 40%);">-+ l1h_tvb = tvb_new_subset(tvb, hdr_len, 2, 2);</span><br><span style="color: hsl(0, 100%, 40%);">-+ payload_tvb = tvb_new_subset(tvb, hdr_len+2, len-(hdr_len+2),</span><br><span style="color: hsl(0, 100%, 40%);">-+ len-(hdr_len+2));</span><br><span style="color: hsl(0, 100%, 40%);">-+ } else {</span><br><span style="color: hsl(0, 100%, 40%);">-+ payload_tvb = tvb_new_subset(tvb, hdr_len, len-hdr_len,</span><br><span style="color: hsl(0, 100%, 40%);">-+ len-hdr_len);</span><br><span style="color: hsl(0, 100%, 40%);">-+ }</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ /* We don't want any UDP related info left in the INFO field, as the</span><br><span style="color: hsl(0, 100%, 40%);">-+ * gsm_a_dtap dissector will not clear but only append */</span><br><span style="color: hsl(0, 100%, 40%);">-+ col_clear(pinfo->cinfo, COL_INFO);</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "GSMTAP");</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ if (arfcn & GSMTAP_ARFCN_F_UPLINK) {</span><br><span style="color: hsl(0, 100%, 40%);">-+ col_append_str(pinfo->cinfo, COL_RES_NET_SRC, "MS");</span><br><span style="color: hsl(0, 100%, 40%);">-+ col_append_str(pinfo->cinfo, COL_RES_NET_DST, "BTS");</span><br><span style="color: hsl(0, 100%, 40%);">-+ /* p2p_dir is used by the LAPDm dissector */</span><br><span style="color: hsl(0, 100%, 40%);">-+ pinfo->p2p_dir = P2P_DIR_SENT;</span><br><span style="color: hsl(0, 100%, 40%);">-+ } else {</span><br><span style="color: hsl(0, 100%, 40%);">-+ col_set_str(pinfo->cinfo, COL_RES_NET_SRC, "BTS");</span><br><span style="color: hsl(0, 100%, 40%);">-+ switch (sub_type & ~GSMTAP_CHANNEL_ACCH) {</span><br><span style="color: hsl(0, 100%, 40%);">-+ case GSMTAP_CHANNEL_BCCH:</span><br><span style="color: hsl(0, 100%, 40%);">-+ case GSMTAP_CHANNEL_CCCH:</span><br><span style="color: hsl(0, 100%, 40%);">-+ case GSMTAP_CHANNEL_PCH:</span><br><span style="color: hsl(0, 100%, 40%);">-+ case GSMTAP_CHANNEL_AGCH:</span><br><span style="color: hsl(0, 100%, 40%);">-+ col_set_str(pinfo->cinfo, COL_RES_NET_DST, "Broadcast");</span><br><span style="color: hsl(0, 100%, 40%);">-+ break;</span><br><span style="color: hsl(0, 100%, 40%);">-+ default:</span><br><span style="color: hsl(0, 100%, 40%);">-+ col_set_str(pinfo->cinfo, COL_RES_NET_DST, "MS");</span><br><span style="color: hsl(0, 100%, 40%);">-+ break;</span><br><span style="color: hsl(0, 100%, 40%);">-+ }</span><br><span style="color: hsl(0, 100%, 40%);">-+ /* p2p_dir is used by the LAPDm dissector */</span><br><span style="color: hsl(0, 100%, 40%);">-+ pinfo->p2p_dir = P2P_DIR_RECV;</span><br><span style="color: hsl(0, 100%, 40%);">-+ }</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ if (tree) {</span><br><span style="color: hsl(0, 100%, 40%);">-+ ti = proto_tree_add_protocol_format(tree, proto_gsmtap, tvb, 0, hdr_len,</span><br><span style="color: hsl(0, 100%, 40%);">-+ "GSM TAP Header, ARFCN: %u (%s), TS: %u, Channel: %s (%u)",</span><br><span style="color: hsl(0, 100%, 40%);">-+ arfcn & GSMTAP_ARFCN_MASK,</span><br><span style="color: hsl(0, 100%, 40%);">-+ arfcn & GSMTAP_ARFCN_F_UPLINK ? "Uplink" : "Downlink",</span><br><span style="color: hsl(0, 100%, 40%);">-+ tvb_get_guint8(tvb, offset+3),</span><br><span style="color: hsl(0, 100%, 40%);">-+ match_strval(tvb_get_guint8(tvb, offset+12), gsmtap_channels),</span><br><span style="color: hsl(0, 100%, 40%);">-+ tvb_get_guint8(tvb, offset+14));</span><br><span style="color: hsl(0, 100%, 40%);">-+ gsmtap_tree = proto_item_add_subtree(ti, ett_gsmtap);</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree_add_item(gsmtap_tree, hf_gsmtap_version,</span><br><span style="color: hsl(0, 100%, 40%);">-+ tvb, offset, 1, FALSE);</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree_add_uint_format(gsmtap_tree, hf_gsmtap_hdrlen,</span><br><span style="color: hsl(0, 100%, 40%);">-+ tvb, offset+1, 1, hdr_len,</span><br><span style="color: hsl(0, 100%, 40%);">-+ "Header length: %u bytes", hdr_len);</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree_add_item(gsmtap_tree, hf_gsmtap_type,</span><br><span style="color: hsl(0, 100%, 40%);">-+ tvb, offset+2, 1, FALSE);</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree_add_item(gsmtap_tree, hf_gsmtap_timeslot,</span><br><span style="color: hsl(0, 100%, 40%);">-+ tvb, offset+3, 1, FALSE);</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree_add_item(gsmtap_tree, hf_gsmtap_arfcn,</span><br><span style="color: hsl(0, 100%, 40%);">-+ tvb, offset+4, 2, FALSE);</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree_add_item(gsmtap_tree, hf_gsmtap_uplink,</span><br><span style="color: hsl(0, 100%, 40%);">-+ tvb, offset+4, 2, FALSE);</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree_add_item(gsmtap_tree, hf_gsmtap_noise_dbm,</span><br><span style="color: hsl(0, 100%, 40%);">-+ tvb, offset+6, 1, FALSE);</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree_add_item(gsmtap_tree, hf_gsmtap_signal_dbm,</span><br><span style="color: hsl(0, 100%, 40%);">-+ tvb, offset+7, 1, FALSE);</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree_add_item(gsmtap_tree, hf_gsmtap_frame_nr,</span><br><span style="color: hsl(0, 100%, 40%);">-+ tvb, offset+8, 4, FALSE);</span><br><span style="color: hsl(0, 100%, 40%);">-+ if (type == GSMTAP_TYPE_UM_BURST)</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree_add_item(gsmtap_tree, hf_gsmtap_burst_type,</span><br><span style="color: hsl(0, 100%, 40%);">-+ tvb, offset+12, 1, FALSE);</span><br><span style="color: hsl(0, 100%, 40%);">-+ else if (type == GSMTAP_TYPE_UM)</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree_add_item(gsmtap_tree, hf_gsmtap_channel_type,</span><br><span style="color: hsl(0, 100%, 40%);">-+ tvb, offset+12, 1, FALSE);</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree_add_item(gsmtap_tree, hf_gsmtap_antenna,</span><br><span style="color: hsl(0, 100%, 40%);">-+ tvb, offset+13, 1, FALSE);</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree_add_item(gsmtap_tree, hf_gsmtap_subslot,</span><br><span style="color: hsl(0, 100%, 40%);">-+ tvb, offset+14, 1, FALSE);</span><br><span style="color: hsl(0, 100%, 40%);">-+ }</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ switch (type) {</span><br><span style="color: hsl(0, 100%, 40%);">-+ case GSMTAP_TYPE_UM:</span><br><span style="color: hsl(0, 100%, 40%);">-+ if (l1h_tvb)</span><br><span style="color: hsl(0, 100%, 40%);">-+ dissect_sacch_l1h(l1h_tvb, tree);</span><br><span style="color: hsl(0, 100%, 40%);">-+ switch (sub_type & ~GSMTAP_CHANNEL_ACCH) {</span><br><span style="color: hsl(0, 100%, 40%);">-+ case GSMTAP_CHANNEL_BCCH:</span><br><span style="color: hsl(0, 100%, 40%);">-+ case GSMTAP_CHANNEL_CCCH:</span><br><span style="color: hsl(0, 100%, 40%);">-+ case GSMTAP_CHANNEL_PCH:</span><br><span style="color: hsl(0, 100%, 40%);">-+ case GSMTAP_CHANNEL_AGCH:</span><br><span style="color: hsl(0, 100%, 40%);">-+ /* FIXME: we might want to skip idle frames */</span><br><span style="color: hsl(0, 100%, 40%);">-+ sub_handle = GSMTAP_SUB_UM;</span><br><span style="color: hsl(0, 100%, 40%);">-+ break;</span><br><span style="color: hsl(0, 100%, 40%);">-+ case GSMTAP_CHANNEL_SDCCH:</span><br><span style="color: hsl(0, 100%, 40%);">-+ case GSMTAP_CHANNEL_SDCCH4:</span><br><span style="color: hsl(0, 100%, 40%);">-+ case GSMTAP_CHANNEL_SDCCH8:</span><br><span style="color: hsl(0, 100%, 40%);">-+ case GSMTAP_CHANNEL_TCH_F:</span><br><span style="color: hsl(0, 100%, 40%);">-+ case GSMTAP_CHANNEL_TCH_H:</span><br><span style="color: hsl(0, 100%, 40%);">-+ sub_handle = GSMTAP_SUB_UM_LAPDM;</span><br><span style="color: hsl(0, 100%, 40%);">-+ break;</span><br><span style="color: hsl(0, 100%, 40%);">-+ case GSMTAP_CHANNEL_RACH:</span><br><span style="color: hsl(0, 100%, 40%);">-+ default:</span><br><span style="color: hsl(0, 100%, 40%);">-+ sub_handle = GSMTAP_SUB_DATA;</span><br><span style="color: hsl(0, 100%, 40%);">-+ break;</span><br><span style="color: hsl(0, 100%, 40%);">-+ }</span><br><span style="color: hsl(0, 100%, 40%);">-+ break;</span><br><span style="color: hsl(0, 100%, 40%);">-+ case GSMTAP_TYPE_UM_BURST:</span><br><span style="color: hsl(0, 100%, 40%);">-+ default:</span><br><span style="color: hsl(0, 100%, 40%);">-+ sub_handle = GSMTAP_SUB_DATA;</span><br><span style="color: hsl(0, 100%, 40%);">-+ break;</span><br><span style="color: hsl(0, 100%, 40%);">-+ }</span><br><span style="color: hsl(0, 100%, 40%);">-+ call_dissector(sub_handles[sub_handle], payload_tvb, pinfo, tree);</span><br><span style="color: hsl(0, 100%, 40%);">-+}</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+static const true_false_string sacch_l1h_fpc_mode_vals = {</span><br><span style="color: hsl(0, 100%, 40%);">-+ "In use",</span><br><span style="color: hsl(0, 100%, 40%);">-+ "Not in use"</span><br><span style="color: hsl(0, 100%, 40%);">-+};</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+void</span><br><span style="color: hsl(0, 100%, 40%);">-+proto_register_gsmtap(void)</span><br><span style="color: hsl(0, 100%, 40%);">-+{</span><br><span style="color: hsl(0, 100%, 40%);">-+ static hf_register_info hf[] = {</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_gsmtap_version, { "Version", "gsmtap.version",</span><br><span style="color: hsl(0, 100%, 40%);">-+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_gsmtap_hdrlen, { "Header Length", "gsmtap.hdr_len",</span><br><span style="color: hsl(0, 100%, 40%);">-+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_gsmtap_type, { "Payload Type", "gsmtap.type",</span><br><span style="color: hsl(0, 100%, 40%);">-+ FT_UINT8, BASE_DEC, VALS(gsmtap_types), 0, NULL, HFILL } },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_gsmtap_timeslot, { "Time Slot", "gsmtap.ts",</span><br><span style="color: hsl(0, 100%, 40%);">-+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_gsmtap_arfcn, { "ARFCN", "gsmtap.arfcn",</span><br><span style="color: hsl(0, 100%, 40%);">-+ FT_UINT16, BASE_DEC, NULL, GSMTAP_ARFCN_MASK, NULL, HFILL } },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_gsmtap_uplink, { "Uplink", "gsmtap.uplink",</span><br><span style="color: hsl(0, 100%, 40%);">-+ FT_UINT16, BASE_DEC, NULL, GSMTAP_ARFCN_F_UPLINK, NULL, HFILL } },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_gsmtap_noise_dbm, { "Signal/Noise Ratio (dB)", "gsmtap.snr_db",</span><br><span style="color: hsl(0, 100%, 40%);">-+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_gsmtap_signal_dbm, { "Signal Level (dBm)", "gsmtap.signal_dbm",</span><br><span style="color: hsl(0, 100%, 40%);">-+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_gsmtap_frame_nr, { "GSM Frame Number", "gsmtap.frame_nr",</span><br><span style="color: hsl(0, 100%, 40%);">-+ FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_gsmtap_burst_type, { "Burst Type", "gsmtap.burst_type",</span><br><span style="color: hsl(0, 100%, 40%);">-+ FT_UINT8, BASE_DEC, VALS(gsmtap_bursts), 0, NULL, HFILL }},</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_gsmtap_channel_type, { "Channel Type", "gsmtap.chan_type",</span><br><span style="color: hsl(0, 100%, 40%);">-+ FT_UINT8, BASE_DEC, VALS(gsmtap_channels), 0, NULL, HFILL }},</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_gsmtap_antenna, { "Antenna Number", "gsmtap.antenna",</span><br><span style="color: hsl(0, 100%, 40%);">-+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_gsmtap_subslot, { "Sub-Slot", "gsmtap.sub_slot",</span><br><span style="color: hsl(0, 100%, 40%);">-+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } },</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_sacch_l1h_power_lev, { "MS power level", "gsmtap.sacch_l1.power_lev",</span><br><span style="color: hsl(0, 100%, 40%);">-+ FT_UINT8, BASE_DEC, NULL, 0x1f, NULL, HFILL } },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_sacch_l1h_fpc, { "FPC", "gsmtap.sacch_l1.fpc",</span><br><span style="color: hsl(0, 100%, 40%);">-+ FT_BOOLEAN, 8, TFS(&sacch_l1h_fpc_mode_vals), 0x04,</span><br><span style="color: hsl(0, 100%, 40%);">-+ NULL, HFILL } },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_sacch_l1h_ta, { "Actual Timing Advance", "gsmtap.sacch_l1.ta",</span><br><span style="color: hsl(0, 100%, 40%);">-+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } },</span><br><span style="color: hsl(0, 100%, 40%);">-+ };</span><br><span style="color: hsl(0, 100%, 40%);">-+ static gint *ett[] = {</span><br><span style="color: hsl(0, 100%, 40%);">-+ &ett_gsmtap</span><br><span style="color: hsl(0, 100%, 40%);">-+ };</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_gsmtap = proto_register_protocol("GSM Radiotap", "GSMTAP", "gsmtap");</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_register_field_array(proto_gsmtap, hf, array_length(hf));</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_register_subtree_array(ett, array_length(ett));</span><br><span style="color: hsl(0, 100%, 40%);">-+}</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+void</span><br><span style="color: hsl(0, 100%, 40%);">-+proto_reg_handoff_gsmtap(void)</span><br><span style="color: hsl(0, 100%, 40%);">-+{</span><br><span style="color: hsl(0, 100%, 40%);">-+ dissector_handle_t gsmtap_handle;</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ sub_handles[GSMTAP_SUB_DATA] = find_dissector("data");</span><br><span style="color: hsl(0, 100%, 40%);">-+ sub_handles[GSMTAP_SUB_UM] = find_dissector("gsm_a_ccch");</span><br><span style="color: hsl(0, 100%, 40%);">-+ sub_handles[GSMTAP_SUB_UM_LAPDM] = find_dissector("lapdm");</span><br><span style="color: hsl(0, 100%, 40%);">-+ sub_handles[GSMTAP_SUB_ABIS] = find_dissector("gsm_a_dtap");</span><br><span style="color: hsl(0, 100%, 40%);">-+ gsmtap_handle = create_dissector_handle(dissect_gsmtap, proto_gsmtap);</span><br><span style="color: hsl(0, 100%, 40%);">-+ dissector_add("udp.port", GSMTAP_UDP_PORT, gsmtap_handle);</span><br><span style="color: hsl(0, 100%, 40%);">-+}</span><br><span style="color: hsl(0, 100%, 40%);">-Index: epan/dissectors/packet-gsmtap.h</span><br><span style="color: hsl(0, 100%, 40%);">-===================================================================</span><br><span>---- /dev/null</span><br><span style="color: hsl(0, 100%, 40%);">-+++ epan/dissectors/packet-gsmtap.h</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -0,0 +1,70 @@</span><br><span style="color: hsl(0, 100%, 40%);">-+#ifndef _GSMTAP_H</span><br><span style="color: hsl(0, 100%, 40%);">-+#define _GSMTAP_H</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+/* gsmtap header, pseudo-header in front of the actua/ GSM payload */</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+/* GSMTAP is a generic header format for GSM protocol captures,</span><br><span style="color: hsl(0, 100%, 40%);">-+ * it uses the IANA-assigned UDP port number 4729 and carries</span><br><span style="color: hsl(0, 100%, 40%);">-+ * payload in various formats of GSM interfaces such as Um MAC</span><br><span style="color: hsl(0, 100%, 40%);">-+ * blocks or Um bursts.</span><br><span style="color: hsl(0, 100%, 40%);">-+ *</span><br><span style="color: hsl(0, 100%, 40%);">-+ * Example programs generating GSMTAP data are airprobe</span><br><span style="color: hsl(0, 100%, 40%);">-+ * (http://airprobe.org/) or OsmocomBB (http://bb.osmocom.org/)</span><br><span style="color: hsl(0, 100%, 40%);">-+ */</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+#define GSMTAP_TYPE_UM 0x01</span><br><span style="color: hsl(0, 100%, 40%);">-+#define GSMTAP_TYPE_ABIS 0x02</span><br><span style="color: hsl(0, 100%, 40%);">-+#define GSMTAP_TYPE_UM_BURST 0x03 /* raw burst bits */</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+#define GSMTAP_BURST_UNKNOWN 0x00</span><br><span style="color: hsl(0, 100%, 40%);">-+#define GSMTAP_BURST_FCCH 0x01</span><br><span style="color: hsl(0, 100%, 40%);">-+#define GSMTAP_BURST_PARTIAL_SCH 0x02</span><br><span style="color: hsl(0, 100%, 40%);">-+#define GSMTAP_BURST_SCH 0x03</span><br><span style="color: hsl(0, 100%, 40%);">-+#define GSMTAP_BURST_CTS_SCH 0x04</span><br><span style="color: hsl(0, 100%, 40%);">-+#define GSMTAP_BURST_COMPACT_SCH 0x05</span><br><span style="color: hsl(0, 100%, 40%);">-+#define GSMTAP_BURST_NORMAL 0x06</span><br><span style="color: hsl(0, 100%, 40%);">-+#define GSMTAP_BURST_DUMMY 0x07</span><br><span style="color: hsl(0, 100%, 40%);">-+#define GSMTAP_BURST_ACCESS 0x08</span><br><span style="color: hsl(0, 100%, 40%);">-+#define GSMTAP_BURST_NONE 0x09</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+#define GSMTAP_CHANNEL_UNKNOWN 0x00</span><br><span style="color: hsl(0, 100%, 40%);">-+#define GSMTAP_CHANNEL_BCCH 0x01</span><br><span style="color: hsl(0, 100%, 40%);">-+#define GSMTAP_CHANNEL_CCCH 0x02</span><br><span style="color: hsl(0, 100%, 40%);">-+#define GSMTAP_CHANNEL_RACH 0x03</span><br><span style="color: hsl(0, 100%, 40%);">-+#define GSMTAP_CHANNEL_AGCH 0x04</span><br><span style="color: hsl(0, 100%, 40%);">-+#define GSMTAP_CHANNEL_PCH 0x05</span><br><span style="color: hsl(0, 100%, 40%);">-+#define GSMTAP_CHANNEL_SDCCH 0x06</span><br><span style="color: hsl(0, 100%, 40%);">-+#define GSMTAP_CHANNEL_SDCCH4 0x07</span><br><span style="color: hsl(0, 100%, 40%);">-+#define GSMTAP_CHANNEL_SDCCH8 0x08</span><br><span style="color: hsl(0, 100%, 40%);">-+#define GSMTAP_CHANNEL_TCH_F 0x09</span><br><span style="color: hsl(0, 100%, 40%);">-+#define GSMTAP_CHANNEL_TCH_H 0x0a</span><br><span style="color: hsl(0, 100%, 40%);">-+#define GSMTAP_CHANNEL_ACCH 0x80</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+#define GSMTAP_ARFCN_F_PCS 0x8000</span><br><span style="color: hsl(0, 100%, 40%);">-+#define GSMTAP_ARFCN_F_UPLINK 0x4000</span><br><span style="color: hsl(0, 100%, 40%);">-+#define GSMTAP_ARFCN_MASK 0x3fff</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+#define GSMTAP_UDP_PORT 4729</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+/* This is the header as it is used by gsmtap-generating software.</span><br><span style="color: hsl(0, 100%, 40%);">-+ * It is not used by the wireshark dissector and provided for reference only.</span><br><span style="color: hsl(0, 100%, 40%);">-+struct gsmtap_hdr {</span><br><span style="color: hsl(0, 100%, 40%);">-+ guint8 version; // version, set to 0x01 currently</span><br><span style="color: hsl(0, 100%, 40%);">-+ guint8 hdr_len; // length in number of 32bit words</span><br><span style="color: hsl(0, 100%, 40%);">-+ guint8 type; // see GSMTAP_TYPE_*</span><br><span style="color: hsl(0, 100%, 40%);">-+ guint8 timeslot; // timeslot (0..7 on Um)</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ guint16 arfcn; // ARFCN (frequency)</span><br><span style="color: hsl(0, 100%, 40%);">-+ gint8 signal_dbm; // signal level in dBm</span><br><span style="color: hsl(0, 100%, 40%);">-+ gint8 snr_db; // signal/noise ratio in dB</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ guint32 frame_number; // GSM Frame Number (FN)</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ guint8 sub_type; // Type of burst/channel, see above</span><br><span style="color: hsl(0, 100%, 40%);">-+ guint8 antenna_nr; // Antenna Number</span><br><span style="color: hsl(0, 100%, 40%);">-+ guint8 sub_slot; // sub-slot within timeslot</span><br><span style="color: hsl(0, 100%, 40%);">-+ guint8 res; // reserved for future use (RFU)</span><br><span style="color: hsl(0, 100%, 40%);">-+}</span><br><span style="color: hsl(0, 100%, 40%);">-+ */</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+#endif /* _GSMTAP_H */</span><br><span style="color: hsl(0, 100%, 40%);">-Index: epan/dissectors/Makefile.common</span><br><span style="color: hsl(0, 100%, 40%);">-===================================================================</span><br><span>---- epan/dissectors/Makefile.common.orig</span><br><span style="color: hsl(0, 100%, 40%);">-+++ epan/dissectors/Makefile.common</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -484,6 +484,7 @@</span><br><span style="color: hsl(0, 100%, 40%);">- packet-gsm_sms.c \</span><br><span style="color: hsl(0, 100%, 40%);">- packet-gsm_sms_ud.c \</span><br><span style="color: hsl(0, 100%, 40%);">- packet-gsm_um.c \</span><br><span style="color: hsl(0, 100%, 40%);">-+ packet-gsmtap.c \</span><br><span style="color: hsl(0, 100%, 40%);">- packet-gssapi.c \</span><br><span style="color: hsl(0, 100%, 40%);">- packet-gtp.c \</span><br><span style="color: hsl(0, 100%, 40%);">- packet-gtpv2.c \</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -1072,6 +1073,7 @@</span><br><span style="color: hsl(0, 100%, 40%);">- packet-gsm_a_common.h \</span><br><span style="color: hsl(0, 100%, 40%);">- packet-gsm_map.h \</span><br><span style="color: hsl(0, 100%, 40%);">- packet-gsm_sms.h \</span><br><span style="color: hsl(0, 100%, 40%);">-+ packet-gsmtap.h \</span><br><span style="color: hsl(0, 100%, 40%);">- packet-gssapi.h \</span><br><span style="color: hsl(0, 100%, 40%);">- packet-gtp.h \</span><br><span style="color: hsl(0, 100%, 40%);">- packet-h223.h \</span><br><span>diff --git a/src/wireshark/smscb.patch b/src/wireshark/smscb.patch</span><br><span>deleted file mode 100644</span><br><span>index 80005a3..0000000</span><br><span>--- a/src/wireshark/smscb.patch</span><br><span>+++ /dev/null</span><br><span>@@ -1,743 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Wireshark patch for SMSCB dissection support in LAPDm</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-Create a new gsm_smscb dissector module for SMSCB as defined in GSM TS</span><br><span style="color: hsl(0, 100%, 40%);">-04.12. Call it from packet-lapdm when the Link Protocol Discriminator</span><br><span style="color: hsl(0, 100%, 40%);">-has the value "0 1".</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-Signed-off-by: Alex Badea <vamposdecampos@gmail.com></span><br><span>----</span><br><span style="color: hsl(0, 100%, 40%);">- epan/dissectors/Makefile.common | 1 +</span><br><span style="color: hsl(0, 100%, 40%);">- epan/dissectors/packet-gsm_smscb.c | 642 ++++++++++++++++++++++++++++++++++++</span><br><span style="color: hsl(0, 100%, 40%);">- epan/dissectors/packet-lapdm.c | 18 +-</span><br><span style="color: hsl(0, 100%, 40%);">- 3 files changed, 658 insertions(+), 3 deletions(-)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common</span><br><span style="color: hsl(0, 100%, 40%);">-index 9f9a602..5684579 100644</span><br><span>---- a/epan/dissectors/Makefile.common</span><br><span style="color: hsl(0, 100%, 40%);">-+++ b/epan/dissectors/Makefile.common</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -500,6 +500,7 @@ DISSECTOR_SRC = \</span><br><span style="color: hsl(0, 100%, 40%);">- packet-gsm_bssmap_le.c \</span><br><span style="color: hsl(0, 100%, 40%);">- packet-gsm_sms.c \</span><br><span style="color: hsl(0, 100%, 40%);">- packet-gsm_sms_ud.c \</span><br><span style="color: hsl(0, 100%, 40%);">-+ packet-gsm_smscb.c \</span><br><span style="color: hsl(0, 100%, 40%);">- packet-gsm_um.c \</span><br><span style="color: hsl(0, 100%, 40%);">- packet-gsmtap.c \</span><br><span style="color: hsl(0, 100%, 40%);">- packet-gssapi.c \</span><br><span style="color: hsl(0, 100%, 40%);">-diff --git a/epan/dissectors/packet-gsm_smscb.c b/epan/dissectors/packet-gsm_smscb.c</span><br><span style="color: hsl(0, 100%, 40%);">-new file mode 100644</span><br><span style="color: hsl(0, 100%, 40%);">-index 0000000..a2f8bee</span><br><span>---- /dev/null</span><br><span style="color: hsl(0, 100%, 40%);">-+++ b/epan/dissectors/packet-gsm_smscb.c</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -0,0 +1,642 @@</span><br><span style="color: hsl(0, 100%, 40%);">-+/* packet-gsm_smscb.c</span><br><span style="color: hsl(0, 100%, 40%);">-+ * Routines for GSM SMSCB (GSM 04.12) dissection</span><br><span style="color: hsl(0, 100%, 40%);">-+ * Copyright 2010, Alex Badea <vamposdecampos@gmail.com></span><br><span style="color: hsl(0, 100%, 40%);">-+ *</span><br><span style="color: hsl(0, 100%, 40%);">-+ * $Id$</span><br><span style="color: hsl(0, 100%, 40%);">-+ *</span><br><span style="color: hsl(0, 100%, 40%);">-+ * Wireshark - Network traffic analyzer</span><br><span style="color: hsl(0, 100%, 40%);">-+ * By Gerald Combs <gerald@wireshark.org></span><br><span style="color: hsl(0, 100%, 40%);">-+ * Copyright 1998 Gerald Combs</span><br><span style="color: hsl(0, 100%, 40%);">-+ *</span><br><span style="color: hsl(0, 100%, 40%);">-+ * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(0, 100%, 40%);">-+ * it under the terms of the GNU General Public License as published by</span><br><span style="color: hsl(0, 100%, 40%);">-+ * the Free Software Foundation; either version 2 of the License, or</span><br><span style="color: hsl(0, 100%, 40%);">-+ * (at your option) any later version.</span><br><span style="color: hsl(0, 100%, 40%);">-+ *</span><br><span style="color: hsl(0, 100%, 40%);">-+ * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(0, 100%, 40%);">-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(0, 100%, 40%);">-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(0, 100%, 40%);">-+ * GNU General Public License for more details.</span><br><span style="color: hsl(0, 100%, 40%);">-+ *</span><br><span style="color: hsl(0, 100%, 40%);">-+ * You should have received a copy of the GNU General Public License along</span><br><span style="color: hsl(0, 100%, 40%);">-+ * with this program; if not, write to the Free Software Foundation, Inc.,</span><br><span style="color: hsl(0, 100%, 40%);">-+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.</span><br><span style="color: hsl(0, 100%, 40%);">-+ */</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+#ifdef HAVE_CONFIG_H</span><br><span style="color: hsl(0, 100%, 40%);">-+# include "config.h"</span><br><span style="color: hsl(0, 100%, 40%);">-+#endif</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+#include <glib.h></span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+#include <epan/packet.h></span><br><span style="color: hsl(0, 100%, 40%);">-+#include <epan/prefs.h></span><br><span style="color: hsl(0, 100%, 40%);">-+#include <epan/reassemble.h></span><br><span style="color: hsl(0, 100%, 40%);">-+#include <epan/asn1.h></span><br><span style="color: hsl(0, 100%, 40%);">-+#include "packet-gsm_map.h"</span><br><span style="color: hsl(0, 100%, 40%);">-+#include "packet-gsm_sms.h"</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+static gint proto_gsm_smscb = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static gint hf_smscb_addr = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static gint hf_smscb_addr_lb = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static gint hf_smscb_addr_seq = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static gint hf_smscb_serial_gs = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static gint hf_smscb_serial_mcode = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static gint hf_smscb_serial_updnum = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static gint hf_smscb_page_num = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static gint hf_smscb_page_cnt = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static gint hf_smscb_msgid = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static gint hf_smscb_content = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static gint hf_smscb_fragments = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static gint hf_smscb_fragment = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static gint hf_smscb_fragment_overlap = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static gint hf_smscb_fragment_overlap_conflicts = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static gint hf_smscb_fragment_multiple_tails = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static gint hf_smscb_fragment_too_long_fragment = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static gint hf_smscb_fragment_error = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static gint hf_smscb_reassembled_in = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static gint hf_smscb_reassembled_length = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static gint hf_smscb_sched_type = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static gint hf_smscb_sched_spare = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static gint hf_smscb_sched_begin_slot = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static gint hf_smscb_sched_end_slot = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static gint hf_smscb_sched_mdt1 = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static gint hf_smscb_sched_mdt2 = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static gint hf_smscb_sched_mdt8 = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static gint hf_smscb_sched_msgid = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static gint hf_smscb_sched_repslot = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+static gint ett_smscb = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static gint ett_smscb_addr = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static gint ett_smscb_dcs = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static gint ett_smscb_fragment = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static gint ett_smscb_fragments = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static gint ett_smscb_sched_new = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static gint ett_smscb_sched_other = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+static gint ett_smscb_sched_slot = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+static GHashTable *smscb_fragment_table = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-+static GHashTable *smscb_reassembled_table = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+static gboolean reassemble_smscb = TRUE;</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+static dissector_handle_t data_handle;</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+#define SMSCB_HDR_MINLEN 1</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+/*</span><br><span style="color: hsl(0, 100%, 40%);">-+ * Bits in the address field.</span><br><span style="color: hsl(0, 100%, 40%);">-+ */</span><br><span style="color: hsl(0, 100%, 40%);">-+#define SMSCB_ADDR_LB 0x10 /* Address Last Bit */</span><br><span style="color: hsl(0, 100%, 40%);">-+#define SMSCB_ADDR_SEQ 0x0f /* Address sequence number */</span><br><span style="color: hsl(0, 100%, 40%);">-+#define SMSCB_SERIAL_GS 0xc000 /* CBS Serial Number - Geographical Scope */</span><br><span style="color: hsl(0, 100%, 40%);">-+#define SMSCB_SERIAL_MCODE 0x3ff0 /* CBS Serial Number - Message Code */</span><br><span style="color: hsl(0, 100%, 40%);">-+#define SMSCB_SERIAL_UPDNUM 0x000f /* CBS Serial Number - Update Number */</span><br><span style="color: hsl(0, 100%, 40%);">-+#define SMSCB_PAGE_NUM 0xf0 /* Page number */</span><br><span style="color: hsl(0, 100%, 40%);">-+#define SMSCB_PAGE_CNT 0x0f /* Page total count */</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+/*</span><br><span style="color: hsl(0, 100%, 40%);">-+ * Bits in the Schedule message</span><br><span style="color: hsl(0, 100%, 40%);">-+ */</span><br><span style="color: hsl(0, 100%, 40%);">-+#define SMSCB_SCHED_TYPE 0xc0 /* Type */</span><br><span style="color: hsl(0, 100%, 40%);">-+#define SMSCB_SCHED_SLOT 0x3f /* Begin/End Slot Number */</span><br><span style="color: hsl(0, 100%, 40%);">-+#define SMSCB_SCHED_SPARE 0xc0 /* Spare */</span><br><span style="color: hsl(0, 100%, 40%);">-+#define SMSCB_SCHED_MDT1 0x8000 /* MDT (1 bit)*/</span><br><span style="color: hsl(0, 100%, 40%);">-+#define SMSCB_SCHED_MSGID 0x7fff /* Message ID */</span><br><span style="color: hsl(0, 100%, 40%);">-+#define SMSCB_SCHED_MDT2 0xc0 /* MDT (2 bits) */</span><br><span style="color: hsl(0, 100%, 40%);">-+#define SMSCB_SCHED_REPSLOT 0x3f /* Repeated Slot Number */</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+#define SMSCB_SEQ_LAST 3</span><br><span style="color: hsl(0, 100%, 40%);">-+#define SMSCB_SEQ_1ST 0</span><br><span style="color: hsl(0, 100%, 40%);">-+#define SMSCB_SEQ_1ST_SCHED 8</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+#define SMSCB_SCHED_SLOT_MAX 48</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+/* 04.12 section 3.3.1 */</span><br><span style="color: hsl(0, 100%, 40%);">-+static const value_string smscb_addr_lb_vals[] = {</span><br><span style="color: hsl(0, 100%, 40%);">-+ { 0, "More blocks" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { 1, "Last block" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { 0, NULL }</span><br><span style="color: hsl(0, 100%, 40%);">-+};</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+/* 04.12 section 3.3.1 */</span><br><span style="color: hsl(0, 100%, 40%);">-+static const value_string smscb_addr_seq_vals[] = {</span><br><span style="color: hsl(0, 100%, 40%);">-+ { 0, "First block" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { 1, "Second block" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { 2, "Third block" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { 3, "Fourth block" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { 8, "First schedule block" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { 15, "Null message" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { 0, NULL }</span><br><span style="color: hsl(0, 100%, 40%);">-+};</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+/* 03.41 section 9.3.2.1 */</span><br><span style="color: hsl(0, 100%, 40%);">-+static const value_string smscb_serial_gs_vals[] = {</span><br><span style="color: hsl(0, 100%, 40%);">-+ { 0, "Cell wide (immediate)" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { 1, "PLMN wide" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { 2, "Location Area wide" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { 3, "Cell wide" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { 0, NULL }</span><br><span style="color: hsl(0, 100%, 40%);">-+};</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+/* 04.14 section 3.5.5 */</span><br><span style="color: hsl(0, 100%, 40%);">-+static const value_string smscb_sched_mdt8_vals[] = {</span><br><span style="color: hsl(0, 100%, 40%);">-+ { 0x00, "Retransmission indication" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { 0x80, "First transmission of an SMSCB within the Schedule Period" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { 0x40, "Free Message Slot, optional reading" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { 0x41, "Free Message Slot, reading advised" },</span><br><span style="color: hsl(0, 100%, 40%);">-+ { 0, NULL }</span><br><span style="color: hsl(0, 100%, 40%);">-+};</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+static const fragment_items smscb_frag_items = {</span><br><span style="color: hsl(0, 100%, 40%);">-+ /* Fragment subtrees */</span><br><span style="color: hsl(0, 100%, 40%);">-+ &ett_smscb_fragment,</span><br><span style="color: hsl(0, 100%, 40%);">-+ &ett_smscb_fragments,</span><br><span style="color: hsl(0, 100%, 40%);">-+ /* Fragment fields */</span><br><span style="color: hsl(0, 100%, 40%);">-+ &hf_smscb_fragments,</span><br><span style="color: hsl(0, 100%, 40%);">-+ &hf_smscb_fragment,</span><br><span style="color: hsl(0, 100%, 40%);">-+ &hf_smscb_fragment_overlap,</span><br><span style="color: hsl(0, 100%, 40%);">-+ &hf_smscb_fragment_overlap_conflicts,</span><br><span style="color: hsl(0, 100%, 40%);">-+ &hf_smscb_fragment_multiple_tails,</span><br><span style="color: hsl(0, 100%, 40%);">-+ &hf_smscb_fragment_too_long_fragment,</span><br><span style="color: hsl(0, 100%, 40%);">-+ &hf_smscb_fragment_error,</span><br><span style="color: hsl(0, 100%, 40%);">-+ /* Reassembled in field */</span><br><span style="color: hsl(0, 100%, 40%);">-+ &hf_smscb_reassembled_in,</span><br><span style="color: hsl(0, 100%, 40%);">-+ /* Reassembled length field */</span><br><span style="color: hsl(0, 100%, 40%);">-+ &hf_smscb_reassembled_length,</span><br><span style="color: hsl(0, 100%, 40%);">-+ /* Tag */</span><br><span style="color: hsl(0, 100%, 40%);">-+ "fragments"</span><br><span style="color: hsl(0, 100%, 40%);">-+};</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+static void smscb_defragment_init(void)</span><br><span style="color: hsl(0, 100%, 40%);">-+{</span><br><span style="color: hsl(0, 100%, 40%);">-+ fragment_table_init(&smscb_fragment_table);</span><br><span style="color: hsl(0, 100%, 40%);">-+ reassembled_table_init(&smscb_reassembled_table);</span><br><span style="color: hsl(0, 100%, 40%);">-+}</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+/* [3GPP TS 03.41 section 9.3] */</span><br><span style="color: hsl(0, 100%, 40%);">-+static int dissect_smscb_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)</span><br><span style="color: hsl(0, 100%, 40%);">-+{</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_item *ti;</span><br><span style="color: hsl(0, 100%, 40%);">-+ gint offset = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-+ gint length, out_len, textlen;</span><br><span style="color: hsl(0, 100%, 40%);">-+ guint8 encoding;</span><br><span style="color: hsl(0, 100%, 40%);">-+ gchar msgbuf[88 + 1];</span><br><span style="color: hsl(0, 100%, 40%);">-+ gchar *utf8_text, *p;</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree_add_item(tree, hf_smscb_serial_gs, tvb, offset, 1, ENC_NA);</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree_add_item(tree, hf_smscb_serial_mcode, tvb, offset, 2, ENC_NA);</span><br><span style="color: hsl(0, 100%, 40%);">-+ offset++;</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree_add_item(tree, hf_smscb_serial_updnum, tvb, offset, 1, ENC_NA);</span><br><span style="color: hsl(0, 100%, 40%);">-+ offset++;</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree_add_item(tree, hf_smscb_msgid, tvb, offset, 2, ENC_BIG_ENDIAN);</span><br><span style="color: hsl(0, 100%, 40%);">-+ col_append_fstr(pinfo->cinfo, COL_INFO, " - Message ID %d", tvb_get_ntohs(tvb, offset));</span><br><span style="color: hsl(0, 100%, 40%);">-+ offset += 2;</span><br><span style="color: hsl(0, 100%, 40%);">-+ ti = proto_tree_add_text(tree, tvb, offset, 1, "Data Coding Scheme");</span><br><span style="color: hsl(0, 100%, 40%);">-+ encoding = dissect_cbs_data_coding_scheme(</span><br><span style="color: hsl(0, 100%, 40%);">-+ tvb_new_subset(tvb, offset, 1, -1), pinfo,</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_item_add_subtree(ti, ett_smscb_dcs));</span><br><span style="color: hsl(0, 100%, 40%);">-+ offset++;</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree_add_item(tree, hf_smscb_page_num, tvb, offset, 1, ENC_NA);</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree_add_item(tree, hf_smscb_page_cnt, tvb, offset, 1, ENC_NA);</span><br><span style="color: hsl(0, 100%, 40%);">-+ offset++;</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ length = tvb_length(tvb) - offset;</span><br><span style="color: hsl(0, 100%, 40%);">-+ switch (encoding) {</span><br><span style="color: hsl(0, 100%, 40%);">-+ case SMS_ENCODING_7BIT:</span><br><span style="color: hsl(0, 100%, 40%);">-+ case SMS_ENCODING_7BIT_LANG:</span><br><span style="color: hsl(0, 100%, 40%);">-+ out_len = gsm_sms_char_7bit_unpack(0, length, sizeof(msgbuf) - 1,</span><br><span style="color: hsl(0, 100%, 40%);">-+ tvb_get_ptr(tvb, offset, length), msgbuf);</span><br><span style="color: hsl(0, 100%, 40%);">-+ msgbuf[out_len] = '\0';</span><br><span style="color: hsl(0, 100%, 40%);">-+ utf8_text = gsm_sms_chars_to_utf8(msgbuf, out_len);</span><br><span style="color: hsl(0, 100%, 40%);">-+ textlen = strlen(utf8_text);</span><br><span style="color: hsl(0, 100%, 40%);">-+ break;</span><br><span style="color: hsl(0, 100%, 40%);">-+ /* TODO: UCS2? */</span><br><span style="color: hsl(0, 100%, 40%);">-+ case SMS_ENCODING_8BIT:</span><br><span style="color: hsl(0, 100%, 40%);">-+ default:</span><br><span style="color: hsl(0, 100%, 40%);">-+ utf8_text = tvb_get_ephemeral_string(tvb, offset, length);</span><br><span style="color: hsl(0, 100%, 40%);">-+ textlen = length;</span><br><span style="color: hsl(0, 100%, 40%);">-+ break;</span><br><span style="color: hsl(0, 100%, 40%);">-+ }</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree_add_string(tree, hf_smscb_content, tvb, offset, length, utf8_text);</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ /* strip padding */</span><br><span style="color: hsl(0, 100%, 40%);">-+ if ((p = strchr( utf8_text, '\r')))</span><br><span style="color: hsl(0, 100%, 40%);">-+ *p = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-+ col_append_fstr(pinfo->cinfo, COL_INFO, " \"%s\"", utf8_text);</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ return tvb_length(tvb);</span><br><span style="color: hsl(0, 100%, 40%);">-+}</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+/* [3GPP TS 04.14 section 3.5.5] */</span><br><span style="color: hsl(0, 100%, 40%);">-+static int dissect_sched_msg_desc(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,</span><br><span style="color: hsl(0, 100%, 40%);">-+ gint *slot_list, gint slot_count)</span><br><span style="color: hsl(0, 100%, 40%);">-+{</span><br><span style="color: hsl(0, 100%, 40%);">-+ gint offset = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-+ gint k;</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_item *ti;</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree *subtree;</span><br><span style="color: hsl(0, 100%, 40%);">-+ guint8 mdt;</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ for (k = 0; k < slot_count; k++) {</span><br><span style="color: hsl(0, 100%, 40%);">-+ mdt = tvb_get_guint8(tvb, offset);</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ if (mdt & 0x80)</span><br><span style="color: hsl(0, 100%, 40%);">-+ mdt = 0x80;</span><br><span style="color: hsl(0, 100%, 40%);">-+ else if (!(mdt & 0x40))</span><br><span style="color: hsl(0, 100%, 40%);">-+ mdt = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ ti = proto_tree_add_text(tree, tvb, offset, 1, "Slot %d - %s",</span><br><span style="color: hsl(0, 100%, 40%);">-+ slot_list[k],</span><br><span style="color: hsl(0, 100%, 40%);">-+ val_to_str(mdt, smscb_sched_mdt8_vals, "Unknown (0x%02x)"));</span><br><span style="color: hsl(0, 100%, 40%);">-+ subtree = proto_item_add_subtree(ti, ett_smscb_sched_slot);</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ if (mdt & 0x80) {</span><br><span style="color: hsl(0, 100%, 40%);">-+ guint16 msgid = tvb_get_ntohs(tvb, offset) & SMSCB_SCHED_MSGID;</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_item_append_text(ti, " (message ID %d)", msgid);</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_item_set_len(ti, 2);</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree_add_item(subtree, hf_smscb_sched_mdt1, tvb, offset, 2, ENC_BIG_ENDIAN);</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree_add_item(subtree, hf_smscb_sched_msgid, tvb, offset, 2, ENC_BIG_ENDIAN);</span><br><span style="color: hsl(0, 100%, 40%);">-+ offset += 2;</span><br><span style="color: hsl(0, 100%, 40%);">-+ } else if (!(mdt & 0xc0)) {</span><br><span style="color: hsl(0, 100%, 40%);">-+ guint8 slot = tvb_get_guint8(tvb, offset) & SMSCB_SCHED_SLOT;</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_item_append_text(ti, " (slot %d)", slot);</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree_add_item(subtree, hf_smscb_sched_mdt2, tvb, offset, 1, ENC_NA);</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree_add_item(subtree, hf_smscb_sched_repslot, tvb, offset, 1, ENC_NA);</span><br><span style="color: hsl(0, 100%, 40%);">-+ offset++;</span><br><span style="color: hsl(0, 100%, 40%);">-+ } else {</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree_add_item(subtree, hf_smscb_sched_mdt8, tvb, offset, 1, ENC_NA);</span><br><span style="color: hsl(0, 100%, 40%);">-+ offset++;</span><br><span style="color: hsl(0, 100%, 40%);">-+ }</span><br><span style="color: hsl(0, 100%, 40%);">-+ }</span><br><span style="color: hsl(0, 100%, 40%);">-+ return offset;</span><br><span style="color: hsl(0, 100%, 40%);">-+}</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+/* [3GPP TS 04.14 section 3.5] */</span><br><span style="color: hsl(0, 100%, 40%);">-+static int dissect_sched_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)</span><br><span style="color: hsl(0, 100%, 40%);">-+{</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_item *ti;</span><br><span style="color: hsl(0, 100%, 40%);">-+ gint offset = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-+ gint first, last, nm, len;</span><br><span style="color: hsl(0, 100%, 40%);">-+ gint new_count = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-+ gint other_count = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-+ gint new_list[SMSCB_SCHED_SLOT_MAX];</span><br><span style="color: hsl(0, 100%, 40%);">-+ gint other_list[SMSCB_SCHED_SLOT_MAX];</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ col_append_str(pinfo->cinfo, COL_INFO, " - Schedule message");</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree_add_item(tree, hf_smscb_sched_type, tvb, offset, 1, ENC_NA);</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree_add_item(tree, hf_smscb_sched_begin_slot, tvb, offset, 1, ENC_NA);</span><br><span style="color: hsl(0, 100%, 40%);">-+ offset++;</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree_add_item(tree, hf_smscb_sched_spare, tvb, offset, 1, ENC_NA);</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree_add_item(tree, hf_smscb_sched_end_slot, tvb, offset, 1, ENC_NA);</span><br><span style="color: hsl(0, 100%, 40%);">-+ offset++;</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ first = tvb_get_guint8(tvb, 0) & SMSCB_SCHED_SLOT;</span><br><span style="color: hsl(0, 100%, 40%);">-+ last = tvb_get_guint8(tvb, 1) & SMSCB_SCHED_SLOT;</span><br><span style="color: hsl(0, 100%, 40%);">-+ last = MIN(last, SMSCB_SCHED_SLOT_MAX);</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ ti = proto_tree_add_text(tree, tvb, offset, 6, "List of new message slots =");</span><br><span style="color: hsl(0, 100%, 40%);">-+ for (nm = first; nm <= last; nm++) {</span><br><span style="color: hsl(0, 100%, 40%);">-+ if (tvb_get_bits8(tvb, offset * 8 + nm - first, 1)) {</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_item_append_text(ti, " %d", nm);</span><br><span style="color: hsl(0, 100%, 40%);">-+ new_list[new_count++] = nm;</span><br><span style="color: hsl(0, 100%, 40%);">-+ } else {</span><br><span style="color: hsl(0, 100%, 40%);">-+ other_list[other_count++] = nm;</span><br><span style="color: hsl(0, 100%, 40%);">-+ }</span><br><span style="color: hsl(0, 100%, 40%);">-+ }</span><br><span style="color: hsl(0, 100%, 40%);">-+ offset += 6;</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ ti = proto_tree_add_text(tree, tvb, offset, 0, "New Message Descriptions");</span><br><span style="color: hsl(0, 100%, 40%);">-+ len = dissect_sched_msg_desc(tvb_new_subset(tvb, offset, -1, -1), pinfo,</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_item_add_subtree(ti, ett_smscb_sched_new),</span><br><span style="color: hsl(0, 100%, 40%);">-+ new_list, new_count);</span><br><span style="color: hsl(0, 100%, 40%);">-+ offset += len;</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_item_set_len(ti, len);</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ ti = proto_tree_add_text(tree, tvb, offset, 0, "Other Message Descriptions");</span><br><span style="color: hsl(0, 100%, 40%);">-+ len = dissect_sched_msg_desc(tvb_new_subset(tvb, offset, -1, -1), pinfo,</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_item_add_subtree(ti, ett_smscb_sched_other),</span><br><span style="color: hsl(0, 100%, 40%);">-+ other_list, other_count);</span><br><span style="color: hsl(0, 100%, 40%);">-+ offset += len;</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_item_set_len(ti, len);</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ return offset;</span><br><span style="color: hsl(0, 100%, 40%);">-+}</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+static inline int seq_any_frags(guint8 seq)</span><br><span style="color: hsl(0, 100%, 40%);">-+{</span><br><span style="color: hsl(0, 100%, 40%);">-+ return seq <= SMSCB_SEQ_LAST || seq == SMSCB_SEQ_1ST_SCHED;</span><br><span style="color: hsl(0, 100%, 40%);">-+}</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+static inline int seq_more_frags(guint8 seq)</span><br><span style="color: hsl(0, 100%, 40%);">-+{</span><br><span style="color: hsl(0, 100%, 40%);">-+ return seq < SMSCB_SEQ_LAST || seq == SMSCB_SEQ_1ST_SCHED;</span><br><span style="color: hsl(0, 100%, 40%);">-+}</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+static inline int seq_first(guint8 seq)</span><br><span style="color: hsl(0, 100%, 40%);">-+{</span><br><span style="color: hsl(0, 100%, 40%);">-+ return seq == SMSCB_SEQ_1ST || seq == SMSCB_SEQ_1ST_SCHED;</span><br><span style="color: hsl(0, 100%, 40%);">-+}</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+static inline int seq_bits(guint8 seq)</span><br><span style="color: hsl(0, 100%, 40%);">-+{</span><br><span style="color: hsl(0, 100%, 40%);">-+ return seq & 3;</span><br><span style="color: hsl(0, 100%, 40%);">-+}</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+/*</span><br><span style="color: hsl(0, 100%, 40%);">-+ * Do the reassembly thing.</span><br><span style="color: hsl(0, 100%, 40%);">-+ *</span><br><span style="color: hsl(0, 100%, 40%);">-+ * SMSCB fragmentation doesn't really fit in with the wireshark</span><br><span style="color: hsl(0, 100%, 40%);">-+ * reassembler. There are only two valid fragment sequences:</span><br><span style="color: hsl(0, 100%, 40%);">-+ * i) 0,1,2,3 for a SMSCB message</span><br><span style="color: hsl(0, 100%, 40%);">-+ * ii) 8,1,2,3 for a schedule message</span><br><span style="color: hsl(0, 100%, 40%);">-+ *</span><br><span style="color: hsl(0, 100%, 40%);">-+ * We can't use different fragment-IDs for each content type,</span><br><span style="color: hsl(0, 100%, 40%);">-+ * since the last 3 blocks have identical sequence numbers.</span><br><span style="color: hsl(0, 100%, 40%);">-+ *</span><br><span style="color: hsl(0, 100%, 40%);">-+ * We can't just mask the lower 2 bits, because when reassembly</span><br><span style="color: hsl(0, 100%, 40%);">-+ * completes (which is on the last block, sequence #3) we won't</span><br><span style="color: hsl(0, 100%, 40%);">-+ * know which content type we've reassembled.</span><br><span style="color: hsl(0, 100%, 40%);">-+ *</span><br><span style="color: hsl(0, 100%, 40%);">-+ * We also can't munge e.g. the schedule sequence to 8,9,10,11,</span><br><span style="color: hsl(0, 100%, 40%);">-+ * since the reassembler will think we're missing the first 8</span><br><span style="color: hsl(0, 100%, 40%);">-+ * blocks and not do anything.</span><br><span style="color: hsl(0, 100%, 40%);">-+ *</span><br><span style="color: hsl(0, 100%, 40%);">-+ * Also, according to TS 03.41 section 8 we must discard</span><br><span style="color: hsl(0, 100%, 40%);">-+ * non-consecutive sequences.</span><br><span style="color: hsl(0, 100%, 40%);">-+ *</span><br><span style="color: hsl(0, 100%, 40%);">-+ * So the approach here is to include the address header byte</span><br><span style="color: hsl(0, 100%, 40%);">-+ * in the first fragment. This way after reassembly we can peek</span><br><span style="color: hsl(0, 100%, 40%);">-+ * at it and dissect accordingly.</span><br><span style="color: hsl(0, 100%, 40%);">-+ *</span><br><span style="color: hsl(0, 100%, 40%);">-+ * A clean implementation would likely be to add a FD_* reassembler</span><br><span style="color: hsl(0, 100%, 40%);">-+ * flag to special-case this behaviour.</span><br><span style="color: hsl(0, 100%, 40%);">-+ */</span><br><span style="color: hsl(0, 100%, 40%);">-+static tvbuff_t *smscb_try_reassembly(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,</span><br><span style="color: hsl(0, 100%, 40%);">-+ guint8 *seq_p, guint8 more)</span><br><span style="color: hsl(0, 100%, 40%);">-+{</span><br><span style="color: hsl(0, 100%, 40%);">-+ guint8 seq = *seq_p;</span><br><span style="color: hsl(0, 100%, 40%);">-+ fragment_data *frag;</span><br><span style="color: hsl(0, 100%, 40%);">-+ guint32 frag_id = 0x42;</span><br><span style="color: hsl(0, 100%, 40%);">-+ guchar expected_seq = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-+ tvbuff_t *reassembled = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-+ gboolean save_fragmented = pinfo->fragmented;</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ if (!reassemble_smscb || !seq_any_frags(seq))</span><br><span style="color: hsl(0, 100%, 40%);">-+ return tvb;</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ frag = fragment_get(pinfo, frag_id, smscb_fragment_table);</span><br><span style="color: hsl(0, 100%, 40%);">-+ if (frag) {</span><br><span style="color: hsl(0, 100%, 40%);">-+ while (frag->next)</span><br><span style="color: hsl(0, 100%, 40%);">-+ frag = frag->next;</span><br><span style="color: hsl(0, 100%, 40%);">-+ expected_seq = frag->offset + 1;</span><br><span style="color: hsl(0, 100%, 40%);">-+ }</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ if (seq != expected_seq)</span><br><span style="color: hsl(0, 100%, 40%);">-+ g_free(fragment_delete(pinfo, frag_id, smscb_fragment_table));</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ if (!seq_first(seq))</span><br><span style="color: hsl(0, 100%, 40%);">-+ tvb = tvb_new_subset(tvb, 1, -1, -1);</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ pinfo->fragmented = more;</span><br><span style="color: hsl(0, 100%, 40%);">-+ frag = fragment_add_seq_check(tvb, 0, pinfo, frag_id,</span><br><span style="color: hsl(0, 100%, 40%);">-+ smscb_fragment_table,</span><br><span style="color: hsl(0, 100%, 40%);">-+ smscb_reassembled_table, seq_bits(seq),</span><br><span style="color: hsl(0, 100%, 40%);">-+ tvb_length(tvb),</span><br><span style="color: hsl(0, 100%, 40%);">-+ more);</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ reassembled = process_reassembled_data(tvb, 0, pinfo,</span><br><span style="color: hsl(0, 100%, 40%);">-+ "Reassembled SMSCB", frag, &smscb_frag_items, NULL, tree);</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ if (frag && pinfo->fd->num == frag->reassembled_in) {</span><br><span style="color: hsl(0, 100%, 40%);">-+ *seq_p = tvb_get_guint8(reassembled, 0) & SMSCB_ADDR_SEQ;</span><br><span style="color: hsl(0, 100%, 40%);">-+ reassembled = tvb_new_subset(reassembled, 1, -1, -1);</span><br><span style="color: hsl(0, 100%, 40%);">-+ } else {</span><br><span style="color: hsl(0, 100%, 40%);">-+ col_append_str(pinfo->cinfo, COL_INFO, " (Fragment)");</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree_add_text(tree, tvb, 0, -1, "Fragment Data");</span><br><span style="color: hsl(0, 100%, 40%);">-+ reassembled = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-+ }</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ pinfo->fragmented = save_fragmented;</span><br><span style="color: hsl(0, 100%, 40%);">-+ return reassembled;</span><br><span style="color: hsl(0, 100%, 40%);">-+}</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+static int dissect_gsm_smscb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)</span><br><span style="color: hsl(0, 100%, 40%);">-+{</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_item *ti;</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree *gsm_smscb_tree = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree *subtree = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-+ guint8 addr, seq, more;</span><br><span style="color: hsl(0, 100%, 40%);">-+ tvbuff_t *payload;</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ if (tvb_length(tvb) < SMSCB_HDR_MINLEN)</span><br><span style="color: hsl(0, 100%, 40%);">-+ return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ addr = tvb_get_guint8(tvb, 0);</span><br><span style="color: hsl(0, 100%, 40%);">-+ seq = addr & SMSCB_ADDR_SEQ;</span><br><span style="color: hsl(0, 100%, 40%);">-+ more = !(addr & SMSCB_ADDR_LB) && seq_more_frags(seq);</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMSCB");</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ col_clear(pinfo->cinfo, COL_INFO);</span><br><span style="color: hsl(0, 100%, 40%);">-+ col_append_str(pinfo->cinfo, COL_INFO,</span><br><span style="color: hsl(0, 100%, 40%);">-+ val_to_str(seq, smscb_addr_seq_vals, "Unknown block #%d"));</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ if (tree) {</span><br><span style="color: hsl(0, 100%, 40%);">-+ ti = proto_tree_add_item(tree, proto_gsm_smscb, tvb, 0, -1, ENC_NA);</span><br><span style="color: hsl(0, 100%, 40%);">-+ gsm_smscb_tree = proto_item_add_subtree(ti, ett_smscb);</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ ti = proto_tree_add_item(gsm_smscb_tree, hf_smscb_addr, tvb, 0, 1, ENC_NA);</span><br><span style="color: hsl(0, 100%, 40%);">-+ subtree = proto_item_add_subtree(ti, ett_smscb_addr);</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree_add_item(subtree, hf_smscb_addr_lb, tvb, 0, 1, ENC_NA);</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree_add_item(subtree, hf_smscb_addr_seq, tvb, 0, 1, ENC_NA);</span><br><span style="color: hsl(0, 100%, 40%);">-+ }</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ payload = smscb_try_reassembly(tvb, pinfo, gsm_smscb_tree, &seq, more);</span><br><span style="color: hsl(0, 100%, 40%);">-+ if (payload) {</span><br><span style="color: hsl(0, 100%, 40%);">-+ switch (seq) {</span><br><span style="color: hsl(0, 100%, 40%);">-+ case SMSCB_SEQ_1ST:</span><br><span style="color: hsl(0, 100%, 40%);">-+ dissect_smscb_message(payload, pinfo, gsm_smscb_tree);</span><br><span style="color: hsl(0, 100%, 40%);">-+ break;</span><br><span style="color: hsl(0, 100%, 40%);">-+ case SMSCB_SEQ_1ST_SCHED:</span><br><span style="color: hsl(0, 100%, 40%);">-+ dissect_sched_message(payload, pinfo, gsm_smscb_tree);</span><br><span style="color: hsl(0, 100%, 40%);">-+ break;</span><br><span style="color: hsl(0, 100%, 40%);">-+ }</span><br><span style="color: hsl(0, 100%, 40%);">-+ }</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ return tvb_length(tvb);</span><br><span style="color: hsl(0, 100%, 40%);">-+}</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+static hf_register_info hf[] = {</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_smscb_addr, {</span><br><span style="color: hsl(0, 100%, 40%);">-+ "Address Field", "smscb.addr", FT_UINT8, BASE_HEX,</span><br><span style="color: hsl(0, 100%, 40%);">-+ NULL, 0x0,</span><br><span style="color: hsl(0, 100%, 40%);">-+ "Address", HFILL,</span><br><span style="color: hsl(0, 100%, 40%);">-+ }},</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_smscb_addr_lb, {</span><br><span style="color: hsl(0, 100%, 40%);">-+ "LB", "smscb.addr.lb", FT_UINT8, BASE_DEC,</span><br><span style="color: hsl(0, 100%, 40%);">-+ VALS(smscb_addr_lb_vals), SMSCB_ADDR_LB,</span><br><span style="color: hsl(0, 100%, 40%);">-+ "Last Block bit", HFILL,</span><br><span style="color: hsl(0, 100%, 40%);">-+ }},</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_smscb_addr_seq, {</span><br><span style="color: hsl(0, 100%, 40%);">-+ "SEQ", "smscb.addr.seq", FT_UINT8, BASE_DEC,</span><br><span style="color: hsl(0, 100%, 40%);">-+ VALS(smscb_addr_seq_vals), SMSCB_ADDR_SEQ,</span><br><span style="color: hsl(0, 100%, 40%);">-+ "Sequence Number", HFILL,</span><br><span style="color: hsl(0, 100%, 40%);">-+ }},</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_smscb_serial_gs, {</span><br><span style="color: hsl(0, 100%, 40%);">-+ "Geographic Scope", "smscb.serial.gs", FT_UINT16, BASE_DEC,</span><br><span style="color: hsl(0, 100%, 40%);">-+ VALS(smscb_serial_gs_vals), SMSCB_SERIAL_GS, NULL, HFILL,</span><br><span style="color: hsl(0, 100%, 40%);">-+ }},</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_smscb_serial_mcode, {</span><br><span style="color: hsl(0, 100%, 40%);">-+ "Message Code", "smscb.serial.mcode", FT_UINT16, BASE_DEC,</span><br><span style="color: hsl(0, 100%, 40%);">-+ NULL, SMSCB_SERIAL_MCODE, NULL, HFILL,</span><br><span style="color: hsl(0, 100%, 40%);">-+ }},</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_smscb_serial_updnum, {</span><br><span style="color: hsl(0, 100%, 40%);">-+ "Update Number", "smscb.serial.updnum", FT_UINT16, BASE_DEC,</span><br><span style="color: hsl(0, 100%, 40%);">-+ NULL, SMSCB_SERIAL_UPDNUM, NULL, HFILL,</span><br><span style="color: hsl(0, 100%, 40%);">-+ }},</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_smscb_msgid, {</span><br><span style="color: hsl(0, 100%, 40%);">-+ "Message Identifier", "smscb.msgid", FT_UINT16, BASE_DEC,</span><br><span style="color: hsl(0, 100%, 40%);">-+ NULL, 0, NULL, HFILL,</span><br><span style="color: hsl(0, 100%, 40%);">-+ }},</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_smscb_page_num, {</span><br><span style="color: hsl(0, 100%, 40%);">-+ "Page number", "smscb.page.num", FT_UINT8, BASE_DEC,</span><br><span style="color: hsl(0, 100%, 40%);">-+ NULL, SMSCB_PAGE_NUM, NULL, HFILL,</span><br><span style="color: hsl(0, 100%, 40%);">-+ }},</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_smscb_page_cnt, {</span><br><span style="color: hsl(0, 100%, 40%);">-+ "Total pages", "smscb.page.cnt", FT_UINT8, BASE_DEC,</span><br><span style="color: hsl(0, 100%, 40%);">-+ NULL, SMSCB_PAGE_CNT, NULL, HFILL,</span><br><span style="color: hsl(0, 100%, 40%);">-+ }},</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_smscb_content, {</span><br><span style="color: hsl(0, 100%, 40%);">-+ "Content of Message", "smscb.content", FT_STRING, BASE_NONE,</span><br><span style="color: hsl(0, 100%, 40%);">-+ NULL, 0x00, NULL, HFILL,</span><br><span style="color: hsl(0, 100%, 40%);">-+ }},</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ /* Schedule message */</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_smscb_sched_type, {</span><br><span style="color: hsl(0, 100%, 40%);">-+ "Type", "smscb.sched.type", FT_UINT8, BASE_HEX,</span><br><span style="color: hsl(0, 100%, 40%);">-+ NULL, SMSCB_SCHED_TYPE,</span><br><span style="color: hsl(0, 100%, 40%);">-+ "Type", HFILL,</span><br><span style="color: hsl(0, 100%, 40%);">-+ }},</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_smscb_sched_spare, {</span><br><span style="color: hsl(0, 100%, 40%);">-+ "Spare", "smscb.sched.spare", FT_UINT8, BASE_DEC,</span><br><span style="color: hsl(0, 100%, 40%);">-+ NULL, SMSCB_SCHED_TYPE,</span><br><span style="color: hsl(0, 100%, 40%);">-+ "Spare", HFILL,</span><br><span style="color: hsl(0, 100%, 40%);">-+ }},</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_smscb_sched_begin_slot, {</span><br><span style="color: hsl(0, 100%, 40%);">-+ "Begin slot", "smscb.sched.begin_slot", FT_UINT8, BASE_DEC,</span><br><span style="color: hsl(0, 100%, 40%);">-+ NULL, SMSCB_SCHED_SLOT,</span><br><span style="color: hsl(0, 100%, 40%);">-+ "Begin slot", HFILL,</span><br><span style="color: hsl(0, 100%, 40%);">-+ }},</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_smscb_sched_end_slot, {</span><br><span style="color: hsl(0, 100%, 40%);">-+ "End slot", "smscb.sched.end_slot", FT_UINT8, BASE_DEC,</span><br><span style="color: hsl(0, 100%, 40%);">-+ NULL, SMSCB_SCHED_SLOT,</span><br><span style="color: hsl(0, 100%, 40%);">-+ "End slot", HFILL,</span><br><span style="color: hsl(0, 100%, 40%);">-+ }},</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_smscb_sched_mdt1, {</span><br><span style="color: hsl(0, 100%, 40%);">-+ "MDT", "smscb.sched.mdt1", FT_UINT16, BASE_DEC,</span><br><span style="color: hsl(0, 100%, 40%);">-+ NULL, SMSCB_SCHED_MDT1,</span><br><span style="color: hsl(0, 100%, 40%);">-+ "Message Description Type", HFILL,</span><br><span style="color: hsl(0, 100%, 40%);">-+ }},</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_smscb_sched_msgid, {</span><br><span style="color: hsl(0, 100%, 40%);">-+ "Message ID", "smscb.sched.msg_id", FT_UINT16, BASE_DEC,</span><br><span style="color: hsl(0, 100%, 40%);">-+ NULL, SMSCB_SCHED_MSGID,</span><br><span style="color: hsl(0, 100%, 40%);">-+ "Message ID", HFILL,</span><br><span style="color: hsl(0, 100%, 40%);">-+ }},</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_smscb_sched_mdt2, {</span><br><span style="color: hsl(0, 100%, 40%);">-+ "MDT", "smscb.sched.mdt2", FT_UINT8, BASE_DEC,</span><br><span style="color: hsl(0, 100%, 40%);">-+ NULL, SMSCB_SCHED_MDT2,</span><br><span style="color: hsl(0, 100%, 40%);">-+ "Message Description Type", HFILL,</span><br><span style="color: hsl(0, 100%, 40%);">-+ }},</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_smscb_sched_repslot, {</span><br><span style="color: hsl(0, 100%, 40%);">-+ "Repeated Slot Number", "smscb.sched.repslot", FT_UINT8, BASE_DEC,</span><br><span style="color: hsl(0, 100%, 40%);">-+ NULL, SMSCB_SCHED_REPSLOT,</span><br><span style="color: hsl(0, 100%, 40%);">-+ "Repeated Slot Number", HFILL,</span><br><span style="color: hsl(0, 100%, 40%);">-+ }},</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_smscb_sched_mdt8, {</span><br><span style="color: hsl(0, 100%, 40%);">-+ "MDT", "smscb.sched.mdt8", FT_UINT8, BASE_HEX,</span><br><span style="color: hsl(0, 100%, 40%);">-+ VALS(smscb_sched_mdt8_vals), 0x00,</span><br><span style="color: hsl(0, 100%, 40%);">-+ "Message Description Type", HFILL,</span><br><span style="color: hsl(0, 100%, 40%);">-+ }},</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ /* Fragment reassembly */</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_smscb_fragments, {</span><br><span style="color: hsl(0, 100%, 40%);">-+ "Message fragments", "smscb.fragments",</span><br><span style="color: hsl(0, 100%, 40%);">-+ FT_NONE, BASE_NONE, NULL, 0x00,</span><br><span style="color: hsl(0, 100%, 40%);">-+ "SMSCB Message fragments", HFILL,</span><br><span style="color: hsl(0, 100%, 40%);">-+ }},</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_smscb_fragment, {</span><br><span style="color: hsl(0, 100%, 40%);">-+ "Message fragment", "smscb.fragment",</span><br><span style="color: hsl(0, 100%, 40%);">-+ FT_FRAMENUM, BASE_NONE, NULL, 0x00,</span><br><span style="color: hsl(0, 100%, 40%);">-+ "SMSCB Message fragment", HFILL,</span><br><span style="color: hsl(0, 100%, 40%);">-+ }},</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_smscb_fragment_overlap, {</span><br><span style="color: hsl(0, 100%, 40%);">-+ "Message fragment overlap", "smscb.fragment.overlap",</span><br><span style="color: hsl(0, 100%, 40%);">-+ FT_BOOLEAN, BASE_NONE, NULL, 0x0,</span><br><span style="color: hsl(0, 100%, 40%);">-+ "SMSCB Message fragment overlaps with other fragment(s)", HFILL,</span><br><span style="color: hsl(0, 100%, 40%);">-+ }},</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_smscb_fragment_overlap_conflicts, {</span><br><span style="color: hsl(0, 100%, 40%);">-+ "Message fragment overlapping with conflicting data", "smscb.fragment.overlap.conflicts",</span><br><span style="color: hsl(0, 100%, 40%);">-+ FT_BOOLEAN, BASE_NONE, NULL, 0x0,</span><br><span style="color: hsl(0, 100%, 40%);">-+ "SMSCB Message fragment overlaps with conflicting data", HFILL,</span><br><span style="color: hsl(0, 100%, 40%);">-+ }},</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_smscb_fragment_multiple_tails, {</span><br><span style="color: hsl(0, 100%, 40%);">-+ "Message has multiple tail fragments", "smscb.fragment.multiple_tails",</span><br><span style="color: hsl(0, 100%, 40%);">-+ FT_BOOLEAN, BASE_NONE, NULL, 0x0,</span><br><span style="color: hsl(0, 100%, 40%);">-+ "SMSCB Message fragment has multiple tail fragments", HFILL,</span><br><span style="color: hsl(0, 100%, 40%);">-+ }},</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_smscb_fragment_too_long_fragment, {</span><br><span style="color: hsl(0, 100%, 40%);">-+ "Message fragment too long", "smscb.fragment.too_long_fragment",</span><br><span style="color: hsl(0, 100%, 40%);">-+ FT_BOOLEAN, BASE_NONE, NULL, 0x0,</span><br><span style="color: hsl(0, 100%, 40%);">-+ "SMSCB Message fragment data goes beyond the packet end", HFILL,</span><br><span style="color: hsl(0, 100%, 40%);">-+ }},</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_smscb_fragment_error, {</span><br><span style="color: hsl(0, 100%, 40%);">-+ "Message defragmentation error", "smscb.fragment.error",</span><br><span style="color: hsl(0, 100%, 40%);">-+ FT_FRAMENUM, BASE_NONE, NULL, 0x00,</span><br><span style="color: hsl(0, 100%, 40%);">-+ "SMSCB Message defragmentation error due to illegal fragments", HFILL,</span><br><span style="color: hsl(0, 100%, 40%);">-+ }},</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_smscb_reassembled_in, {</span><br><span style="color: hsl(0, 100%, 40%);">-+ "Reassembled in", "smscb.reassembled.in",</span><br><span style="color: hsl(0, 100%, 40%);">-+ FT_FRAMENUM, BASE_NONE, NULL, 0x00,</span><br><span style="color: hsl(0, 100%, 40%);">-+ "SMSCB Message has been reassembled in this packet.", HFILL,</span><br><span style="color: hsl(0, 100%, 40%);">-+ }},</span><br><span style="color: hsl(0, 100%, 40%);">-+ { &hf_smscb_reassembled_length, {</span><br><span style="color: hsl(0, 100%, 40%);">-+ "Reassembled SMSCB length", "smscb.reassembled.length",</span><br><span style="color: hsl(0, 100%, 40%);">-+ FT_UINT32, BASE_DEC, NULL, 0x00,</span><br><span style="color: hsl(0, 100%, 40%);">-+ "The total length of the reassembled payload", HFILL,</span><br><span style="color: hsl(0, 100%, 40%);">-+ }},</span><br><span style="color: hsl(0, 100%, 40%);">-+};</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+static gint *ett[] = {</span><br><span style="color: hsl(0, 100%, 40%);">-+ &ett_smscb,</span><br><span style="color: hsl(0, 100%, 40%);">-+ &ett_smscb_addr,</span><br><span style="color: hsl(0, 100%, 40%);">-+ &ett_smscb_dcs,</span><br><span style="color: hsl(0, 100%, 40%);">-+ &ett_smscb_fragment,</span><br><span style="color: hsl(0, 100%, 40%);">-+ &ett_smscb_fragments,</span><br><span style="color: hsl(0, 100%, 40%);">-+ &ett_smscb_sched_new,</span><br><span style="color: hsl(0, 100%, 40%);">-+ &ett_smscb_sched_other,</span><br><span style="color: hsl(0, 100%, 40%);">-+ &ett_smscb_sched_slot,</span><br><span style="color: hsl(0, 100%, 40%);">-+};</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+void proto_reg_handoff_gsm_smscb(void)</span><br><span style="color: hsl(0, 100%, 40%);">-+{</span><br><span style="color: hsl(0, 100%, 40%);">-+ data_handle = find_dissector("data");</span><br><span style="color: hsl(0, 100%, 40%);">-+}</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+void proto_register_gsm_smscb(void)</span><br><span style="color: hsl(0, 100%, 40%);">-+{</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_gsm_smscb = proto_register_protocol(</span><br><span style="color: hsl(0, 100%, 40%);">-+ "Short Message Service Cell Broadcast",</span><br><span style="color: hsl(0, 100%, 40%);">-+ "SMSCB", "gsm_smscb");</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_register_field_array(proto_gsm_smscb, hf, array_length(hf));</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_register_subtree_array(ett, array_length(ett));</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">-+ new_register_dissector("gsm_smscb", dissect_gsm_smscb, proto_gsm_smscb);</span><br><span style="color: hsl(0, 100%, 40%);">-+ register_init_routine(smscb_defragment_init);</span><br><span style="color: hsl(0, 100%, 40%);">-+}</span><br><span style="color: hsl(0, 100%, 40%);">-diff --git a/epan/dissectors/packet-lapdm.c b/epan/dissectors/packet-lapdm.c</span><br><span style="color: hsl(0, 100%, 40%);">-index dbeac85..add859d 100644</span><br><span>---- a/epan/dissectors/packet-lapdm.c</span><br><span style="color: hsl(0, 100%, 40%);">-+++ b/epan/dissectors/packet-lapdm.c</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -110,6 +110,7 @@ static GHashTable *lapdm_reassembled_table = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- static dissector_table_t lapdm_sapi_dissector_table;</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(0, 100%, 40%);">- static dissector_handle_t data_handle;</span><br><span style="color: hsl(0, 100%, 40%);">-+static dissector_handle_t smscb_handle;</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(0, 100%, 40%);">- static gboolean reassemble_lapdm = TRUE;</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(0, 100%, 40%);">-@@ -121,6 +122,7 @@ static gboolean reassemble_lapdm = TRUE;</span><br><span style="color: hsl(0, 100%, 40%);">- #define LAPDM_CR 0x02 /* Command/Response bit */</span><br><span style="color: hsl(0, 100%, 40%);">- #define LAPDM_EA 0x01 /* First Address Extension bit */</span><br><span style="color: hsl(0, 100%, 40%);">- #define LAPDM_LPD 0x60 /* Link Protocol Discriminator */</span><br><span style="color: hsl(0, 100%, 40%);">-+#define LAPDM_LPD_CB 0x20 /* Cell Broadcast LPD */</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(0, 100%, 40%);">- /*</span><br><span style="color: hsl(0, 100%, 40%);">- * Bits in the length field.</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -219,6 +221,7 @@ dissect_lapdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)</span><br><span style="color: hsl(0, 100%, 40%);">- tvbuff_t *payload;</span><br><span style="color: hsl(0, 100%, 40%);">- int available_length;</span><br><span style="color: hsl(0, 100%, 40%);">- gboolean is_response = FALSE;</span><br><span style="color: hsl(0, 100%, 40%);">-+ gboolean is_cbs = FALSE;</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(0, 100%, 40%);">- /* Check that there's enough data */</span><br><span style="color: hsl(0, 100%, 40%);">- if (tvb_length(tvb) < LAPDM_HEADER_LEN)</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -229,6 +232,7 @@ dissect_lapdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)</span><br><span style="color: hsl(0, 100%, 40%);">- addr = tvb_get_guint8(tvb, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- length = tvb_get_guint8(tvb, 2);</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(0, 100%, 40%);">-+ is_cbs = (addr & LAPDM_LPD) == LAPDM_LPD_CB;</span><br><span style="color: hsl(0, 100%, 40%);">- cr = addr & LAPDM_CR;</span><br><span style="color: hsl(0, 100%, 40%);">- if (pinfo->p2p_dir == P2P_DIR_RECV) {</span><br><span style="color: hsl(0, 100%, 40%);">- is_response = cr ? FALSE : TRUE;</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -245,15 +249,22 @@ dissect_lapdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)</span><br><span style="color: hsl(0, 100%, 40%);">- addr_tree = proto_item_add_subtree(addr_ti, ett_lapdm_address);</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(0, 100%, 40%);">- proto_tree_add_uint(addr_tree, hf_lapdm_lpd, tvb, 0, 1, addr);</span><br><span style="color: hsl(0, 100%, 40%);">-- proto_tree_add_uint(addr_tree, hf_lapdm_sapi, tvb, 0, 1, addr);</span><br><span style="color: hsl(0, 100%, 40%);">-- proto_tree_add_uint(addr_tree, hf_lapdm_cr, tvb, 0, 1, addr);</span><br><span style="color: hsl(0, 100%, 40%);">-- proto_tree_add_uint(addr_tree, hf_lapdm_ea, tvb, 0, 1, addr);</span><br><span style="color: hsl(0, 100%, 40%);">-+ if (!is_cbs) {</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree_add_uint(addr_tree, hf_lapdm_sapi, tvb, 0, 1, addr);</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree_add_uint(addr_tree, hf_lapdm_cr, tvb, 0, 1, addr);</span><br><span style="color: hsl(0, 100%, 40%);">-+ proto_tree_add_uint(addr_tree, hf_lapdm_ea, tvb, 0, 1, addr);</span><br><span style="color: hsl(0, 100%, 40%);">-+ }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- else {</span><br><span style="color: hsl(0, 100%, 40%);">- lapdm_ti = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- lapdm_tree = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(0, 100%, 40%);">-+ if (is_cbs) {</span><br><span style="color: hsl(0, 100%, 40%);">-+ call_dissector(smscb_handle, tvb, pinfo, tree);</span><br><span style="color: hsl(0, 100%, 40%);">-+ return;</span><br><span style="color: hsl(0, 100%, 40%);">-+ }</span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span style="color: hsl(0, 100%, 40%);">- control = dissect_xdlc_control(tvb, 1, pinfo, lapdm_tree, hf_lapdm_control,</span><br><span style="color: hsl(0, 100%, 40%);">- ett_lapdm_control, &lapdm_cf_items, NULL /* LAPDm doesnt support extended */, NULL, NULL,</span><br><span style="color: hsl(0, 100%, 40%);">- is_response, FALSE, FALSE);</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -486,5 +497,6 @@ void</span><br><span style="color: hsl(0, 100%, 40%);">- proto_reg_handoff_lapdm(void)</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- data_handle = find_dissector("data");</span><br><span style="color: hsl(0, 100%, 40%);">-+ smscb_handle = find_dissector("gsm_smscb");</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(0, 100%, 40%);">-+</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9240">change 9240</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/9240"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I448dc5a3dba3ecc6fc041861239dc23cca72b70b </div>
<div style="display:none"> Gerrit-Change-Number: 9240 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>