Adding upstream version 4.2.2.upstream/4.2.2

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 110 insertions, 0 deletions

diff --git a/epan/dissectors/packet-telkonet.c b/epan/dissectors/packet-telkonet.c
new file mode 100644
index 00000000..5d30da4d
--- /dev/null
+++ b/epan/dissectors/packet-telkonet.c
@@ -0,0 +1,110 @@
+/* packet-telkonet.c
+ * Routines for ethertype 0x88A1 tunneling dissection
+ *
+ * Copyright 2006 Joerg Mayer (see AUTHORS file)
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+/* 2do:
+ * - find out more about the real meaning of the 8 bytes
+ *   and possible other packet types
+ * - Telkonet (www.telkonet.com) has registered other ethertypes
+ *   as well: find out what they do
+ */
+
+#include "config.h"
+
+#include <epan/packet.h>
+#include <epan/etypes.h>
+
+void proto_reg_handoff_telkonet(void);
+void proto_register_telkonet(void);
+
+static int proto_telkonet = -1;
+static int hf_telkonet_type = -1;
+
+static gint ett_telkonet = -1;
+
+static dissector_handle_t telkonet_handle;
+static dissector_handle_t eth_withoutfcs_handle;
+
+typedef enum {
+	TELKONET_TYPE_TUNNEL = 0x78
+} telkonet_type_t;
+
+static const value_string telkonet_type_vals[] = {
+	{ TELKONET_TYPE_TUNNEL,	"tunnel" },
+
+	{ 0x00,	NULL }
+};
+
+static int
+dissect_telkonet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
+{
+	proto_tree *ti, *telkonet_tree;
+	int offset = 0;
+	telkonet_type_t type;
+
+	col_set_str(pinfo->cinfo, COL_PROTOCOL, "TELKONET");
+	col_clear(pinfo->cinfo, COL_INFO);
+
+	type = (telkonet_type_t)tvb_get_guint8(tvb, offset);
+	col_add_fstr(pinfo->cinfo, COL_INFO, "Telkonet type: %s",
+		val_to_str(type, telkonet_type_vals, "Unknown (0x%02x)"));
+
+	ti = proto_tree_add_item(tree, proto_telkonet, tvb, 0, 8, ENC_NA);
+	telkonet_tree = proto_item_add_subtree(ti, ett_telkonet);
+
+	proto_tree_add_item(telkonet_tree, hf_telkonet_type, tvb, 0, 8, ENC_NA);
+	offset += 8;
+
+	if (type == TELKONET_TYPE_TUNNEL)
+		call_dissector(eth_withoutfcs_handle, tvb_new_subset_remaining(tvb, offset),
+			pinfo, tree);
+
+	return tvb_captured_length(tvb);
+}
+
+void
+proto_register_telkonet(void)
+{
+	static hf_register_info hf[] = {
+		{ &hf_telkonet_type,
+		{ "Type", "telkonet.type", FT_BYTES, BASE_NONE, NULL,
+			0x0, "TELKONET type", HFILL }},
+	};
+	static gint *ett[] = {
+		&ett_telkonet,
+	};
+
+	proto_telkonet = proto_register_protocol("Telkonet powerline", "TELKONET", "telkonet");
+	proto_register_field_array(proto_telkonet, hf, array_length(hf));
+	proto_register_subtree_array(ett, array_length(ett));
+	telkonet_handle = register_dissector("telkonet", dissect_telkonet, proto_telkonet);
+}
+
+void
+proto_reg_handoff_telkonet(void)
+{
+	eth_withoutfcs_handle = find_dissector_add_dependency("eth_withoutfcs", proto_telkonet);
+
+	dissector_add_uint("ethertype", ETHERTYPE_TELKONET, telkonet_handle);
+}
+
+/*
+ * Editor modelines  -  https://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:
+ */