From Guy Martin:
authoretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>
Sat, 11 Feb 2012 16:38:01 +0000 (16:38 +0000)
committeretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>
Sat, 11 Feb 2012 16:38:01 +0000 (16:38 +0000)
Dissector for MPEG section packets.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6820

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40970 f5534014-38df-0310-8fa8-9805f1628bb7

epan/CMakeLists.txt
epan/dissectors/Makefile.common
epan/dissectors/packet-mpeg-sect.c [new file with mode: 0644]

index 10f456c..a89eafe 100644 (file)
@@ -799,6 +799,7 @@ set(DISSECTOR_SRC
        dissectors/packet-mount.c
        dissectors/packet-mp2t.c
        dissectors/packet-mp4ves.c
+       dissectors/packet-mpeg-sect.c
        dissectors/packet-mpeg1.c
        dissectors/packet-mpls.c
        dissectors/packet-mpls-echo.c
index 3a51ca4..baae982 100644 (file)
@@ -717,6 +717,7 @@ DISSECTOR_SRC = \
        packet-mount.c          \
        packet-mp2t.c           \
        packet-mp4ves.c         \
+       packet-mpeg-sect.c      \
        packet-mpeg1.c          \
        packet-mpls.c           \
        packet-mpls-echo.c      \
diff --git a/epan/dissectors/packet-mpeg-sect.c b/epan/dissectors/packet-mpeg-sect.c
new file mode 100644 (file)
index 0000000..8e188f7
--- /dev/null
@@ -0,0 +1,274 @@
+/* packet-mpeg-sect.c
+ * Routines for MPEG2 (ISO/ISO 13818-1) Section dissection
+ * Copyright 2012, Guy Martin <gmsoft@tuxicoman.be>
+ *
+ * $Id$
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * Copied from WHATEVER_FILE_YOU_USED (where "WHATEVER_FILE_YOU_USED"
+ * is a dissector file; if you just copied this from README.developer,
+ * don't bother with the "Copied from" - you don't even need to put
+ * in a "Copied from" if you copied an existing dissector, especially
+ * if the bulk of the code in the new dissector is your code)
+ *
+ * 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <glib.h>
+
+#include <epan/packet.h>
+#include <epan/prefs.h>
+
+static int proto_mpeg_sect = -1;
+static int hf_mpeg_sect_table_id = -1;
+static int hf_mpeg_sect_syntax_indicator = -1;
+static int hf_mpeg_sect_zero = -1;
+static int hf_mpeg_sect_reserved = -1;
+static int hf_mpeg_sect_length = -1;
+static int hf_mpeg_sect_crc = -1;
+
+static gint ett_mpeg_sect = -1;
+
+static dissector_table_t mpeg_sect_tid_dissector_table;
+
+#define MPEG_SECT_TABLE_ID_MASK                0xFF0000
+#define MPEG_SECT_SYNTAX_INDICATOR_MASK        0x008000
+#define MPEG_SECT_ZERO_MASK            0x004000
+#define MPEG_SECT_RESERVED_MASK                0x003000
+#define MPEG_SECT_LENGTH_MASK          0x000FFF
+
+/* From ISO/IEC 13818-1 */
+enum {
+       TID_PAT,
+       TID_CA,
+       TID_PMT,
+       TID_TS_DESC,
+       TID_SCENE_DESC,
+       TID_OBJECT_DESC,
+       TID_FORBIDEN = 0xFF,
+};
+
+/* From ETSI EN 300 468 */
+enum {
+       TID_NIT = 0x40,
+       TID_NIT_OTHER,
+       TID_SDT,
+       TID_SDT_OTHER = 0x46,
+       TID_BAT = 0x4A,
+       TID_EIT = 0x4E,
+       TID_EIT_OTHER,
+       TID_TDT = 0x70,
+       TID_RST,
+       TID_ST,
+       TID_TOT,
+
+
+};
+
+/* From ETSI EN 301 790 */
+enum {
+
+       TID_RMT = 0x41, /* Conflict with TID_NIT_OTHER */
+       TID_SCT = 0xA0,
+       TID_FCT,
+       TID_TCT,
+       TID_SPT,
+       TID_CMT,
+       TID_TBTP,
+       TID_PCR,
+       TID_TIM = 0xB0,
+
+};
+
+/* From ESTI EN 301 192 */
+enum {
+       TID_DVB_MPE = 0x3E
+};
+
+static const value_string mpeg_sect_table_id_vals[] = {
+
+       { TID_PAT, "Program Association Table (PAT)" },
+       { TID_CA, "Conditional Access (CA)" },
+       { TID_PMT, "Program Map Table (PMT)" },
+       { TID_TS_DESC, "Transport Stream Description" },
+       { TID_SCENE_DESC, "ISO/IEC 14496 Scene Description" },
+       { TID_OBJECT_DESC, "ISO/IEC 14496 Object Description" },
+       { TID_NIT, "Network Information Table (NIT), current network" },
+       { TID_NIT_OTHER, "Network Information Table (NIT), other network" },
+       { TID_SDT, "Service Description Table (SDT), current network" },
+       { TID_SDT_OTHER, "Service Description (SDT), other network" },
+       { TID_BAT, "Bouquet Associatoin Table (BAT)" },
+       { TID_EIT, "Event Information Table (EIT), actual TS" },
+       { TID_EIT_OTHER, "Event Information Table (EIT), other TS" },
+       { TID_TDT, "Time and Date Table (TDT)" },
+       { TID_RST, "Running Status Table (RST)" },
+       { TID_ST, "Stuffing Table (ST)" },
+       { TID_TOT, "Time Offset Table (TOT)" },
+       { TID_SCT, "Superframe Composition Table (SCT)" },
+       { TID_FCT, "Frame Composition Table (FCT)" },
+       { TID_TCT, "Time-Slot Composition Table (TCT)" },
+       { TID_SPT, "Satellite Position Table (SPT)" },
+       { TID_CMT, "Correction Message Table (CMT)" },
+       { TID_TBTP, "Terminal Burst Time Plan (TBTP)" },
+       { TID_TIM, "Terminal Information Message (TIM)" },
+       { TID_DVB_MPE, "DVB MultiProtocol Encapsulation (MPE)" },
+       { TID_FORBIDEN, "Forbidden" },
+       { 0, NULL }
+};
+
+void
+dissect_mpeg_sect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+
+       gint offset = 0;
+
+       guint8 table_id = 0;
+       guint16 header = 0;
+       guint16 section_length = 0;
+       guint16 syntax_indicator = 0;
+
+       proto_item *ti = NULL;
+       proto_tree *mpeg_sect_tree = NULL;
+
+       tvbuff_t *pload_tvb = NULL;
+
+       if (tvb_length(tvb) < 3)
+               return;
+
+       table_id = tvb_get_guint8(tvb, offset);
+       header = tvb_get_ntohs(tvb, offset + 1);
+       syntax_indicator = header & MPEG_SECT_SYNTAX_INDICATOR_MASK;
+       section_length = header & MPEG_SECT_LENGTH_MASK;
+
+       set_actual_length(tvb, section_length + 3);
+
+       col_set_str(pinfo->cinfo, COL_PROTOCOL, "MPEG SECT");
+       col_add_fstr(pinfo->cinfo, COL_INFO, "Table ID 0x%hhX", table_id);
+
+       ti = proto_tree_add_item(tree, proto_mpeg_sect, tvb, offset, -1, ENC_NA);
+       mpeg_sect_tree = proto_item_add_subtree(ti, ett_mpeg_sect);
+
+       proto_item_append_text(ti, " Table_ID=0x%hhx", table_id);
+
+       if (syntax_indicator) {
+               /* Pass everything but the CRC */
+               section_length -= sizeof(guint32);
+       }
+
+       if (tree) {
+
+               proto_tree_add_item(mpeg_sect_tree, hf_mpeg_sect_table_id, tvb, offset, 3, ENC_BIG_ENDIAN);
+               proto_tree_add_item(mpeg_sect_tree, hf_mpeg_sect_syntax_indicator, tvb, offset, 3, ENC_BIG_ENDIAN);
+               proto_tree_add_item(mpeg_sect_tree, hf_mpeg_sect_zero, tvb, offset, 3, ENC_BIG_ENDIAN);
+               proto_tree_add_item(mpeg_sect_tree, hf_mpeg_sect_reserved, tvb, offset, 3, ENC_BIG_ENDIAN);
+               proto_tree_add_item(mpeg_sect_tree, hf_mpeg_sect_length, tvb, offset, 3, ENC_BIG_ENDIAN);
+
+               offset += 3;
+
+               if (syntax_indicator)
+                       proto_tree_add_item(mpeg_sect_tree, hf_mpeg_sect_crc, tvb, offset + section_length, 4, ENC_BIG_ENDIAN);
+       }
+
+       
+       pload_tvb = tvb_new_subset(tvb, 3, section_length, -1);
+       dissector_try_uint(mpeg_sect_tid_dissector_table, table_id, pload_tvb, pinfo, tree);
+
+       return;
+
+}
+
+
+static gboolean
+heur_dissect_mpeg_sect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+       guint16 section_length = 0;
+
+       section_length = (tvb_get_ntohs(tvb, 1) & MPEG_SECT_LENGTH_MASK) + 3;
+       if (tvb_length_remaining(tvb, 0) < section_length)
+               return FALSE;
+
+       dissect_mpeg_sect(tvb, pinfo, tree);
+       return TRUE;
+}
+
+void
+proto_register_mpeg_sect(void)
+{
+
+       static hf_register_info hf[] = {
+               
+               { &hf_mpeg_sect_table_id, {
+                       "Table ID", "mpeg_sect.tid",
+                       FT_UINT24, BASE_HEX, VALS(mpeg_sect_table_id_vals), MPEG_SECT_TABLE_ID_MASK, NULL, HFILL
+               } },
+
+               { &hf_mpeg_sect_syntax_indicator, {
+                       "Syntax indicator", "mpeg_sect.syntax_indicator",
+                       FT_UINT24, BASE_DEC, NULL, MPEG_SECT_SYNTAX_INDICATOR_MASK, NULL, HFILL
+               } },
+
+               { &hf_mpeg_sect_zero, {
+                       "Zero or reserved", "mpeg_sect.zero",
+                       FT_UINT24, BASE_DEC, NULL, MPEG_SECT_ZERO_MASK, NULL, HFILL
+               } },
+
+               { &hf_mpeg_sect_reserved, {
+                       "Reserved", "mpeg_sect.reserved",
+                       FT_UINT24, BASE_HEX, NULL, MPEG_SECT_RESERVED_MASK, NULL, HFILL
+               } },
+
+               { &hf_mpeg_sect_length, {
+                       "Length", "mpeg_sect.len",
+                       FT_UINT24, BASE_DEC, NULL, MPEG_SECT_LENGTH_MASK, NULL, HFILL
+               } },
+
+               { &hf_mpeg_sect_crc, {
+                       "CRC 32", "mpeg_sect.crc",
+                       FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL
+               } },
+                       
+
+       };
+
+       static gint *ett[] = {
+               &ett_mpeg_sect
+       };
+
+       proto_mpeg_sect = proto_register_protocol("MPEG2 Section", "MPEG SECT", "mpeg_sect");
+       register_dissector("mpeg_sect", dissect_mpeg_sect, proto_mpeg_sect);
+
+       proto_register_field_array(proto_mpeg_sect, hf, array_length(hf));
+       proto_register_subtree_array(ett, array_length(ett));
+
+       
+       mpeg_sect_tid_dissector_table = register_dissector_table("mpeg_sect.tid", "MPEG SECT Table ID", FT_UINT8, BASE_HEX);
+
+}
+
+
+void
+proto_reg_handoff_mpeg_sect(void)
+{
+       heur_dissector_add("mp2t.pid", heur_dissect_mpeg_sect, proto_mpeg_sect);
+}
+
+