X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/69f6f4392a3dd9b25467da61bf112d34cc7d558d..1bcd37991fa57d9e966a6f96e7cbff59b16c28bd:/print-symantec.c diff --git a/print-symantec.c b/print-symantec.c index 8d80ad90..8fe0c79f 100644 --- a/print-symantec.c +++ b/print-symantec.c @@ -19,51 +19,48 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +/* \summary: Symantec Enterprise Firewall printer */ + #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif -#include - -#include -#include +#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]; + nd_byte stuff1[6]; + nd_uint16_t ether_type; + nd_byte stuff2[36]; }; -static inline void -symantec_hdr_print(register const u_char *bp, u_int length) +static void +symantec_hdr_print(netdissect_options *ndo, const u_char *bp, u_int length) { - register const struct symantec_header *sp; - u_int16_t etype; + const struct symantec_header *sp; + uint16_t etype; sp = (const struct symantec_header *)bp; - etype = EXTRACT_16BITS(&sp->ether_type); - if (!qflag) { - if (etype <= ETHERMTU) - (void)printf("invalid ethertype %u", etype); + etype = GET_BE_U_2(sp->ether_type); + if (!ndo->ndo_qflag) { + if (etype <= MAX_ETHERNET_LENGTH_VAL) + ND_PRINT("invalid ethertype %u", etype); else - (void)printf("ethertype %s (0x%04x)", + ND_PRINT("ethertype %s (0x%04x)", tok2str(ethertype_values,"Unknown", etype), etype); } else { - if (etype <= ETHERMTU) - (void)printf("invalid ethertype %u", etype); + if (etype <= MAX_ETHERNET_LENGTH_VAL) + ND_PRINT("invalid ethertype %u", etype); else - (void)printf("%s", tok2str(ethertype_values,"Unknown Ethertype (0x%04x)", etype)); + ND_PRINT("%s", tok2str(ethertype_values,"Unknown Ethertype (0x%04x)", etype)); } - (void)printf(", length %u: ", length); + ND_PRINT(", length %u: ", length); } /* @@ -72,44 +69,45 @@ symantec_hdr_print(register 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 -symantec_if_print(const struct pcap_pkthdr *h, const u_char *p) +void +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; - struct symantec_header *sp; + const struct symantec_header *sp; u_short ether_type; + ndo->ndo_protocol = "symantec"; if (caplen < sizeof (struct symantec_header)) { - printf("[|symantec]"); - return caplen; + ndo->ndo_ll_hdr_len += caplen; + nd_print_trunc(ndo); + return; } - if (eflag) - symantec_hdr_print(p, length); + ndo->ndo_ll_hdr_len += sizeof (struct symantec_header); + if (ndo->ndo_eflag) + symantec_hdr_print(ndo, p, length); 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); + ether_type = GET_BE_U_2(sp->ether_type); - if (ether_type <= ETHERMTU) { + if (ether_type <= MAX_ETHERNET_LENGTH_VAL) { /* 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 (!suppress_default_print) - default_print(p, caplen); - } else if (ethertype_print(gndo, ether_type, p, length, caplen) == 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 */ - 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 (!suppress_default_print) - default_print(p, caplen); + if (!ndo->ndo_suppress_default_print) + ND_DEFAULTPRINT(p, caplen); } - - return (sizeof (struct symantec_header)); }