From Guy Martin via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6989 :

Add support for DVB EIT packets from ETSI EN 300 468.

svn path=/trunk/; revision=41750

5 files changed, 346 insertions, 0 deletions

diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index 5d9fe968de..9c448a58cf 100644
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -532,6 +532,7 @@ set(DISSECTOR_SRC
 	dissectors/packet-dtpt.c
 	dissectors/packet-dua.c
 	dissectors/packet-dvb-data-mpe.c
+	dissectors/packet-dvb-eit.c
 	dissectors/packet-dvb-ipdc.c
 	dissectors/packet-dvbci.c
 	dissectors/packet-dvmrp.c
diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common
index 68808d5c6d..5efdaf545d 100644
--- a/epan/dissectors/Makefile.common
+++ b/epan/dissectors/Makefile.common
@@ -450,6 +450,7 @@ DISSECTOR_SRC = \
 	packet-dtpt.c		\
 	packet-dua.c		\
 	packet-dvb-data-mpe.c	\
+	packet-dvb-eit.c	\
 	packet-dvb-ipdc.c	\
 	packet-dvbci.c		\
 	packet-dvmrp.c		\
diff --git a/epan/dissectors/packet-dvb-eit.c b/epan/dissectors/packet-dvb-eit.c
new file mode 100644
index 0000000000..0f3086bde3
--- /dev/null
+++ b/epan/dissectors/packet-dvb-eit.c
@@ -0,0 +1,308 @@
+/* packet-dvb-eit.c
+ * Routines for DVB (ETSI EN 300 468) Event Information Table (EIT) dissection
+ * Copyright 2012, Guy Martin <gmsoft@tuxicoman.be>
+ *
+ * $Id$
+ *
+ * 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <glib.h>
+
+#include <epan/packet.h>
+#include <epan/dissectors/packet-mpeg-sect.h>
+
+#include "packet-mpeg-descriptor.h"
+
+static int proto_dvb_eit = -1;
+static int hf_dvb_eit_service_id = -1;
+static int hf_dvb_eit_reserved = -1;
+static int hf_dvb_eit_version_number = -1;
+static int hf_dvb_eit_current_next_indicator = -1;
+static int hf_dvb_eit_section_number = -1;
+static int hf_dvb_eit_last_section_number = -1;
+
+static int hf_dvb_eit_transport_stream_id = -1;
+static int hf_dvb_eit_original_network_id = -1;
+static int hf_dvb_eit_segment_last_section_number = -1;
+static int hf_dvb_eit_last_table_id = -1;
+
+static int hf_dvb_eit_event_id = -1;
+static int hf_dvb_eit_start_time = -1;
+static int hf_dvb_eit_duration = -1;
+static int hf_dvb_eit_running_status = -1;
+static int hf_dvb_eit_free_ca_mode = -1;
+static int hf_dvb_eit_descriptors_loop_length = -1;
+
+static gint ett_dvb_eit = -1;
+static gint ett_dvb_eit_event = -1;
+
+
+#define DVB_EIT_TID_MIN				0x4E
+#define DVB_EIT_TID_MAX				0x6F
+
+#define DVB_EIT_RESERVED_MASK			0xC0
+#define DVB_EIT_VERSION_NUMBER_MASK		0x3E
+#define DVB_EIT_CURRENT_NEXT_INDICATOR_MASK	0x01
+
+#define DVB_EIT_RUNNING_STATUS_MASK		0xE000
+#define DVB_EIT_FREE_CA_MODE_MASK		0x1000
+#define DVB_EIT_DESCRIPTORS_LOOP_LENGTH_MASK	0x0FFF
+
+static const value_string dvb_eit_cur_next_vals[] = {
+	{ 0, "Not yet applicable" },
+	{ 1, "Currently applicable" },
+
+	{ 0, NULL }
+};
+
+static const value_string dvb_eit_running_status_vals[] = {
+	{ 0, "Undefined" },
+	{ 1, "Not Running" },
+	{ 2, "Starts in a few seconds" },
+	{ 3, "Pausing" },
+	{ 4, "Running" },
+	{ 5, "Service off-air" },
+
+	{ 0, NULL }
+};
+
+static const value_string dvb_eit_free_ca_mode_vals[] = {
+	{ 0, "Not Scrambled" },
+	{ 1, "One or more component scrambled" },
+
+	{ 0, NULL }
+};
+
+static void
+dissect_dvb_eit(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+
+	guint offset = 0, length = 0, descriptor_end = 0;
+	guint16 evt_id = 0, descriptor_len = 0;
+
+	proto_item *ti = NULL;
+	proto_tree *dvb_eit_tree = NULL;
+	proto_item *ei = NULL;
+	proto_tree *dvb_eit_event_tree = NULL;
+	proto_item *duration_item = NULL;
+
+	nstime_t start_time;
+
+	col_clear(pinfo->cinfo, COL_INFO);
+	col_set_str(pinfo->cinfo, COL_INFO, "Event Information Table (EIT)");
+
+	if (!tree)
+		return;
+
+	ti = proto_tree_add_item(tree, proto_dvb_eit, tvb, offset, -1, ENC_NA);
+	dvb_eit_tree = proto_item_add_subtree(ti, ett_dvb_eit);
+
+	offset += packet_mpeg_sect_header(tvb, offset, dvb_eit_tree, &length, NULL);
+	length -= 4;
+
+	proto_tree_add_item(dvb_eit_tree, hf_dvb_eit_service_id, tvb, offset, 2, ENC_BIG_ENDIAN);
+	offset += 2;
+
+	proto_tree_add_item(dvb_eit_tree, hf_dvb_eit_reserved, tvb, offset, 1, ENC_BIG_ENDIAN);
+	proto_tree_add_item(dvb_eit_tree, hf_dvb_eit_version_number, tvb, offset, 1, ENC_BIG_ENDIAN);
+	proto_tree_add_item(dvb_eit_tree, hf_dvb_eit_current_next_indicator, tvb, offset, 1, ENC_BIG_ENDIAN);
+	offset++;
+
+	proto_tree_add_item(dvb_eit_tree, hf_dvb_eit_section_number, tvb, offset, 1, ENC_BIG_ENDIAN);
+	offset++;
+
+	proto_tree_add_item(dvb_eit_tree, hf_dvb_eit_last_section_number, tvb, offset, 1, ENC_BIG_ENDIAN);
+	offset++;
+
+	proto_tree_add_item(dvb_eit_tree, hf_dvb_eit_transport_stream_id, tvb, offset, 2, ENC_BIG_ENDIAN);
+	offset += 2;
+
+	proto_tree_add_item(dvb_eit_tree, hf_dvb_eit_original_network_id, tvb, offset, 2, ENC_BIG_ENDIAN);
+	offset += 2;
+
+	proto_tree_add_item(dvb_eit_tree, hf_dvb_eit_segment_last_section_number, tvb, offset, 1, ENC_BIG_ENDIAN);
+	offset++;
+
+	proto_tree_add_item(dvb_eit_tree, hf_dvb_eit_last_table_id, tvb, offset, 1, ENC_BIG_ENDIAN);
+	offset++;
+
+	if (offset >= length) {
+		packet_mpeg_sect_crc(tvb, pinfo, dvb_eit_tree, 0, offset);
+		return;
+	}
+
+	/* Parse all the events */
+	while (offset < length) {
+
+		evt_id = tvb_get_ntohs(tvb, offset);
+		ei = proto_tree_add_text(dvb_eit_tree, tvb, offset, 12, "Event 0x%04hx", evt_id);
+		dvb_eit_event_tree = proto_item_add_subtree(ei, ett_dvb_eit_event);
+
+		proto_tree_add_item(dvb_eit_event_tree, hf_dvb_eit_event_id, tvb, offset, 2, ENC_BIG_ENDIAN);
+		offset += 2;
+
+		if (tvb_memeql(tvb, offset, "\xFF\xFF\xFF\xFF\xFF", 5)) {
+			if (packet_mpeg_sect_mjd_to_utc_time(tvb, offset, &start_time) < 0) {
+				proto_tree_add_text(tree, tvb, offset, 5, "Unparseable time");
+			} else {
+				proto_tree_add_time_format(dvb_eit_event_tree, hf_dvb_eit_start_time, tvb, offset, 5, &start_time, "Start Time: %s UTC", abs_time_to_str(&start_time, ABSOLUTE_TIME_UTC, FALSE));
+			}
+		} else {
+			proto_tree_add_text(tree, tvb, offset, 5, "Start Time: Undefined (0xFFFFFFFFFF)");
+		}
+		offset += 5;
+
+		duration_item = proto_tree_add_item(dvb_eit_event_tree, hf_dvb_eit_duration, tvb, offset, 3, ENC_BIG_ENDIAN);
+		proto_item_append_text(duration_item, " (%02u:%02u:%02u)",
+			MPEG_SECT_BCD44_TO_DEC(tvb_get_guint8(tvb, offset)),
+			MPEG_SECT_BCD44_TO_DEC(tvb_get_guint8(tvb, offset + 1)),
+			MPEG_SECT_BCD44_TO_DEC(tvb_get_guint8(tvb, offset + 2)));
+		offset += 3;
+
+		proto_tree_add_item(dvb_eit_event_tree, hf_dvb_eit_running_status, tvb, offset, 2, ENC_BIG_ENDIAN);
+		proto_tree_add_item(dvb_eit_event_tree, hf_dvb_eit_free_ca_mode, tvb, offset, 2, ENC_BIG_ENDIAN);
+		proto_tree_add_item(dvb_eit_event_tree, hf_dvb_eit_descriptors_loop_length, tvb, offset, 2, ENC_BIG_ENDIAN);
+		descriptor_len = tvb_get_ntohs(tvb, offset) & DVB_EIT_DESCRIPTORS_LOOP_LENGTH_MASK;
+		offset += 2;
+
+		descriptor_end = offset + descriptor_len;
+		while (offset < descriptor_end)
+			offset += proto_mpeg_descriptor_dissect(tvb, offset, dvb_eit_event_tree);
+
+	}
+
+	packet_mpeg_sect_crc(tvb, pinfo, dvb_eit_tree, 0, offset);
+}
+
+
+void
+proto_register_dvb_eit(void)
+{
+
+	static hf_register_info hf[] = {
+
+		{ &hf_dvb_eit_service_id, {
+			"Service ID", "dvb_eit.sid",
+			FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL
+		} },
+
+		{ &hf_dvb_eit_reserved, {
+			"Reserved", "dvb_eit.reserved",
+			FT_UINT8, BASE_HEX, NULL, DVB_EIT_RESERVED_MASK, NULL, HFILL
+		} },
+
+		{ &hf_dvb_eit_version_number, {
+			"Version Number", "dvb_eit.version",
+			FT_UINT8, BASE_HEX, NULL, DVB_EIT_VERSION_NUMBER_MASK, NULL, HFILL
+		} },
+
+		{ &hf_dvb_eit_current_next_indicator, {
+			"Current/Next Indicator", "dvb_eit.cur_next_ind",
+			FT_UINT8, BASE_DEC, VALS(dvb_eit_cur_next_vals), DVB_EIT_CURRENT_NEXT_INDICATOR_MASK, NULL, HFILL
+		} },
+
+		{ &hf_dvb_eit_section_number, {
+			"Section Number", "dvb_eit.sect_num",
+			FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL
+		} },
+
+		{ &hf_dvb_eit_last_section_number, {
+			"Last Section Number", "dvb_eit.last_sect_num",
+			FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL
+		} },
+
+		{ &hf_dvb_eit_transport_stream_id, {
+			"Transport Stream ID", "dvb_eit.tsid",
+			FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL
+		} },
+
+		{ &hf_dvb_eit_original_network_id, {
+			"Original Network ID", "dvb_eit.original_nid",
+			FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL
+		} },
+
+		{ &hf_dvb_eit_segment_last_section_number, {
+			"Segment Last Section Number", "dvb_eit.segment_last_sect_num",
+			FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL
+		} },
+
+		{ &hf_dvb_eit_last_table_id, {
+			"Last Table ID", "dvb_eit.last_tid",
+			FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL
+		} },
+
+		{ &hf_dvb_eit_event_id, {
+			"Event ID", "dvb_eit.evt.id",
+			FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL
+		} },
+
+		{ &hf_dvb_eit_start_time, {
+			"UTC Start Time", "dvb_eit.evt.start_time",
+			FT_ABSOLUTE_TIME, ABSOLUTE_TIME_UTC, NULL, 0, NULL, HFILL
+		} },
+
+		{ &hf_dvb_eit_duration, {
+			"Duration", "dvb_eit.evt.duration",
+			FT_UINT24, BASE_HEX, NULL, 0, NULL, HFILL
+		} },
+
+		{ &hf_dvb_eit_running_status, {
+			"Running Status", "dvb_eit.evt.running_status",
+			FT_UINT16, BASE_HEX, VALS(dvb_eit_running_status_vals), DVB_EIT_RUNNING_STATUS_MASK, NULL, HFILL
+		} },
+
+		{ &hf_dvb_eit_free_ca_mode, {
+			"Free CA Mode", "dvb_eit.evt.free_ca_mode",
+			FT_UINT16, BASE_HEX, VALS(dvb_eit_free_ca_mode_vals), DVB_EIT_FREE_CA_MODE_MASK, NULL, HFILL
+		} },
+
+		{ &hf_dvb_eit_descriptors_loop_length, {
+			"Descriptors Loop Length", "dvb_eit.evt.descr_loop_len",
+			FT_UINT16, BASE_HEX, NULL, DVB_EIT_DESCRIPTORS_LOOP_LENGTH_MASK, NULL, HFILL
+		} }
+	};
+
+	static gint *ett[] = {
+		&ett_dvb_eit,
+		&ett_dvb_eit_event
+	};
+
+	proto_dvb_eit = proto_register_protocol("DVB Event Information Table", "DVB EIT", "dvb_eit");
+
+	proto_register_field_array(proto_dvb_eit, hf, array_length(hf));
+	proto_register_subtree_array(ett, array_length(ett));
+
+}
+
+
+void proto_reg_handoff_dvb_eit(void)
+{
+	int tid;
+	dissector_handle_t dvb_eit_handle;
+
+	dvb_eit_handle = create_dissector_handle(dissect_dvb_eit, proto_dvb_eit);
+
+	for (tid = DVB_EIT_TID_MIN; tid <= DVB_EIT_TID_MAX; tid++)
+		dissector_add_uint("mpeg_sect.tid", tid, dvb_eit_handle);
+}
diff --git a/epan/dissectors/packet-mpeg-sect.c b/epan/dissectors/packet-mpeg-sect.c
index fbd6a2a803..16f448c4ae 100644
--- a/epan/dissectors/packet-mpeg-sect.c
+++ b/epan/dissectors/packet-mpeg-sect.c
@@ -144,6 +144,33 @@ static const value_string mpeg_sect_table_id_vals[] = {
 	{ 0, NULL }
 };
 
