summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2016-01-27 11:46:57 +0100
committerTobias Klauser <tklauser@distanz.ch>2016-01-27 11:46:57 +0100
commitc5bd0062b3e6b6456512d223b84e8e82aa6aa1c9 (patch)
tree42edbd6b4b5c35e4b94282c0b27331dd2315eb45
parent56fd1dec9b72960a19d07b4b145b0811257359ab (diff)
netsniff-ng: Rename proto_vlan.h to vlan.h
The proto_ prefix is reserved for dissectors and the header contains helper functions not exclusive to the proto_vlan dissector, so give it a more generic name. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
-rw-r--r--dissector.h2
-rw-r--r--proto_vlan.c2
-rw-r--r--vlan.h (renamed from proto_vlan.h)9
3 files changed, 4 insertions, 9 deletions
diff --git a/dissector.h b/dissector.h
index d8ad6ac..52f341b 100644
--- a/dissector.h
+++ b/dissector.h
@@ -17,7 +17,7 @@
#include "ring.h"
#include "tprintf.h"
#include "linktype.h"
-#include "proto_vlan.h"
+#include "vlan.h"
#define PRINT_NORM 0
#define PRINT_LESS 1
diff --git a/proto_vlan.c b/proto_vlan.c
index c1b3e65..ebdf281 100644
--- a/proto_vlan.c
+++ b/proto_vlan.c
@@ -10,7 +10,7 @@
#include <netinet/in.h> /* for ntohs() */
#include "proto.h"
-#include "proto_vlan.h"
+#include "vlan.h"
#include "dissector_eth.h"
#include "pkt_buff.h"
diff --git a/proto_vlan.h b/vlan.h
index dc31cfa..b58d1a2 100644
--- a/proto_vlan.h
+++ b/vlan.h
@@ -1,10 +1,5 @@
-/*
- * proto_vlan.h - VLAN proto helpers & declarations
- * Subject to the GPL, version 2.
- */
-
-#ifndef PROTO_VLAN_H
-#define PROTO_VLAN_H
+#ifndef VLAN_H
+#define VLAN_H
#include <stdbool.h>
#include <inttypes.h>