Adding upstream version 4.2.2.upstream/4.2.2

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

1 files changed, 122 insertions, 0 deletions

diff --git a/epan/dissectors/packet-clip.c b/epan/dissectors/packet-clip.c
new file mode 100644
index 00000000..c3f1128a
--- /dev/null
+++ b/epan/dissectors/packet-clip.c
@@ -0,0 +1,122 @@
+/* packet-clip.c
+ * Routines for clip packet disassembly
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ *
+ * This file created by Thierry Andry <Thierry.Andry@advalvas.be>
+ * from nearly-the-same packet-raw.c created by Mike Hall <mlh@io.com>
+ * Copyright 1999
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "config.h"
+
+#include <epan/packet.h>
+#include <epan/expert.h>
+#include <wiretap/wtap.h>
+
+#include "packet-ip.h"
+
+void proto_register_clip(void);
+void proto_reg_handoff_clip(void);
+
+static int proto_clip = -1;
+
+static gint ett_clip = -1;
+
+static expert_field ei_no_link_info = EI_INIT;
+
+static dissector_handle_t clip_handle;
+static dissector_handle_t ip_handle;
+
+static int
+dissect_clip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
+{
+  proto_item *fh_item;
+
+  /* load the top pane info. This should be overwritten by
+     the next protocol in the stack */
+  col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "N/A");
+  col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A");
+  col_set_str(pinfo->cinfo, COL_PROTOCOL, "CLIP");
+  col_set_str(pinfo->cinfo, COL_INFO, "Classical IP frame");
+
+  /* populate a tree in the second pane with the status of the link
+     layer (ie none)
+
+     XXX - the Linux Classical IP code supports both LLC Encapsulation,
+     which puts an LLC header and possibly a SNAP header in front of
+     the network-layer header, and VC Based Multiplexing, which puts
+     no headers in front of the network-layer header.
+
+     The ATM on Linux code includes a patch to "tcpdump"
+     that compares the first few bytes of the packet with the
+     LLC header that Classical IP frames may have and, if there's
+     a SNAP LLC header at the beginning of the packet, it gets
+     the packet type from that header and uses that, otherwise
+     it treats the packet as being raw IP with no link-level
+     header, in order to handle both of those.
+
+     This code, however, won't handle LLC Encapsulation.  We've
+     not yet seen a capture taken on a machine using LLC Encapsulation,
+     however.  If we see one, we can modify the code.
+
+     A future version of libpcap, however, will probably use DLT_LINUX_SLL
+     for both of those cases, to avoid the headache of having to
+     generate capture-filter code to handle both of those cases. */
+  fh_item = proto_tree_add_item(tree, proto_clip, tvb, 0, 0, ENC_NA);
+  expert_add_info(pinfo, fh_item, &ei_no_link_info);
+
+  call_dissector(ip_handle, tvb, pinfo, tree);
+  return tvb_captured_length(tvb);
+}
+
+void
+proto_register_clip(void)
+{
+  static gint *ett[] = {
+    &ett_clip,
+  };
+
+  static ei_register_info ei[] = {
+    { &ei_no_link_info, { "clip.no_link_info", PI_PROTOCOL, PI_NOTE, "No link information available", EXPFILL }},
+  };
+
+  expert_module_t* expert_clip;
+
+  proto_clip = proto_register_protocol("Classical IP frame", "CLIP", "clip");
+
+  proto_register_subtree_array(ett, array_length(ett));
+  expert_clip = expert_register_protocol(proto_clip);
+  expert_register_field_array(expert_clip, ei, array_length(ei));
+
+  clip_handle = register_dissector("clip", dissect_clip, proto_clip);
+}
+
+void
+proto_reg_handoff_clip(void)
+{
+
+  /*
+   * Get a handle for the IP dissector.
+   */
+  ip_handle = find_dissector_add_dependency("ip", proto_clip);
+
+      /* XXX - no protocol, can't be disabled */
+  dissector_add_uint("wtap_encap", WTAP_ENCAP_LINUX_ATM_CLIP, clip_handle);
+}
+
+/*
+ * Editor modelines  -  https://www.wireshark.org/tools/modelines.html
+ *
+ * Local Variables:
+ * c-basic-offset: 2
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * ex: set shiftwidth=2 tabstop=8 expandtab:
+ * :indentSize=2:tabSize=8:noTabs=true:
+ */