X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/259983f43d16099f636cddd84226988c165185c1..refs/pull/435/head:/print-llc.c diff --git a/print-llc.c b/print-llc.c index 06d0d296..e8a3314c 100644 --- a/print-llc.c +++ b/print-llc.c @@ -22,20 +22,13 @@ * with an awful lot of hacking by Jeffrey Mogul, DECWRL */ -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-llc.c,v 1.64 2005-04-26 03:51:38 guy Exp $"; -#endif - +#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif #include -#include -#include - #include "interface.h" #include "addrtoname.h" #include "extract.h" /* must come after interface.h */ @@ -44,12 +37,13 @@ static const char rcsid[] _U_ = #include "ethertype.h" #include "oui.h" -static struct tok llc_values[] = { +static const struct tok llc_values[] = { { LLCSAP_NULL, "Null" }, { LLCSAP_GLOBAL, "Global" }, { LLCSAP_8021B_I, "802.1B I" }, { LLCSAP_8021B_G, "802.1B G" }, { LLCSAP_IP, "IP" }, + { LLCSAP_SNA, "SNA" }, { LLCSAP_PROWAYNM, "ProWay NM" }, { LLCSAP_8021D, "STP" }, { LLCSAP_RS511, "RS511" }, @@ -62,7 +56,7 @@ static struct tok llc_values[] = { { 0, NULL }, }; -static struct tok cmd2str[] = { +static const struct tok llc_cmd_values[] = { { LLC_UI, "ui" }, { LLC_TEST, "test" }, { LLC_XID, "xid" }, @@ -74,12 +68,43 @@ static struct tok cmd2str[] = { { 0, NULL } }; -static const struct tok cisco_values[] = { +static const struct tok llc_flag_values[] = { + { 0, "Command" }, + { LLC_GSAP, "Response" }, + { LLC_U_POLL, "Poll" }, + { LLC_GSAP|LLC_U_POLL, "Final" }, + { LLC_IS_POLL, "Poll" }, + { LLC_GSAP|LLC_IS_POLL, "Final" }, + { 0, NULL } +}; + + +static const struct tok llc_ig_flag_values[] = { + { 0, "Individual" }, + { LLC_IG, "Group" }, + { 0, NULL } +}; + + +static const struct tok llc_supervisory_values[] = { + { 0, "Receiver Ready" }, + { 1, "Receiver not Ready" }, + { 2, "Reject" }, + { 0, NULL } +}; + + +static const struct tok cisco_values[] = { { PID_CISCO_CDP, "CDP" }, + { PID_CISCO_VTP, "VTP" }, + { PID_CISCO_DTP, "DTP" }, + { PID_CISCO_UDLD, "UDLD" }, + { PID_CISCO_PVST, "PVST" }, + { PID_CISCO_VLANBRIDGE, "VLAN Bridge" }, { 0, NULL } }; -static const struct tok bridged_values[] = { +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" }, @@ -94,8 +119,12 @@ static const struct tok bridged_values[] = { { 0, NULL }, }; +static const struct tok null_values[] = { + { 0, NULL } +}; + struct oui_tok { - u_int32_t oui; + uint32_t oui; const struct tok *tok; }; @@ -112,24 +141,56 @@ static const struct oui_tok oui_to_tok[] = { * Returns non-zero IFF it succeeds in printing the header */ int -llc_print(const u_char *p, u_int length, u_int caplen, +llc_print(netdissect_options *ndo, 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_int16_t control; + uint8_t dsap_field, dsap, ssap_field, ssap; + uint16_t control; + int is_u; register int ret; - if (caplen < 3) { - (void)printf("[|llc]"); - default_print((u_char *)p, caplen); - return(0); + *extracted_ethertype = 0; + + if (caplen < 3 || length < 3) { + ND_PRINT((ndo, "[|llc]")); + ND_DEFAULTPRINT((u_char *)p, caplen); + return (1); } - /* Watch out for possible alignment problems */ - memcpy((char *)&llc, (char *)p, min(caplen, sizeof(llc))); + dsap_field = *p; + ssap_field = *(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 || length < 4) { + ND_PRINT((ndo, "[|llc]")); + ND_DEFAULTPRINT((u_char *)p, caplen); + return (1); + } + + /* + * ...and is little-endian. + */ + control = EXTRACT_LE_16BITS(p + 2); + is_u = 0; + } - if (llc.ssap == LLCSAP_GLOBAL && llc.dsap == LLCSAP_GLOBAL) { + if (ssap_field == LLCSAP_GLOBAL && dsap_field == LLCSAP_GLOBAL) { /* * This is an Ethernet_802.3 IPX frame; it has an * 802.3 header (i.e., an Ethernet header where the @@ -145,33 +206,51 @@ llc_print(const u_char *p, u_int length, u_int caplen, * least one capture file.) */ - if (eflag) - printf("IPX-802.3: "); + if (ndo->ndo_eflag) + ND_PRINT((ndo, "IPX 802.3: ")); - ipx_print(p, length); + ipx_print(ndo, p, length); return (1); } - 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); + dsap = dsap_field & ~LLC_IG; + ssap = ssap_field & ~LLC_GSAP; + + if (ndo->ndo_eflag) { + ND_PRINT((ndo, "LLC, dsap %s (0x%02x) %s, ssap %s (0x%02x) %s", + tok2str(llc_values, "Unknown", dsap), + dsap, + tok2str(llc_ig_flag_values, "Unknown", dsap_field & LLC_IG), + tok2str(llc_values, "Unknown", ssap), + ssap, + tok2str(llc_flag_values, "Unknown", ssap_field & LLC_GSAP))); + + if (is_u) { + ND_PRINT((ndo, ", ctrl 0x%02x: ", control)); + } else { + ND_PRINT((ndo, ", ctrl 0x%04x: ", control)); + } + } - if (llc.ssap == LLCSAP_8021D && llc.dsap == LLCSAP_8021D) { - stp_print(p, length); + if (ssap == LLCSAP_8021D && dsap == LLCSAP_8021D && + control == LLC_UI) { + stp_print(ndo, p+3, length-3); return (1); } - if (llc.ssap == LLCSAP_IP && llc.dsap == LLCSAP_IP) { - ip_print(gndo, p+4, length-4); + if (ssap == LLCSAP_IP && dsap == LLCSAP_IP && + control == LLC_UI) { + if (caplen < 4 || length < 4) { + ND_PRINT((ndo, "[|llc]")); + ND_DEFAULTPRINT((u_char *)p, caplen); + return (1); + } + ip_print(ndo, 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 @@ -179,17 +258,16 @@ 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); + if (ndo->ndo_eflag) + ND_PRINT((ndo, "IPX 802.2: ")); + + ipx_print(ndo, 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 @@ -202,182 +280,125 @@ 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; } 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; } - netbeui_print(control, p, length); + netbeui_print(ndo, control, p, length); return (1); } #endif - if (llc.ssap == LLCSAP_ISONS && llc.dsap == LLCSAP_ISONS - && llc.llcui == LLC_UI) { - isoclns_print(p + 3, length - 3, caplen - 3); + if (ssap == LLCSAP_ISONS && dsap == LLCSAP_ISONS + && control == LLC_UI) { + isoclns_print(ndo, 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) { - 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); - } - + 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(ndo, p+3, length-3, caplen-3, 2); if (ret) return (ret); } - if (!eflag) { - if ((llc.ssap & ~LLC_GSAP) == llc.dsap) { + if (!ndo->ndo_eflag) { + if (ssap == dsap) { if (esrc == NULL || edst == NULL) - (void)printf("%s ", llcsap_string(llc.dsap)); + ND_PRINT((ndo, "%s ", tok2str(llc_values, "Unknown DSAP 0x%02x", dsap))); else - (void)printf("%s > %s %s ", - etheraddr_string(esrc), - etheraddr_string(edst), - llcsap_string(llc.dsap)); + ND_PRINT((ndo, "%s > %s %s ", + etheraddr_string(ndo, esrc), + etheraddr_string(ndo, edst), + tok2str(llc_values, "Unknown DSAP 0x%02x", dsap))); } else { if (esrc == NULL || edst == NULL) - (void)printf("%s > %s ", - llcsap_string(llc.ssap & ~LLC_GSAP), - llcsap_string(llc.dsap)); + ND_PRINT((ndo, "%s > %s ", + tok2str(llc_values, "Unknown SSAP 0x%02x", ssap), + tok2str(llc_values, "Unknown DSAP 0x%02x", dsap))); else - (void)printf("%s %s > %s %s ", - etheraddr_string(esrc), - llcsap_string(llc.ssap & ~LLC_GSAP), - etheraddr_string(edst), - llcsap_string(llc.dsap)); + ND_PRINT((ndo, "%s %s > %s %s ", + etheraddr_string(ndo, esrc), + tok2str(llc_values, "Unknown SSAP 0x%02x", ssap), + etheraddr_string(ndo, edst), + tok2str(llc_values, "Unknown DSAP 0x%02x", dsap))); } } - if ((llc.llcu & LLC_U_FMT) == LLC_U_FMT) { - u_int16_t cmd; - 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)) { - case 0: f = 'C'; break; - case LLC_GSAP: f = 'R'; break; - case LLC_U_POLL: f = 'P'; break; - case LLC_GSAP|LLC_U_POLL: f = 'F'; break; - default: f = '?'; break; - } - - printf("%s/%c", m, f); + if (is_u) { + ND_PRINT((ndo, "Unnumbered, %s, Flags [%s], length %u", + tok2str(llc_cmd_values, "%02x", LLC_U_CMD(control)), + tok2str(llc_flag_values,"?",(ssap_field & LLC_GSAP) | (control & LLC_U_POLL)), + length)); p += 3; - 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; - length -= 3; - caplen -= 3; + ND_PRINT((ndo, ": %02x %02x", p[1], p[2])); } } } 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)) { - case 0: f = 'C'; break; - case LLC_GSAP: f = 'R'; break; - case LLC_IS_POLL: f = 'P'; break; - case LLC_GSAP|LLC_IS_POLL: f = 'F'; break; - default: f = '?'; break; - } - if ((control & LLC_S_FMT) == LLC_S_FMT) { - static const char *llc_s[] = { "rr", "rej", "rnr", "03" }; - (void)printf("%s (r=%d,%c)", - llc_s[LLC_S_CMD(control)], + ND_PRINT((ndo, "Supervisory, %s, rcv seq %u, Flags [%s], length %u", + tok2str(llc_supervisory_values,"?",LLC_S_CMD(control)), LLC_IS_NR(control), - f); + tok2str(llc_flag_values,"?",(ssap_field & LLC_GSAP) | (control & LLC_IS_POLL)), + length)); } else { - (void)printf("I (s=%d,r=%d,%c)", + ND_PRINT((ndo, "Information, send seq %u, rcv seq %u, Flags [%s], length %u", LLC_I_NS(control), LLC_IS_NR(control), - f); + tok2str(llc_flag_values,"?",(ssap_field & LLC_GSAP) | (control & LLC_IS_POLL)), + length)); } - p += 4; - length -= 4; - caplen -= 4; } return(1); } 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) +snap_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen, u_int bridge_pad) { + uint32_t orgcode; + register u_short et; register int ret; + ND_TCHECK2(*p, 5); + if (caplen < 5 || length < 5) + goto trunc; + orgcode = EXTRACT_24BITS(p); + et = EXTRACT_16BITS(p + 3); + + if (ndo->ndo_eflag) { + const struct tok *tok = null_values; + const struct oui_tok *otp; + + for (otp = &oui_to_tok[0]; otp->tok != NULL; otp++) { + if (otp->oui == orgcode) { + tok = otp->tok; + break; + } + } + ND_PRINT((ndo, "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: @@ -387,8 +408,7 @@ snap_print(const u_char *p, u_int length, u_int caplen, * Cisco hardware; the protocol ID is * an Ethernet protocol type. */ - ret = ether_encap_print(et, p, length, caplen, - extracted_ethertype); + ret = ethertype_print(ndo, et, p, length, caplen); if (ret) return (ret); break; @@ -403,18 +423,33 @@ snap_print(const u_char *p, u_int length, u_int caplen, * but used 0x000000 and an Ethernet * packet type for AARP packets. */ - ret = ether_encap_print(et, p, length, caplen, - extracted_ethertype); + ret = ethertype_print(ndo, et, p, length, caplen); if (ret) return (ret); } break; case OUI_CISCO: - if (et == PID_CISCO_CDP) { - cdp_print(p, length, caplen); - return (1); - } + switch (et) { + case PID_CISCO_CDP: + cdp_print(ndo, p, length, caplen); + return (1); + case PID_CISCO_DTP: + dtp_print(ndo, p, length); + return (1); + case PID_CISCO_UDLD: + udld_print(ndo, p, length); + return (1); + case PID_CISCO_VTP: + vtp_print(ndo, p, length); + return (1); + case PID_CISCO_PVST: + case PID_CISCO_VLANBRIDGE: + stp_print(ndo, p, length); + return (1); + default: + break; + } break; case OUI_RFC2684: @@ -429,6 +464,7 @@ snap_print(const u_char *p, u_int length, u_int caplen, /* * Skip the padding. */ + ND_TCHECK2(*p, bridge_pad); caplen -= bridge_pad; length -= bridge_pad; p += bridge_pad; @@ -436,7 +472,7 @@ snap_print(const u_char *p, u_int length, u_int caplen, /* * What remains is an Ethernet packet. */ - ether_print(p, length, caplen); + ether_print(ndo, p, length, caplen, NULL, NULL); return (1); case PID_RFC2684_802_5_FCS: @@ -449,6 +485,7 @@ snap_print(const u_char *p, u_int length, u_int caplen, * Skip the padding, but not the Access * Control field. */ + ND_TCHECK2(*p, bridge_pad); caplen -= bridge_pad; length -= bridge_pad; p += bridge_pad; @@ -457,7 +494,7 @@ snap_print(const u_char *p, u_int length, u_int caplen, * What remains is an 802.5 Token Ring * packet. */ - token_print(p, length, caplen); + token_print(ndo, p, length, caplen); return (1); case PID_RFC2684_FDDI_FCS: @@ -469,6 +506,7 @@ snap_print(const u_char *p, u_int length, u_int caplen, /* * Skip the padding. */ + ND_TCHECK2(*p, bridge_pad + 1); caplen -= bridge_pad + 1; length -= bridge_pad + 1; p += bridge_pad + 1; @@ -476,15 +514,19 @@ snap_print(const u_char *p, u_int length, u_int caplen, /* * What remains is an FDDI packet. */ - fddi_print(p, length, caplen); + fddi_print(ndo, p, length, caplen); return (1); case PID_RFC2684_BPDU: - stp_print(p, length); + stp_print(ndo, p, length); return (1); } } return (0); + +trunc: + ND_PRINT((ndo, "[|snap]")); + return (1); }