X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/f5aa04085ef784abf76e4b6b419343e0843b7f32..refs/heads/master:/print-ppp.c diff --git a/print-ppp.c b/print-ppp.c index 8e2024de..f7af42a5 100644 --- a/print-ppp.c +++ b/print-ppp.c @@ -31,17 +31,10 @@ * o BAP support */ -#ifdef HAVE_CONFIG_H #include -#endif #include "netdissect-stdinc.h" -#ifdef __bsdi__ -#include -#include -#endif - #include #include "netdissect.h" @@ -196,7 +189,7 @@ static const char *lcpconfopts[] = { "deprecated(12)", /* used to be a Multi-Link-Procedure*/ "Call-Back", /* (13) */ "deprecated(14)", /* used to be a Connect-Time */ - "deprecated(15)", /* used to be a Compund-Frames */ + "deprecated(15)", /* used to be a Compound-Frames */ "deprecated(16)", /* used to be a Nominal-Data-Encap */ "MRRU", /* (17) */ "12-Bit seq #", /* (18) */ @@ -442,7 +435,6 @@ handle_ctrl_proto(netdissect_options *ndo, if (!ndo->ndo_vflag) return; - ND_TCHECK_2(tptr); len = GET_BE_U_2(tptr); tptr += 2; @@ -470,10 +462,8 @@ handle_ctrl_proto(netdissect_options *ndo, case CPCODES_VEXT: if (length < 11) break; - ND_TCHECK_4(tptr); ND_PRINT("\n\t Magic-Num 0x%08x", GET_BE_U_4(tptr)); tptr += 4; - ND_TCHECK_3(tptr); ND_PRINT(" Vendor: %s (%u)", tok2str(oui_values,"Unknown",GET_BE_U_3(tptr)), GET_BE_U_3(tptr)); @@ -536,7 +526,6 @@ handle_ctrl_proto(netdissect_options *ndo, case CPCODES_PROT_REJ: if (length < 6) break; - ND_TCHECK_2(tptr); ND_PRINT("\n\t Rejected %s Protocol (0x%04x)", tok2str(ppptype2str,"unknown", GET_BE_U_2(tptr)), GET_BE_U_2(tptr)); @@ -551,7 +540,6 @@ handle_ctrl_proto(netdissect_options *ndo, case CPCODES_DISC_REQ: if (length < 8) break; - ND_TCHECK_4(tptr); ND_PRINT("\n\t Magic-Num 0x%08x", GET_BE_U_4(tptr)); /* XXX: need to decode Data? - hexdump for now */ if (len > 8) { @@ -563,7 +551,6 @@ handle_ctrl_proto(netdissect_options *ndo, case CPCODES_ID: if (length < 8) break; - ND_TCHECK_4(tptr); ND_PRINT("\n\t Magic-Num 0x%08x", GET_BE_U_4(tptr)); /* RFC 1661 says this is intended to be human readable */ if (len > 8) { @@ -575,9 +562,7 @@ handle_ctrl_proto(netdissect_options *ndo, case CPCODES_TIME_REM: if (length < 12) break; - ND_TCHECK_4(tptr); ND_PRINT("\n\t Magic-Num 0x%08x", GET_BE_U_4(tptr)); - ND_TCHECK_4(tptr + 4); ND_PRINT(", Seconds-Remaining %us", GET_BE_U_4(tptr + 4)); /* XXX: need to decode Message? */ break; @@ -630,16 +615,13 @@ print_lcp_config_options(netdissect_options *ndo, ND_PRINT(" (length bogus, should be >= 6)"); return len; } - ND_TCHECK_3(p + 2); ND_PRINT(": Vendor: %s (%u)", tok2str(oui_values,"Unknown",GET_BE_U_3(p + 2)), GET_BE_U_3(p + 2)); #if 0 - ND_TCHECK_1(p + 5); ND_PRINT(", kind: 0x%02x", GET_U_1(p + 5)); ND_PRINT(", Value: 0x"); for (i = 0; i < len - 6; i++) { - ND_TCHECK_1(p + 6 + i); ND_PRINT("%02x", GET_U_1(p + 6 + i)); } #endif @@ -649,7 +631,6 @@ print_lcp_config_options(netdissect_options *ndo, ND_PRINT(" (length bogus, should be = 4)"); return len; } - ND_TCHECK_2(p + 2); ND_PRINT(": %u", GET_BE_U_2(p + 2)); break; case LCPOPT_ACCM: @@ -657,7 +638,6 @@ print_lcp_config_options(netdissect_options *ndo, ND_PRINT(" (length bogus, should be = 6)"); return len; } - ND_TCHECK_4(p + 2); ND_PRINT(": 0x%08x", GET_BE_U_4(p + 2)); break; case LCPOPT_AP: @@ -665,13 +645,11 @@ print_lcp_config_options(netdissect_options *ndo, ND_PRINT(" (length bogus, should be >= 4)"); return len; } - ND_TCHECK_2(p + 2); ND_PRINT(": %s", tok2str(ppptype2str, "Unknown Auth Proto (0x04x)", GET_BE_U_2(p + 2))); switch (GET_BE_U_2(p + 2)) { case PPP_CHAP: - ND_TCHECK_1(p + 4); ND_PRINT(", %s", tok2str(authalg_values, "Unknown Auth Alg %u", GET_U_1(p + 4))); break; @@ -689,7 +667,6 @@ print_lcp_config_options(netdissect_options *ndo, ND_PRINT(" (length bogus, should be >= 4)"); return 0; } - ND_TCHECK_2(p + 2); if (GET_BE_U_2(p + 2) == PPP_LQM) ND_PRINT(": LQR"); else @@ -700,7 +677,6 @@ print_lcp_config_options(netdissect_options *ndo, ND_PRINT(" (length bogus, should be = 6)"); return 0; } - ND_TCHECK_4(p + 2); ND_PRINT(": 0x%08x", GET_BE_U_4(p + 2)); break; case LCPOPT_PFC: @@ -712,7 +688,6 @@ print_lcp_config_options(netdissect_options *ndo, ND_PRINT(" (length bogus, should be = 4)"); return 0; } - ND_TCHECK_2(p + 2); ND_PRINT(": 0x%04x", GET_BE_U_2(p + 2)); break; case LCPOPT_CBACK: @@ -720,8 +695,6 @@ print_lcp_config_options(netdissect_options *ndo, ND_PRINT(" (length bogus, should be >= 3)"); return 0; } - ND_PRINT(": "); - ND_TCHECK_1(p + 2); ND_PRINT(": Callback Operation %s (%u)", tok2str(ppp_callback_values, "Unknown", GET_U_1(p + 2)), GET_U_1(p + 2)); @@ -731,7 +704,6 @@ print_lcp_config_options(netdissect_options *ndo, ND_PRINT(" (length bogus, should be = 4)"); return 0; } - ND_TCHECK_2(p + 2); ND_PRINT(": %u", GET_BE_U_2(p + 2)); break; case LCPOPT_MLED: @@ -739,7 +711,6 @@ print_lcp_config_options(netdissect_options *ndo, ND_PRINT(" (length bogus, should be >= 3)"); return 0; } - ND_TCHECK_1(p + 2); switch (GET_U_1(p + 2)) { /* class */ case MEDCLASS_NULL: ND_PRINT(": Null"); @@ -752,7 +723,6 @@ print_lcp_config_options(netdissect_options *ndo, ND_PRINT(" (length bogus, should be = 7)"); return 0; } - ND_TCHECK_4(p + 3); ND_PRINT(": IPv4 %s", GET_IPADDR_STRING(p + 3)); break; case MEDCLASS_MAC: @@ -760,8 +730,7 @@ print_lcp_config_options(netdissect_options *ndo, ND_PRINT(" (length bogus, should be = 9)"); return 0; } - ND_TCHECK_6(p + 3); - ND_PRINT(": MAC %s", GET_ETHERADDR_STRING(p + 3)); + ND_PRINT(": MAC %s", GET_MAC48_STRING(p + 3)); break; case MEDCLASS_MNB: ND_PRINT(": Magic-Num-Block"); /* XXX */ @@ -863,23 +832,19 @@ handle_chap(netdissect_options *ndo, ND_PRINT("[|chap]"); return; } else if (length < 4) { - ND_TCHECK_1(p); ND_PRINT("[|chap 0x%02x]", GET_U_1(p)); return; } - ND_TCHECK_1(p); code = GET_U_1(p); ND_PRINT("CHAP, %s (0x%02x)", tok2str(chapcode_values,"unknown",code), code); p++; - ND_TCHECK_1(p); ND_PRINT(", id %u", GET_U_1(p)); /* ID */ p++; - ND_TCHECK_2(p); len = GET_BE_U_2(p); p += 2; @@ -888,47 +853,33 @@ handle_chap(netdissect_options *ndo, * don't know which flavor of CHAP (i.e. CHAP-MD5, MS-CHAPv1, * MS-CHAPv2) is used at this point, we can't decode packet * specifically to each algorithms. Instead, we simply decode - * the GCD (Gratest Common Denominator) for all algorithms. + * the GCD (Greatest Common Denominator) for all algorithms. */ switch (code) { case CHAP_CHAL: case CHAP_RESP: if (length - (p - p0) < 1) return; - ND_TCHECK_1(p); val_size = GET_U_1(p); /* value size */ p++; if (length - (p - p0) < val_size) return; ND_PRINT(", Value "); for (i = 0; i < val_size; i++) { - ND_TCHECK_1(p); ND_PRINT("%02x", GET_U_1(p)); p++; } name_size = len - (u_int)(p - p0); ND_PRINT(", Name "); - for (i = 0; i < name_size; i++) { - ND_TCHECK_1(p); - fn_print_char(ndo, GET_U_1(p)); - p++; - } + nd_printjn(ndo, p, name_size); break; case CHAP_SUCC: case CHAP_FAIL: msg_size = len - (u_int)(p - p0); ND_PRINT(", Msg "); - for (i = 0; i< msg_size; i++) { - ND_TCHECK_1(p); - fn_print_char(ndo, GET_U_1(p)); - p++; - } + nd_printjn(ndo, p, msg_size); break; } - return; - -trunc: - ND_PRINT("[|chap]"); } /* PAP (see RFC 1334) */ @@ -939,30 +890,25 @@ handle_pap(netdissect_options *ndo, u_int code, len; u_int peerid_len, passwd_len, msg_len; const u_char *p0; - u_int i; p0 = p; if (length < 1) { ND_PRINT("[|pap]"); return; } else if (length < 4) { - ND_TCHECK_1(p); ND_PRINT("[|pap 0x%02x]", GET_U_1(p)); return; } - ND_TCHECK_1(p); code = GET_U_1(p); ND_PRINT("PAP, %s (0x%02x)", tok2str(papcode_values, "unknown", code), code); p++; - ND_TCHECK_1(p); ND_PRINT(", id %u", GET_U_1(p)); /* ID */ p++; - ND_TCHECK_2(p); len = GET_BE_U_2(p); p += 2; @@ -983,31 +929,22 @@ handle_pap(netdissect_options *ndo, goto trunc; if (length - (p - p0) < 1) return; - ND_TCHECK_1(p); peerid_len = GET_U_1(p); /* Peer-ID Length */ p++; if (length - (p - p0) < peerid_len) return; ND_PRINT(", Peer "); - for (i = 0; i < peerid_len; i++) { - ND_TCHECK_1(p); - fn_print_char(ndo, GET_U_1(p)); - p++; - } + nd_printjn(ndo, p, peerid_len); + p += peerid_len; if (length - (p - p0) < 1) return; - ND_TCHECK_1(p); passwd_len = GET_U_1(p); /* Password Length */ p++; if (length - (p - p0) < passwd_len) return; ND_PRINT(", Name "); - for (i = 0; i < passwd_len; i++) { - ND_TCHECK_1(p); - fn_print_char(ndo, GET_U_1(p)); - p++; - } + nd_printjn(ndo, p, passwd_len); break; case PAP_AACK: case PAP_ANAK: @@ -1020,17 +957,12 @@ handle_pap(netdissect_options *ndo, goto trunc; if (length - (p - p0) < 1) return; - ND_TCHECK_1(p); msg_len = GET_U_1(p); /* Msg-Length */ p++; if (length - (p - p0) < msg_len) return; ND_PRINT(", Msg "); - for (i = 0; i< msg_len; i++) { - ND_TCHECK_1(p); - fn_print_char(ndo, GET_U_1(p)); - p++; - } + nd_printjn(ndo, p, msg_len); break; } return; @@ -1082,7 +1014,6 @@ print_ipcp_config_options(netdissect_options *ndo, ND_PRINT(" (length bogus, should be = 10)"); return len; } - ND_TCHECK_4(p + 6); ND_PRINT(": src %s, dst %s", GET_IPADDR_STRING(p + 2), GET_IPADDR_STRING(p + 6)); @@ -1092,7 +1023,6 @@ print_ipcp_config_options(netdissect_options *ndo, ND_PRINT(" (length bogus, should be >= 4)"); return 0; } - ND_TCHECK_2(p + 2); compproto = GET_BE_U_2(p + 2); ND_PRINT(": %s (0x%02x):", @@ -1169,7 +1099,6 @@ print_ipcp_config_options(netdissect_options *ndo, ND_PRINT(" (length bogus, should be = 6)"); return 0; } - ND_TCHECK_4(p + 2); ND_PRINT(": %s", GET_IPADDR_STRING(p + 2)); break; default: @@ -1181,7 +1110,7 @@ print_ipcp_config_options(netdissect_options *ndo, print_unknown_data(ndo, p + 2, "\n\t ", len - 2); break; } - if (ndo->ndo_vflag > 1) + if (ndo->ndo_vflag > 1 && ND_TTEST_LEN(p + 2, len - 2)) print_unknown_data(ndo, p + 2, "\n\t ", len - 2); /* exclude TLV header */ return len; @@ -1283,7 +1212,6 @@ print_ccp_config_options(netdissect_options *ndo, ND_PRINT(" (length bogus, should be >= 3)"); return len; } - ND_TCHECK_1(p + 2); ND_PRINT(": Version: %u, Dictionary Bits: %u", GET_U_1(p + 2) >> 5, GET_U_1(p + 2) & 0x1f); @@ -1293,7 +1221,6 @@ print_ccp_config_options(netdissect_options *ndo, ND_PRINT(" (length bogus, should be >= 4)"); return len; } - ND_TCHECK_1(p + 3); ND_PRINT(": Features: %u, PxP: %s, History: %u, #CTX-ID: %u", (GET_U_1(p + 2) & 0xc0) >> 6, (GET_U_1(p + 2) & 0x20) ? "Enabled" : "Disabled", @@ -1305,7 +1232,6 @@ print_ccp_config_options(netdissect_options *ndo, ND_PRINT(" (length bogus, should be >= 4)"); return len; } - ND_TCHECK_1(p + 3); ND_PRINT(": Window: %uK, Method: %s (0x%x), MBZ: %u, CHK: %u", (GET_U_1(p + 2) & 0xf0) >> 4, ((GET_U_1(p + 2) & 0x0f) == 8) ? "zlib" : "unknown", @@ -1382,7 +1308,6 @@ print_bacp_config_options(netdissect_options *ndo, ND_PRINT(" (length bogus, should be = 6)"); return len; } - ND_TCHECK_4(p + 2); ND_PRINT(": Magic-Num 0x%08x", GET_BE_U_4(p + 2)); break; default: @@ -1417,7 +1342,6 @@ ppp_hdlc(netdissect_options *ndo, u_char *b, *t, c; const u_char *s; u_int i, proto; - const void *se; if (caplen == 0) return; @@ -1425,13 +1349,15 @@ ppp_hdlc(netdissect_options *ndo, if (length == 0) return; - b = (u_char *)nd_malloc(ndo, caplen); - if (b == NULL) - return; + b = (u_char *)malloc(caplen); + if (b == NULL) { + (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC, + "%s: malloc", __func__); + } /* * Unescape all the data into a temporary, private, buffer. - * Do this so that we dont overwrite the original packet + * Do this so that we don't overwrite the original packet * contents. */ for (s = p, t = b, i = caplen; i != 0; i--) { @@ -1448,10 +1374,15 @@ ppp_hdlc(netdissect_options *ndo, } /* - * Change the end pointer, so bounds checks work. + * Switch to the output buffer for dissection, and save it + * on the buffer stack so it can be freed; our caller must + * pop it when done. */ - se = ndo->ndo_snapend; - ndo->ndo_snapend = t; + if (!nd_push_buffer(ndo, b, b, (u_int)(t - b))) { + free(b); + (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC, + "%s: can't push buffer on buffer stack", __func__); + } length = ND_BYTES_AVAILABLE_AFTER(b); /* now lets guess about the payload codepoint format */ @@ -1479,19 +1410,25 @@ ppp_hdlc(netdissect_options *ndo, if (length < 4) goto trunc; proto = GET_BE_U_2(b + 2); /* load the PPP proto-id */ - handle_ppp(ndo, proto, b + 4, length - 4); + if ((proto & 0xff00) == 0x7e00) + ND_PRINT("(protocol 0x%04x invalid)", proto); + else + handle_ppp(ndo, proto, b + 4, length - 4); break; default: /* last guess - proto must be a PPP proto-id */ - handle_ppp(ndo, proto, b + 2, length - 2); + if ((proto & 0xff00) == 0x7e00) + ND_PRINT("(protocol 0x%04x invalid)", proto); + else + handle_ppp(ndo, proto, b + 2, length - 2); break; } cleanup: - ndo->ndo_snapend = se; + nd_pop_packet_info(ndo); return; trunc: - ndo->ndo_snapend = se; + nd_pop_packet_info(ndo); nd_print_trunc(ndo); } @@ -1574,7 +1511,6 @@ ppp_print(netdissect_options *ndo, */ if (length < 2) goto trunc; - ND_TCHECK_2(p); ppp_header = GET_BE_U_2(p); switch(ppp_header) { @@ -1602,25 +1538,30 @@ ppp_print(netdissect_options *ndo, if (length < 2) goto trunc; - ND_TCHECK_1(p); if (GET_U_1(p) % 2) { proto = GET_U_1(p); /* PFC is used */ p++; length--; hdr_len++; } else { - ND_TCHECK_2(p); proto = GET_BE_U_2(p); p += 2; length -= 2; hdr_len += 2; } - if (ndo->ndo_eflag) - ND_PRINT("%s (0x%04x), length %u: ", - tok2str(ppptype2str, "unknown", proto), + if (ndo->ndo_eflag) { + const char *typestr; + typestr = tok2str(ppptype2str, "unknown", proto); + ND_PRINT("%s (0x%04x), length %u", + typestr, proto, olen); + if (*typestr == 'u') /* "unknown" */ + return hdr_len; + + ND_PRINT(": "); + } handle_ppp(ndo, proto, p, length); return (hdr_len); @@ -1771,166 +1712,3 @@ ppp_hdlc_if_print(netdissect_options *ndo, ndo->ndo_ll_hdr_len += hdrlen; } - -#define PPP_BSDI_HDRLEN 24 - -/* BSD/OS specific PPP printer */ -void -ppp_bsdos_if_print(netdissect_options *ndo, - const struct pcap_pkthdr *h _U_, const u_char *p _U_) -{ - u_int hdrlength; -#ifdef __bsdi__ - u_int length = h->len; - u_int caplen = h->caplen; - uint16_t ptype; - uint8_t llhl; - const u_char *q; - u_int i; - - ndo->ndo_protocol = "ppp_bsdos"; - if (caplen < PPP_BSDI_HDRLEN) { - nd_print_trunc(ndo); - ndo->ndo_ll_hdr_len += caplen; - return; - } - - hdrlength = 0; - -#if 0 - if (GET_U_1(p) == PPP_ADDRESS && - GET_U_1(p + 1) == PPP_CONTROL) { - if (ndo->ndo_eflag) - ND_PRINT("%02x %02x ", GET_U_1(p), - GET_U_1(p + 1)); - p += 2; - hdrlength = 2; - } - - if (ndo->ndo_eflag) - ND_PRINT("%u ", length); - /* Retrieve the protocol type */ - if (GET_U_1(p) & 01) { - /* Compressed protocol field */ - ptype = GET_U_1(p); - if (ndo->ndo_eflag) - ND_PRINT("%02x ", ptype); - p++; - hdrlength += 1; - } else { - /* Un-compressed protocol field */ - ptype = GET_BE_U_2(p); - if (ndo->ndo_eflag) - ND_PRINT("%04x ", ptype); - p += 2; - hdrlength += 2; - } -#else - ptype = 0; /*XXX*/ - if (ndo->ndo_eflag) - ND_PRINT("%c ", GET_U_1(p + SLC_DIR) ? 'O' : 'I'); - llhl = GET_U_1(p + SLC_LLHL); - if (llhl) { - /* link level header */ - struct ppp_header *ph; - - q = p + SLC_BPFHDRLEN; - ph = (struct ppp_header *)q; - if (ph->phdr_addr == PPP_ADDRESS - && ph->phdr_ctl == PPP_CONTROL) { - if (ndo->ndo_eflag) - ND_PRINT("%02x %02x ", GET_U_1(q), - GET_U_1(q + 1)); - ptype = GET_BE_U_2(&ph->phdr_type); - if (ndo->ndo_eflag && (ptype == PPP_VJC || ptype == PPP_VJNC)) { - ND_PRINT("%s ", tok2str(ppptype2str, - "proto-#%u", ptype)); - } - } else { - if (ndo->ndo_eflag) { - ND_PRINT("LLH=["); - for (i = 0; i < llhl; i++) - ND_PRINT("%02x", GET_U_1(q + i)); - ND_PRINT("] "); - } - } - } - if (ndo->ndo_eflag) - ND_PRINT("%u ", length); - if (GET_U_1(p + SLC_CHL)) { - q = p + SLC_BPFHDRLEN + llhl; - - switch (ptype) { - case PPP_VJC: - ptype = vjc_print(ndo, q, ptype); - hdrlength = PPP_BSDI_HDRLEN; - p += hdrlength; - switch (ptype) { - case PPP_IP: - ip_print(ndo, p, length); - break; - case PPP_IPV6: - ip6_print(ndo, p, length); - break; - case PPP_MPLS_UCAST: - case PPP_MPLS_MCAST: - mpls_print(ndo, p, length); - break; - } - goto printx; - case PPP_VJNC: - ptype = vjc_print(ndo, q, ptype); - hdrlength = PPP_BSDI_HDRLEN; - p += hdrlength; - switch (ptype) { - case PPP_IP: - ip_print(ndo, p, length); - break; - case PPP_IPV6: - ip6_print(ndo, p, length); - break; - case PPP_MPLS_UCAST: - case PPP_MPLS_MCAST: - mpls_print(ndo, p, length); - break; - } - goto printx; - default: - if (ndo->ndo_eflag) { - ND_PRINT("CH=["); - for (i = 0; i < llhl; i++) - ND_PRINT("%02x", - GET_U_1(q + i)); - ND_PRINT("] "); - } - break; - } - } - - hdrlength = PPP_BSDI_HDRLEN; -#endif - - length -= hdrlength; - p += hdrlength; - - switch (ptype) { - case PPP_IP: - ip_print(p, length); - break; - case PPP_IPV6: - ip6_print(ndo, p, length); - break; - case PPP_MPLS_UCAST: - case PPP_MPLS_MCAST: - mpls_print(ndo, p, length); - break; - default: - ND_PRINT("%s ", tok2str(ppptype2str, "unknown PPP protocol (0x%04x)", ptype)); - } - -printx: -#else /* __bsdi */ - hdrlength = 0; -#endif /* __bsdi__ */ - ndo->ndo_ll_hdr_len += hdrlength; -}