Adding upstream version 4.2.2.upstream/4.2.2

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

1 files changed, 137 insertions, 0 deletions

diff --git a/epan/dissectors/packet-ipfc.c b/epan/dissectors/packet-ipfc.c
new file mode 100644
index 00000000..5544ea60
--- /dev/null
+++ b/epan/dissectors/packet-ipfc.c
@@ -0,0 +1,137 @@
+/* packet-ipfc.c
+ * Routines for Decoding Network_Header for IP-over-FC when we only
+ * capture the frame starting at the Network_Header (as opposed to
+ * when we have the full FC frame).
+ * See RFC 2625.
+ * Copyright 2001, Dinesh G Dutt <ddutt@cisco.com>
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "config.h"
+
+#include <epan/packet.h>
+#include <epan/capture_dissectors.h>
+#include <epan/to_str.h>
+
+#include "packet-llc.h"
+
+void proto_register_ipfc(void);
+void proto_reg_handoff_ipfc(void);
+
+static dissector_handle_t ipfc_handle;
+static capture_dissector_handle_t ipfc_cap_handle;
+
+/* Initialize the protocol and registered fields */
+static int proto_ipfc              = -1;
+static int hf_ipfc_network_da = -1;
+static int hf_ipfc_network_sa = -1;
+
+/* Initialize the subtree pointers */
+static gint ett_ipfc = -1;
+static dissector_handle_t llc_handle;
+static capture_dissector_handle_t llc_cap_handle;
+
+static gboolean
+capture_ipfc (const guchar *pd, int offset _U_, int len, capture_packet_info_t *cpinfo, const union wtap_pseudo_header *pseudo_header _U_)
+{
+  if (!BYTES_ARE_IN_FRAME(0, len, 16))
+    return FALSE;
+
+  return call_capture_dissector(llc_cap_handle, pd, 16, len, cpinfo, pseudo_header);
+}
+
+static int
+dissect_ipfc (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
+{
+
+/* Set up structures needed to add the protocol subtree and manage it */
+    proto_item *ti;
+    proto_tree *ipfc_tree;
+    int offset = 0;
+    tvbuff_t *next_tvb;
+
+    /* Make entries in Protocol column and Info column on summary display */
+    col_set_str(pinfo->cinfo, COL_PROTOCOL, "IP/FC");
+
+    if (tree) {
+        ti = proto_tree_add_protocol_format (tree, proto_ipfc, tvb, offset, 16,
+                                         "IP Over FC Network_Header");
+        ipfc_tree = proto_item_add_subtree (ti, ett_ipfc);
+
+        proto_tree_add_item (ipfc_tree, hf_ipfc_network_da, tvb, offset, 8, ENC_NA);
+        proto_tree_add_item (ipfc_tree, hf_ipfc_network_sa, tvb, offset+8, 8, ENC_NA);
+    }
+
+    next_tvb = tvb_new_subset_remaining (tvb, 16);
+    call_dissector(llc_handle, next_tvb, pinfo, tree);
+    return tvb_captured_length(tvb);
+}
+
+/* Register the protocol with Wireshark */
+
+/* this format is require because a script is used to build the C function
+   that calls all the protocol registration.
+*/
+
+void
+proto_register_ipfc (void)
+{
+
+/* Setup list of header fields  See Section 1.6.1 for details*/
+    static hf_register_info hf[] = {
+        { &hf_ipfc_network_da,
+          {"Network DA", "ipfc.nh.da", FT_FCWWN, BASE_NONE, NULL,
+           0x0, NULL, HFILL}},
+        { &hf_ipfc_network_sa,
+          {"Network SA", "ipfc.nh.sa", FT_FCWWN, BASE_NONE, NULL,
+           0x0, NULL, HFILL}},
+    };
+
+    /* Setup protocol subtree array */
+    static gint *ett[] = {
+        &ett_ipfc,
+    };
+
+    /* Register the protocol name and description */
+    proto_ipfc = proto_register_protocol("IP Over FC", "IPFC", "ipfc");
+
+    /* Required function calls to register the header fields and subtrees used */
+    proto_register_field_array(proto_ipfc, hf, array_length(hf));
+    proto_register_subtree_array(ett, array_length(ett));
+
+    ipfc_handle = register_dissector("ipfc", dissect_ipfc, proto_ipfc);
+    ipfc_cap_handle = register_capture_dissector("ipfc", capture_ipfc, proto_ipfc);
+}
+
+/* If this dissector uses sub-dissector registration add a registration routine.
+   This format is required because a script is used to find these routines and
+   create the code that calls these routines.
+*/
+void
+proto_reg_handoff_ipfc (void)
+{
+    dissector_add_uint("wtap_encap", WTAP_ENCAP_IP_OVER_FC, ipfc_handle);
+
+    llc_handle = find_dissector_add_dependency("llc", proto_ipfc);
+    llc_cap_handle = find_capture_dissector("llc");
+
+    capture_dissector_add_uint("wtap_encap", WTAP_ENCAP_IP_OVER_FC, ipfc_cap_handle);
+}
+
+/*
+ * Editor modelines  -  https://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */