Regenerate config files.

[tcpdump] / print-symantec.c

diff --git a/print-symantec.c b/print-symantec.c
index 631c7d961665d332886834023f61cfb2f0d2eb46..9e9f8f33f06d32281764dcdf8848f4be058d1f96 100644 (file)
--- a/print-symantec.c
+++ b/print-symantec.c
@@ -19,30 +19,31 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#define NETDISSECT_REWORKED
+/* \summary: Symantec Enterprise Firewall printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "ethertype.h"
 
 #include "ether.h"
 
 struct symantec_header {
-       u_int8_t  stuff1[6];
-       u_int16_t ether_type;
-       u_int8_t  stuff2[36];
+       uint8_t  stuff1[6];
+       uint16_t ether_type;
+       uint8_t  stuff2[36];
 };
 
 static inline void
 symantec_hdr_print(netdissect_options *ndo, register const u_char *bp, u_int length)
 {
        register const struct symantec_header *sp;
-       u_int16_t etype;
+       uint16_t etype;
 
        sp = (const struct symantec_header *)bp;
 
@@ -75,7 +76,7 @@ symantec_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_
 {
        u_int length = h->len;
        u_int caplen = h->caplen;
-       struct symantec_header *sp;
+       const struct symantec_header *sp;
        u_short ether_type;
 
        if (caplen < sizeof (struct symantec_header)) {
@@ -88,7 +89,7 @@ symantec_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_
 
        length -= sizeof (struct symantec_header);
        caplen -= sizeof (struct symantec_header);
-       sp = (struct symantec_header *)p;
+       sp = (const struct symantec_header *)p;
        p += sizeof (struct symantec_header);
 
        ether_type = EXTRACT_16BITS(&sp->ether_type);
@@ -96,17 +97,17 @@ symantec_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_
        if (ether_type <= ETHERMTU) {
                /* ether_type not known, print raw packet */
                if (!ndo->ndo_eflag)
-                       symantec_hdr_print(ndo, (u_char *)sp, length + sizeof (struct symantec_header));
+                       symantec_hdr_print(ndo, (const u_char *)sp, length + sizeof (struct symantec_header));
 
                if (!ndo->ndo_suppress_default_print)
-                       ndo->ndo_default_print(ndo, p, caplen);
-       } else if (ethertype_print(ndo, ether_type, p, length, caplen) == 0) {
+                       ND_DEFAULTPRINT(p, caplen);
+       } else if (ethertype_print(ndo, ether_type, p, length, caplen, NULL, NULL) == 0) {
                /* ether_type not known, print raw packet */
                if (!ndo->ndo_eflag)
-                       symantec_hdr_print(ndo, (u_char *)sp, length + sizeof (struct symantec_header));
+                       symantec_hdr_print(ndo, (const u_char *)sp, length + sizeof (struct symantec_header));
 
                if (!ndo->ndo_suppress_default_print)
-                       ndo->ndo_default_print(ndo, p, caplen);
+                       ND_DEFAULTPRINT(p, caplen);
        }
 
        return (sizeof (struct symantec_header));