Reorganize netdissect.h

[tcpdump] / print-vtp.c

diff --git a/print-vtp.c b/print-vtp.c
index 9fe86e3c4bb67cea2775ed3a421d717f776dfe49..cba34a6c6081c9ec30e01f8d8a8496e67c431df7 100644 (file)
--- a/print-vtp.c
+++ b/print-vtp.c
@@ -22,14 +22,13 @@
  * Original code ode by Carles Kishimoto <[email protected]>
  */
 
-#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 
@@ -241,7 +240,7 @@ vtp_print (netdissect_options *ndo,
 
            ND_TCHECK2(*tptr, len);
 
-           vtp_vlan = (struct vtp_vlan_*)tptr;
+           vtp_vlan = (const struct vtp_vlan_*)tptr;
            ND_PRINT((ndo, "\n\tVLAN info status %s, type %s, VLAN-id %u, MTU %u, SAID 0x%08x, Name %s",
                   tok2str(vtp_vlan_status,"Unknown",vtp_vlan->status),
                   tok2str(vtp_vlan_type_values,"Unknown",vtp_vlan->type),