*/
#ifndef lint
-static const char rcsid[] =
- "@(#) $Header: /tcpdump/master/tcpdump/print-ppp.c,v 1.41 2000-08-18 07:53:35 itojun Exp $ (LBL)";
+static const char rcsid[] _U_ =
+ "@(#) $Header: /tcpdump/master/tcpdump/print-ppp.c,v 1.98 2004-07-06 22:11:17 guy Exp $ (LBL)";
#endif
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
+#include <tcpdump-stdinc.h>
-struct mbuf;
-struct rtentry;
-#include <net/if.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/if_ether.h>
-
-#include <ctype.h>
-#include <netdb.h>
-#include <pcap.h>
-#include <stdio.h>
#ifdef __bsdi__
#include <net/slcompress.h>
#include <net/if_ppp.h>
#endif
+#include <pcap.h>
+#include <stdio.h>
+#include <stdlib.h>
+
#include "interface.h"
#include "extract.h"
#include "addrtoname.h"
#include "ppp.h"
-
-/* XXX This goes somewhere else. */
-#define PPP_HDRLEN 4
+#include "chdlc.h"
+#include "ethertype.h"
+#include "oui.h"
/*
* The following constatns are defined by IANA. Please refer to
* for the up-to-date information.
*/
-/* Control Protocols (LCP/IPCP/CCP etc.) Codes */
+/* Protocol Codes defined in ppp.h */
+
+struct tok ppptype2str[] = {
+ { PPP_IP, "IP" },
+ { PPP_OSI, "OSI" },
+ { PPP_NS, "NS" },
+ { PPP_DECNET, "DECNET" },
+ { PPP_APPLE, "APPLE" },
+ { PPP_IPX, "IPX" },
+ { PPP_VJC, "VJC IP" },
+ { PPP_VJNC, "VJNC IP" },
+ { PPP_BRPDU, "BRPDU" },
+ { PPP_STII, "STII" },
+ { PPP_VINES, "VINES" },
+ { PPP_MPLS_UCAST, "MPLS" },
+ { PPP_MPLS_MCAST, "MPLS" },
+ { PPP_COMP, "Compressed"},
+
+ { PPP_HELLO, "HELLO" },
+ { PPP_LUXCOM, "LUXCOM" },
+ { PPP_SNS, "SNS" },
+ { PPP_IPCP, "IPCP" },
+ { PPP_OSICP, "OSICP" },
+ { PPP_NSCP, "NSCP" },
+ { PPP_DECNETCP, "DECNETCP" },
+ { PPP_APPLECP, "APPLECP" },
+ { PPP_IPXCP, "IPXCP" },
+ { PPP_STIICP, "STIICP" },
+ { PPP_VINESCP, "VINESCP" },
+ { PPP_MPLSCP, "MPLSCP" },
+
+ { PPP_LCP, "LCP" },
+ { PPP_PAP, "PAP" },
+ { PPP_LQM, "LQM" },
+ { PPP_CHAP, "CHAP" },
+ { PPP_BACP, "BACP" },
+ { PPP_BAP, "BAP" },
+ { PPP_MP, "ML" },
+ { 0, NULL }
+};
+
+/* Control Protocols (LCP/IPCP/CCP etc.) Codes defined in RFC 1661 */
#define CPCODES_VEXT 0 /* Vendor-Specific (RFC2153) */
#define CPCODES_CONF_REQ 1 /* Configure-Request */
#define CPCODES_ECHO_REQ 9 /* Echo-Request (LCP only) */
#define CPCODES_ECHO_RPL 10 /* Echo-Reply (LCP only) */
#define CPCODES_DISC_REQ 11 /* Discard-Request (LCP only) */
-#define CPCODES_ID 12 /* Identification (LCP only) */
-#define CPCODES_TIME_REM 13 /* Time-Remaining (LCP only) */
-#define CPCODES_RESET_REQ 14 /* Reset-Request (CCP only) */
+#define CPCODES_ID 12 /* Identification (LCP only) RFC1570 */
+#define CPCODES_TIME_REM 13 /* Time-Remaining (LCP only) RFC1570 */
+#define CPCODES_RESET_REQ 14 /* Reset-Request (CCP only) RFC1962 */
#define CPCODES_RESET_REP 15 /* Reset-Reply (CCP only) */
-#define CPCODES_MIN CPCODES_VEXT
-#define CPCODES_MAX CPCODES_RESET_REP
-
-static const char *cpcodes[] = {
- /*
- * Control Protocol code values (RFC1661)
- */
- "Vend-Ext", /* (0) RFC2153 */
- "Conf-Req", /* (1) */
- "Conf-Ack", /* (2) */
- "Conf-Nak", /* (3) */
- "Conf-Rej", /* (4) */
- "Term-Req", /* (5) */
- "Term-Ack", /* (6) */
- "Code-Rej", /* (7) */
- "Prot-Rej", /* (8) */
- "Echo-Req", /* (9) */
- "Echo-Rep", /* (10) */
- "Disc-Req", /* (11) */
- "Ident", /* (12) RFC1570 */
- "Time-Rem", /* (13) RFC1570 */
- "Reset-Req", /* (14) RFC1962 */
- "Reset-Ack", /* (15) RFC1962 */
+struct tok cpcodes[] = {
+ {CPCODES_VEXT, "Vendor-Extension"}, /* RFC2153 */
+ {CPCODES_CONF_REQ, "Conf-Request"},
+ {CPCODES_CONF_ACK, "Conf-Ack"},
+ {CPCODES_CONF_NAK, "Conf-Nack"},
+ {CPCODES_CONF_REJ, "Conf-Reject"},
+ {CPCODES_TERM_REQ, "Term-Request"},
+ {CPCODES_TERM_ACK, "Term-Ack"},
+ {CPCODES_CODE_REJ, "Code-Reject"},
+ {CPCODES_PROT_REJ, "Prot-Reject"},
+ {CPCODES_ECHO_REQ, "Echo-Request"},
+ {CPCODES_ECHO_RPL, "Echo-Reply"},
+ {CPCODES_DISC_REQ, "Disc-Req"},
+ {CPCODES_ID, "Ident"}, /* RFC1570 */
+ {CPCODES_TIME_REM, "Time-Rem"}, /* RFC1570 */
+ {CPCODES_RESET_REQ, "Reset-Req"}, /* RFC1962 */
+ {CPCODES_RESET_REP, "Reset-Ack"}, /* RFC1962 */
+ {0, NULL}
};
/* LCP Config Options */
static const char *lcpconfopts[] = {
"Vend-Ext", /* (0) */
- "MRU", /* (1) */
+ "MRU", /* (1) */
"ACCM", /* (2) */
"Auth-Prot", /* (3) */
"Qual-Prot", /* (4) */
static const char *ccpconfopts[] = {
"OUI", /* (0) */
- "Pred-1", /* (1) */
+ "Pred-1", /* (1) */
"Pred-2", /* (2) */
"Puddle", /* (3) */
"unassigned(4)", /* (4) */
/* BVCP - to be supported */
/* BCP - to be supported */
/* IPXCP - to be supported */
+/* MPLSCP - to be supported */
/* Auth Algorithms */
#define BAP_CSIND 7
#define BAP_CSRES 8
-static const char *ppp_protoname __P((u_int proto));
-static void handle_ctrl_proto __P((u_int proto,const u_char *p, int length));
-static void handle_chap __P((const u_char *p, int length));
-static void handle_pap __P((const u_char *p, int length));
-static void handle_bap __P((const u_char *p, int length));
-static int print_lcp_config_options __P((const u_char *p));
-static int print_ipcp_config_options __P((const u_char *p));
-static int print_ccp_config_options __P((const u_char *p));
-static int print_bacp_config_options __P((const u_char *p));
-static void handle_ppp __P((u_int proto, const u_char *p, int length));
-
-static const char *
-ppp_protoname(u_int proto)
-{
- static char buf[20];
-
- switch (proto) {
- case PPP_IP: return "IP";
-#ifdef PPP_XNS
- case PPP_XNS: return "XNS";
-#endif
-#ifdef PPP_IPX
- case PPP_IPX: return "IPX";
-#endif
-#ifdef PPP_COMP
- case PPP_COMP: return "COMP";
-#endif
-#ifdef PPP_IPCP
- case PPP_IPCP: return "IPCP";
-#endif
-#ifdef PPP_IPV6CP
- case PPP_IPV6CP: return "IPV6CP";
-#endif
-#ifdef PPP_IPXCP
- case PPP_IPXCP: return "IPXCP";
-#endif
-#ifdef PPP_CCP
- case PPP_CCP: return "CCP";
-#endif
-#ifdef PPP_LCP
- case PPP_LCP: return "LCP";
-#endif
-#ifdef PPP_PAP
- case PPP_PAP: return "PAP";
-#endif
-#ifdef PPP_LQR
- case PPP_LQR: return "LQR";
-#endif
-#ifdef PPP_CHAP
- case PPP_CHAP: return "CHAP";
-#endif
-#ifdef PPP_BACP
- case PPP_BACP: return "BACP";
-#endif
-#ifdef PPP_BAP
- case PPP_BAP: return "BAP";
-#endif
- default:
- snprintf(buf, sizeof(buf), "unknown-0x%04x", proto);
- return buf;
- }
-}
+static void handle_ctrl_proto (u_int proto,const u_char *p, int length);
+static void handle_chap (const u_char *p, int length);
+static void handle_pap (const u_char *p, int length);
+static void handle_bap (const u_char *p, int length);
+static int print_lcp_config_options (const u_char *p, int);
+static int print_ipcp_config_options (const u_char *p, int);
+static int print_ccp_config_options (const u_char *p, int);
+static int print_bacp_config_options (const u_char *p, int);
+static void handle_ppp (u_int proto, const u_char *p, int length);
+static void ppp_hdlc(const u_char *p, int length);
/* generic Control Protocol (e.g. LCP, IPCP, CCP, etc.) handler */
static void
-handle_ctrl_proto(u_int proto, const u_char *p, int length)
+handle_ctrl_proto(u_int proto, const u_char *pptr, int length)
{
+ const char *typestr;
u_int code, len;
- int (*pfunc)();
+ int (*pfunc)(const u_char *, int);
int x, j;
+ const u_char *tptr;
- code = *p;
- if ((code >= CPCODES_MIN) && (code <= CPCODES_MAX))
- printf("%s", cpcodes[code]);
- else {
- printf("0x%02x", code);
- return;
- }
- p++;
+ tptr=pptr;
- printf("(%u)", *p); /* ID */
- p++;
+ typestr = tok2str(ppptype2str, "unknown", proto);
+ printf("%s, ",typestr);
- len = EXTRACT_16BITS(p);
- p += 2;
+ if (length < 4) /* FIXME weak boundary checking */
+ goto trunc;
+ TCHECK2(*tptr, 2);
- if (len <= 4) {
- return; /* there may be a NULL confreq etc.*/
- }
+ code = *tptr++;
+ printf("%s (0x%02x), id %u",
+ tok2str(cpcodes, "Unknown Opcode",code),
+ code,
+ *tptr++); /* ID */
+
+ TCHECK2(*tptr, 2);
+ len = EXTRACT_16BITS(tptr);
+ tptr += 2;
+
+ if (length <= 4)
+ return; /* there may be a NULL confreq etc. */
+
switch (code) {
case CPCODES_VEXT:
- printf(", Magic-Num=%08x", EXTRACT_32BITS(p));
- p += 4;
- printf(" OUI=%02x%02x%02x", p[0], p[1], p[2]);
+ if (length < 11)
+ break;
+ TCHECK2(*tptr, 4);
+ printf(", Magic-Num 0x%08x", EXTRACT_32BITS(tptr));
+ tptr += 4;
+ TCHECK2(*tptr, 3);
+ printf(" Vendor: %s (%u)",
+ tok2str(oui_values,"Unknown",EXTRACT_24BITS(tptr)),
+ EXTRACT_24BITS(tptr));
/* XXX: need to decode Kind and Value(s)? */
break;
case CPCODES_CONF_REQ:
case PPP_BACP:
pfunc = print_bacp_config_options;
break;
+ default:
+ /*
+ * This should never happen, but we set
+ * "pfunc" to squelch uninitialized
+ * variable warnings from compilers.
+ */
+ pfunc = NULL;
+ break;
}
- if ((j = (*pfunc)(p)) == 0)
+ if ((j = (*pfunc)(tptr, len)) == 0)
break;
x -= j;
- p += j;
+ tptr += j;
} while (x > 0);
break;
/* XXX: need to decode Rejected-Packet? */
break;
case CPCODES_PROT_REJ:
- printf(", Rejected-Protocol=%04x", EXTRACT_16BITS(p));
+ if (length < 6)
+ break;
+ TCHECK2(*tptr, 2);
+ printf(", Rejected %s Protocol (0x%04x)",
+ tok2str(ppptype2str,"unknown", EXTRACT_16BITS(tptr)),
+ EXTRACT_16BITS(tptr));
/* XXX: need to decode Rejected-Information? */
break;
case CPCODES_ECHO_REQ:
case CPCODES_ECHO_RPL:
case CPCODES_DISC_REQ:
case CPCODES_ID:
- printf(", Magic-Num=%08x", EXTRACT_32BITS(p));
+ if (length < 8)
+ break;
+ TCHECK2(*tptr, 4);
+ printf(", Magic-Num 0x%08x", EXTRACT_32BITS(tptr));
/* XXX: need to decode Data? */
break;
case CPCODES_TIME_REM:
- printf(", Magic-Num=%08x", EXTRACT_32BITS(p));
- printf(" Seconds-Remaining=%u", EXTRACT_32BITS(p + 4));
+ if (length < 12)
+ break;
+ TCHECK2(*tptr, 4);
+ printf(", Magic-Num 0x%08x", EXTRACT_32BITS(tptr));
+ TCHECK2(*(tptr + 4), 4);
+ printf(", Seconds-Remaining %us", EXTRACT_32BITS(tptr + 4));
/* XXX: need to decode Message? */
break;
default:
- printf(", unknown-Codes-0x%02x", code);
+ /* XXX this is dirty but we do not get the
+ * original pointer passed to the begin
+ * the PPP packet */
+ if (vflag <= 1)
+ print_unknown_data(pptr-2,"\n\t",length+2);
break;
}
+ printf(", length %u", length);
+
+ if (vflag >1)
+ print_unknown_data(pptr-2,"\n\t",length+2);
+ return;
+
+trunc:
+ printf("[|%s]", typestr);
}
/* LCP config options */
static int
-print_lcp_config_options(const u_char *p)
+print_lcp_config_options(const u_char *p, int length)
{
- int len = p[1];
- int opt = p[0];
- int i;
-
+ int len, opt;
+
+ if (length < 2)
+ return 0;
+ TCHECK2(*p, 2);
+ len = p[1];
+ opt = p[0];
+ if (length < len)
+ return 0;
if ((opt >= LCPOPT_MIN) && (opt <= LCPOPT_MAX))
- printf(", %s", lcpconfopts[opt]);
+ printf(", %s (%u)", lcpconfopts[opt],opt);
+ else {
+ printf(", unknown LCP option 0x%02x", opt);
+ return len;
+ }
switch (opt) {
case LCPOPT_VEXT:
if (len >= 6) {
- printf(" OUI=%02x%02x%02x", p[2], p[3], p[4]);
-#if 0
- printf(" kind=%02x", p[5]);
- printf(" val=")
+ TCHECK2(*(p + 2), 3);
+ printf(" Vendor: %s (%u)",
+ tok2str(oui_values,"Unknown",EXTRACT_24BITS(p+2)),
+ EXTRACT_24BITS(p+2));
+#if 0
+ TCHECK(p[5]);
+ printf(", kind: 0x%02x", p[5]);
+ printf(", Value: 0x")
for (i = 0; i < len - 6; i++) {
+ TCHECK(p[6 + i]);
printf("%02x", p[6 + i]);
}
#endif
}
break;
case LCPOPT_MRU:
- if (len == 4)
- printf("=%u", EXTRACT_16BITS(p + 2));
+ if (len == 4) {
+ TCHECK2(*(p + 2), 2);
+ printf(" %u", EXTRACT_16BITS(p + 2));
+ }
break;
case LCPOPT_ACCM:
- if (len == 6)
- printf("=%08x", EXTRACT_32BITS(p + 2));
+ if (len == 6) {
+ TCHECK2(*(p + 2), 4);
+ printf(" 0x%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;
- }
+ TCHECK2(*(p + 2), 2);
+ switch (EXTRACT_16BITS(p+2)) {
+ case PPP_PAP:
+ printf(" PAP");
+ break;
+ case PPP_CHAP:
+ printf(" CHAP");
+ TCHECK(p[4]);
+ 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)
+ TCHECK2(*(p + 2), 2);
+ if (EXTRACT_16BITS(p+2) == PPP_LQM)
printf(" LQR");
else
printf(" unknown");
}
break;
case LCPOPT_MN:
- if (len == 6)
- printf("=%08x", EXTRACT_32BITS(p + 2));
+ if (len == 6) {
+ TCHECK2(*(p + 2), 4);
+ printf(" 0x%08x", EXTRACT_32BITS(p + 2));
+ }
break;
case LCPOPT_PFC:
break;
case LCPOPT_ACFC:
break;
case LCPOPT_LD:
- if (len == 4)
- printf("=%04x", EXTRACT_16BITS(p + 2));
+ if (len == 4) {
+ TCHECK2(*(p + 2), 2);
+ printf(" 0x%04x", EXTRACT_16BITS(p + 2));
+ }
break;
case LCPOPT_CBACK:
+ if (len < 3)
+ break;
+ TCHECK(p[2]);
switch (p[2]) { /* Operation */
case CALLBACK_AUTH:
printf(" UserAuth");
}
break;
case LCPOPT_MLMRRU:
- if (len == 4)
- printf("=%u", EXTRACT_16BITS(p + 2));
+ if (len == 4) {
+ TCHECK2(*(p + 2), 2);
+ printf(" %u", EXTRACT_16BITS(p + 2));
+ }
break;
case LCPOPT_MLED:
+ if (len < 3)
+ break;
+ TCHECK(p[2]);
switch (p[2]) { /* class */
case MEDCLASS_NULL:
printf(" Null");
printf(" Local"); /* XXX */
break;
case MEDCLASS_IPV4:
- printf(" IPv4=%s", ipaddr_string(p + 3));
+ if (len != 7)
+ break;
+ TCHECK2(*(p + 3), 4);
+ printf(" IPv4 %s", ipaddr_string(p + 3));
break;
case MEDCLASS_MAC:
- printf(" MAC=%02x:%02x:%02x:%02x:%02x:%02x",
+ if (len != 9)
+ break;
+ TCHECK(p[8]);
+ printf(" MAC %02x:%02x:%02x:%02x:%02x:%02x",
p[3], p[4], p[5], p[6], p[7], p[8]);
break;
case MEDCLASS_MNB:
#endif
}
return len;
+
+trunc:
+ printf("[|lcp]");
+ return 0;
}
/* CHAP */
handle_chap(const u_char *p, int length)
{
u_int code, len;
- int val_size, name_size, msg_size;
+ int val_size, name_size, msg_size;
+ const u_char *p0;
int i;
+ p0 = p;
+ if (length < 1) {
+ printf("[|chap]");
+ return;
+ } else if (length < 4) {
+ TCHECK(*p);
+ printf("[|chap 0x%02x]", *p);
+ return;
+ }
+
+ TCHECK(*p);
code = *p;
if ((code >= CHAP_CODEMIN) && (code <= CHAP_CODEMAX))
printf("%s", chapcode[code - 1]);
}
p++;
+ TCHECK(*p);
printf("(%u)", *p); /* ID */
p++;
+ TCHECK2(*p, 2);
len = EXTRACT_16BITS(p);
p += 2;
switch (code) {
case CHAP_CHAL:
case CHAP_RESP:
+ if (length - (p - p0) < 1)
+ return;
+ TCHECK(*p);
val_size = *p; /* value size */
p++;
- printf(", Value=");
- for (i = 0; i < val_size; i++)
+ if (length - (p - p0) < val_size)
+ return;
+ printf(", Value ");
+ for (i = 0; i < val_size; i++) {
+ TCHECK(*p);
printf("%02x", *p++);
- name_size = len - val_size - 5;
- printf(", Name=");
+ }
+ name_size = len - (p - p0);
+ printf(", Name ");
for (i = 0; i < name_size; i++) {
- if (isprint(*p))
- printf("%c", *p);
- else
- printf("\\%03o", *p);
- p++;
+ TCHECK(*p);
+ safeputchar(*p++);
}
break;
case CHAP_SUCC:
case CHAP_FAIL:
- msg_size = len - 4;
- printf(", Msg=");
+ msg_size = len - (p - p0);
+ printf(", Msg ");
for (i = 0; i< msg_size; i++) {
- if (isprint(*p))
- printf("%c", *p);
- else
- printf("\\%03o", *p);
- p++;
+ TCHECK(*p);
+ safeputchar(*p++);
}
break;
}
+ return;
+
+trunc:
+ printf("[|chap]");
}
-/* PAP */
+/* PAP (see RFC 1334) */
static void
handle_pap(const u_char *p, int length)
{
u_int code, len;
- int peerid_len, passwd_len, msg_len;
+ int peerid_len, passwd_len, msg_len;
+ const u_char *p0;
int i;
+ p0 = p;
+ if (length < 1) {
+ printf("[|pap]");
+ return;
+ } else if (length < 4) {
+ TCHECK(*p);
+ printf("[|pap 0x%02x]", *p);
+ return;
+ }
+
+ TCHECK(*p);
code = *p;
if ((code >= PAP_CODEMIN) && (code <= PAP_CODEMAX))
printf("%s", papcode[code - 1]);
}
p++;
+ TCHECK(*p);
printf("(%u)", *p); /* ID */
p++;
+ TCHECK2(*p, 2);
len = EXTRACT_16BITS(p);
p += 2;
switch (code) {
case PAP_AREQ:
+ if (length - (p - p0) < 1)
+ return;
+ TCHECK(*p);
peerid_len = *p; /* Peer-ID Length */
p++;
- printf(", Peer=");
+ if (length - (p - p0) < peerid_len)
+ return;
+ printf(", Peer ");
for (i = 0; i < peerid_len; i++) {
- if (isprint(*p))
- printf("%c", *p);
- else
- printf("\\%03o", *p);
- p++;
+ TCHECK(*p);
+ safeputchar(*p++);
}
+
+ if (length - (p - p0) < 1)
+ return;
+ TCHECK(*p);
passwd_len = *p; /* Password Length */
p++;
- printf(", Name=");
+ if (length - (p - p0) < passwd_len)
+ return;
+ printf(", Name ");
for (i = 0; i < passwd_len; i++) {
- if (isprint(*p))
- printf("%c", *p);
- else
- printf("\\%03o", *p);
- p++;
+ TCHECK(*p);
+ safeputchar(*p++);
}
break;
case PAP_AACK:
case PAP_ANAK:
+ if (length - (p - p0) < 1)
+ return;
+ TCHECK(*p);
msg_len = *p; /* Msg-Length */
p++;
- printf(", Msg=");
+ if (length - (p - p0) < msg_len)
+ return;
+ printf(", Msg ");
for (i = 0; i< msg_len; i++) {
- if (isprint(*p))
- printf("%c", *p);
- else
- printf("\\%03o", *p);
- p++;
+ TCHECK(*p);
+ safeputchar(*p++);
}
break;
}
+ return;
+
+trunc:
+ printf("[|pap]");
}
/* BAP */
static void
-handle_bap(const u_char *p, int length)
+handle_bap(const u_char *p _U_, int length _U_)
{
/* XXX: to be supported!! */
}
/* IPCP config options */
static int
-print_ipcp_config_options(const u_char *p)
+print_ipcp_config_options(const u_char *p, int length)
{
- int len = p[1];
- int opt = p[0];
-
+ int len, opt;
+
+ if (length < 2)
+ return 0;
+ TCHECK2(*p, 2);
+ len = p[1];
+ opt = p[0];
+ if (length < len)
+ return 0;
switch (opt) {
case IPCPOPT_2ADDR: /* deprecated */
- printf(", IP-Addrs src=%s dst=%s",
+ if (len != 10)
+ goto invlen;
+ TCHECK2(*(p + 6), 4);
+ printf(", IP-Addrs src %s, dst %s",
ipaddr_string(p + 2),
ipaddr_string(p + 6));
- break;
+ break;
case IPCPOPT_IPCOMP:
+ if (len < 4)
+ goto invlen;
printf(", IP-Comp");
+ TCHECK2(*(p + 2), 2);
if (EXTRACT_16BITS(p + 2) == PPP_VJC) {
printf(" VJ-Comp");
/* XXX: VJ-Comp parameters should be decoded */
printf(" unknown-comp-proto=%04x", EXTRACT_16BITS(p + 2));
break;
case IPCPOPT_ADDR:
- printf(", IP-Addr=%s", ipaddr_string(p + 2));
+ if (len != 6)
+ goto invlen;
+ TCHECK2(*(p + 2), 4);
+ printf(", IP-Addr %s", ipaddr_string(p + 2));
break;
case IPCPOPT_MOBILE4:
- printf(", Home-Addr=%s", ipaddr_string(p + 2));
+ if (len != 6)
+ goto invlen;
+ TCHECK2(*(p + 2), 4);
+ printf(", Home-Addr %s", ipaddr_string(p + 2));
break;
case IPCPOPT_PRIDNS:
- printf(", Pri-DNS=%s", ipaddr_string(p + 2));
+ if (len != 6)
+ goto invlen;
+ TCHECK2(*(p + 2), 4);
+ printf(", Pri-DNS %s", ipaddr_string(p + 2));
break;
case IPCPOPT_PRINBNS:
- printf(", Pri-NBNS=%s", ipaddr_string(p + 2));
+ if (len != 6)
+ goto invlen;
+ TCHECK2(*(p + 2), 4);
+ printf(", Pri-NBNS %s", ipaddr_string(p + 2));
break;
case IPCPOPT_SECDNS:
- printf(", Sec-DNS=%s", ipaddr_string(p + 2));
+ if (len != 6)
+ goto invlen;
+ TCHECK2(*(p + 2), 4);
+ printf(", Sec-DNS %s", ipaddr_string(p + 2));
break;
case IPCPOPT_SECNBNS:
- printf(", Sec-NBNS=%s", ipaddr_string(p + 2));
+ if (len != 6)
+ goto invlen;
+ TCHECK2(*(p + 2), 4);
+ printf(", Sec-NBNS %s", ipaddr_string(p + 2));
break;
default:
printf(", unknown-%d", opt);
break;
}
return len;
+
+invlen:
+ printf(", invalid-length-%d", opt);
+ return 0;
+
+trunc:
+ printf("[|ipcp]");
+ return 0;
}
/* CCP config options */
static int
-print_ccp_config_options(const u_char *p)
+print_ccp_config_options(const u_char *p, int length)
{
- int len = p[1];
- int opt = p[0];
-
+ int len, opt;
+
+ if (length < 2)
+ return 0;
+ TCHECK2(*p, 2);
+ len = p[1];
+ opt = p[0];
+ if (length < len)
+ return 0;
if ((opt >= CCPOPT_MIN) && (opt <= CCPOPT_MAX))
printf(", %s", ccpconfopts[opt]);
#if 0 /* XXX */
}
#endif
return len;
+
+trunc:
+ printf("[|ccp]");
+ return 0;
}
/* BACP config options */
static int
-print_bacp_config_options(const u_char *p)
+print_bacp_config_options(const u_char *p, int length)
{
- int len = p[1];
- int opt = p[0];
-
+ int len, opt;
+
+ if (length < 2)
+ return 0;
+ TCHECK2(*p, 2);
+ len = p[1];
+ opt = p[0];
+ if (length < len)
+ return 0;
if (opt == BACPOPT_FPEER) {
+ TCHECK2(*(p + 2), 4);
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);
}
return len;
+
+trunc:
+ printf("[|bacp]");
+ return 0;
+}
+
+
+static void
+ppp_hdlc(const u_char *p, int length)
+{
+ u_char *b, *s, *t, c;
+ int i, proto;
+ const void *se;
+
+ b = (u_int8_t *)malloc(length);
+ if (b == NULL)
+ return;
+
+ /*
+ * Unescape all the data into a temporary, private, buffer.
+ * Do this so that we dont overwrite the original packet
+ * contents.
+ */
+ for (s = (u_char *)p, t = b, i = length; i > 0; i--) {
+ c = *s++;
+ if (c == 0x7d) {
+ if (i > 1) {
+ i--;
+ c = *s++ ^ 0x20;
+ } else
+ continue;
+ }
+ *t++ = c;
+ }
+
+ se = snapend;
+ snapend = t;
+
+ /* now lets guess about the payload codepoint format */
+ proto = *b; /* start with a one-octet codepoint guess */
+
+ switch (proto) {
+ case PPP_IP:
+ ip_print(b+1, t - b - 1);
+ goto cleanup;
+#ifdef INET6
+ case PPP_IPV6:
+ ip6_print(b+1, t - b - 1);
+ goto cleanup;
+#endif
+ default: /* no luck - try next guess */
+ break;
+ }
+
+ proto = EXTRACT_16BITS(b); /* next guess - load two octets */
+
+ switch (proto) {
+ case 0xff03: /* looks like a PPP frame */
+ proto = EXTRACT_16BITS(b+2); /* load the PPP proto-id */
+ handle_ppp(proto, b+4, t - b - 4);
+ break;
+ default: /* last guess - proto must be a PPP proto-id */
+ handle_ppp(proto, b+2, t - b - 2);
+ break;
+ }
+
+cleanup:
+ snapend = se;
+ free(b);
+ return;
}
static void
handle_ppp(u_int proto, const u_char *p, int length)
{
+ if ((proto & 0xff00) == 0x7e00) {/* is this an escape code ? */
+ ppp_hdlc(p-1, length);
+ return;
+ }
+
switch (proto) {
case PPP_LCP:
case PPP_IPCP:
+ case PPP_OSICP:
+ case PPP_MPLSCP:
+ case PPP_IPV6CP:
case PPP_CCP:
case PPP_BACP:
handle_ctrl_proto(proto, p, length);
handle_bap(p, length);
break;
case ETHERTYPE_IP: /*XXX*/
+ case PPP_VJNC:
case PPP_IP:
ip_print(p, length);
break;
ip6_print(p, length);
break;
#endif
+ case ETHERTYPE_IPX: /*XXX*/
+ case PPP_IPX:
+ ipx_print(p, length);
+ break;
+ case PPP_OSI:
+ isoclns_print(p, length, length);
+ break;
+ case PPP_MPLS_UCAST:
+ case PPP_MPLS_MCAST:
+ mpls_print(p, length);
+ break;
+ case PPP_COMP:
+ printf("compressed PPP data");
+ break;
+ default:
+ printf("%s ", tok2str(ppptype2str, "unknown PPP protocol (0x%04x)", proto));
+ print_unknown_data(p,"\n\t",length);
+ break;
}
}
/* Standard PPP printer */
-void
+u_int
ppp_print(register const u_char *p, u_int length)
{
u_int proto;
+ u_int olen = length; /* _o_riginal length */
+ u_int hdr_len = 0;
/*
* Here, we assume that p points to the Address and Control
* field (if they present).
*/
+ if (length < 2)
+ goto trunc;
+ TCHECK2(*p, 2);
if (*p == PPP_ADDRESS && *(p + 1) == PPP_CONTROL) {
p += 2; /* ACFC not used */
length -= 2;
+ hdr_len += 2;
}
-
+
+ if (length < 2)
+ goto trunc;
+ TCHECK(*p);
if (*p % 2) {
proto = *p; /* PFC is used */
p++;
length--;
+ hdr_len++;
} else {
+ TCHECK2(*p, 2);
proto = EXTRACT_16BITS(p);
p += 2;
length -= 2;
+ hdr_len += 2;
}
- printf("%s: ", ppp_protoname(proto));
+ if (eflag)
+ printf("%s (0x%04x), length %u: ",
+ tok2str(ppptype2str, "unknown", proto),
+ proto,
+ olen);
handle_ppp(proto, p, length);
+ return (hdr_len);
+trunc:
+ printf("[|ppp]");
+ return (0);
}
/* PPP I/F printer */
-void
-ppp_if_print(u_char *user, const struct pcap_pkthdr *h,
- register const u_char *p)
+u_int
+ppp_if_print(const struct pcap_pkthdr *h, register const u_char *p)
{
register u_int length = h->len;
register u_int caplen = h->caplen;
- const struct ip *ip;
- u_int proto;
-
- ts_print(&h->ts);
if (caplen < PPP_HDRLEN) {
printf("[|ppp]");
- goto out;
+ return (caplen);
}
-
- /*
- * Some printers want to get back at the link level addresses,
- * and/or check that they're not walking off the end of the packet.
- * Rather than pass them all the way down, we set these globals. */
-
- packetp = p;
- snapend = p + caplen;
#if 0
/*
* actual PPP frame. The 1st octet looks like Input/Output flag
* while 2nd octet is unknown, at least to me
+ *
+ * That was what the original tcpdump code did.
+ *
+ * FreeBSD's "if_ppp.c" *does* set the first octet to 1 for outbound
+ * packets and 0 for inbound packets - but only if the
+ * protocol field has the 0x8000 bit set (i.e., it's a network
+ * control protocol); it does so before running the packet through
+ * "bpf_filter" to see if it should be discarded, and to see
+ * if we should update the time we sent the most recent packet...
+ *
+ * ...but it puts the original address field back after doing
+ * so.
+ *
+ * NetBSD's "if_ppp.c" doesn't set the first octet in that fashion.
+ *
+ * I don't know if any PPP implementation handed up to a BPF
+ * device packets with the first octet being 1 for outbound and
+ * whether that ever needs to be checked or not.
+ *
+ * Note that NetBSD has a DLT_PPP_SERIAL, which it uses for PPP,
+ * and its tcpdump appears to assume that the frame always
+ * begins with an address field and a control field, and that
+ * the address field might be 0x0f or 0x8f, for Cisco
+ * point-to-point with HDLC framing as per section 4.3.1 of RFC
+ * 1547, as well as 0xff, for PPP in HDLC-like framing as per
+ * RFC 1662.
+ *
+ * (Is the Cisco framing in question what DLT_C_HDLC, in
+ * BSD/OS, is?)
*/
if (eflag)
printf("%c %4d %02x ", p[0] ? 'O' : 'I', length, p[1]);
ppp_print(p, length);
- if (xflag)
- default_print(p, caplen);
-out:
- putchar('\n');
+ return (0);
}
+/*
+ * PPP I/F printer to use if we know that RFC 1662-style PPP in HDLC-like
+ * framing, or Cisco PPP with HDLC framing as per section 4.3.1 of RFC 1547,
+ * is being used (i.e., we don't check for PPP_ADDRESS and PPP_CONTROL,
+ * discard them *if* those are the first two octets, and parse the remaining
+ * packet as a PPP packet, as "ppp_print()" does).
+ *
+ * This handles, for example, DLT_PPP_SERIAL in NetBSD.
+ */
+u_int
+ppp_hdlc_if_print(const struct pcap_pkthdr *h, register const u_char *p)
+{
+ register u_int length = h->len;
+ register u_int caplen = h->caplen;
+ u_int proto;
+ u_int hdrlen = 0;
+ if (caplen < 2) {
+ printf("[|ppp]");
+ return (caplen);
+ }
-struct tok ppptype2str[] = {
- { PPP_IP, "IP" },
- { PPP_OSI, "OSI" },
- { PPP_NS, "NS" },
- { PPP_DECNET, "DECNET" },
- { PPP_APPLE, "APPLE" },
- { PPP_IPX, "IPX" },
- { PPP_VJC, "VJC" },
- { PPP_VJNC, "VJNC" },
- { PPP_BRPDU, "BRPDU" },
- { PPP_STII, "STII" },
- { PPP_VINES, "VINES" },
-
- { PPP_HELLO, "HELLO" },
- { PPP_LUXCOM, "LUXCOM" },
- { PPP_SNS, "SNS" },
- { PPP_IPCP, "IPCP" },
- { PPP_OSICP, "OSICP" },
- { PPP_NSCP, "NSCP" },
- { PPP_DECNETCP, "DECNETCP" },
- { PPP_APPLECP, "APPLECP" },
- { PPP_IPXCP, "IPXCP" },
- { PPP_STIICP, "STIICP" },
- { PPP_VINESCP, "VINESCP" },
-
- { PPP_LCP, "LCP" },
- { PPP_PAP, "PAP" },
- { PPP_LQM, "LQM" },
- { PPP_CHAP, "CHAP" },
- { PPP_BACP, "BACP" },
- { PPP_BAP, "BAP" },
- { PPP_MP, "MP" },
- { 0, NULL }
-};
+ switch (p[0]) {
+
+ case PPP_ADDRESS:
+ if (caplen < 4) {
+ printf("[|ppp]");
+ return (caplen);
+ }
+
+ if (eflag)
+ printf("%02x %02x %d ", p[0], p[1], length);
+ p += 2;
+ length -= 2;
+ hdrlen += 2;
+
+ proto = EXTRACT_16BITS(p);
+ p += 2;
+ length -= 2;
+ hdrlen += 2;
+ printf("%s: ", tok2str(ppptype2str, "unknown PPP protocol (0x%04x)", proto));
+
+ handle_ppp(proto, p, length);
+ break;
+
+ case CHDLC_UNICAST:
+ case CHDLC_BCAST:
+ return (chdlc_if_print(h, p));
+
+ default:
+ if (eflag)
+ printf("%02x %02x %d ", p[0], p[1], length);
+ p += 2;
+ length -= 2;
+ hdrlen += 2;
+
+ /*
+ * XXX - NetBSD's "ppp_netbsd_serial_if_print()" treats
+ * the next two octets as an Ethernet type; does that
+ * ever happen?
+ */
+ printf("unknown addr %02x; ctrl %02x", p[0], p[1]);
+ break;
+ }
+
+ return (hdrlen);
+}
#define PPP_BSDI_HDRLEN 24
/* BSD/OS specific PPP printer */
-void
-ppp_bsdos_if_print(u_char *user, const struct pcap_pkthdr *h,
- register const u_char *p)
+u_int
+ppp_bsdos_if_print(const struct pcap_pkthdr *h _U_, register const u_char *p _U_)
{
+ register int hdrlength;
#ifdef __bsdi__
register u_int length = h->len;
register u_int caplen = h->caplen;
- register int hdrlength;
u_int16_t ptype;
const u_char *q;
int i;
- ts_print(&h->ts);
-
if (caplen < PPP_BSDI_HDRLEN) {
printf("[|ppp]");
- goto out;
+ return (caplen)
}
- /*
- * Some printers want to get back at the link level addresses,
- * and/or check that they're not walking off the end of the packet.
- * Rather than pass them all the way down, we set these globals.
- */
- packetp = p;
- snapend = p + caplen;
hdrlength = 0;
#if 0
printf("] ");
}
}
- if (eflag)
- printf("%d ", length);
}
+ if (eflag)
+ printf("%d ", length);
if (p[SLC_CHL]) {
q = p + SLC_BPFHDRLEN + p[SLC_LLHL];
switch (ptype) {
case PPP_VJC:
- ptype = vjc_print(q, length - (q - p), ptype);
+ ptype = vjc_print(q, ptype);
hdrlength = PPP_BSDI_HDRLEN;
p += hdrlength;
switch (ptype) {
ip6_print(p, length);
break;
#endif
+ case PPP_MPLS_UCAST:
+ case PPP_MPLS_MCAST:
+ mpls_print(p, length);
+ break;
}
goto printx;
case PPP_VJNC:
- ptype = vjc_print(q, length - (q - p), ptype);
+ ptype = vjc_print(q, ptype);
hdrlength = PPP_BSDI_HDRLEN;
p += hdrlength;
switch (ptype) {
ip6_print(p, length);
break;
#endif
+ case PPP_MPLS_UCAST:
+ case PPP_MPLS_MCAST:
+ mpls_print(p, length);
+ break;
}
goto printx;
default:
ip6_print(p, length);
break;
#endif
+ case PPP_MPLS_UCAST:
+ case PPP_MPLS_MCAST:
+ mpls_print(p, length);
+ break;
default:
- printf("%s ", tok2str(ppptype2str, "proto-#%d", ptype));
+ printf("%s ", tok2str(ppptype2str, "unknown PPP protocol (0x%04x)", ptype));
}
printx:
- if (xflag)
- default_print((const u_char *)p, caplen - hdrlength);
-out:
- putchar('\n');
+#else /* __bsdi */
+ hdrlength = 0;
#endif /* __bsdi__ */
+ return (hdrlength);
}
projects / tcpdump / blobdiff