X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/176a3e498602351ae25833cf7456c1e30f7f59ae..refs/heads/tcpdump-4.9:/print-cip.c diff --git a/print-cip.c b/print-cip.c index 45ece55f..a123b69f 100644 --- a/print-cip.c +++ b/print-cip.c @@ -1,6 +1,6 @@ /* - * Marko Kiiskila carnil@cs.tut.fi - * + * Marko Kiiskila carnil@cs.tut.fi + * * Tampere University of Technology - Telecommunications Laboratory * * Permission to use, copy, modify and distribute this @@ -12,18 +12,15 @@ * documentation, and that the use of this software is * acknowledged in any publications resulting from using * the software. - * + * * TUT ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION AND DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS * SOFTWARE. - * + * */ -#ifndef lint -static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-cip.c,v 1.14 2001-07-05 18:54:15 guy Exp $ (LBL)"; -#endif +/* \summary: Classical-IP over ATM printer */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -31,25 +28,12 @@ static const char rcsid[] = #include -#include -#include -#include -#include +#include - -#include - -#include -#include - -#include "interface.h" +#include "netdissect.h" #include "addrtoname.h" -#include "ethertype.h" -#include "ether.h" - -#define RFC1483LLC_LEN 8 -static unsigned char rfcllc[] = { +static const unsigned char rfcllc[] = { 0xaa, /* DSAP: non-ISO */ 0xaa, /* SSAP: non-ISO */ 0x03, /* Ctrl: Unnumbered Information Command PDU */ @@ -58,105 +42,67 @@ static unsigned char rfcllc[] = { 0x00 }; static inline void -cip_print(register const u_char *bp, int length) +cip_print(netdissect_options *ndo, u_int length) { - int i; - - if (memcmp(rfcllc, bp, sizeof(rfcllc))) { - if (qflag) { - for (i = 0;i < RFC1483LLC_LEN; i++) - (void)printf("%2.2x ",bp[i]); - } else { - for (i = 0;i < RFC1483LLC_LEN - 2; i++) - (void)printf("%2.2x ",bp[i]); - etherproto_string(((u_short*)bp)[3]); - } - } else { - if (qflag) - (void)printf("(null encapsulation)"); - else { - (void)printf("(null encap)"); - etherproto_string(ETHERTYPE_IP); - } - } + /* + * There is no MAC-layer header, so just print the length. + */ + ND_PRINT((ndo, "%u: ", length)); } /* - * This is the top level routine of the printer. 'p' is the points - * to the raw header of the packet, 'tvp' is the timestamp, - * 'length' is the length of the packet off the wire, and 'caplen' + * This is the top level routine of the printer. 'p' points + * to the LLC/SNAP or raw header of the packet, 'h->ts' is the timestamp, + * 'h->len' is the length of the packet off the wire, and 'h->caplen' * is the number of bytes actually captured. */ -void -cip_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p) +u_int +cip_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p) { - int caplen = h->caplen; - int length = h->len; - u_short ether_type; - u_short extracted_ethertype; - u_short *bp; - - ++infodelay; - ts_print(&h->ts); - - if (memcmp(rfcllc, p, sizeof(rfcllc))==0 && caplen < RFC1483LLC_LEN) { - printf("[|cip]"); - goto out; + u_int caplen = h->caplen; + u_int length = h->len; + size_t cmplen; + int llc_hdrlen; + + cmplen = sizeof(rfcllc); + if (cmplen > caplen) + cmplen = caplen; + if (cmplen > length) + cmplen = length; + + if (ndo->ndo_eflag) + cip_print(ndo, length); + + if (cmplen == 0) { + ND_PRINT((ndo, "[|cip]")); + return 0; } - - if (eflag) - cip_print(p, length); - - /* - * Some printers want to get back at the ethernet 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. - */ - packetp = p; - snapend = p + caplen; - - if (memcmp(rfcllc, p, sizeof(rfcllc))==0) { - length -= RFC1483LLC_LEN; - caplen -= RFC1483LLC_LEN; - bp = (u_short *)p; - p += RFC1483LLC_LEN; - ether_type = ntohs(bp[3]); + if (memcmp(rfcllc, p, cmplen) == 0) { + /* + * LLC header is present. Try to print it & higher layers. + */ + llc_hdrlen = llc_print(ndo, p, length, caplen, NULL, NULL); + if (llc_hdrlen < 0) { + /* packet type not known, print raw packet */ + if (!ndo->ndo_suppress_default_print) + ND_DEFAULTPRINT(p, caplen); + llc_hdrlen = -llc_hdrlen; + } } else { - ether_type = ETHERTYPE_IP; - bp = (u_short *)p; + /* + * LLC header is absent; treat it as just IP. + */ + llc_hdrlen = 0; + ip_print(ndo, p, length); } - /* - * Is it (gag) an 802.3 encapsulation? - */ - extracted_ethertype = 0; - if (ether_type < ETHERMTU) { - /* Try to print the LLC-layer header & higher layers */ - if (llc_print(p, length, caplen, NULL, NULL, - &extracted_ethertype)==0) { - /* ether_type not known, print raw packet */ - if (!eflag) - cip_print((u_char *)bp, length + RFC1483LLC_LEN); - if (extracted_ethertype) { - printf("(LLC %s) ", - etherproto_string(htons(extracted_ethertype))); - } - if (!xflag && !qflag) - default_print(p, caplen); - } - } else if (ether_encap_print(ether_type, p, length, caplen, - &extracted_ethertype) == 0) { - /* ether_type not known, print raw packet */ - if (!eflag) - cip_print((u_char *)bp, length + RFC1483LLC_LEN); - if (!xflag && !qflag) - default_print(p, caplen); - } - if (xflag) - default_print(p, caplen); - out: - putchar('\n'); - --infodelay; - if (infoprint) - info(0); + return (llc_hdrlen); } + + +/* + * Local Variables: + * c-style: whitesmith + * c-basic-offset: 8 + * End: + */