Add AMR codec support

CMake work and rebase on current wireshark master by Pau Espin Pedrol.

Change-Id: I5ec963b910f8f271aa2e5d680ea33e2170a6f367

CMakeLists.txt

@@ -1015,6 +1015,10 @@ if(ENABLE_BCG729)
 	set(PACKAGELIST ${PACKAGELIST} BCG729)
 endif()
 
+if(ENABLE_AMRNB)
+	set(PACKAGELIST ${PACKAGELIST} AMRNB)
+endif()
+
 if(ENABLE_LIBXML2)
 	set(PACKAGELIST ${PACKAGELIST} LibXml2)
 endif()
@@ -1145,6 +1149,9 @@ endif()
 if(BCG729_FOUND)
 	set(HAVE_BCG729 1)
 endif()
+if(AMRNB_FOUND)
+	set(HAVE_AMRNB 1)
+endif()
 if(LIBXML2_FOUND)
 	set(HAVE_LIBXML2 1)
 else()
@@ -1455,6 +1462,11 @@ set_package_properties(BCG729 PROPERTIES
 	URL "https://www.linphone.org/technical-corner/bcg729/overview"
 	PURPOSE "Support for G.729 codec in RTP player"
 )
+set_package_properties(AMRNB PROPERTIES
+	DESCRIPTION "AMRNB decoder"
+	URL "https://sourceforge.net/p/opencore-amr"
+	PURPOSE "Support for AMRNB codec in RTP player"
+)
 set_package_properties(LIBXML2 PROPERTIES
 	DESCRIPTION "XML parsing library"
 	URL "http://xmlsoft.org/"
@@ -1713,6 +1725,9 @@ if(WIN32)
 	if (BCG729_FOUND)
 		list (APPEND OPTIONAL_DLLS "${BCG729_DLL_DIR}/${BCG729_DLL}")
 	endif(BCG729_FOUND)
+	if (AMRNB_FOUND)
+		list (APPEND OPTIONAL_DLLS "${AMRNB_DLL_DIR}/${AMRNB_DLL}")
+	endif(AMRNB_FOUND)
 	if (LIBXML2_FOUND)
 		list (APPEND OPTIONAL_DLLS "${LIBXML2_DLL_DIR}/${LIBXML2_DLL}")
 	endif(LIBXML2_FOUND)
@@ -2901,6 +2916,9 @@ if(RPMBUILD_EXECUTABLE)
 	if (BCG729_FOUND)
 		list(APPEND _rpmbuild_with_args --with bcg729)
 	endif()
+	if (AMRNB_FOUND)
+		list(APPEND _rpmbuild_with_args --with amrnb)
+	endif()
 	if (LIBXML2_FOUND)
 		list(APPEND _rpmbuild_with_args --with libxml2)
 	endif()

CMakeOptions.txt

@@ -80,6 +80,7 @@ option(ENABLE_KERBEROS   "Build with Kerberos support" ON)
 option(ENABLE_SBC        "Build with SBC Codec support in RTP Player" ON)
 option(ENABLE_SPANDSP    "Build with G.722/G.726 codecs support in RTP Player" ON)
 option(ENABLE_BCG729     "Build with G.729 codec support in RTP Player" ON)
+option(ENABLE_AMRNB      "Build with AMRNB codec support in RTP Player" ON)
 option(ENABLE_LIBXML2    "Build with libxml2 support" ON)
 # How to install
 set(DUMPCAP_INSTALL_OPTION   "normal" CACHE STRING "Permissions to install")

cmake/modules/FindAMRNB.cmake

@@ -0,0 +1,57 @@
+# Find the system's opencore-amrnb includes and library
+#
+#  AMRNB_INCLUDE_DIRS - where to find amrnb/decoder.h
+#  AMRNB_LIBRARIES    - List of libraries when using amrnb
+#  AMRNB_FOUND        - True if amrnb found
+#  AMRNB_DLL_DIR      - (Windows) Path to the amrnb DLL
+#  AMRNB_DLL          - (Windows) Name of the amrnb DLL
+
+include( FindWSWinLibs )
+FindWSWinLibs( "opencore-amrnb-.*" "AMRNB_HINTS" )
+
+if (NOT WIN32)
+  find_package(PkgConfig)
+  pkg_search_module(AMRNB opencore-amrnb)
+endif()
+
+find_path( AMRNB_INCLUDE_DIR
+  NAMES opencore-amrnb/interf_dec.h
+  HINTS
+    "${AMRNB_INCLUDE_DIR}"
+    "${AMRNB_HINTS}/include"
+  PATHS /usr/local/include /usr/include
+)
+
+find_library( AMRNB_LIBRARY
+  NAMES opencore-amrnb
+  HINTS
+    "${AMRNB_LIBDIR}"
+    "${AMRNB_HINTS}/lib"
+  PATHS /usr/local/lib /usr/lib
+)
+
+include( FindPackageHandleStandardArgs )
+find_package_handle_standard_args( amrnb DEFAULT_MSG AMRNB_INCLUDE_DIR AMRNB_LIBRARY )
+
+if( AMRNB_FOUND )
+  set( AMRNB_INCLUDE_DIRS ${AMRNB_INCLUDE_DIR} )
+  set( AMRNB_LIBRARIES ${AMRNB_LIBRARY} )
+  if (WIN32)
+    set ( AMRNB_DLL_DIR "${AMRNB_HINTS}/bin"
+      CACHE PATH "Path to amrnb DLL"
+    )
+    file( GLOB _amrnb_dll RELATIVE "${AMRNB_DLL_DIR}"
+      "${AMRNB_DLL_DIR}/libamrnb.dll"
+    )
+    set ( AMRNB_DLL ${_amrnb_dll}
+      # We're storing filenames only. Should we use STRING instead?
+      CACHE FILEPATH "amrnb DLL file name"
+    )
+    mark_as_advanced( AMRNB_DLL_DIR AMRNB_DLL )
+  endif()
+else()
+  set( AMRNB_INCLUDE_DIRS )
+  set( AMRNB_LIBRARIES )
+endif()
+
+mark_as_advanced( AMRNB_LIBRARIES AMRNB_INCLUDE_DIRS )

cmakeconfig.h.in

@@ -276,6 +276,9 @@
 /* Define to 1 if you have the bcg729 library. */
 #cmakedefine HAVE_BCG729 1
 
+/* Define to 1 if you have the opencore-amrnb library. */
+#cmakedefine HAVE_AMRNB 1
+
 /* Define to 1 if you have the lixbml2 library. */
 #cmakedefine HAVE_LIBXML2 1
 

codecs/CMakeLists.txt

@@ -49,6 +49,11 @@ if(HAVE_BCG729)
   list(APPEND wscodecs_LIBS ${BCG729_LIBRARIES})
 endif()
 
+if(AMRNB_FOUND)
+  list(APPEND WSCODECS_FILES amr/amrdecode.c)
+  list(APPEND wscodecs_LIBS ${AMRNB_LIBRARIES})
+endif()
+
 add_library(wscodecs
   ${WSCODECS_FILES}
   ${CMAKE_BINARY_DIR}/image/libwscodecs.rc

codecs/amr/amrdecode.c

@@ -0,0 +1,98 @@
+/* amrdecode.c
+ * AMR codec
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+
+#include <glib.h>
+#include <string.h>
+#include "amrdecode.h"
+#include "ws_attributes.h"
+
+#include <opencore-amrnb/interf_dec.h>
+
+void *
+codec_amr_init(void)
+{
+    void *state;
+    state = Decoder_Interface_init();
+
+    return state;
+}
+
+void
+codec_amr_release(void *state)
+{
+    Decoder_Interface_exit(state);
+}
+
+unsigned
+codec_amr_get_channels(void *ctx _U_)
+{
+    return 1;
+}
+
+unsigned
+codec_amr_get_frequency(void *ctx _U_)
+{
+    return 8000;
+}
+
+size_t
+codec_amr_decode(void *state, const void *input, size_t inputSizeBytes, void *output,
+        size_t *outputSizeBytes)
+{
+    int mode;
+    unsigned packet_size;
+    static const uint8_t block_size[16] = {12, 13, 15, 17, 19, 20, 26, 31, 5, 0, 0, 0, 0, 0, 0, 0};
+
+    /* First byte is CMR, second is the Payload TOC */
+    mode = (((uint8_t *)input)[1] >> 3) & 0x0F;
+    packet_size = block_size[mode] + 2;
+
+    if (!output || !outputSizeBytes)
+	    return 160*2;
+
+    *outputSizeBytes = 160 * 2; /* 160 frames, two byte per frame, 20ms */
+
+    /* If the size is screwed up, insert silence */
+    if (packet_size > inputSizeBytes) {
+	    memset(output, 0, *outputSizeBytes);
+	    return *outputSizeBytes;
+    }
+
+    Decoder_Interface_Decode(state, (const unsigned char *)input+1, (short *)output, 0);
+    return *outputSizeBytes;
+}
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */
+

codecs/amr/amrdecode.h

@@ -0,0 +1,48 @@
+/* G726decode.h
+ * Definitions for A-law G.722 codec
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef __CODECS_AMRDECODE_H__
+#define __CODECS_AMRDECODE_H__
+
+#include <stdint.h>
+
+void *codec_amr_init(void);
+void  codec_amr_release(void *ctx);
+unsigned codec_amr_get_channels(void *ctx);
+unsigned codec_amr_get_frequency(void *ctx);
+size_t   codec_amr_decode(void *ctx, const void *input, size_t inputSizeBytes, void *output,
+        size_t *outputSizeBytes);
+
+#endif /* AMRdecode.h */
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */

codecs/codecs.c

@@ -29,6 +29,10 @@
 #include "G729/G729decode.h"
 #endif
 
+#ifdef HAVE_AMRNB
+#include "amr/amrdecode.h"
+#endif
+
 #ifdef HAVE_PLUGINS
 
 
@@ -92,6 +96,11 @@ codecs_init(void)
             codec_sbc_get_channels, codec_sbc_get_frequency, codec_sbc_decode);
 #endif
 
