X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/464c44fbd1394ac006d8d99f16e80ead423c1c47..b54ff914a1ea5c40da3687b52a508748ecb801b0:/print-atm.c diff --git a/print-atm.c b/print-atm.c index 6104c361..110d3881 100644 --- a/print-atm.c +++ b/print-atm.c @@ -19,19 +19,15 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ #ifndef lint -static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-atm.c,v 1.24 2002-07-11 09:17:23 guy Exp $ (LBL)"; +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-atm.c,v 1.39 2005-05-18 20:24:04 hannes Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include -#include -#include - -#include +#include #include #include @@ -43,39 +39,67 @@ static const char rcsid[] = #include "ethertype.h" #include "atm.h" #include "atmuni31.h" +#include "llc.h" #include "ether.h" +struct tok oam_celltype_values[] = { + { 0x1, "Fault Management" }, + { 0x2, "Performance Management" }, + { 0x8, "activate/deactivate" }, + { 0xf, "System Management" }, + { 0, NULL } +}; + +struct tok oam_fm_functype_values[] = { + { 0x0, "AIS" }, + { 0x1, "RDI" }, + { 0x4, "Continuity Check" }, + { 0x8, "Loopback" }, + { 0, NULL } +}; + +struct tok oam_pm_functype_values[] = { + { 0x0, "Forward Monitoring" }, + { 0x1, "Backward Reporting" }, + { 0x2, "Monitoring and Reporting" }, + { 0, NULL } +}; + +struct tok oam_ad_functype_values[] = { + { 0x0, "Performance Monitoring" }, + { 0x1, "Continuity Check" }, + { 0, NULL } +}; + +static const struct tok *oam_functype_values[16] = { + NULL, + oam_fm_functype_values, /* 1 */ + oam_pm_functype_values, /* 2 */ + NULL, + NULL, + NULL, + NULL, + NULL, + oam_ad_functype_values, /* 8 */ + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL +}; + /* * Print an RFC 1483 LLC-encapsulated ATM frame. */ static void atm_llc_print(const u_char *p, int length, int caplen) { - struct ether_header ehdr; - u_short ether_type; u_short extracted_ethertype; - ether_type = p[6] << 8 | p[7]; - - /* - * Fake up an Ethernet header for the benefit of printers that - * insist on "packetp" pointing to an Ethernet header. - */ - memset(&ehdr, '\0', sizeof ehdr); - - /* - * Some printers want to get back at the ethernet addresses. - * Rather than pass it all the way down, we set this global. - * - * Actually, the only printers that use packetp are print-arp.c - * and print-bootp.c, and they assume that packetp points to an - * Ethernet header. The right thing to do is to fix them to know - * which link type is in use when they excavate. XXX - */ - packetp = (u_char *)&ehdr; - - if (!llc_print(p, length, caplen, ESRC(&ehdr), EDST(&ehdr), + if (!llc_print(p, length, caplen, NULL, NULL, &extracted_ethertype)) { /* ether_type not known, print raw packet */ if (extracted_ethertype) { @@ -88,54 +112,70 @@ atm_llc_print(const u_char *p, int length, int caplen) } /* - * This is the top level routine of the printer. 'p' is the points - * to the LLC/SNAP header of the packet, 'tvp' is the timestamp, - * 'length' is the length of the packet off the wire, and 'caplen' + * Given a SAP value, generate the LLC header value for a UI packet + * with that SAP as the source and destination SAP. + */ +#define LLC_UI_HDR(sap) ((sap)<<16 | (sap<<8) | 0x03) + +/* + * This is the top level routine of the printer. 'p' points + * to the LLC/SNAP 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 -atm_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p) +u_int +atm_if_print(const struct pcap_pkthdr *h, const u_char *p) { u_int caplen = h->caplen; u_int length = h->len; - - ++infodelay; - ts_print(&h->ts); + u_int32_t llchdr; + u_int hdrlen = 0; if (caplen < 8) { printf("[|atm]"); - goto out; + return (caplen); } /* - * Some printers want to check that they're not walking off the - * end of the packet. - * Rather than pass it all the way down, we set this global. + * Extract the presumed LLC header into a variable, for quick + * testing. + * Then check for a header that's neither a header for a SNAP + * packet nor an RFC 2684 routed NLPID-formatted PDU nor + * an 802.2-but-no-SNAP IP packet. */ - snapend = p + caplen; - - if (p[0] != 0xaa || p[1] != 0xaa || p[2] != 0x03) { + llchdr = EXTRACT_24BITS(p); + if (llchdr != LLC_UI_HDR(LLCSAP_SNAP) && + llchdr != LLC_UI_HDR(LLCSAP_ISONS) && + llchdr != LLC_UI_HDR(LLCSAP_IP)) { /* * XXX - assume 802.6 MAC header from Fore driver. - * XXX - should we also assume it's not a MAC header - * if it begins with 0xfe 0xfe 0x03, for RFC 2684 - * routed NLPID-formatted PDUs? + * + * Unfortunately, the above list doesn't check for + * all known SAPs, doesn't check for headers where + * the source and destination SAP aren't the same, + * and doesn't check for non-UI frames. It also + * runs the risk of an 802.6 MAC header that happens + * to begin with one of those values being + * incorrectly treated as an 802.2 header. + * + * So is that Fore driver still around? And, if so, + * is it still putting 802.6 MAC headers on ATM + * packets? If so, could it be changed to use a + * new DLT_IEEE802_6 value if we added it? */ if (eflag) - printf("%04x%04x %04x%04x ", - p[0] << 24 | p[1] << 16 | p[2] << 8 | p[3], - p[4] << 24 | p[5] << 16 | p[6] << 8 | p[7], - p[8] << 24 | p[9] << 16 | p[10] << 8 | p[11], - p[12] << 24 | p[13] << 16 | p[14] << 8 | p[15]); + printf("%08x%08x %08x%08x ", + EXTRACT_32BITS(p), + EXTRACT_32BITS(p+4), + EXTRACT_32BITS(p+8), + EXTRACT_32BITS(p+12)); p += 20; length -= 20; caplen -= 20; + hdrlen += 20; } atm_llc_print(p, length, caplen); - if (xflag) - default_print(p, caplen); - out: - putchar('\n'); + return (hdrlen); } /* @@ -204,40 +244,30 @@ atm_print(u_int vpi, u_int vci, u_int traftype, const u_char *p, u_int length, if (eflag) printf("VPI:%u VCI:%u ", vpi, vci); - /* - * Some printers want to check that they're not walking off the - * end of the packet. - * Rather than pass it all the way down, we set this global. - */ - snapend = p + caplen; - if (vpi == 0) { switch (vci) { case PPC: sig_print(p, caplen); - goto out; + return; case BCC: printf("broadcast sig: "); - goto out; - - case OAMF4SC: - printf("oamF4(segment): "); - goto out; + return; + case OAMF4SC: /* fall through */ case OAMF4EC: - printf("oamF4(end): "); - goto out; + oam_print(p, length); + return; case METAC: printf("meta: "); - goto out; + return; case ILMIC: printf("ilmi: "); snmp_print(p, length); - goto out; + return; } } @@ -255,8 +285,48 @@ atm_print(u_int vpi, u_int vci, u_int traftype, const u_char *p, u_int length, lane_print(p, length, caplen); break; } +} -out: - if (xflag) - default_print(p, caplen); +int +oam_print (const u_char *p, u_int length) { + + u_int16_t cell_header, cell_type, func_type,vpi,vci,payload,clp; + + cell_header = EXTRACT_32BITS(p); + cell_type = ((*(p+4))>>4) & 0x0f; + func_type = *(p+4) & 0x0f; + + vpi = (cell_header>>20)&0xff; + vci = (cell_header>>4)&0xffff; + payload = (cell_header>>1)&0x7; + clp = cell_header&0x1; + + switch (vci) { + case OAMF4SC: + printf("OAM F4 (segment), "); + break; + case OAMF4EC: + printf("OAM F4 (end), "); + break; + default: + printf("OAM F5, "); + break; + } + + if (eflag) + printf("vpi %u, vci %u, payload %u, clp %u, ",vpi,vci,payload,clp); + + printf("cell-type %s (%u)", + tok2str(oam_celltype_values, "unknown", cell_type), + cell_type); + + if (oam_functype_values[cell_type] == NULL) + printf(", func-type unknown (%u)", func_type); + else + printf(", func-type %s (%u)", + bittok2str(oam_functype_values[cell_type],"none",func_type), + func_type); + + printf(", length %u",length); + return 1; }