X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/88e479b75ea97730bf265a2371c0658a401eae92..cc2d4cbd8ca150504127f375d8b51b194958d95b:/print-chdlc.c diff --git a/print-chdlc.c b/print-chdlc.c index 74edb40a..bd3133bb 100644 --- a/print-chdlc.c +++ b/print-chdlc.c @@ -19,22 +19,22 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +/* \summary: Cisco HDLC printer */ + #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif -#include - -#include +#include "netdissect-stdinc.h" -#include "interface.h" +#include "netdissect.h" #include "addrtoname.h" #include "ethertype.h" #include "extract.h" -#include "ppp.h" #include "chdlc.h" +#include "nlpid.h" -static void chdlc_slarp_print(const u_char *, u_int); +static void chdlc_slarp_print(netdissect_options *, const u_char *, u_int); static const struct tok chdlc_cast_values[] = { { CHDLC_UNICAST, "unicast" }, @@ -45,26 +45,26 @@ static const struct tok chdlc_cast_values[] = { /* Standard CHDLC printer */ u_int -chdlc_if_print(const struct pcap_pkthdr *h, register const u_char *p) +chdlc_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p) { - register u_int length = h->len; - register u_int caplen = h->caplen; - - if (caplen < CHDLC_HDRLEN) { - printf("[|chdlc]"); - return (caplen); - } - return (chdlc_print(p,length)); + ndo->ndo_protocol = "chdlc_if"; + return chdlc_print(ndo, p, h->len); } u_int -chdlc_print(register const u_char *p, u_int length) { +chdlc_print(netdissect_options *ndo, const u_char *p, u_int length) +{ u_int proto; + const u_char *bp = p; - proto = EXTRACT_16BITS(&p[2]); - if (eflag) { - printf("%s, ethertype %s (0x%04x), length %u: ", - tok2str(chdlc_cast_values, "0x%02x", p[0]), + ndo->ndo_protocol = "chdlc"; + if (length < CHDLC_HDRLEN) + goto trunc; + ND_TCHECK_LEN(p, CHDLC_HDRLEN); + proto = EXTRACT_BE_U_2(p + 2); + if (ndo->ndo_eflag) { + ND_PRINT("%s, ethertype %s (0x%04x), length %u: ", + tok2str(chdlc_cast_values, "0x%02x", EXTRACT_U_1(p)), tok2str(ethertype_values, "Unknown", proto), proto, length); @@ -75,15 +75,13 @@ chdlc_print(register const u_char *p, u_int length) { switch (proto) { case ETHERTYPE_IP: - ip_print(gndo, p, length); + ip_print(ndo, p, length); break; -#ifdef INET6 case ETHERTYPE_IPV6: - ip6_print(gndo, p, length); + ip6_print(ndo, p, length); break; -#endif case CHDLC_TYPE_SLARP: - chdlc_slarp_print(p, length); + chdlc_slarp_print(ndo, p, length); break; #if 0 case CHDLC_TYPE_CDP: @@ -92,43 +90,50 @@ chdlc_print(register const u_char *p, u_int length) { #endif case ETHERTYPE_MPLS: case ETHERTYPE_MPLS_MULTI: - mpls_print(p, length); + mpls_print(ndo, p, length); break; case ETHERTYPE_ISO: /* is the fudge byte set ? lets verify by spotting ISO headers */ - if (*(p+1) == 0x81 || - *(p+1) == 0x82 || - *(p+1) == 0x83) - isoclns_print(p+1, length-1, length-1); + if (length < 2) + goto trunc; + ND_TCHECK_2(p); + if (EXTRACT_U_1(p + 1) == NLPID_CLNP || + EXTRACT_U_1(p + 1) == NLPID_ESIS || + EXTRACT_U_1(p + 1) == NLPID_ISIS) + isoclns_print(ndo, p + 1, length - 1); else - isoclns_print(p, length, length); + isoclns_print(ndo, p, length); break; default: - if (!eflag) - printf("unknown CHDLC protocol (0x%04x)", proto); + if (!ndo->ndo_eflag) + ND_PRINT("unknown CHDLC protocol (0x%04x)", proto); break; } return (CHDLC_HDRLEN); + +trunc: + nd_print_trunc(ndo); + return ndo->ndo_snapend - bp; } /* * The fixed-length portion of a SLARP packet. */ struct cisco_slarp { - u_int8_t code[4]; + nd_uint32_t code; #define SLARP_REQUEST 0 #define SLARP_REPLY 1 #define SLARP_KEEPALIVE 2 union { struct { - u_int8_t addr[4]; - u_int8_t mask[4]; + uint8_t addr[4]; + uint8_t mask[4]; } addr; struct { - u_int8_t myseq[4]; - u_int8_t yourseq[4]; - u_int8_t rel[2]; + nd_uint32_t myseq; + nd_uint32_t yourseq; + nd_uint16_t rel; } keep; } un; }; @@ -137,20 +142,21 @@ struct cisco_slarp { #define SLARP_MAX_LEN 18 static void -chdlc_slarp_print(const u_char *cp, u_int length) +chdlc_slarp_print(netdissect_options *ndo, const u_char *cp, u_int length) { const struct cisco_slarp *slarp; u_int sec,min,hrs,days; - printf("SLARP (length: %u), ",length); + ndo->ndo_protocol = "chdlc_slarp"; + ND_PRINT("SLARP (length: %u), ",length); if (length < SLARP_MIN_LEN) goto trunc; slarp = (const struct cisco_slarp *)cp; - TCHECK2(*slarp, SLARP_MIN_LEN); - switch (EXTRACT_32BITS(&slarp->code)) { + ND_TCHECK_LEN(slarp, SLARP_MIN_LEN); + switch (EXTRACT_BE_U_4(slarp->code)) { case SLARP_REQUEST: - printf("request"); + ND_PRINT("request"); /* * At least according to William "Chops" Westfield's * message in @@ -162,48 +168,39 @@ chdlc_slarp_print(const u_char *cp, u_int length) */ break; case SLARP_REPLY: - printf("reply %s/%s", - ipaddr_string(&slarp->un.addr.addr), - ipaddr_string(&slarp->un.addr.mask)); + ND_PRINT("reply %s/%s", + ipaddr_string(ndo, slarp->un.addr.addr), + ipaddr_string(ndo, slarp->un.addr.mask)); break; case SLARP_KEEPALIVE: - printf("keepalive: mineseen=0x%08x, yourseen=0x%08x, reliability=0x%04x", - EXTRACT_32BITS(&slarp->un.keep.myseq), - EXTRACT_32BITS(&slarp->un.keep.yourseq), - EXTRACT_16BITS(&slarp->un.keep.rel)); + ND_PRINT("keepalive: mineseen=0x%08x, yourseen=0x%08x, reliability=0x%04x", + EXTRACT_BE_U_4(slarp->un.keep.myseq), + EXTRACT_BE_U_4(slarp->un.keep.yourseq), + EXTRACT_BE_U_2(slarp->un.keep.rel)); if (length >= SLARP_MAX_LEN) { /* uptime-stamp is optional */ cp += SLARP_MIN_LEN; - if (!TTEST2(*cp, 4)) - goto trunc; - sec = EXTRACT_32BITS(cp) / 1000; + ND_TCHECK_4(cp); + sec = EXTRACT_BE_U_4(cp) / 1000; min = sec / 60; sec -= min * 60; hrs = min / 60; min -= hrs * 60; days = hrs / 24; hrs -= days * 24; - printf(", link uptime=%ud%uh%um%us",days,hrs,min,sec); + ND_PRINT(", link uptime=%ud%uh%um%us",days,hrs,min,sec); } break; default: - printf("0x%02x unknown", EXTRACT_32BITS(&slarp->code)); - if (vflag <= 1) - print_unknown_data(gndo,cp+4,"\n\t",length-4); + ND_PRINT("0x%02x unknown", EXTRACT_BE_U_4(slarp->code)); + if (ndo->ndo_vflag <= 1) + print_unknown_data(ndo,cp+4,"\n\t",length-4); break; } - if (SLARP_MAX_LEN < length && vflag) - printf(", (trailing junk: %d bytes)", length - SLARP_MAX_LEN); - if (vflag > 1) - print_unknown_data(gndo,cp+4,"\n\t",length-4); + if (SLARP_MAX_LEN < length && ndo->ndo_vflag) + ND_PRINT(", (trailing junk: %u bytes)", length - SLARP_MAX_LEN); + if (ndo->ndo_vflag > 1) + print_unknown_data(ndo,cp+4,"\n\t",length-4); return; trunc: - printf("[|slarp]"); + nd_print_trunc(ndo); } - - -/* - * Local Variables: - * c-style: whitesmith - * c-basic-offset: 8 - * End: - */