X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/c0af6af3011d4c55bdadf3dd76cd5fc1115c50d0..a63600a1fc28dbc7ae7ce9f996829c49a25fb33c:/print-sll.c diff --git a/print-sll.c b/print-sll.c index e87bd032..eb8d620a 100644 --- a/print-sll.c +++ b/print-sll.c @@ -26,11 +26,17 @@ #endif #ifdef HAVE_NET_IF_H +/* + * Include diag-control.h before , which too defines a macro + * named ND_UNREACHABLE. + */ +#include "diag-control.h" #include #endif #include "netdissect-stdinc.h" +#define ND_LONGJMP_FROM_TCHECK #include "netdissect.h" #include "addrtoname.h" #include "ethertype.h" @@ -154,18 +160,19 @@ sll_print(netdissect_options *ndo, const struct sll_header *sllp, u_int length) u_short ether_type; ndo->ndo_protocol = "sll"; - ND_PRINT("%3s ",tok2str(sll_pkttype_values,"?",EXTRACT_BE_U_2(sllp->sll_pkttype))); + ND_PRINT("%3s ", + tok2str(sll_pkttype_values,"?",GET_BE_U_2(sllp->sll_pkttype))); /* * XXX - check the link-layer address type value? * For now, we just assume 6 means Ethernet. * XXX - print others as strings of hex? */ - if (EXTRACT_BE_U_2(sllp->sll_halen) == 6) - ND_PRINT("%s ", etheraddr_string(ndo, sllp->sll_addr)); + if (GET_BE_U_2(sllp->sll_halen) == MAC_ADDR_LEN) + ND_PRINT("%s ", GET_ETHERADDR_STRING(sllp->sll_addr)); if (!ndo->ndo_qflag) { - ether_type = EXTRACT_BE_U_2(sllp->sll_protocol); + ether_type = GET_BE_U_2(sllp->sll_protocol); if (ether_type <= MAX_ETHERNET_LENGTH_VAL) { /* @@ -210,7 +217,7 @@ sll_print(netdissect_options *ndo, const struct sll_header *sllp, u_int length) * 'h->len' is the length of the packet off the wire, and 'h->caplen' * is the number of bytes actually captured. */ -u_int +void sll_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p) { u_int caplen = h->caplen; @@ -221,16 +228,8 @@ sll_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char int llc_hdrlen; u_int hdrlen; - ndo->ndo_protocol = "sll_if"; - if (caplen < SLL_HDR_LEN) { - /* - * XXX - this "can't happen" because "pcap-linux.c" always - * adds this many bytes of header to every packet in a - * cooked socket capture. - */ - nd_print_trunc(ndo); - return (caplen); - } + ndo->ndo_protocol = "sll"; + ND_TCHECK_LEN(p, SLL_HDR_LEN); sllp = (const struct sll_header *)p; @@ -245,7 +244,7 @@ sll_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char p += SLL_HDR_LEN; hdrlen = SLL_HDR_LEN; - hatype = EXTRACT_BE_U_2(sllp->sll_hatype); + hatype = GET_BE_U_2(sllp->sll_hatype); switch (hatype) { case 803: @@ -253,9 +252,11 @@ sll_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char * This is an packet with a radiotap header; * just dissect the payload as such. */ - return (SLL_HDR_LEN + ieee802_11_radio_print(ndo, p, length, caplen)); + ndo->ndo_ll_hdr_len += SLL_HDR_LEN; + ndo->ndo_ll_hdr_len += ieee802_11_radio_print(ndo, p, length, caplen); + return; } - ether_type = EXTRACT_BE_U_2(sllp->sll_protocol); + ether_type = GET_BE_U_2(sllp->sll_protocol); recurse: /* @@ -303,15 +304,16 @@ recurse: if (caplen < 4) { ndo->ndo_protocol = "vlan"; nd_print_trunc(ndo); - return (hdrlen + caplen); + ndo->ndo_ll_hdr_len += hdrlen + caplen; + return; } if (ndo->ndo_eflag) { - uint16_t tag = EXTRACT_BE_U_2(p); + uint16_t tag = GET_BE_U_2(p); ND_PRINT("%s, ", ieee8021q_tci_string(tag)); } - ether_type = EXTRACT_BE_U_2(p + 2); + ether_type = GET_BE_U_2(p + 2); if (ether_type <= MAX_ETHERNET_LENGTH_VAL) ether_type = LINUX_SLL_P_802_2; if (!ndo->ndo_qflag) { @@ -333,7 +335,7 @@ recurse: } } - return (hdrlen); + ndo->ndo_ll_hdr_len += hdrlen; } static void @@ -342,18 +344,18 @@ sll2_print(netdissect_options *ndo, const struct sll2_header *sllp, u_int length u_short ether_type; ndo->ndo_protocol = "sll2"; - ND_PRINT("%3s ",tok2str(sll_pkttype_values,"?",EXTRACT_U_1(sllp->sll2_pkttype))); + ND_PRINT("ifindex %u ", GET_BE_U_4(sllp->sll2_if_index)); /* * XXX - check the link-layer address type value? * For now, we just assume 6 means Ethernet. * XXX - print others as strings of hex? */ - if (EXTRACT_U_1(sllp->sll2_halen) == 6) - ND_PRINT("%s ", etheraddr_string(ndo, sllp->sll2_addr)); + if (GET_U_1(sllp->sll2_halen) == MAC_ADDR_LEN) + ND_PRINT("%s ", GET_ETHERADDR_STRING(sllp->sll2_addr)); if (!ndo->ndo_qflag) { - ether_type = EXTRACT_BE_U_2(sllp->sll2_protocol); + ether_type = GET_BE_U_2(sllp->sll2_protocol); if (ether_type <= MAX_ETHERNET_LENGTH_VAL) { /* @@ -398,7 +400,7 @@ sll2_print(netdissect_options *ndo, const struct sll2_header *sllp, u_int length * 'h->len' is the length of the packet off the wire, and 'h->caplen' * is the number of bytes actually captured. */ -u_int +void sll2_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p) { u_int caplen = h->caplen; @@ -413,26 +415,20 @@ sll2_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char char ifname[IF_NAMESIZE]; #endif - ndo->ndo_protocol = "sll2_if"; - if (caplen < SLL2_HDR_LEN) { - /* - * XXX - this "can't happen" because "pcap-linux.c" always - * adds this many bytes of header to every packet in a - * cooked socket capture. - */ - nd_print_trunc(ndo); - return (caplen); - } + ndo->ndo_protocol = "sll2"; + ND_TCHECK_LEN(p, SLL2_HDR_LEN); sllp = (const struct sll2_header *)p; #ifdef HAVE_NET_IF_H - if_index = EXTRACT_BE_U_4(sllp->sll2_if_index); - if (if_indextoname(if_index, ifname)) - ND_PRINT("ifindex %u (%s) ", if_index, ifname); - else - ND_PRINT("ifindex %u ", if_index); + if_index = GET_BE_U_4(sllp->sll2_if_index); + if (!if_indextoname(if_index, ifname)) + strncpy(ifname, "?", 2); + ND_PRINT("%-5s ", ifname); #endif + ND_PRINT("%-3s ", + tok2str(sll_pkttype_values, "?", GET_U_1(sllp->sll2_pkttype))); + if (ndo->ndo_eflag) sll2_print(ndo, sllp, length); @@ -444,7 +440,7 @@ sll2_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char p += SLL2_HDR_LEN; hdrlen = SLL2_HDR_LEN; - hatype = EXTRACT_BE_U_2(sllp->sll2_hatype); + hatype = GET_BE_U_2(sllp->sll2_hatype); switch (hatype) { case 803: @@ -452,9 +448,11 @@ sll2_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char * This is an packet with a radiotap header; * just dissect the payload as such. */ - return (SLL_HDR_LEN + ieee802_11_radio_print(ndo, p, length, caplen)); + ndo->ndo_ll_hdr_len += SLL2_HDR_LEN; + ndo->ndo_ll_hdr_len += ieee802_11_radio_print(ndo, p, length, caplen); + return; } - ether_type = EXTRACT_BE_U_2(sllp->sll2_protocol); + ether_type = GET_BE_U_2(sllp->sll2_protocol); recurse: /* @@ -502,15 +500,16 @@ recurse: if (caplen < 4) { ndo->ndo_protocol = "vlan"; nd_print_trunc(ndo); - return (hdrlen + caplen); + ndo->ndo_ll_hdr_len += hdrlen + caplen; + return; } if (ndo->ndo_eflag) { - uint16_t tag = EXTRACT_BE_U_2(p); + uint16_t tag = GET_BE_U_2(p); ND_PRINT("%s, ", ieee8021q_tci_string(tag)); } - ether_type = EXTRACT_BE_U_2(p + 2); + ether_type = GET_BE_U_2(p + 2); if (ether_type <= MAX_ETHERNET_LENGTH_VAL) ether_type = LINUX_SLL_P_802_2; if (!ndo->ndo_qflag) { @@ -526,11 +525,11 @@ recurse: if (ethertype_print(ndo, ether_type, p, length, caplen, NULL, NULL) == 0) { /* ether_type not known, print raw packet */ if (!ndo->ndo_eflag) - sll2_print(ndo, sllp, length + SLL_HDR_LEN); + sll2_print(ndo, sllp, length + SLL2_HDR_LEN); if (!ndo->ndo_suppress_default_print) ND_DEFAULTPRINT(p, caplen); } } - return (hdrlen); + ndo->ndo_ll_hdr_len += hdrlen; }