+/* From packet-dvbci.c 
+   read a utc_time field in an apdu and write it to utc_time
+   the encoding of the field is according to DVB-SI specification, section 5.2.5
+   16bit modified julian day (MJD), 24bit 6*4bit BCD digits hhmmss
+   return the length in bytes or -1 for error */ 
+gint
+packet_mpeg_sect_mjd_to_utc_time(tvbuff_t *tvb, gint offset, nstime_t *utc_time)
+{ 
+    gint bcd_time_offset; /* start offset of the bcd time in the tvbuff */
+    guint8 hour, min, sec;
+
+    if (!utc_time)
+        return -1;
+
+    nstime_set_zero(utc_time);
+    utc_time->secs = (tvb_get_ntohs(tvb, offset) - 40587) * 86400;
+    bcd_time_offset = offset+2;
+    hour = MPEG_SECT_BCD44_TO_DEC(tvb_get_guint8(tvb, bcd_time_offset));
+    min = MPEG_SECT_BCD44_TO_DEC(tvb_get_guint8(tvb, bcd_time_offset+1));
+    sec = MPEG_SECT_BCD44_TO_DEC(tvb_get_guint8(tvb, bcd_time_offset+2));
+    if (hour>23 || min>59 || sec>59)
+        return -1;
+
+    utc_time->secs += hour*3600 + min*60 + sec;
+    return 5;
+}
+
 guint
 packet_mpeg_sect_header(tvbuff_t *tvb, guint offset,
 			proto_tree *tree, guint *sect_len, gboolean *ssi)
diff --git a/epan/dissectors/packet-mpeg-sect.h b/epan/dissectors/packet-mpeg-sect.h
index e99ae3541a..9339d3a21d 100644
--- a/epan/dissectors/packet-mpeg-sect.h
+++ b/epan/dissectors/packet-mpeg-sect.h
@@ -32,6 +32,15 @@
 #define PACKET_MPEG_SECT_PI__LENGTH	3
 #define PACKET_MPEG_SECT_PI__SIZE	4
 
+/* convert a byte that contains two 4bit BCD digits into a decimal value */
+#define MPEG_SECT_BCD44_TO_DEC(x)  (((x&0xf0) >> 4) * 10 + (x&0x0f))
+
+/*
+ * Used to read a date provided in MJD format into a utc_time structure
+ */
+extern gint
+packet_mpeg_sect_mjd_to_utc_time(tvbuff_t *tvb, gint offset, nstime_t *utc_time);
+
 /*
  *  Used to process the 'standard' mpeg section header that is described below
  *  and populate the data into the tree