all: import netsniff-ng 0.5.8-rc0 source

We decided to get rid of the old Git history and start a new one for
several reasons:

 *) Allow / enforce only high-quality commits (which was not the case
    for many commits in the history), have a policy that is more close
    to the one from the Linux kernel. With high quality commits, we
    mean code that is logically split into commits and commit messages
    that are signed-off and have a proper subject and message body.
    We do not allow automatic Github merges anymore, since they are
    total bullshit. However, we will either cherry-pick your patches
    or pull them manually.

 *) The old archive was about ~27MB for no particular good reason.
    This basically derived from the bad decision that also some PDF
    files where stored there. From this moment onwards, no binary
    objects are allowed to be stored in this repository anymore.

The old archive is not wiped away from the Internet. You will still
be able to find it, e.g. on git.cryptoism.org etc.

Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>

1 files changed, 61 insertions, 0 deletions

diff --git a/proto_vlan.c b/proto_vlan.c
new file mode 100644
index 0000000..baa36b8
--- /dev/null
+++ b/proto_vlan.c
@@ -0,0 +1,61 @@
+/*
+ * netsniff-ng - the packet sniffing beast
+ * Copyright 2009, 2010 Daniel Borkmann.
+ * Copyright 2010 Emmanuel Roullit.
+ * Subject to the GPL, version 2.
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <netinet/in.h>    /* for ntohs() */
+
+#include "proto.h"
+#include "protos.h"
+#include "dissector_eth.h"
+#include "pkt_buff.h"
+
+struct vlanhdr {
+	uint16_t h_vlan_TCI;
+	uint16_t h_vlan_encapsulated_proto;
+} __attribute__((packed));
+
+static void vlan(struct pkt_buff *pkt)
+{
+	uint16_t tci;
+	struct vlanhdr *vlan = (struct vlanhdr *) pkt_pull(pkt, sizeof(*vlan));
+
+	if (vlan == NULL)
+		return;
+
+	tci = ntohs(vlan->h_vlan_TCI);
+
+	tprintf(" [ VLAN ");
+	tprintf("Prio (%d), ", (tci & 0xE000) >> 13);
+	tprintf("CFI (%d), ", (tci & 0x1000) >> 12);
+	tprintf("ID (%d), ", (tci & 0x0FFF));
+	tprintf("Proto (0x%.4x)", ntohs(vlan->h_vlan_encapsulated_proto));
+	tprintf(" ]\n");
+
+	pkt_set_proto(pkt, &eth_lay2, ntohs(vlan->h_vlan_encapsulated_proto));
+}
+
+static void vlan_less(struct pkt_buff *pkt)
+{
+	uint16_t tci;
+	struct vlanhdr *vlan = (struct vlanhdr *) pkt_pull(pkt, sizeof(*vlan));
+
+	if (vlan == NULL)
+		return;
+
+	tci = ntohs(vlan->h_vlan_TCI);
+
+	tprintf(" VLAN%d", (tci & 0x0FFF));
+
+	pkt_set_proto(pkt, &eth_lay2, ntohs(vlan->h_vlan_encapsulated_proto));
+}
+
+struct protocol vlan_ops = {
+	.key = 0x8100,
+	.print_full = vlan,
+	.print_less = vlan_less,
+};