+#ifdef HAVE_AMRNB
+    register_codec("AMR", codec_amr_init, codec_amr_release,
+	    codec_amr_get_channels, codec_amr_get_frequency, codec_amr_decode);
+#endif
+
 #ifdef HAVE_PLUGINS
     libwscodecs_plugins = plugins_init(WS_PLUGIN_CODEC);
     g_slist_foreach(codecs_plugins, call_plugin_register_codec_module, NULL);

debian/control

@@ -12,9 +12,9 @@ Build-Depends: lsb-release,
  libcap2-dev [linux-any] | libcap-dev (>= 2.17) [linux-any],
  bison, quilt, libparse-yapp-perl,
 # enable versioned libgnutls28-dev below to have GPLv2+ compatible GMP
-# libgnutls28-dev (>= 3.2.14-1~),
+ libgnutls28-dev (>= 3.2.14-1~),
 # enable backports-compatible libgnutls-dev
- libgnutls-dev,
+# libgnutls-dev,
  libgcrypt-dev, libkrb5-dev, liblua5.2-dev, libsmi2-dev,
  libmaxminddb-dev, dpkg-dev (>= 1.16.1~),
  libnl-genl-3-dev [linux-any], libnl-route-3-dev [linux-any], asciidoctor,

docbook/release-notes.asciidoc

