From 3268023b877afa13ad68c08237baa36f9d6c89ec Mon Sep 17 00:00:00 2001 From: Andrew Chernyh Date: Mon, 6 Jul 2015 10:29:48 +0600 Subject: [PATCH] Added TDMoP protocol dissector Bug: 11340 Change-Id: I04408db376718c7a5392f9521d7d75d0481ec30e Reviewed-on: https://code.wireshark.org/review/9514 Reviewed-by: Anders Broman --- docbook/release-notes.asciidoc | 1 + epan/CMakeLists.txt | 1 + epan/address.h | 3 +- epan/dissectors/Makefile.common | 1 + epan/dissectors/packet-tdmop.c | 387 ++++++++++++++++++++++++++++++++ epan/to_str.c | 1 + 6 files changed, 393 insertions(+), 1 deletion(-) create mode 100644 epan/dissectors/packet-tdmop.c diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc index 1230e0821f..6282dac597 100644 --- a/docbook/release-notes.asciidoc +++ b/docbook/release-notes.asciidoc @@ -224,6 +224,7 @@ Network File System over Remote Direct Memory Access (NFSoRDMA) eXpressive Internet Protocol (XIP) Windows Search Protocol (MS-WSP) Message Queuing Telemetry Transport For Sensor Networks (MQTT-SN) +Time Division Multiplexing over Packet Network (TDMoP) --sort-and-group-- === Updated Protocol Support diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index 908544be05..789b3eeebe 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -1324,6 +1324,7 @@ set(DISSECTOR_SRC dissectors/packet-tapa.c dissectors/packet-tcp.c dissectors/packet-tdmoe.c + dissectors/packet-tdmop.c dissectors/packet-tds.c dissectors/packet-teamspeak2.c dissectors/packet-teimanagement.c diff --git a/epan/address.h b/epan/address.h index 4ffcbe9e02..c48cc7020d 100644 --- a/epan/address.h +++ b/epan/address.h @@ -253,7 +253,8 @@ typedef enum { PT_USB, /* USB endpoint 0xffff means the host */ PT_I2C, PT_IBQP, /* Infiniband QP number */ - PT_BLUETOOTH + PT_BLUETOOTH, + PT_TDMOP } port_type; /* Types of circuit IDs Wireshark knows about. */ diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common index 68ac0d931b..0ada6ab360 100644 --- a/epan/dissectors/Makefile.common +++ b/epan/dissectors/Makefile.common @@ -1236,6 +1236,7 @@ DISSECTOR_SRC = \ packet-tapa.c \ packet-tcp.c \ packet-tdmoe.c \ + packet-tdmop.c \ packet-tds.c \ packet-teamspeak2.c \ packet-teimanagement.c \ diff --git a/epan/dissectors/packet-tdmop.c b/epan/dissectors/packet-tdmop.c new file mode 100644 index 0000000000..b51a4c02af --- /dev/null +++ b/epan/dissectors/packet-tdmop.c @@ -0,0 +1,387 @@ +/* packet-tdmop.c + * Routines for TDM over Packet network disassembly + * Copyright 2015, Andrew Chernyh + * + * Wireshark - Network traffic analyzer + * By Gerald Combs + * 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. + */ +/* + * TDMoP protocol is proprietary protocol developed by "NSC Communication Siberia Ltd." + */ +#include "config.h" +#include +#include + +#define TDMOP_PORT 0 +/*Using of ethertype 0x0808(assigned to Frame Realy ARP) was implemented in hardware, when ethertype was not assigned*/ +#define ETHERTYPE_TDMOP 0 + +#define MAX_DCHANNEL_LEN 128 + +void proto_register_tdmop(void); +void proto_reg_handoff_tdmop(void); + +static int proto_tdmop = -1; +static gint ett_tdmop = -1; +static gint ett_tdmop_channel = -1; + +static int hf_tdmop_TransferID = -1; +static int hf_tdmop_DstCh = -1; +static int hf_tdmop_SrcCh = -1; +static int hf_tdmop_Flags = -1; +static int hf_tdmop_Flags_no_data = -1; +static int hf_tdmop_Flags_lost_request = -1; +static int hf_tdmop_Flags_remote_no_data = -1; +static int hf_tdmop_Flags_compressed = -1; +static int hd_tdmop_SrcDst = -1; +static int hd_tdmop_SeqNum = -1; +static int hd_tdmop_LastRecv = -1; +static int hd_tdmop_Delay = -1; +static int hd_tdmop_Reserved = -1; +static int hf_tdmop_payload = -1; +static int hf_tdmop_Compression_mask = -1; + +static dissector_handle_t lapd_handle = NULL; +static dissector_handle_t data_handle = NULL; + +static gint pref_tdmop_d_channel = 16; +static guint32 pref_tdmop_mask = 0xFFFFFFFFUL; +static guint32 pref_tdmop_ethertype = ETHERTYPE_TDMOP; +static guint32 pref_tdmop_udpport = TDMOP_PORT; + +#define TDMOP_FLAG_NO_DATA (1<<3) +#define TDMOP_FLAG_REMOTE_NO_DATA (1<<2) +#define TDMOP_FLAG_COMPRESSED (1<<4) +#define TDMOP_FLAG_LOST_REQUEST ((1<<3)|(0x02)) + +static guint8 reverse_map[256]= +{ +0x00,0x80,0x40,0xC0,0x20,0xA0,0x60,0xE0,0x10,0x90,0x50,0xD0,0x30,0xB0,0x70,0xF0, +0x08,0x88,0x48,0xC8,0x28,0xA8,0x68,0xE8,0x18,0x98,0x58,0xD8,0x38,0xB8,0x78,0xF8, +0x04,0x84,0x44,0xC4,0x24,0xA4,0x64,0xE4,0x14,0x94,0x54,0xD4,0x34,0xB4,0x74,0xF4, +0x0C,0x8C,0x4C,0xCC,0x2C,0xAC,0x6C,0xEC,0x1C,0x9C,0x5C,0xDC,0x3C,0xBC,0x7C,0xFC, +0x02,0x82,0x42,0xC2,0x22,0xA2,0x62,0xE2,0x12,0x92,0x52,0xD2,0x32,0xB2,0x72,0xF2, +0x0A,0x8A,0x4A,0xCA,0x2A,0xAA,0x6A,0xEA,0x1A,0x9A,0x5A,0xDA,0x3A,0xBA,0x7A,0xFA, +0x06,0x86,0x46,0xC6,0x26,0xA6,0x66,0xE6,0x16,0x96,0x56,0xD6,0x36,0xB6,0x76,0xF6, +0x0E,0x8E,0x4E,0xCE,0x2E,0xAE,0x6E,0xEE,0x1E,0x9E,0x5E,0xDE,0x3E,0xBE,0x7E,0xFE, +0x01,0x81,0x41,0xC1,0x21,0xA1,0x61,0xE1,0x11,0x91,0x51,0xD1,0x31,0xB1,0x71,0xF1, +0x09,0x89,0x49,0xC9,0x29,0xA9,0x69,0xE9,0x19,0x99,0x59,0xD9,0x39,0xB9,0x79,0xF9, +0x05,0x85,0x45,0xC5,0x25,0xA5,0x65,0xE5,0x15,0x95,0x55,0xD5,0x35,0xB5,0x75,0xF5, +0x0D,0x8D,0x4D,0xCD,0x2D,0xAD,0x6D,0xED,0x1D,0x9D,0x5D,0xDD,0x3D,0xBD,0x7D,0xFD, +0x03,0x83,0x43,0xC3,0x23,0xA3,0x63,0xE3,0x13,0x93,0x53,0xD3,0x33,0xB3,0x73,0xF3, +0x0B,0x8B,0x4B,0xCB,0x2B,0xAB,0x6B,0xEB,0x1B,0x9B,0x5B,0xDB,0x3B,0xBB,0x7B,0xFB, +0x07,0x87,0x47,0xC7,0x27,0xA7,0x67,0xE7,0x17,0x97,0x57,0xD7,0x37,0xB7,0x77,0xF7, +0x0F,0x8F,0x4F,0xCF,0x2F,0xAF,0x6F,0xEF,0x1F,0x9F,0x5F,0xDF,0x3F,0xBF,0x7F,0xFF +}; + +static void dissect_tdmop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + guint8 dchannel_data[MAX_DCHANNEL_LEN]; + guint dchannel_len; + guint8 flags; + gint offset; + proto_item *ti; + proto_tree *tdmop_tree; + guint32 dstch; + guint32 srcch; + flags = tvb_get_guint8(tvb, 4); + offset = 0; + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TDMoP"); + col_clear(pinfo->cinfo, COL_INFO); + if (flags & TDMOP_FLAG_LOST_REQUEST) + { + col_add_fstr(pinfo->cinfo, COL_INFO, "Lost Request"); + } + /*conversation*/ + dstch = tvb_get_guint8(tvb, offset + 2); + srcch = tvb_get_guint8(tvb, offset + 3); + pinfo->destport = dstch; + pinfo->srcport = srcch; + pinfo->ptype = PT_TDMOP; + ti = proto_tree_add_item(tree, proto_tdmop, tvb, 0, -1, ENC_NA); + tdmop_tree = proto_item_add_subtree(ti, ett_tdmop); + /*path info*/ + proto_tree_add_item(tdmop_tree, hf_tdmop_TransferID, tvb, offset, 4, ENC_LITTLE_ENDIAN); + offset += 2; + proto_tree_add_item(tdmop_tree, hf_tdmop_DstCh, tvb, offset, 1, ENC_LITTLE_ENDIAN); + offset += 1; + proto_tree_add_item(tdmop_tree, hf_tdmop_SrcCh, tvb, offset, 1, ENC_LITTLE_ENDIAN); + offset += 1; + /*flags*/ + proto_tree_add_item(tdmop_tree, hf_tdmop_Flags, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tdmop_tree, hf_tdmop_Flags_no_data, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tdmop_tree, hf_tdmop_Flags_lost_request, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tdmop_tree, hf_tdmop_Flags_remote_no_data, tvb, offset, 1, ENC_NA); + proto_tree_add_item(tdmop_tree, hf_tdmop_Flags_compressed, tvb, offset, 1, ENC_NA); + offset += 1; + /*sequence and delay info*/ + proto_tree_add_item(tdmop_tree, hd_tdmop_SrcDst, tvb, offset, 1, ENC_LITTLE_ENDIAN); + offset += 1; + proto_tree_add_item(tdmop_tree, hd_tdmop_SeqNum, tvb, offset, 2, ENC_LITTLE_ENDIAN); + offset += 2; + proto_tree_add_item(tdmop_tree, hd_tdmop_LastRecv, tvb, offset, 2, ENC_LITTLE_ENDIAN); + offset += 2; + proto_tree_add_item(tdmop_tree, hd_tdmop_Delay, tvb, offset, 2, ENC_LITTLE_ENDIAN); + offset += 2; + proto_tree_add_item(tdmop_tree, hd_tdmop_Reserved, tvb, offset, 2, ENC_LITTLE_ENDIAN); + offset += 2; + if ((flags & TDMOP_FLAG_NO_DATA)==0) + { + gint len; + gint blockid; + dchannel_len=0; + len=tvb_captured_length_remaining(tvb, 0); + proto_tree_add_item(tdmop_tree, hf_tdmop_payload, tvb, offset, -1, ENC_NA); + blockid=0; + /*demux TDM stream*/ + while (offset> 16) & 0xFFFF)|((mask & 0xFFFF) << 16); + proto_tree_add_uint_format_value(currentblock, hf_tdmop_Compression_mask, tvb, offset, 4, mask, "%08X", mask); + offset+=4; + } + for (i=0; i<32; i++) + { + if (mask & (1UL<0) + { + guint8 *buff = (guint8 *)g_memdup(dchannel_data, dchannel_len); + tvbuff_t *new_tvb; + new_tvb = tvb_new_child_real_data(tvb, buff, dchannel_len, dchannel_len); + tvb_set_free_cb(new_tvb, g_free); + call_dissector(lapd_handle, new_tvb, pinfo, tree); + } + } +} + +void proto_register_tdmop(void) +{ + module_t *tdmop_module; + static hf_register_info hf[] = + { + { + &hf_tdmop_TransferID, + { "TDMoP Transfer ID", "tdmop.transferid", + FT_UINT32, BASE_HEX, + NULL, 0x0, + NULL, HFILL} + }, + { + &hf_tdmop_DstCh, + { "TDMoP Dst Ch", "tdmop.dstch", + FT_UINT8, BASE_DEC, + NULL, 0x0, + NULL, HFILL} + }, + { + &hf_tdmop_SrcCh, + { "TDMoP Src Ch", "tdmop.srcch", + FT_UINT8, BASE_DEC, + NULL, 0x0, + NULL, HFILL} + }, + { + &hf_tdmop_Flags, + { "TDMoP Flags", "tdmop.flags", + FT_UINT8, BASE_DEC, + NULL, 0x0, + NULL, HFILL} + }, + { + &hf_tdmop_Flags_lost_request, + { "TDMoP Lost Request Flag", "tdmop.flags.lostrequest", + FT_BOOLEAN, 8, + NULL, TDMOP_FLAG_LOST_REQUEST, + NULL, HFILL} + }, + { + &hf_tdmop_Flags_no_data, + { "TDMoP No data flag", "tdmop.flags.nodata", + FT_BOOLEAN, 8, + NULL, TDMOP_FLAG_NO_DATA, + NULL, HFILL} + }, + { + &hf_tdmop_Flags_remote_no_data, + { "TDMoP No data recieved from remote side flag", "tdmop.flags.remotenodata", + FT_BOOLEAN, 8, + NULL, TDMOP_FLAG_REMOTE_NO_DATA, + NULL, HFILL} + }, + { + &hf_tdmop_Flags_compressed, + { "TDMoP compressed framed", "tdmop.flags.compressed", + FT_BOOLEAN, 8, + NULL, TDMOP_FLAG_COMPRESSED, + NULL, HFILL} + }, + { + &hd_tdmop_SrcDst, + { "TDMoP Short SrcDst", "tdmop.srcdst", + FT_UINT8, BASE_HEX, + NULL, 0x0, + NULL, HFILL} + }, + { + &hd_tdmop_SeqNum, + { "TDMoP Sequence number", "tdmop.seqnum", + FT_UINT16, BASE_DEC, + NULL, 0x0, + NULL, HFILL} + }, + { + &hd_tdmop_LastRecv, + { "TDMoP Last Received number", "tdmop.recvnumber", + FT_UINT16, BASE_DEC, + NULL, 0x0, + NULL, HFILL} + }, + { + &hd_tdmop_Delay, + { "TDMoP Delay", "tdmop.delay", + FT_UINT16, BASE_DEC, + NULL, 0x0, + NULL, HFILL} + }, + { + &hd_tdmop_Reserved, + { "TDMoP Reserved", "tdmop.reserved", + FT_UINT16, BASE_DEC, + NULL, 0x0, + NULL, HFILL} + }, + { + &hf_tdmop_payload, + { "TDMoP Payload", "tdmop.payload", + FT_BYTES, BASE_NONE, + NULL, 0x0, + NULL, HFILL} + }, + { + &hf_tdmop_Compression_mask, + { "TDMoP Compression mask", "tdmop.cmask", + FT_UINT32, BASE_HEX, + NULL, 0x0, + NULL, HFILL} + } + }; + static gint *ett[] = { + &ett_tdmop, + &ett_tdmop_channel + }; + proto_tdmop = proto_register_protocol ( + "TDMoP protocol", + "TDMoP", + "tdmop" + ); + proto_register_field_array(proto_tdmop, hf, array_length(hf)); + proto_register_subtree_array(ett, array_length(ett)); + tdmop_module = prefs_register_protocol(proto_tdmop, proto_reg_handoff_tdmop); + prefs_register_uint_preference(tdmop_module, "d_channel", + "TDMoP D-Channel", + "The TDMoD channel that contains the D-Channel.", + 10, &pref_tdmop_d_channel); + prefs_register_uint_preference(tdmop_module, "ts_mask", + "TDMoP default timeslot mask", + "The bitmask of channels in uncompressed TDMoP frame", + 16, &pref_tdmop_mask); + prefs_register_uint_preference(tdmop_module, "ethertype", + "Ethertype for TDMoP stream(Usually 0808)", + "The ethertype assigned to TDMoP (without IP/UDP) stream", + 16, &pref_tdmop_ethertype); + prefs_register_uint_preference(tdmop_module, "udpport", + "UDP Port of TDMoP stream(Usually 41000)", + "The udp port assigned to TDMoP stream", + 10, &pref_tdmop_udpport); +} + +void proto_reg_handoff_tdmop(void) +{ + static dissector_handle_t tdmop_handle; + static gboolean init = FALSE; + static guint32 current_tdmop_ethertype; + static guint32 current_tdmop_udpport; + if (!init) + { + tdmop_handle = create_dissector_handle(dissect_tdmop, proto_tdmop); + dissector_add_uint("udp.port", pref_tdmop_udpport, tdmop_handle); + dissector_add_uint("ethertype", pref_tdmop_ethertype, tdmop_handle); + lapd_handle = find_dissector("lapd-bitstream"); + data_handle = find_dissector("data"); + current_tdmop_ethertype = pref_tdmop_ethertype; + current_tdmop_udpport = pref_tdmop_udpport; + init = TRUE; + } + if (current_tdmop_ethertype != pref_tdmop_ethertype) + { + dissector_delete_uint("ethertype", current_tdmop_ethertype, tdmop_handle); + dissector_add_uint("ethertype", pref_tdmop_ethertype, tdmop_handle); + current_tdmop_ethertype = pref_tdmop_ethertype; + } + if (current_tdmop_udpport != pref_tdmop_udpport) + { + dissector_delete_uint("udp.port", current_tdmop_udpport, tdmop_handle); + dissector_add_uint("udp.port", pref_tdmop_udpport, tdmop_handle); + current_tdmop_udpport = pref_tdmop_udpport; + } +} + +/* + * Editor modelines - https://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=4 expandtab: + * :indentSize=4:tabSize=4:noTabs=true: + */ diff --git a/epan/to_str.c b/epan/to_str.c index b0f95f2d38..3e2aa7d9dd 100644 --- a/epan/to_str.c +++ b/epan/to_str.c @@ -1150,6 +1150,7 @@ port_type_to_str (port_type type) case PT_I2C: return "I2C"; case PT_IBQP: return "IBQP"; case PT_BLUETOOTH: return "BLUETOOTH"; + case PT_TDMOP: return "TDMOP"; default: return "[Unknown]"; } }