gre: add support for MikroTik Ethernet-over-IP hack.

[tcpdump] / print-symantec.c

diff --git a/print-symantec.c b/print-symantec.c
index 617cf44725be43e4f77e44ddb0abc8f426e594df..0d394e30f2ec8b79becd4b825c35154bcaffce85 100644 (file)
--- a/print-symantec.c
+++ b/print-symantec.c
@@ -27,6 +27,7 @@
 
 #include "netdissect-stdinc.h"
 
+#define ND_LONGJMP_FROM_TCHECK
 #include "netdissect.h"
 #include "extract.h"
 #include "ethertype.h"
@@ -45,7 +46,7 @@ symantec_hdr_print(netdissect_options *ndo, const u_char *bp, u_int length)
 
        sp = (const struct symantec_header *)bp;
 
-       etype = EXTRACT_BE_U_2(sp->ether_type);
+       etype = GET_BE_U_2(sp->ether_type);
        if (!ndo->ndo_qflag) {
                if (etype <= MAX_ETHERNET_LENGTH_VAL)
                          ND_PRINT("invalid ethertype %u", etype);
@@ -69,7 +70,7 @@ symantec_hdr_print(netdissect_options *ndo, const u_char *bp, u_int length)
  * 'h->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */
-u_int
+void
 symantec_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
 {
        u_int length = h->len;
@@ -77,12 +78,10 @@ symantec_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_
        const struct symantec_header *sp;
        u_short ether_type;
 
-       ndo->ndo_protocol = "symantec_if";
-       if (caplen < sizeof (struct symantec_header)) {
-               nd_print_trunc(ndo);
-               return caplen;
-       }
+       ndo->ndo_protocol = "symantec";
+       ND_TCHECK_LEN(p, sizeof(struct symantec_header));
 
+       ndo->ndo_ll_hdr_len += sizeof (struct symantec_header);
        if (ndo->ndo_eflag)
                symantec_hdr_print(ndo, p, length);
 
@@ -91,7 +90,7 @@ symantec_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_
        sp = (const struct symantec_header *)p;
        p += sizeof (struct symantec_header);
 
-       ether_type = EXTRACT_BE_U_2(sp->ether_type);
+       ether_type = GET_BE_U_2(sp->ether_type);
 
        if (ether_type <= MAX_ETHERNET_LENGTH_VAL) {
                /* ether_type not known, print raw packet */
@@ -108,6 +107,4 @@ symantec_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_
                if (!ndo->ndo_suppress_default_print)
                        ND_DEFAULTPRINT(p, caplen);
        }
-
-       return (sizeof (struct symantec_header));
 }