Regenerate config files.

[tcpdump] / print-symantec.c

diff --git a/print-symantec.c b/print-symantec.c
index a921b49dec5a5a89aef565596dff3ce1625423fe..9e9f8f33f06d32281764dcdf8848f4be058d1f96 100644 (file)
--- a/print-symantec.c
+++ b/print-symantec.c
@@ -18,58 +18,51 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */

-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-symantec.c,v 1.3 2004-03-22 20:02:01 guy Exp $ (LBL)";
-#endif
+
+/* \summary: Symantec Enterprise Firewall printer */

 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

-#include <tcpdump-stdinc.h>
-
-#include <stdio.h>
-#include <pcap.h>
+#include <netdissect-stdinc.h>

 
 

-#include "interface.h"
-#include "addrtoname.h"
+#include "netdissect.h"
+#include "extract.h"

 #include "ethertype.h"
 
 #include "ether.h"
 
 #include "ethertype.h"
 
 #include "ether.h"
 

-const u_char *snapend;
-

 struct symantec_header {
 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
 };
 
 static inline void

-symantec_hdr_print(register const u_char *bp, u_int length)
+symantec_hdr_print(netdissect_options *ndo, register const u_char *bp, u_int length)

 {
        register const struct symantec_header *sp;
 {
        register const struct symantec_header *sp;

-       u_int16_t etype;
+       uint16_t etype;

 
        sp = (const struct symantec_header *)bp;
 
 
        sp = (const struct symantec_header *)bp;
 

-       etype = ntohs(sp->ether_type);
-       if (!qflag) {
+       etype = EXTRACT_16BITS(&sp->ether_type);
+       if (!ndo->ndo_qflag) {

                if (etype <= ETHERMTU)
                if (etype <= ETHERMTU)

-                         (void)printf("invalid ethertype %u", etype);
-                else 
-                         (void)printf("ethertype %s (0x%04x)",
+                         ND_PRINT((ndo, "invalid ethertype %u", etype));
+                else
+                         ND_PRINT((ndo, "ethertype %s (0x%04x)",

                                       tok2str(ethertype_values,"Unknown", etype),
                                       tok2str(ethertype_values,"Unknown", etype),

-                                       etype);
+                                       etype));

         } else {
                 if (etype <= ETHERMTU)
         } else {
                 if (etype <= ETHERMTU)

-                          (void)printf("invalid ethertype %u", etype);
-                else 
-                          (void)printf("%s", tok2str(ethertype_values,"Unknown Ethertype (0x%04x)", etype));  
+                          ND_PRINT((ndo, "invalid ethertype %u", etype));
+                else
+                          ND_PRINT((ndo, "%s", tok2str(ethertype_values,"Unknown Ethertype (0x%04x)", etype)));

         }
 
         }
 

-       (void)printf(", length %u: ", length);
+       ND_PRINT((ndo, ", length %u: ", length));

 }
 
 /*
 }
 
 /*


@@ -79,45 +72,43 @@ symantec_hdr_print(register const u_char *bp, u_int length)
  * is the number of bytes actually captured.
  */
 u_int
  * is the number of bytes actually captured.
  */
 u_int

-symantec_if_print(const struct pcap_pkthdr *h, const u_char *p)
+symantec_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)

 {
        u_int length = h->len;
        u_int caplen = h->caplen;
 {
        u_int length = h->len;
        u_int caplen = h->caplen;

-       struct symantec_header *sp;
+       const struct symantec_header *sp;

        u_short ether_type;
        u_short ether_type;

-       u_short extracted_ether_type;

 
        if (caplen < sizeof (struct symantec_header)) {
 
        if (caplen < sizeof (struct symantec_header)) {

-               printf("[|symantec]");
+               ND_PRINT((ndo, "[|symantec]"));

                return caplen;
        }
 
                return caplen;
        }
 

-       if (eflag)
-               symantec_hdr_print(p, length);
+       if (ndo->ndo_eflag)
+               symantec_hdr_print(ndo, p, length);

 
        length -= sizeof (struct symantec_header);
        caplen -= sizeof (struct symantec_header);
 
        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);
 
        p += sizeof (struct symantec_header);
 

-       ether_type = ntohs(sp->ether_type);
+       ether_type = EXTRACT_16BITS(&sp->ether_type);

 
        if (ether_type <= ETHERMTU) {
                /* ether_type not known, print raw packet */
 
        if (ether_type <= ETHERMTU) {
                /* ether_type not known, print raw packet */

-               if (!eflag)
-                       symantec_hdr_print((u_char *)sp, length + sizeof (struct symantec_header));
+               if (!ndo->ndo_eflag)
+                       symantec_hdr_print(ndo, (const u_char *)sp, length + sizeof (struct symantec_header));

 
 

-               if (!xflag && !qflag)
-                       default_print(p, caplen);
-       } else if (ether_encap_print(ether_type, p, length, caplen,
-           &extracted_ether_type) == 0) {
+               if (!ndo->ndo_suppress_default_print)
+                       ND_DEFAULTPRINT(p, caplen);
+       } else if (ethertype_print(ndo, ether_type, p, length, caplen, NULL, NULL) == 0) {

                /* ether_type not known, print raw packet */
                /* ether_type not known, print raw packet */

-               if (!eflag)
-                       symantec_hdr_print((u_char *)sp, length + sizeof (struct symantec_header));
+               if (!ndo->ndo_eflag)
+                       symantec_hdr_print(ndo, (const u_char *)sp, length + sizeof (struct symantec_header));

 
 

-               if (!xflag && !qflag)
-                       default_print(p, caplen);
-       } 
+               if (!ndo->ndo_suppress_default_print)
+                       ND_DEFAULTPRINT(p, caplen);
+       }

 
        return (sizeof (struct symantec_header));
 }
 
        return (sizeof (struct symantec_header));
 }