X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/5bca6d30f4cf933b3971de2e9fa6bb95dc36a133..27cb3953154b4562a7f4b51be6146688531903bd:/print-chdlc.c diff --git a/print-chdlc.c b/print-chdlc.c index 3f6cf205..ea1a197a 100644 --- a/print-chdlc.c +++ b/print-chdlc.c @@ -1,4 +1,3 @@ -/* maybe it should be merged into print-ppp.c */ /* * Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996, 1997 * The Regents of the University of California. All rights reserved. @@ -21,68 +20,43 @@ */ #ifndef lint -static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-chdlc.c,v 1.10 2000-09-29 05:33:48 guy Exp $ (LBL)"; +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-chdlc.c,v 1.32.2.7 2005-04-27 14:35:56 hannes Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include -#include -#include -#include -#include +#include -struct mbuf; -struct rtentry; - -#include - -#include -#include #include #include -#ifdef __bsdi__ -#include -#include -#endif #include "interface.h" #include "addrtoname.h" #include "ethertype.h" +#include "extract.h" #include "ppp.h" #include "chdlc.h" static void chdlc_slarp_print(const u_char *, u_int); /* Standard CHDLC printer */ -void -chdlc_if_print(u_char *user, const struct pcap_pkthdr *h, - register const u_char *p) +u_int +chdlc_if_print(const struct pcap_pkthdr *h, register const u_char *p) { register u_int length = h->len; register u_int caplen = h->caplen; const struct ip *ip; u_int proto; - ts_print(&h->ts); - if (caplen < CHDLC_HDRLEN) { printf("[|chdlc]"); - goto out; + return (caplen); } - /* - * Some printers want to get back at the link level addresses, - * and/or check that they're not walking off the end of the packet. - * Rather than pass them all the way down, we set these globals. - */ - proto = ntohs(*(u_short *)&p[2]); - packetp = p; - snapend = p + caplen; - + proto = EXTRACT_16BITS(&p[2]); if (eflag) { switch (p[0]) { case CHDLC_UNICAST: @@ -99,10 +73,10 @@ chdlc_if_print(u_char *user, const struct pcap_pkthdr *h, } length -= CHDLC_HDRLEN; - ip = (struct ip *)(p + CHDLC_HDRLEN); + ip = (const struct ip *)(p + CHDLC_HDRLEN); switch (proto) { case ETHERTYPE_IP: - ip_print((const u_char *)ip, length); + ip_print(gndo, (const u_char *)ip, length); break; #ifdef INET6 case ETHERTYPE_IPV6: @@ -117,69 +91,119 @@ chdlc_if_print(u_char *user, const struct pcap_pkthdr *h, chdlc_cdp_print((const u_char *)ip, length); break; #endif + case ETHERTYPE_MPLS: + case ETHERTYPE_MPLS_MULTI: + mpls_print((const u_char *)(ip), length); + break; + case ETHERTYPE_ISO: + /* is the fudge byte set ? lets verify by spotting ISO headers */ + if (*(p+CHDLC_HDRLEN+1) == 0x81 || + *(p+CHDLC_HDRLEN+1) == 0x82 || + *(p+CHDLC_HDRLEN+1) == 0x83) + isoclns_print(p+CHDLC_HDRLEN+1, length-1, length-1); + else + isoclns_print(p+CHDLC_HDRLEN, length, length); + break; + default: + printf("unknown CHDLC protocol (0x%04x)", proto); + break; } - if (xflag) - default_print((const u_char *)ip, caplen - CHDLC_HDRLEN); -out: - putchar('\n'); + + return (CHDLC_HDRLEN); } +/* + * The fixed-length portion of a SLARP packet. + */ struct cisco_slarp { - u_int code; + u_int8_t code[4]; #define SLARP_REQUEST 0 #define SLARP_REPLY 1 #define SLARP_KEEPALIVE 2 union { struct { - struct in_addr addr; - struct in_addr mask; - u_short unused[3]; + u_int8_t addr[4]; + u_int8_t mask[4]; } addr; struct { - u_int myseq; - u_int yourseq; - u_short rel; - u_short t1; - u_short t2; + u_int8_t myseq[4]; + u_int8_t yourseq[4]; + u_int8_t rel[2]; } keep; } un; }; -#define SLARP_LEN 18 +#define SLARP_MIN_LEN 14 +#define SLARP_MAX_LEN 18 static void chdlc_slarp_print(const u_char *cp, u_int length) { - struct cisco_slarp *slarp; + const struct cisco_slarp *slarp; + u_int sec,min,hrs,days; - if (length < SLARP_LEN) { - printf("[|slarp]"); - return; - } + printf("SLARP (length: %u), ",length); + if (length < SLARP_MIN_LEN) + goto trunc; - slarp = (struct cisco_slarp *)cp; - switch (ntohl(slarp->code)) { + slarp = (const struct cisco_slarp *)cp; + TCHECK2(*slarp, SLARP_MIN_LEN); + switch (EXTRACT_32BITS(&slarp->code)) { case SLARP_REQUEST: - printf("slarp-request"); + printf("request"); + /* + * At least according to William "Chops" Westfield's + * message in + * + * http://www.nethelp.no/net/cisco-hdlc.txt + * + * the address and mask aren't used in requests - + * they're just zero. + */ break; case SLARP_REPLY: - printf("slarp-reply %s/%s", + printf("reply %s/%s", ipaddr_string(&slarp->un.addr.addr), ipaddr_string(&slarp->un.addr.mask)); break; case SLARP_KEEPALIVE: - printf("slarp-keepalive my=0x%x your=0x%x ", - (u_int32_t)ntohl(slarp->un.keep.myseq), - (u_int32_t)ntohl(slarp->un.keep.yourseq)); - printf("reliability=0x%04x t1=%d.%d", - ntohs(slarp->un.keep.rel), ntohs(slarp->un.keep.t1), - ntohs(slarp->un.keep.t2)); + 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)); + + if (length >= SLARP_MAX_LEN) { /* uptime-stamp is optional */ + cp += SLARP_MIN_LEN; + if (!TTEST2(*cp, 4)) + goto trunc; + sec = EXTRACT_32BITS(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); + } break; default: - printf("slarp-0x%x unknown", (u_int32_t)ntohl(slarp->code)); + printf("0x%02x unknown", EXTRACT_32BITS(&slarp->code)); + if (vflag <= 1) + print_unknown_data(cp+4,"\n\t",length-4); break; } - if (SLARP_LEN < length && vflag) - printf("(trailing junk: %d bytes)", length - SLARP_LEN); + if (SLARP_MAX_LEN < length && vflag) + printf(", (trailing junk: %d bytes)", length - SLARP_MAX_LEN); + if (vflag > 1) + print_unknown_data(cp+4,"\n\t",length-4); + return; + +trunc: + printf("[|slarp]"); } + + +/* + * Local Variables: + * c-style: whitesmith + * c-basic-offset: 8 + * End: + */