From Rolf Fiedler (bug 2408):

This extends the EyeSDN wiretap module to be able to support:
- DSS1/Q.931
- PPP
- LAPB/X.25
- ATM raw cells
- SS7 MTP2

svn path=/trunk/; revision=25123

1 files changed, 152 insertions, 0 deletions

diff --git a/epan/dissectors/packet-l1-events.c b/epan/dissectors/packet-l1-events.c
new file mode 100644
index 0000000000..123e88a529
--- /dev/null
+++ b/epan/dissectors/packet-l1-events.c
@@ -0,0 +1,152 @@
+/* packet-l1-events.c
+ * Routines for text-based layer 1 message
+ *
+ * (C) Rolf Fiedler 2008, based on packet-text-media.c by Olivier Biot, 2004.
+ *
+ * $Id$
+ *
+ * Refer to the AUTHORS file or the AUTHORS section in the man page
+ * for contacting the author(s) of this file.
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+/* Edit this file with 4-space tabs */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <string.h>
+#include <ctype.h>
+
+#include <glib.h>
+#include <epan/packet.h>
+#include <epan/strutil.h>
+
+
+/*
+ * dissector for line-based text messages from layer 1
+ */
+
+/* Filterable header fields */
+static gint proto_l1_events = -1;
+
+/* Subtrees */
+static gint ett_l1_events = -1;
+
+/* Dissector handles */
+static dissector_handle_t l1_events_handle;
+
+static void
+dissect_l1_events(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+	proto_tree	*subtree;
+	proto_item	*ti;
+	gint		offset = 0, next_offset;
+	gint		len;
+	const char	*data_name;
+
+	data_name = pinfo->match_string;
+	if (! (data_name && data_name[0])) {
+		/*
+		 * No information from "match_string"
+		 */
+		data_name = (char *)(pinfo->private_data);
+		if (! (data_name && data_name[0])) {
+			/*
+			 * No information from "private_data"
+			 */
+			data_name = NULL;
+		}
+	}
+
+	if (check_col(pinfo->cinfo, COL_PROTOCOL))
+		col_set_str(pinfo->cinfo, COL_PROTOCOL, "Layer1");
+	if (check_col(pinfo->cinfo, COL_DEF_SRC))
+		col_set_str(pinfo->cinfo, COL_DEF_SRC, 
+			    pinfo->pseudo_header->l1event.uton? "TE" : "NT");
+	if (check_col(pinfo->cinfo, COL_INFO)) {
+	        len = tvb_find_line_end(tvb, 0,
+					tvb_ensure_length_remaining(tvb, 0),
+					&next_offset, FALSE);
+	        if(len>0) 
+		        col_set_str(pinfo->cinfo, COL_INFO, 
+				    tvb_format_text(tvb, 0, len));
+	}
+	if (tree) {
+		ti = proto_tree_add_item(tree, proto_l1_events,
+				tvb, 0, -1, FALSE);
+		if (data_name)
+			proto_item_append_text(ti, ": %s", data_name);
+		subtree = proto_item_add_subtree(ti, ett_l1_events);
+		/* Read the media line by line */
+		while (tvb_reported_length_remaining(tvb, offset) != 0) {
+			/*
+			 * XXX - we need to be passed the parameters
+			 * of the content type via "pinfo->private_data",
+			 * so that we know the character set.  We'd
+			 * have to handle that character set, which
+			 * might be a multibyte character set such
+			 * as "iso-10646-ucs-2", or might require other
+			 * special processing.
+			 */
+			len = tvb_find_line_end(tvb, offset,
+					tvb_ensure_length_remaining(tvb, offset),
+					&next_offset, FALSE);
+			if (len == -1)
+				break;
+
+			/* We use next_offset - offset instead of len in the
+			 * call to tvb_format_text() so it will include the
+			 * line terminator(s) (\r and/or \n) in the display.
+			 */
+			proto_tree_add_text(subtree, tvb, offset, next_offset - offset,
+					    "%s", tvb_format_text(tvb, offset,
+								  next_offset - offset));
+			offset = next_offset;
+		}
+	}
+}
+
+void
+proto_register_l1_events(void)
+{
+	static gint *ett[] = {
+		&ett_l1_events,
+	};
+
+	proto_register_subtree_array(ett, array_length(ett));
+
+	proto_l1_events = proto_register_protocol(
+			"Layer 1 Event Messages", /* Long name */
+			"Layer 1 Events",	  /* Short name */
+			"data-l1-events");		/* Filter name */
+	register_dissector("data-l1-events", dissect_l1_events, 
+			   proto_l1_events);
+}
+
+void
+proto_reg_handoff_l1_events(void)
+{
+	l1_events_handle = create_dissector_handle(
+					dissect_l1_events, proto_l1_events);
+
+        dissector_add("wtap_encap", WTAP_ENCAP_LAYER1_EVENT, l1_events_handle); /* for text msgs from trace files */
+}