diff options
Diffstat (limited to 'contrib/tcpdump/print-llc.c')
-rw-r--r-- | contrib/tcpdump/print-llc.c | 277 |
1 files changed, 171 insertions, 106 deletions
diff --git a/contrib/tcpdump/print-llc.c b/contrib/tcpdump/print-llc.c index 8b0a531..cc665f5 100644 --- a/contrib/tcpdump/print-llc.c +++ b/contrib/tcpdump/print-llc.c @@ -26,7 +26,7 @@ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-llc.c,v 1.61 2005/04/06 21:32:41 mcr Exp $"; + "@(#) $Header: /tcpdump/master/tcpdump/print-llc.c,v 1.61.2.4 2005/04/26 07:27:16 guy Exp $"; #endif #ifdef HAVE_CONFIG_H @@ -61,6 +61,7 @@ static struct tok llc_values[] = { { LLCSAP_IPX, "IPX" }, { LLCSAP_NETBEUI, "NetBeui" }, { LLCSAP_ISONS, "OSI" }, + { 0, NULL }, }; static struct tok cmd2str[] = { @@ -75,6 +76,40 @@ static struct tok cmd2str[] = { { 0, NULL } }; +static const struct tok cisco_values[] = { + { PID_CISCO_CDP, "CDP" }, + { 0, NULL } +}; + +static const struct tok bridged_values[] = { + { PID_RFC2684_ETH_FCS, "Ethernet + FCS" }, + { PID_RFC2684_ETH_NOFCS, "Ethernet w/o FCS" }, + { PID_RFC2684_802_4_FCS, "802.4 + FCS" }, + { PID_RFC2684_802_4_NOFCS, "802.4 w/o FCS" }, + { PID_RFC2684_802_5_FCS, "Token Ring + FCS" }, + { PID_RFC2684_802_5_NOFCS, "Token Ring w/o FCS" }, + { PID_RFC2684_FDDI_FCS, "FDDI + FCS" }, + { PID_RFC2684_FDDI_NOFCS, "FDDI w/o FCS" }, + { PID_RFC2684_802_6_FCS, "802.6 + FCS" }, + { PID_RFC2684_802_6_NOFCS, "802.6 w/o FCS" }, + { PID_RFC2684_BPDU, "BPDU" }, + { 0, NULL }, +}; + +struct oui_tok { + u_int32_t oui; + const struct tok *tok; +}; + +static const struct oui_tok oui_to_tok[] = { + { OUI_ENCAP_ETHER, ethertype_values }, + { OUI_CISCO_90, ethertype_values }, /* uses some Ethertype values */ + { OUI_APPLETALK, ethertype_values }, /* uses some Ethertype values */ + { OUI_CISCO, cisco_values }, + { OUI_RFC2684, bridged_values }, /* bridged, RFC 2427 FR or RFC 2864 ATM */ + { 0, NULL } +}; + /* * Returns non-zero IFF it succeeds in printing the header */ @@ -82,9 +117,9 @@ int llc_print(const u_char *p, u_int length, u_int caplen, const u_char *esrc, const u_char *edst, u_short *extracted_ethertype) { - struct llc llc; - register u_short et; + u_int8_t dsap, ssap; u_int16_t control; + int is_u; register int ret; if (caplen < 3) { @@ -93,18 +128,40 @@ llc_print(const u_char *p, u_int length, u_int caplen, return(0); } - /* Watch out for possible alignment problems */ - memcpy((char *)&llc, (char *)p, min(caplen, sizeof(llc))); + dsap = *p; + ssap = *(p + 1); + + /* + * OK, what type of LLC frame is this? The length + * of the control field depends on that - I frames + * have a two-byte control field, and U frames have + * a one-byte control field. + */ + control = *(p + 2); + if ((control & LLC_U_FMT) == LLC_U_FMT) { + /* + * U frame. + */ + is_u = 1; + } else { + /* + * The control field in I and S frames is + * 2 bytes... + */ + if (caplen < 4) { + (void)printf("[|llc]"); + default_print((u_char *)p, caplen); + return(0); + } - if (eflag) - printf("LLC, dsap %s (0x%02x), ssap %s (0x%02x), cmd 0x%02x: ", - tok2str(llc_values,"Unknown",llc.dsap), - llc.dsap, - tok2str(llc_values,"Unknown",llc.ssap), - llc.ssap, - llc.llcu); + /* + * ...and is little-endian. + */ + control = EXTRACT_LE_16BITS(p + 2); + is_u = 0; + } - if (llc.ssap == LLCSAP_GLOBAL && llc.dsap == LLCSAP_GLOBAL) { + if (ssap == LLCSAP_GLOBAL && dsap == LLCSAP_GLOBAL) { /* * This is an Ethernet_802.3 IPX frame; it has an * 802.3 header (i.e., an Ethernet header where the @@ -127,18 +184,38 @@ llc_print(const u_char *p, u_int length, u_int caplen, return (1); } - if (llc.ssap == LLCSAP_8021D && llc.dsap == LLCSAP_8021D) { - stp_print(p, length); + if (eflag) { + if (is_u) { + printf("LLC, dsap %s (0x%02x), ssap %s (0x%02x), cmd 0x%02x: ", + tok2str(llc_values, "Unknown", dsap), + dsap, + tok2str(llc_values, "Unknown", ssap), + ssap, + control); + } else { + printf("LLC, dsap %s (0x%02x), ssap %s (0x%02x), cmd 0x%04x: ", + tok2str(llc_values, "Unknown", dsap), + dsap, + tok2str(llc_values, "Unknown", ssap), + ssap, + control); + } + } + + if (ssap == LLCSAP_8021D && dsap == LLCSAP_8021D && + control == LLC_UI) { + stp_print(p+3, length-3); return (1); } - if (llc.ssap == LLCSAP_IP && llc.dsap == LLCSAP_IP) { + if (ssap == LLCSAP_IP && dsap == LLCSAP_IP && + control == LLC_UI) { ip_print(gndo, p+4, length-4); return (1); } - if (llc.ssap == LLCSAP_IPX && llc.dsap == LLCSAP_IPX && - llc.llcui == LLC_UI) { + if (ssap == LLCSAP_IPX && dsap == LLCSAP_IPX && + control == LLC_UI) { /* * This is an Ethernet_802.2 IPX frame, with an 802.3 * header and an 802.2 LLC header with the source and @@ -147,16 +224,13 @@ llc_print(const u_char *p, u_int length, u_int caplen, * Skip DSAP, LSAP, and control field. */ printf("(NOV-802.2) "); - p += 3; - length -= 3; - caplen -= 3; - ipx_print(p, length); + ipx_print(p+3, length-3); return (1); } #ifdef TCPDUMP_DO_SMB - if (llc.ssap == LLCSAP_NETBEUI && llc.dsap == LLCSAP_NETBEUI - && (!(llc.llcu & LLC_S_FMT) || llc.llcu == LLC_U_FMT)) { + if (ssap == LLCSAP_NETBEUI && dsap == LLCSAP_NETBEUI + && (!(control & LLC_S_FMT) || control == LLC_U_FMT)) { /* * we don't actually have a full netbeui parser yet, but the * smb parser can handle many smb-in-netbeui packets, which @@ -169,107 +243,69 @@ llc_print(const u_char *p, u_int length, u_int caplen, */ /* - * Skip the DSAP and LSAP. + * Skip the LLC header. */ - p += 2; - length -= 2; - caplen -= 2; - - /* - * OK, what type of LLC frame is this? The length - * of the control field depends on that - I frames - * have a two-byte control field, and U frames have - * a one-byte control field. - */ - if (llc.llcu == LLC_U_FMT) { - control = llc.llcu; - p += 1; - length -= 1; - caplen -= 1; + if (is_u) { + p += 3; + length -= 3; + caplen -= 3; } else { - /* - * The control field in I and S frames is - * little-endian. - */ - control = EXTRACT_LE_16BITS(&llc.llcu); - p += 2; - length -= 2; - caplen -= 2; + p += 4; + length -= 4; + caplen -= 4; } netbeui_print(control, p, length); return (1); } #endif - if (llc.ssap == LLCSAP_ISONS && llc.dsap == LLCSAP_ISONS - && llc.llcui == LLC_UI) { + if (ssap == LLCSAP_ISONS && dsap == LLCSAP_ISONS + && control == LLC_UI) { isoclns_print(p + 3, length - 3, caplen - 3); return (1); } - if (llc.ssap == LLCSAP_SNAP && llc.dsap == LLCSAP_SNAP - && llc.llcui == LLC_UI) { - u_int32_t orgcode; - - if (caplen < sizeof(llc)) { - (void)printf("[|llc-snap]"); - default_print((u_char *)p, caplen); - return (0); - } - - caplen -= sizeof(llc); - length -= sizeof(llc); - p += sizeof(llc); - - orgcode = EXTRACT_24BITS(&llc.llc_orgcode[0]); - et = EXTRACT_16BITS(&llc.llc_ethertype[0]); - - if (eflag) - (void)printf("oui %s (0x%06x), ethertype %s (0x%04x): ", - tok2str(oui_values,"Unknown",orgcode), - orgcode, - tok2str(ethertype_values,"Unknown", et), - et); - + if (ssap == LLCSAP_SNAP && dsap == LLCSAP_SNAP + && control == LLC_UI) { /* * XXX - what *is* the right bridge pad value here? * Does anybody ever bridge one form of LAN traffic * over a networking type that uses 802.2 LLC? */ - ret = snap_print(p, length, caplen, extracted_ethertype, - orgcode, et, 2); + ret = snap_print(p+3, length-3, caplen-3, extracted_ethertype, + 2); if (ret) return (ret); } - if ((llc.ssap & ~LLC_GSAP) == llc.dsap) { - if (eflag || esrc == NULL || edst == NULL) - (void)printf("%s ", llcsap_string(llc.dsap)); - else - (void)printf("%s > %s %s ", + if (!eflag) { + if ((ssap & ~LLC_GSAP) == dsap) { + if (esrc == NULL || edst == NULL) + (void)printf("%s ", llcsap_string(dsap)); + else + (void)printf("%s > %s %s ", + etheraddr_string(esrc), + etheraddr_string(edst), + llcsap_string(dsap)); + } else { + if (esrc == NULL || edst == NULL) + (void)printf("%s > %s ", + llcsap_string(ssap & ~LLC_GSAP), + llcsap_string(dsap)); + else + (void)printf("%s %s > %s %s ", etheraddr_string(esrc), + llcsap_string(ssap & ~LLC_GSAP), etheraddr_string(edst), - llcsap_string(llc.dsap)); - } else { - if (eflag || esrc == NULL || edst == NULL) - (void)printf("%s > %s ", - llcsap_string(llc.ssap & ~LLC_GSAP), - llcsap_string(llc.dsap)); - else - (void)printf("%s %s > %s %s ", - etheraddr_string(esrc), - llcsap_string(llc.ssap & ~LLC_GSAP), - etheraddr_string(edst), - llcsap_string(llc.dsap)); + llcsap_string(dsap)); + } } - if ((llc.llcu & LLC_U_FMT) == LLC_U_FMT) { - u_int16_t cmd; + if (is_u) { const char *m; char f; - cmd = LLC_U_CMD(llc.llcu); - m = tok2str(cmd2str, "%02x", cmd); - switch ((llc.ssap & LLC_GSAP) | (llc.llcu & LLC_U_POLL)) { + m = tok2str(cmd2str, "%02x", LLC_U_CMD(control)); + switch ((ssap & LLC_GSAP) | (control & LLC_U_POLL)) { case 0: f = 'C'; break; case LLC_GSAP: f = 'R'; break; case LLC_U_POLL: f = 'P'; break; @@ -283,7 +319,7 @@ llc_print(const u_char *p, u_int length, u_int caplen, length -= 3; caplen -= 3; - if ((llc.llcu & ~LLC_U_POLL) == LLC_XID) { + if ((control & ~LLC_U_POLL) == LLC_XID) { if (*p == LLC_XID_FI) { printf(": %02x %02x", p[1], p[2]); p += 3; @@ -294,11 +330,7 @@ llc_print(const u_char *p, u_int length, u_int caplen, } else { char f; - /* - * The control field in I and S frames is little-endian. - */ - control = EXTRACT_LE_16BITS(&llc.llcu); - switch ((llc.ssap & LLC_GSAP) | (control & LLC_IS_POLL)) { + switch ((ssap & LLC_GSAP) | (control & LLC_IS_POLL)) { case 0: f = 'C'; break; case LLC_GSAP: f = 'R'; break; case LLC_IS_POLL: f = 'P'; break; @@ -327,11 +359,37 @@ llc_print(const u_char *p, u_int length, u_int caplen, int snap_print(const u_char *p, u_int length, u_int caplen, - u_short *extracted_ethertype, u_int32_t orgcode, u_short et, - u_int bridge_pad) + u_short *extracted_ethertype, u_int bridge_pad) { + u_int32_t orgcode; + register u_short et; register int ret; + TCHECK2(*p, 5); + orgcode = EXTRACT_24BITS(p); + et = EXTRACT_16BITS(p + 3); + + if (eflag) { + const struct tok *tok = NULL; + const struct oui_tok *otp; + + for (otp = &oui_to_tok[0]; otp->tok != NULL; otp++) { + if (otp->oui == orgcode) { + tok = otp->tok; + break; + } + } + (void)printf("oui %s (0x%06x), %s %s (0x%04x): ", + tok2str(oui_values, "Unknown", orgcode), + orgcode, + (orgcode == 0x000000 ? "ethertype" : "pid"), + tok2str(tok, "Unknown", et), + et); + } + p += 5; + length -= 5; + caplen -= 5; + switch (orgcode) { case OUI_ENCAP_ETHER: case OUI_CISCO_90: @@ -383,6 +441,7 @@ snap_print(const u_char *p, u_int length, u_int caplen, /* * Skip the padding. */ + TCHECK2(*p, bridge_pad); caplen -= bridge_pad; length -= bridge_pad; p += bridge_pad; @@ -403,6 +462,7 @@ snap_print(const u_char *p, u_int length, u_int caplen, * Skip the padding, but not the Access * Control field. */ + TCHECK2(*p, bridge_pad); caplen -= bridge_pad; length -= bridge_pad; p += bridge_pad; @@ -423,6 +483,7 @@ snap_print(const u_char *p, u_int length, u_int caplen, /* * Skip the padding. */ + TCHECK2(*p, bridge_pad + 1); caplen -= bridge_pad + 1; length -= bridge_pad + 1; p += bridge_pad + 1; @@ -439,6 +500,10 @@ snap_print(const u_char *p, u_int length, u_int caplen, } } return (0); + +trunc: + (void)printf("[|snap]"); + return (1); } |