X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/4aac37f04316b37b73b99bdcdbfa97347bb2fe51..refs/pull/1034/head:/print-ppp.c?ds=sidebyside diff --git a/print-ppp.c b/print-ppp.c index 6156e195..aba243dd 100644 --- a/print-ppp.c +++ b/print-ppp.c @@ -42,8 +42,6 @@ #include #endif -#include - #include "netdissect.h" #include "extract.h" #include "addrtoname.h" @@ -442,7 +440,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 +467,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 +531,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 +545,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 +556,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 +567,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 +620,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 +636,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 +643,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 +650,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 +672,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 +682,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 +693,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: @@ -721,7 +701,6 @@ print_lcp_config_options(netdissect_options *ndo, 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 +710,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 +717,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 +729,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,7 +736,6 @@ 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)); break; case MEDCLASS_MNB: @@ -863,23 +838,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; @@ -895,21 +866,18 @@ handle_chap(netdissect_options *ndo, 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++; } @@ -919,16 +887,11 @@ handle_chap(netdissect_options *ndo, 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++; } break; } - return; - -trunc: - ND_PRINT("[|chap]"); } /* PAP (see RFC 1334) */ @@ -946,23 +909,19 @@ handle_pap(netdissect_options *ndo, 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,28 +942,24 @@ 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++; } 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++; } @@ -1020,14 +975,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++; } @@ -1082,7 +1035,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 +1044,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 +1120,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: @@ -1283,7 +1233,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 +1242,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 +1253,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 +1329,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: @@ -1413,11 +1359,11 @@ static void ppp_hdlc(netdissect_options *ndo, const u_char *p, u_int length) { - u_int caplen = ndo->ndo_snapend - p; + u_int caplen = ND_BYTES_AVAILABLE_AFTER(p); u_char *b, *t, c; const u_char *s; u_int i, proto; - const void *se; + const void *sb, *se; if (caplen == 0) return; @@ -1431,7 +1377,7 @@ ppp_hdlc(netdissect_options *ndo, /* * 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--) { @@ -1449,8 +1395,11 @@ ppp_hdlc(netdissect_options *ndo, /* * Change the end pointer, so bounds checks work. + * Change the pointer to packet data to help debugging. */ + sb = ndo->ndo_packetp; se = ndo->ndo_snapend; + ndo->ndo_packetp = b; ndo->ndo_snapend = t; length = ND_BYTES_AVAILABLE_AFTER(b); @@ -1479,18 +1428,26 @@ 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_packetp = sb; ndo->ndo_snapend = se; return; trunc: + ndo->ndo_packetp = sb; ndo->ndo_snapend = se; nd_print_trunc(ndo); } @@ -1574,17 +1531,16 @@ ppp_print(netdissect_options *ndo, */ if (length < 2) goto trunc; - ND_TCHECK_2(p); ppp_header = GET_BE_U_2(p); switch(ppp_header) { - case (PPP_WITHDIRECTION_IN << 8 | PPP_CONTROL): + case (PPP_PPPD_IN << 8 | PPP_CONTROL): if (ndo->ndo_eflag) ND_PRINT("In "); p += 2; length -= 2; hdr_len += 2; break; - case (PPP_WITHDIRECTION_OUT << 8 | PPP_CONTROL): + case (PPP_PPPD_OUT << 8 | PPP_CONTROL): if (ndo->ndo_eflag) ND_PRINT("Out "); p += 2; length -= 2; @@ -1602,25 +1558,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); @@ -1631,18 +1592,20 @@ trunc: /* PPP I/F printer */ -u_int +void ppp_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p) { u_int length = h->len; u_int caplen = h->caplen; - ndo->ndo_protocol = "ppp_if"; + ndo->ndo_protocol = "ppp"; if (caplen < PPP_HDRLEN) { nd_print_trunc(ndo); - return (caplen); + ndo->ndo_ll_hdr_len += caplen; + return; } + ndo->ndo_ll_hdr_len += PPP_HDRLEN; #if 0 /* @@ -1687,8 +1650,6 @@ ppp_if_print(netdissect_options *ndo, #endif ppp_print(ndo, p, length); - - return (0); } /* @@ -1700,7 +1661,7 @@ ppp_if_print(netdissect_options *ndo, * * This handles, for example, DLT_PPP_SERIAL in NetBSD. */ -u_int +void ppp_hdlc_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p) { @@ -1709,10 +1670,11 @@ ppp_hdlc_if_print(netdissect_options *ndo, u_int proto; u_int hdrlen = 0; - ndo->ndo_protocol = "ppp_hdlc_if"; + ndo->ndo_protocol = "ppp_hdlc"; if (caplen < 2) { nd_print_trunc(ndo); - return (caplen); + ndo->ndo_ll_hdr_len += caplen; + return; } switch (GET_U_1(p)) { @@ -1720,7 +1682,8 @@ ppp_hdlc_if_print(netdissect_options *ndo, case PPP_ADDRESS: if (caplen < 4) { nd_print_trunc(ndo); - return (caplen); + ndo->ndo_ll_hdr_len += caplen; + return; } if (ndo->ndo_eflag) @@ -1741,12 +1704,14 @@ ppp_hdlc_if_print(netdissect_options *ndo, case CHDLC_UNICAST: case CHDLC_BCAST: - return (chdlc_if_print(ndo, h, p)); + chdlc_if_print(ndo, h, p); + return; default: if (caplen < 4) { nd_print_trunc(ndo); - return (caplen); + ndo->ndo_ll_hdr_len += caplen; + return; } if (ndo->ndo_eflag) @@ -1765,14 +1730,14 @@ ppp_hdlc_if_print(netdissect_options *ndo, break; } - return (hdrlen); + ndo->ndo_ll_hdr_len += hdrlen; } #define PPP_BSDI_HDRLEN 24 /* BSD/OS specific PPP printer */ -u_int -ppp_bsdos_if_print(netdissect_options *ndo _U_, +void +ppp_bsdos_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h _U_, const u_char *p _U_) { u_int hdrlength; @@ -1784,10 +1749,11 @@ ppp_bsdos_if_print(netdissect_options *ndo _U_, const u_char *q; u_int i; - ndo->ndo_protocol = "ppp_bsdos_if"; + ndo->ndo_protocol = "ppp_bsdos"; if (caplen < PPP_BSDI_HDRLEN) { nd_print_trunc(ndo); - return (caplen); + ndo->ndo_ll_hdr_len += caplen; + return; } hdrlength = 0; @@ -1927,5 +1893,5 @@ printx: #else /* __bsdi */ hdrlength = 0; #endif /* __bsdi__ */ - return (hdrlength); + ndo->ndo_ll_hdr_len += hdrlength; }