@@ -67,6 +67,8 @@ TPM 2.0 protocol
 --
 GSM-R protocol (User-to-User Information Element usage)
 --
+OsmoTRX Protocol (raw GSM burst data between osmo-trx and osmo-bts-trx)
+--
 
 === Updated Protocol Support
 

epan/dissectors/CMakeLists.txt

@@ -1460,6 +1460,7 @@ set(DISSECTOR_SRC
 	${CMAKE_CURRENT_SOURCE_DIR}/packet-osi-options.c
 	${CMAKE_CURRENT_SOURCE_DIR}/packet-osi.c
 	${CMAKE_CURRENT_SOURCE_DIR}/packet-ositp.c
+	${CMAKE_CURRENT_SOURCE_DIR}/packet-osmo_trx.c
 	${CMAKE_CURRENT_SOURCE_DIR}/packet-ospf.c
 	${CMAKE_CURRENT_SOURCE_DIR}/packet-ossp.c
 	${CMAKE_CURRENT_SOURCE_DIR}/packet-ouch.c

epan/dissectors/packet-osmo_trx.c

@@ -0,0 +1,264 @@
+/* packet-osmo_trx.c
+ * Dissector for Osmocom TRX Protocol (between osmo-trx and osmo-bts-trx)
+ *
+ * (C) 2018 by Harald Welte <laforge@gnumonks.org>
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "config.h"
+
+#include <epan/packet.h>
+#include <epan/conversation.h>
+
+#include "packet-e164.h"
+#include "packet-e212.h"
+#include "packet-dns.h"
+
+/* This protocol is a non-standard, ad-hoc protocol to pass baseband GSM bursts
+ * between the modem (osmo-trx) and the encoder/decoder (osmo-bts-trx). Osmocom
+ * inherited this when forking OsmoTRX off the OpenBTS "Transceiver" program.
+ */
+
+/* the TRX-side control interface for C(N) is on  port P=B+2N+1;
+ * the corresponding core-side interface for every socket is at P+100
+ * Give a base port B (5700), the master clock interface is at port P=B */
+#define OTRXC_UDP_PORTS "5701,5703,5800,5801,5803"
+
+/* the data interface is on an odd numbered port P=B+2N+2 */
+#define OTRXB_TX_UDP_PORTS "5702,5704"
+/* the corresponding core-side interface for every socket is at P+100 */
+#define OTRXB_RX_UDP_PORTS "5802,5804"
+
+static int proto_otrx_b_tx = -1;
+static int proto_otrx_b_rx = -1;
+static int proto_otrx_c = -1;
+
+static int hf_otrxb_timeslot = -1;
+static int hf_otrxb_frame_nr = -1;
+static int hf_otrxb_rssi = -1;
+static int hf_otrxb_timing_offset = -1;
+static int hf_otrxb_soft_symbols = -1;
+static int hf_otrxb_tx_att = -1;
+static int hf_otrxb_hard_symbols = -1;
+
+static int hf_otrxc_type = -1;
+static int hf_otrxc_verb = -1;
+static int hf_otrxc_params = -1;
+static int hf_otrxc_status = -1;
+
+static gint ett_otrxb = -1;
+
+/* Burst data in Receive direction */
+static int dissect_otrx_b_rx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
+{
+	int len, offset = 0;
+	proto_item *ti;
+	proto_tree *otrxb_tree = NULL;
+	guint8 ts, rssi;
+	guint32 fn;
+	gint16 toa;
+
+	col_set_str(pinfo->cinfo, COL_PROTOCOL, "ORX-B-Rx");
+	col_clear(pinfo->cinfo, COL_INFO);
+
+	len = tvb_reported_length(tvb);
+
+	ts = tvb_get_guint8(tvb, 0);
+	fn = tvb_get_ntohl(tvb, 1);
+	rssi = tvb_get_guint8(tvb, 5);
+	toa = tvb_get_ntohs(tvb, 6);
+
+	col_add_fstr(pinfo->cinfo, COL_INFO, "Rx TS=%u, FN=%u, RSSI=%u, ToA=%d", ts, fn, rssi, toa);
+
+	if (tree) {
+		ti = proto_tree_add_protocol_format(tree, proto_otrx_b_tx, tvb, 0, len,
+						"OsmoTRX Tx Burst (TS=%d, FN=%u, RSSI=%u, ToA=%d)",
+						ts, fn, rssi, toa);
+		otrxb_tree = proto_item_add_subtree(ti, ett_otrxb);
+
+		proto_tree_add_item(otrxb_tree, hf_otrxb_timeslot, tvb, offset, 1, ENC_NA);
+		offset++;
+
+		proto_tree_add_item(otrxb_tree, hf_otrxb_frame_nr, tvb, offset, 4, ENC_BIG_ENDIAN);
+		offset += 4;
+
+		proto_tree_add_item(otrxb_tree, hf_otrxb_rssi, tvb, offset, 1, ENC_NA);
+		offset++;
+
+		proto_tree_add_item(otrxb_tree, hf_otrxb_timing_offset, tvb, offset, 2, ENC_BIG_ENDIAN);
+		offset += 2;
+
+		proto_tree_add_item(otrxb_tree, hf_otrxb_soft_symbols, tvb, offset, 148, ENC_NA);
+	}
+
+	return tvb_captured_length(tvb);
+}
+
+/* Burst data in Transmit direction */
+static int dissect_otrx_b_tx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
+{
+	int len, offset = 0;
+	proto_item *ti;
+	proto_tree *otrxb_tree = NULL;
+	guint8 ts;
+	guint32 fn;
+	guint8 tx_att;
+
+	col_set_str(pinfo->cinfo, COL_PROTOCOL, "OTRX-B-Tx");
+	col_clear(pinfo->cinfo, COL_INFO);
+
+	len = tvb_reported_length(tvb);
+
+	ts = tvb_get_guint8(tvb, 0);
+	fn = tvb_get_ntohl(tvb, 1);
+	tx_att = tvb_get_guint8(tvb, 5);
+
+	col_add_fstr(pinfo->cinfo, COL_INFO, "Tx TS=%d, FN=%u, TX_ATT=%u", ts, fn, tx_att);
+
+	if (tree) {
+		ti = proto_tree_add_protocol_format(tree, proto_otrx_b_rx, tvb, 0, len,
+						"OsmoTRX Rx Burst (TS=%d, FN=%u, TX_ATT=%u)",
+						ts, fn, tx_att);
+		otrxb_tree = proto_item_add_subtree(ti, ett_otrxb);
+
+		proto_tree_add_item(otrxb_tree, hf_otrxb_timeslot, tvb, offset, 1, ENC_NA);
+		offset++;
+
+		proto_tree_add_item(otrxb_tree, hf_otrxb_frame_nr, tvb, offset, 4, ENC_BIG_ENDIAN);
+		offset += 4;
+
+		proto_tree_add_item(otrxb_tree, hf_otrxb_tx_att, tvb, offset, 1, ENC_NA);
+		offset++;
+
+		proto_tree_add_item(otrxb_tree, hf_otrxb_hard_symbols, tvb, offset, 148, ENC_NA);
+	}
+
+	return tvb_captured_length(tvb);
+}
+
+/* Burst data in Transmit direction */
+static int dissect_otrx_c(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
+{
+	int offset = 0, len;
+	proto_item *ti;
+	proto_tree *otrxc_tree = NULL;
+	const char *str, *chr, *pos, *type;
+
+	col_set_str(pinfo->cinfo, COL_PROTOCOL, "OTRX-C");
+	col_clear(pinfo->cinfo, COL_INFO);
+
+	len = tvb_reported_length(tvb);
+	str = tvb_get_string_enc(wmem_packet_scope(), tvb, 0, len, ENC_ASCII);
+
+	col_set_str(pinfo->cinfo, COL_INFO, str);
+	if (tree) {
+		ti = proto_tree_add_protocol_format(tree, proto_otrx_c, tvb, 0, len,
+							"OsmoTRX Control: %s", str);
+		otrxc_tree = proto_item_add_subtree(ti, ett_otrxb);
+
+		proto_tree_add_item(otrxc_tree, hf_otrxc_type, tvb, offset, 3, ENC_ASCII|ENC_NA);
+		type = str + offset;
+		offset += 3 + 1;
+
+		pos = str+offset;
+		chr = strchr(pos, ' ');
+		if (!chr)
+			goto out;
+		proto_tree_add_item(otrxc_tree, hf_otrxc_verb, tvb, offset, (guint)(chr-pos),
+				    ENC_ASCII|ENC_NA);
+		offset += (gint) (chr-pos) + 1;
+
+		if (offset >= len)
+			goto out;
+
+		if (!strncmp(type, "RSP", 3)) {
+			pos = str+offset;
+			chr = strchr(pos, ' ');
+			if (!chr)
+				goto out;
+			proto_tree_add_item(otrxc_tree, hf_otrxc_status, tvb, offset, (guint)(chr-pos),
+					    ENC_ASCII|ENC_NA);
+			offset += (gint) (chr-pos) + 1;
+		}
+
+		if (offset >= len)
+			goto out;
+
+		proto_tree_add_item(otrxc_tree, hf_otrxc_params, tvb, offset, len-offset,
+				    ENC_ASCII|ENC_NA);
+	}
+out:
+	return tvb_captured_length(tvb);
+}
+
+void
+proto_register_otrxb(void)
+{
+	static hf_register_info hf[] = {
+		{ &hf_otrxb_timeslot, { "Timeslot", "osmo_trx.burst.timeslot",
+		  FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } },
+		{ &hf_otrxb_frame_nr, { "GSM Frame Number", "osmo_trx.burst.frame_nr",
+		  FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
+		{ &hf_otrxb_rssi, { "RSSI (-dBm)", "osmo_trx.burst.rssi",
+		  FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } },
+		{ &hf_otrxb_timing_offset, { "Correlator Timing Offset (1/256 symbols)", "osmo_trx.burst.timing_offset",
+		  FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL } },
+		{ &hf_otrxb_soft_symbols, { "Soft Symbols", "osmo_trx.burst.soft-symbols",
+		  FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL } },
+
+		{ &hf_otrxb_tx_att, { "Tx Attenuation (dB)", "osmo_trx.burst.tx-atten",
+		  FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } },
+		{ &hf_otrxb_hard_symbols, { "Hard Symbols", "osmo_trx.burst.hard-symbols",
+		  FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL } },
+
+		{ &hf_otrxc_type, { "Type", "osmo_trx.ctrl.type",
+		  FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } },
+		{ &hf_otrxc_verb, { "Verb", "osmo_trx.ctrl.verb",
+		  FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } },
+		{ &hf_otrxc_params, { "Parameters", "osmo_trx.ctrl.params",
+		  FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } },
+		{ &hf_otrxc_status, { "Status", "osmo_trx.ctrl.status",
+		  FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } },
+	};
+	static gint *ett[] = {
+		&ett_otrxb,
+	};
+
+	proto_otrx_b_tx = proto_register_protocol("Osmocom TRX Burst Protocol (Tx)",
+						  "otrx_b_tx", "otrx_b_tx");
+	proto_otrx_b_rx = proto_register_protocol("Osmocom TRX Burst Protocol (Rx)",
+						  "otrx_b_rx", "otrx_b_rx");
+	proto_otrx_c = proto_register_protocol("Osmocom TRX Control Protocol", "otrx_c", "otrx_c");
+	proto_register_field_array(proto_otrx_c, hf, array_length(hf));
+	proto_register_subtree_array(ett, array_length(ett));
+}
+
+void
+proto_reg_handoff_otrxb(void)
+{
+	dissector_handle_t otrxb_tx_handle, otrxb_rx_handle, otrxc_handle;
+	otrxb_tx_handle = create_dissector_handle(dissect_otrx_b_tx, proto_otrx_b_tx);
+	otrxb_rx_handle = create_dissector_handle(dissect_otrx_b_rx, proto_otrx_b_rx);
+	otrxc_handle = create_dissector_handle(dissect_otrx_c, proto_otrx_c);
+	dissector_add_uint_range_with_preference("udp.port", OTRXB_TX_UDP_PORTS, otrxb_tx_handle);
+	dissector_add_uint_range_with_preference("udp.port", OTRXB_RX_UDP_PORTS, otrxb_rx_handle);
+	dissector_add_uint_range_with_preference("udp.port", OTRXC_UDP_PORTS, otrxc_handle);
+}
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 8
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * End:
+ *
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
+ */