From: hannes Date: Thu, 22 May 2003 15:29:22 +0000 (+0000) Subject: remove some EXTRACT_ lookalikes plus misc. display cleanup X-Git-Tag: tcpdump-3.8-bp~136 X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/ee4affc8c4ca9d0640bb52f6fa15a4d3131d0fb0 remove some EXTRACT_ lookalikes plus misc. display cleanup --- diff --git a/ppp.h b/ppp.h index 839efd11..42348086 100644 --- a/ppp.h +++ b/ppp.h @@ -1,4 +1,4 @@ -/* @(#) $Header: /tcpdump/master/tcpdump/ppp.h,v 1.13 2002-09-14 13:14:04 hannes Exp $ (LBL) */ +/* @(#) $Header: /tcpdump/master/tcpdump/ppp.h,v 1.14 2003-05-22 15:29:22 hannes Exp $ (LBL) */ /* * Point to Point Protocol (PPP) RFC1331 * @@ -56,9 +56,12 @@ #define PPP_LCP 0xc021 /* Link Control Protocol */ #define PPP_PAP 0xc023 /* Password Authentication Protocol */ #define PPP_LQM 0xc025 /* Link Quality Monitoring */ +#define PPP_SPAP 0xc027 #define PPP_CHAP 0xc223 /* Challenge Handshake Authentication Protocol */ #define PPP_BACP 0xc02b /* Bandwidth Allocation Control Protocol */ #define PPP_BAP 0xc02d /* BAP */ #define PPP_MP 0xc03d /* Multi-Link */ +#define PPP_SPAP_OLD 0xc123 +#define PPP_EAP 0xc227 extern struct tok ppptype2str[]; diff --git a/print-ppp.c b/print-ppp.c index 10ce9abc..8c60baf1 100644 --- a/print-ppp.c +++ b/print-ppp.c @@ -31,7 +31,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-ppp.c,v 1.84 2003-05-22 12:02:24 hannes Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-ppp.c,v 1.85 2003-05-22 15:29:22 hannes Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -404,7 +404,7 @@ handle_ctrl_proto(u_int proto, const u_char *pptr, int length) break; printf(", Magic-Num=%08x", EXTRACT_32BITS(tptr)); tptr += 4; - printf(" OUI=%02x%02x%02x", tptr[0], tptr[1], tptr[2]); + printf(" OUI 0x%06x", EXTRACT_24BITS(tptr)); /* XXX: need to decode Kind and Value(s)? */ break; case CPCODES_CONF_REQ: @@ -508,10 +508,10 @@ print_lcp_config_options(const u_char *p, int length) switch (opt) { case LCPOPT_VEXT: if (len >= 6) { - printf(" OUI=%02x%02x%02x", p[2], p[3], p[4]); + printf(" OUI 0x%06x", EXTRACT_24BITS(p+2)); #if 0 - printf(" kind=%02x", p[5]); - printf(" val=") + printf(" kind 0x%02x", p[5]); + printf(" val 0x") for (i = 0; i < len - 6; i++) { printf("%02x", p[6 + i]); } @@ -520,46 +520,52 @@ print_lcp_config_options(const u_char *p, int length) break; case LCPOPT_MRU: if (len == 4) - printf("=%u", EXTRACT_16BITS(p + 2)); + printf(" %u", EXTRACT_16BITS(p + 2)); break; case LCPOPT_ACCM: if (len == 6) - printf("=%08x", EXTRACT_32BITS(p + 2)); + printf(" %08x", EXTRACT_32BITS(p + 2)); break; case LCPOPT_AP: if (len >= 4) { - if (p[2] == 0xc0 && p[3] == 0x23) - printf(" PAP"); - else if (p[2] == 0xc2 && p[3] == 0x23) { - printf(" CHAP/"); - switch (p[4]) { - default: - printf("unknown-algorithm-%u", p[4]); - break; - case AUTHALG_CHAPMD5: - printf("MD5"); - break; - case AUTHALG_MSCHAP1: - printf("MSCHAPv1"); - break; - case AUTHALG_MSCHAP2: - printf("MSCHAPv2"); - break; - } + switch (EXTRACT_16BITS(p+2)) { + case PPP_PAP: + printf(" PAP"); + break; + case PPP_CHAP: + printf(" CHAP"); + switch (p[4]) { + default: + printf(", unknown-algorithm-%u", p[4]); + break; + case AUTHALG_CHAPMD5: + printf(", MD5"); + break; + case AUTHALG_MSCHAP1: + printf(", MSCHAPv1"); + break; + case AUTHALG_MSCHAP2: + printf(", MSCHAPv2"); + break; } - else if (p[2] == 0xc2 && p[3] == 0x27) - printf(" EAP"); - else if (p[2] == 0xc0 && p[3] == 0x27) - printf(" SPAP"); - else if (p[2] == 0xc1 && p[3] == 0x23) - printf(" Old-SPAP"); - else - printf("unknown"); + break; + case PPP_EAP: + printf(" EAP"); + break; + case PPP_SPAP: + printf(" SPAP"); + break; + case PPP_SPAP_OLD: + printf(" Old-SPAP"); + break; + default: + printf("unknown"); + } } break; case LCPOPT_QP: if (len >= 4) { - if (p[2] == 0xc0 && p[3] == 0x25) + if (EXTRACT_16BITS(p+2) == PPP_LQM) printf(" LQR"); else printf(" unknown"); @@ -567,7 +573,7 @@ print_lcp_config_options(const u_char *p, int length) break; case LCPOPT_MN: if (len == 6) - printf("=%08x", EXTRACT_32BITS(p + 2)); + printf(" 0x%08x", EXTRACT_32BITS(p + 2)); break; case LCPOPT_PFC: break; @@ -575,7 +581,7 @@ print_lcp_config_options(const u_char *p, int length) break; case LCPOPT_LD: if (len == 4) - printf("=%04x", EXTRACT_16BITS(p + 2)); + printf(" 0x%04x", EXTRACT_16BITS(p + 2)); break; case LCPOPT_CBACK: if (len < 3) @@ -606,7 +612,7 @@ print_lcp_config_options(const u_char *p, int length) break; case LCPOPT_MLMRRU: if (len == 4) - printf("=%u", EXTRACT_16BITS(p + 2)); + printf(" %u", EXTRACT_16BITS(p + 2)); break; case LCPOPT_MLED: if (len < 3) @@ -621,12 +627,12 @@ print_lcp_config_options(const u_char *p, int length) case MEDCLASS_IPV4: if (len != 7) break; - printf(" IPv4=%s", ipaddr_string(p + 3)); + printf(" IPv4 %s", ipaddr_string(p + 3)); break; case MEDCLASS_MAC: if (len != 9) break; - printf(" MAC=%02x:%02x:%02x:%02x:%02x:%02x", + printf(" MAC %02x:%02x:%02x:%02x:%02x:%02x", p[3], p[4], p[5], p[6], p[7], p[8]); break; case MEDCLASS_MNB: @@ -714,18 +720,18 @@ handle_chap(const u_char *p, int length) p++; if (length - (p - p0) < val_size) return; - printf(", Value="); + printf(", Value "); for (i = 0; i < val_size; i++) printf("%02x", *p++); name_size = len - (p - p0); - printf(", Name="); + printf(", Name "); for (i = 0; i < name_size; i++) safeputchar(*p++); break; case CHAP_SUCC: case CHAP_FAIL: msg_size = len - (p - p0); - printf(", Msg="); + printf(", Msg "); for (i = 0; i< msg_size; i++) safeputchar(*p++); break; @@ -773,7 +779,7 @@ handle_pap(const u_char *p, int length) p++; if (length - (p - p0) < peerid_len) return; - printf(", Peer="); + printf(", Peer "); for (i = 0; i < peerid_len; i++) safeputchar(*p++); @@ -783,7 +789,7 @@ handle_pap(const u_char *p, int length) p++; if (length - (p - p0) < passwd_len) return; - printf(", Name="); + printf(", Name "); for (i = 0; i < passwd_len; i++) safeputchar(*p++); break; @@ -795,7 +801,7 @@ handle_pap(const u_char *p, int length) p++; if (length - (p - p0) < msg_len) return; - printf(", Msg="); + printf(", Msg "); for (i = 0; i< msg_len; i++) safeputchar(*p++); break; @@ -827,7 +833,7 @@ print_ipcp_config_options(const u_char *p, int length) case IPCPOPT_2ADDR: /* deprecated */ if (len != 10) goto invlen; - printf(", IP-Addrs src=%s dst=%s", + printf(", IP-Addrs src %s, dst %s", ipaddr_string(p + 2), ipaddr_string(p + 6)); break; @@ -844,32 +850,32 @@ print_ipcp_config_options(const u_char *p, int length) case IPCPOPT_ADDR: if (len != 6) goto invlen; - printf(", IP-Addr=%s", ipaddr_string(p + 2)); + printf(", IP-Addr %s", ipaddr_string(p + 2)); break; case IPCPOPT_MOBILE4: if (len != 6) goto invlen; - printf(", Home-Addr=%s", ipaddr_string(p + 2)); + printf(", Home-Addr %s", ipaddr_string(p + 2)); break; case IPCPOPT_PRIDNS: if (len != 6) goto invlen; - printf(", Pri-DNS=%s", ipaddr_string(p + 2)); + printf(", Pri-DNS %s", ipaddr_string(p + 2)); break; case IPCPOPT_PRINBNS: if (len != 6) goto invlen; - printf(", Pri-NBNS=%s", ipaddr_string(p + 2)); + printf(", Pri-NBNS %s", ipaddr_string(p + 2)); break; case IPCPOPT_SECDNS: if (len != 6) goto invlen; - printf(", Sec-DNS=%s", ipaddr_string(p + 2)); + printf(", Sec-DNS %s", ipaddr_string(p + 2)); break; case IPCPOPT_SECNBNS: if (len != 6) goto invlen; - printf(", Sec-NBNS=%s", ipaddr_string(p + 2)); + printf(", Sec-NBNS %s", ipaddr_string(p + 2)); break; default: printf(", unknown-%d", opt); @@ -937,7 +943,7 @@ print_bacp_config_options(const u_char *p, int length) return 0; if (opt == BACPOPT_FPEER) { printf(", Favored-Peer"); - printf(" Magic-Num=%08x", EXTRACT_32BITS(p + 2)); + printf(", Magic-Num 0x%08x", EXTRACT_32BITS(p + 2)); } else { printf(", unknown-option-%d", opt); } @@ -1031,7 +1037,7 @@ ppp_print(register const u_char *p, u_int length) } if (eflag) - printf("PPP-%s (0x%04x) length: %u, ", + printf("PPP-%s (0x%04x), length %u, ", tok2str(ppptype2str, "unknown", proto), proto, olen);