The Tcpdump Group git mirrors - tcpdump/blobdiff

* complete PPP support.

*/

* complete PPP support.

*/

+/* \summary: Point to Point Protocol (PPP) printer */

+

/*

* TODO:

* o resolve XXX as much as possible

/*

* TODO:

* o resolve XXX as much as possible

*/

#ifdef HAVE_CONFIG_H

*/

#ifdef HAVE_CONFIG_H

-#include "config.h"

+#include <config.h>

#endif

-#include <tcpdump-stdinc.h>

+#include "netdissect-stdinc.h"

#ifdef __bsdi__

#include <net/slcompress.h>

#include <net/if_ppp.h>

#endif

#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 "netdissect.h"

#include "extract.h"

#include "addrtoname.h"

#include "ppp.h"

#include "chdlc.h"

#include "ethertype.h"

#include "oui.h"

#include "extract.h"

#include "addrtoname.h"

#include "ppp.h"

#include "chdlc.h"

#include "ethertype.h"

#include "oui.h"

+#include "netdissect-alloc.h"

/*

- * The following constatns are defined by IANA. Please refer to

- * http://www.isi.edu/in-notes/iana/assignments/ppp-numbers

+ * The following constants are defined by IANA. Please refer to

+ * https://www.isi.edu/in-notes/iana/assignments/ppp-numbers

* for the up-to-date information.

*/

* for the up-to-date information.

*/

{ PPP_BACP, "BACP" },

{ PPP_BAP, "BAP" },

{ PPP_MPCP, "MLPPP-CP" },

{ PPP_BACP, "BACP" },

{ PPP_BAP, "BAP" },

{ PPP_MPCP, "MLPPP-CP" },

+ { PPP_CCP, "CCP" },

{ 0, NULL }

};

{ 0, NULL }

};

#define LCPOPT_SDLOS 29

#define LCPOPT_PPPMUX 30

#define LCPOPT_SDLOS 29

#define LCPOPT_PPPMUX 30

-#define LCPOPT_MIN LCPOPT_VEXT

-#define LCPOPT_MAX LCPOPT_PPPMUX

-

static const char *lcpconfopts[] = {

"Vend-Ext", /* (0) */

"MRU", /* (1) */

static const char *lcpconfopts[] = {

"Vend-Ext", /* (0) */

"MRU", /* (1) */

"PPP-Muxing", /* (30) */

};

"PPP-Muxing", /* (30) */

};

+#define NUM_LCPOPTS (sizeof(lcpconfopts) / sizeof(lcpconfopts[0]))

+

/* ECP - to be supported */

/* CCP Config Options */

/* ECP - to be supported */

/* CCP Config Options */

#define BAP_CSIND 7

#define BAP_CSRES 8

#define BAP_CSIND 7

#define BAP_CSRES 8

-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 void handle_mlppp(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_ip6cp_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);

+static u_int print_lcp_config_options(netdissect_options *, const u_char *p, u_int);

+static u_int print_ipcp_config_options(netdissect_options *, const u_char *p, u_int);

+static u_int print_ip6cp_config_options(netdissect_options *, const u_char *p, u_int);

+static u_int print_ccp_config_options(netdissect_options *, const u_char *p, u_int);

+static u_int print_bacp_config_options(netdissect_options *, const u_char *p, u_int);

+static void handle_ppp(netdissect_options *, u_int proto, const u_char *p, u_int length);

/* generic Control Protocol (e.g. LCP, IPCP, CCP, etc.) handler */

static void

/* generic Control Protocol (e.g. LCP, IPCP, CCP, etc.) handler */

static void

-handle_ctrl_proto(u_int proto, const u_char *pptr, int length)

+handle_ctrl_proto(netdissect_options *ndo,

+ u_int proto, const u_char *pptr, u_int length)

{

const char *typestr;

u_int code, len;

{

const char *typestr;

u_int code, len;

- int (*pfunc)(const u_char *, int);

- int x, j;

+ u_int (*pfunc)(netdissect_options *, const u_char *, u_int);

+ u_int tlen, advance;

const u_char *tptr;

tptr=pptr;

typestr = tok2str(ppptype2str, "unknown ctrl-proto (0x%04x)", proto);

const u_char *tptr;

tptr=pptr;

typestr = tok2str(ppptype2str, "unknown ctrl-proto (0x%04x)", proto);

- printf("%s, ",typestr);

+ ND_PRINT("%s, ", typestr);

if (length < 4) /* FIXME weak boundary checking */

goto trunc;

if (length < 4) /* FIXME weak boundary checking */

goto trunc;

- TCHECK2(*tptr, 2);

+ ND_TCHECK_2(tptr);

- code = *tptr++;

+ code = GET_U_1(tptr);

+ tptr++;

- printf("%s (0x%02x), id %u, length %u",

- tok2str(cpcodes, "Unknown Opcode",code),

- code,

- *tptr++, /* ID */

- length+2);

+ ND_PRINT("%s (0x%02x), id %u, length %u",

+ tok2str(cpcodes, "Unknown Opcode",code),

+ code,

+ GET_U_1(tptr), /* ID */

+ length + 2);

+ tptr++;

- if (!vflag)

- return;

-

- if (length <= 4)

- return; /* there may be a NULL confreq etc. */

+ if (!ndo->ndo_vflag)

+ return;

- TCHECK2(*tptr, 2);

- len = EXTRACT_16BITS(tptr);

+ len = GET_BE_U_2(tptr);

tptr += 2;

- printf("\n\tencoded length %u (=Option(s) length %u)",len,len-4);

+ if (len < 4) {

+ ND_PRINT("\n\tencoded length %u (< 4))", len);

+ return;

+ }

+

+ if (len > length) {

+ ND_PRINT("\n\tencoded length %u (> packet length %u))", len, length);

+ return;

+ }

+ length = len;

- if (vflag>1)

- print_unknown_data(gndo,pptr-2,"\n\t",6);

+ ND_PRINT("\n\tencoded length %u (=Option(s) length %u)", len, len - 4);

+

+ if (length == 4)

+ return; /* there may be a NULL confreq etc. */

+

+ if (ndo->ndo_vflag > 1)

+ print_unknown_data(ndo, pptr - 2, "\n\t", 6);

switch (code) {

case CPCODES_VEXT:

if (length < 11)

break;

switch (code) {

case CPCODES_VEXT:

if (length < 11)

break;

- TCHECK2(*tptr, 4);

- printf("\n\t Magic-Num 0x%08x", EXTRACT_32BITS(tptr));

+ ND_PRINT("\n\t Magic-Num 0x%08x", GET_BE_U_4(tptr));

tptr += 4;

- TCHECK2(*tptr, 3);

- printf(" Vendor: %s (%u)",

- tok2str(oui_values,"Unknown",EXTRACT_24BITS(tptr)),

- EXTRACT_24BITS(tptr));

+ ND_PRINT(" Vendor: %s (%u)",

+ tok2str(oui_values,"Unknown",GET_BE_U_3(tptr)),

+ GET_BE_U_3(tptr));

/* XXX: need to decode Kind and Value(s)? */

break;

case CPCODES_CONF_REQ:

case CPCODES_CONF_ACK:

case CPCODES_CONF_NAK:

case CPCODES_CONF_REJ:

/* XXX: need to decode Kind and Value(s)? */

break;

case CPCODES_CONF_REQ:

case CPCODES_CONF_ACK:

case CPCODES_CONF_NAK:

case CPCODES_CONF_REJ:

- x = len - 4; /* Code(1), Identifier(1) and Length(2) */

+ tlen = len - 4; /* Code(1), Identifier(1) and Length(2) */

do {

switch (proto) {

case PPP_LCP:

do {

switch (proto) {

case PPP_LCP:

if (pfunc == NULL) /* catch the above null pointer if unknown CP */

break;

if (pfunc == NULL) /* catch the above null pointer if unknown CP */

break;

- if ((j = (*pfunc)(tptr, len)) == 0)

+ if ((advance = (*pfunc)(ndo, tptr, len)) == 0)

+ break;

+ if (tlen < advance) {

+ ND_PRINT(" [remaining options length %u < %u]",

+ tlen, advance);

+ nd_print_invalid(ndo);

break;

- x -= j;

- tptr += j;

- } while (x > 0);

+ }

+ tlen -= advance;

+ tptr += advance;

+ } while (tlen != 0);

break;

case CPCODES_TERM_REQ:

break;

case CPCODES_TERM_REQ:

case CPCODES_PROT_REJ:

if (length < 6)

break;

case CPCODES_PROT_REJ:

if (length < 6)

break;

- TCHECK2(*tptr, 2);

- printf("\n\t Rejected %s Protocol (0x%04x)",

- tok2str(ppptype2str,"unknown", EXTRACT_16BITS(tptr)),

- EXTRACT_16BITS(tptr));

+ ND_PRINT("\n\t Rejected %s Protocol (0x%04x)",

+ tok2str(ppptype2str,"unknown", GET_BE_U_2(tptr)),

+ GET_BE_U_2(tptr));

/* XXX: need to decode Rejected-Information? - hexdump for now */

- if (len > 6) {

- printf("\n\t Rejected Packet");

- print_unknown_data(gndo,tptr+2,"\n\t ",len-2);

- }

+ if (len > 6) {

+ ND_PRINT("\n\t Rejected Packet");

+ print_unknown_data(ndo, tptr + 2, "\n\t ", len - 2);

+ }

break;

case CPCODES_ECHO_REQ:

case CPCODES_ECHO_RPL:

case CPCODES_DISC_REQ:

if (length < 8)

break;

case CPCODES_ECHO_REQ:

case CPCODES_ECHO_RPL:

case CPCODES_DISC_REQ:

if (length < 8)

break;

- TCHECK2(*tptr, 4);

- printf("\n\t Magic-Num 0x%08x", EXTRACT_32BITS(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) {

- printf("\n\t -----trailing data-----");

- TCHECK2(tptr[4], len-8);

- print_unknown_data(gndo,tptr+4,"\n\t ",len-8);

- }

+ if (len > 8) {

+ ND_PRINT("\n\t -----trailing data-----");

+ ND_TCHECK_LEN(tptr + 4, len - 8);

+ print_unknown_data(ndo, tptr + 4, "\n\t ", len - 8);

+ }

break;

case CPCODES_ID:

if (length < 8)

break;

case CPCODES_ID:

if (length < 8)

break;

- TCHECK2(*tptr, 4);

- printf("\n\t Magic-Num 0x%08x", EXTRACT_32BITS(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) {

- printf("\n\t Message\n\t ");

- fn_printn(tptr+4,len-4,snapend);

- }

+ if (len > 8) {

+ ND_PRINT("\n\t Message\n\t ");

+ if (nd_printn(ndo, tptr + 4, len - 4, ndo->ndo_snapend))

+ goto trunc;

+ }

break;

case CPCODES_TIME_REM:

if (length < 12)

break;

case CPCODES_TIME_REM:

if (length < 12)

break;

- TCHECK2(*tptr, 4);

- printf("\n\t Magic-Num 0x%08x", EXTRACT_32BITS(tptr));

- TCHECK2(*(tptr + 4), 4);

- printf(", Seconds-Remaining %us", EXTRACT_32BITS(tptr + 4));

+ ND_PRINT("\n\t Magic-Num 0x%08x", GET_BE_U_4(tptr));

+ ND_PRINT(", Seconds-Remaining %us", GET_BE_U_4(tptr + 4));

/* XXX: need to decode Message? */

break;

default:

/* XXX: need to decode Message? */

break;

default:

- /* 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(gndo,pptr-2,"\n\t ",length+2);

+ /* XXX this is dirty but we do not get the

+ * original pointer passed to the begin

+ * the PPP packet */

+ if (ndo->ndo_vflag <= 1)

+ print_unknown_data(ndo, pptr - 2, "\n\t ", length + 2);

break;

}

return;

trunc:

break;

}

return;

trunc:

- printf("[|%s]", typestr);

+ ND_PRINT("[|%s]", typestr);

}

/* LCP config options */

}

/* LCP config options */

-static int

-print_lcp_config_options(const u_char *p, int length)

+static u_int

+print_lcp_config_options(netdissect_options *ndo,

+ const u_char *p, u_int length)

{

- int len, opt;

+ u_int opt, len;

if (length < 2)

return 0;

if (length < 2)

return 0;

- TCHECK2(*p, 2);

- len = p[1];

- opt = p[0];

+ ND_TCHECK_2(p);

+ opt = GET_U_1(p);

+ len = GET_U_1(p + 1);

if (length < len)

return 0;

if (len < 2) {

if (length < len)

return 0;

if (len < 2) {

- if ((opt >= LCPOPT_MIN) && (opt <= LCPOPT_MAX))

- printf("\n\t %s Option (0x%02x), length %u (bogus, should be >= 2)", lcpconfopts[opt],opt,len);

+ if (opt < NUM_LCPOPTS)

+ ND_PRINT("\n\t %s Option (0x%02x), length %u (length bogus, should be >= 2)",

+ lcpconfopts[opt], opt, len);

else

- printf("\n\tunknown LCP option 0x%02x", opt);

+ ND_PRINT("\n\tunknown LCP option 0x%02x", opt);

return 0;

}

return 0;

}

- if ((opt >= LCPOPT_MIN) && (opt <= LCPOPT_MAX))

- printf("\n\t %s Option (0x%02x), length %u: ", lcpconfopts[opt],opt,len);

+ if (opt < NUM_LCPOPTS)

+ ND_PRINT("\n\t %s Option (0x%02x), length %u", lcpconfopts[opt], opt, len);

else {

- printf("\n\tunknown LCP option 0x%02x", opt);

+ ND_PRINT("\n\tunknown LCP option 0x%02x", opt);

return len;

}

switch (opt) {

case LCPOPT_VEXT:

return len;

}

switch (opt) {

case LCPOPT_VEXT:

- if (len >= 6) {

- TCHECK2(*(p + 2), 3);

- printf("Vendor: %s (%u)",

- tok2str(oui_values,"Unknown",EXTRACT_24BITS(p+2)),

- EXTRACT_24BITS(p+2));

+ if (len < 6) {

+ ND_PRINT(" (length bogus, should be >= 6)");

+ return len;

+ }

+ ND_PRINT(": Vendor: %s (%u)",

+ tok2str(oui_values,"Unknown",GET_BE_U_3(p + 2)),

+ GET_BE_U_3(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

+ ND_PRINT(", kind: 0x%02x", GET_U_1(p + 5));

+ ND_PRINT(", Value: 0x");

+ for (i = 0; i < len - 6; i++) {

+ ND_PRINT("%02x", GET_U_1(p + 6 + i));

}

+#endif

break;

case LCPOPT_MRU:

break;

case LCPOPT_MRU:

- if (len == 4) {

- TCHECK2(*(p + 2), 2);

- printf("%u", EXTRACT_16BITS(p + 2));

+ if (len != 4) {

+ ND_PRINT(" (length bogus, should be = 4)");

+ return len;

}

+ ND_PRINT(": %u", GET_BE_U_2(p + 2));

break;

case LCPOPT_ACCM:

break;

case LCPOPT_ACCM:

- if (len == 6) {

- TCHECK2(*(p + 2), 4);

- printf("0x%08x", EXTRACT_32BITS(p + 2));

+ if (len != 6) {

+ ND_PRINT(" (length bogus, should be = 6)");

+ return len;

}

+ ND_PRINT(": 0x%08x", GET_BE_U_4(p + 2));

break;

case LCPOPT_AP:

break;

case LCPOPT_AP:

- if (len >= 4) {

- TCHECK2(*(p + 2), 2);

- printf("%s", tok2str(ppptype2str,"Unknown Auth Proto (0x04x)",EXTRACT_16BITS(p+2)));

-

- switch (EXTRACT_16BITS(p+2)) {

- case PPP_CHAP:

- TCHECK(p[4]);

- printf(", %s",tok2str(authalg_values,"Unknown Auth Alg %u",p[4]));

+ if (len < 4) {

+ ND_PRINT(" (length bogus, should be >= 4)");

+ return len;

+ }

+ 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_PRINT(", %s",

+ tok2str(authalg_values, "Unknown Auth Alg %u", GET_U_1(p + 4)));

break;

- case PPP_PAP: /* fall through */

- case PPP_EAP:

- case PPP_SPAP:

- case PPP_SPAP_OLD:

+ case PPP_PAP: /* fall through */

+ case PPP_EAP:

+ case PPP_SPAP:

+ case PPP_SPAP_OLD:

break;

- default:

- print_unknown_data(gndo,p,"\n\t",len);

- }

+ default:

+ print_unknown_data(ndo, p, "\n\t", len);

}

break;

case LCPOPT_QP:

}

break;

case LCPOPT_QP:

- if (len >= 4) {

- TCHECK2(*(p + 2), 2);

- if (EXTRACT_16BITS(p+2) == PPP_LQM)

- printf(" LQR");

- else

- printf(" unknown");

+ if (len < 4) {

+ ND_PRINT(" (length bogus, should be >= 4)");

+ return 0;

}

+ if (GET_BE_U_2(p + 2) == PPP_LQM)

+ ND_PRINT(": LQR");

+ else

+ ND_PRINT(": unknown");

break;

case LCPOPT_MN:

break;

case LCPOPT_MN:

- if (len == 6) {

- TCHECK2(*(p + 2), 4);

- printf("0x%08x", EXTRACT_32BITS(p + 2));

+ if (len != 6) {

+ ND_PRINT(" (length bogus, should be = 6)");

+ return 0;

}

+ ND_PRINT(": 0x%08x", GET_BE_U_4(p + 2));

break;

case LCPOPT_PFC:

break;

case LCPOPT_ACFC:

break;

case LCPOPT_LD:

break;

case LCPOPT_PFC:

break;

case LCPOPT_ACFC:

break;

case LCPOPT_LD:

- if (len == 4) {

- TCHECK2(*(p + 2), 2);

- printf("0x%04x", EXTRACT_16BITS(p + 2));

+ if (len != 4) {

+ ND_PRINT(" (length bogus, should be = 4)");

+ return 0;

}

+ ND_PRINT(": 0x%04x", GET_BE_U_2(p + 2));

break;

case LCPOPT_CBACK:

break;

case LCPOPT_CBACK:

- if (len < 3)

- break;

- TCHECK(p[2]);

- printf("Callback Operation %s (%u)",

- tok2str(ppp_callback_values,"Unknown",p[2]),

- p[2]);

+ if (len < 3) {

+ ND_PRINT(" (length bogus, should be >= 3)");

+ return 0;

+ }

+ ND_PRINT(": ");

+ ND_PRINT(": Callback Operation %s (%u)",

+ tok2str(ppp_callback_values, "Unknown", GET_U_1(p + 2)),

+ GET_U_1(p + 2));

break;

case LCPOPT_MLMRRU:

break;

case LCPOPT_MLMRRU:

- if (len == 4) {

- TCHECK2(*(p + 2), 2);

- printf("%u", EXTRACT_16BITS(p + 2));

+ if (len != 4) {

+ ND_PRINT(" (length bogus, should be = 4)");

+ return 0;

}

+ ND_PRINT(": %u", GET_BE_U_2(p + 2));

break;

case LCPOPT_MLED:

break;

case LCPOPT_MLED:

- if (len < 3)

- break;

- TCHECK(p[2]);

- switch (p[2]) { /* class */

+ if (len < 3) {

+ ND_PRINT(" (length bogus, should be >= 3)");

+ return 0;

+ }

+ switch (GET_U_1(p + 2)) { /* class */

case MEDCLASS_NULL:

- printf("Null");

+ ND_PRINT(": Null");

break;

case MEDCLASS_LOCAL:

break;

case MEDCLASS_LOCAL:

- printf("Local"); /* XXX */

+ ND_PRINT(": Local"); /* XXX */

break;

case MEDCLASS_IPV4:

break;

case MEDCLASS_IPV4:

- if (len != 7)

- break;

- TCHECK2(*(p + 3), 4);

- printf("IPv4 %s", ipaddr_string(p + 3));

+ if (len != 7) {

+ ND_PRINT(" (length bogus, should be = 7)");

+ return 0;

+ }

+ ND_PRINT(": IPv4 %s", GET_IPADDR_STRING(p + 3));

break;

case MEDCLASS_MAC:

break;

case MEDCLASS_MAC:

- 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]);

+ if (len != 9) {

+ ND_PRINT(" (length bogus, should be = 9)");

+ return 0;

+ }

+ ND_PRINT(": MAC %s", GET_ETHERADDR_STRING(p + 3));

break;

case MEDCLASS_MNB:

break;

case MEDCLASS_MNB:

- printf("Magic-Num-Block"); /* XXX */

+ ND_PRINT(": Magic-Num-Block"); /* XXX */

break;

case MEDCLASS_PSNDN:

break;

case MEDCLASS_PSNDN:

- printf("PSNDN"); /* XXX */

+ ND_PRINT(": PSNDN"); /* XXX */

+ break;

+ default:

+ ND_PRINT(": Unknown class %u", GET_U_1(p + 2));

break;

}

break;

}

break;

case LCPOPT_PPPMUX:

break;

#endif

case LCPOPT_PPPMUX:

break;

#endif

- default:

- if(vflag<2)

- print_unknown_data(gndo,&p[2],"\n\t ",len-2);

- break;

+ default:

+ /*

+ * Unknown option; dump it as raw bytes now if we're

+ * not going to do so below.

+ */

+ if (ndo->ndo_vflag < 2)

+ print_unknown_data(ndo, p + 2, "\n\t ", len - 2);

+ break;

}

- if (vflag>1)

- print_unknown_data(gndo,&p[2],"\n\t ",len-2); /* exclude TLV header */

+ if (ndo->ndo_vflag > 1)

+ print_unknown_data(ndo, p + 2, "\n\t ", len - 2); /* exclude TLV header */

return len;

trunc:

return len;

trunc:

- printf("[|lcp]");

+ ND_PRINT("[|lcp]");

return 0;

}

return 0;

}

};

static void

};

static void

-handle_mlppp(const u_char *p, int length) {

+handle_mlppp(netdissect_options *ndo,

+ const u_char *p, u_int length)

+{

+ if (!ndo->ndo_eflag)

+ ND_PRINT("MLPPP, ");

- if (!eflag)

- printf("MLPPP, ");

+ if (length < 2) {

+ ND_PRINT("[|mlppp]");

+ return;

+ }

+ if (!ND_TTEST_2(p)) {

+ ND_PRINT("[|mlppp]");

+ return;

+ }

- printf("seq 0x%03x, Flags [%s], length %u",

- (EXTRACT_16BITS(p))&0x0fff, /* only support 12-Bit sequence space for now */

- bittok2str(ppp_ml_flag_values, "none", *p & 0xc0),

+ ND_PRINT("seq 0x%03x, Flags [%s], length %u",

+ (GET_BE_U_2(p))&0x0fff,

+ /* only support 12-Bit sequence space for now */

+ bittok2str(ppp_ml_flag_values, "none", GET_U_1(p) & 0xc0),

length);

-

- return;

}

/* CHAP */

static void

}

/* CHAP */

static void

-handle_chap(const u_char *p, int length)

+handle_chap(netdissect_options *ndo,

+ const u_char *p, u_int length)

{

u_int code, len;

{

u_int code, len;

- int val_size, name_size, msg_size;

+ u_int val_size, name_size, msg_size;

const u_char *p0;

- int i;

+ u_int i;

p0 = p;

if (length < 1) {

p0 = p;

if (length < 1) {

- printf("[|chap]");

+ ND_PRINT("[|chap]");

return;

} else if (length < 4) {

return;

} else if (length < 4) {

- TCHECK(*p);

- printf("[|chap 0x%02x]", *p);

+ ND_PRINT("[|chap 0x%02x]", GET_U_1(p));

return;

}

return;

}

- TCHECK(*p);

- code = *p;

- printf("CHAP, %s (0x%02x)",

+ code = GET_U_1(p);

+ ND_PRINT("CHAP, %s (0x%02x)",

tok2str(chapcode_values,"unknown",code),

code);

p++;

tok2str(chapcode_values,"unknown",code),

code);

p++;

- TCHECK(*p);

- printf(", id %u", *p); /* ID */

+ ND_PRINT(", id %u", GET_U_1(p)); /* ID */

p++;

- TCHECK2(*p, 2);

- len = EXTRACT_16BITS(p);

+ len = GET_BE_U_2(p);

p += 2;

/*

p += 2;

/*

case CHAP_RESP:

if (length - (p - p0) < 1)

return;

case CHAP_RESP:

if (length - (p - p0) < 1)

return;

- TCHECK(*p);

- val_size = *p; /* value size */

+ val_size = GET_U_1(p); /* value size */

p++;

if (length - (p - p0) < val_size)

return;

p++;

if (length - (p - p0) < val_size)

return;

- printf(", Value ");

+ ND_PRINT(", Value ");

for (i = 0; i < val_size; i++) {

- TCHECK(*p);

- printf("%02x", *p++);

+ ND_PRINT("%02x", GET_U_1(p));

+ p++;

}

- name_size = len - (p - p0);

- printf(", Name ");

+ name_size = len - (u_int)(p - p0);

+ ND_PRINT(", Name ");

for (i = 0; i < name_size; i++) {

- TCHECK(*p);

- safeputchar(*p++);

+ fn_print_char(ndo, GET_U_1(p));

+ p++;

}

break;

case CHAP_SUCC:

case CHAP_FAIL:

}

break;

case CHAP_SUCC:

case CHAP_FAIL:

- msg_size = len - (p - p0);

- printf(", Msg ");

+ msg_size = len - (u_int)(p - p0);

+ ND_PRINT(", Msg ");

for (i = 0; i< msg_size; i++) {

- TCHECK(*p);

- safeputchar(*p++);

+ fn_print_char(ndo, GET_U_1(p));

+ p++;

}

break;

}

break;

}

- return;

-

-trunc:

- printf("[|chap]");

}

/* PAP (see RFC 1334) */

static void

}

/* PAP (see RFC 1334) */

static void

-handle_pap(const u_char *p, int length)

+handle_pap(netdissect_options *ndo,

+ const u_char *p, u_int length)

{

u_int code, len;

{

u_int code, len;

- int peerid_len, passwd_len, msg_len;

+ u_int peerid_len, passwd_len, msg_len;

const u_char *p0;

- int i;

+ u_int i;

p0 = p;

if (length < 1) {

p0 = p;

if (length < 1) {

- printf("[|pap]");

+ ND_PRINT("[|pap]");

return;

} else if (length < 4) {

return;

} else if (length < 4) {

- TCHECK(*p);

- printf("[|pap 0x%02x]", *p);

+ ND_PRINT("[|pap 0x%02x]", GET_U_1(p));

return;

}

return;

}

- TCHECK(*p);

- code = *p;

- printf("PAP, %s (0x%02x)",

- tok2str(papcode_values,"unknown",code),

- code);

+ code = GET_U_1(p);

+ ND_PRINT("PAP, %s (0x%02x)",

+ tok2str(papcode_values, "unknown", code),

+ code);

p++;

- TCHECK(*p);

- printf(", id %u", *p); /* ID */

+ ND_PRINT(", id %u", GET_U_1(p)); /* ID */

p++;

- TCHECK2(*p, 2);

- len = EXTRACT_16BITS(p);

+ len = GET_BE_U_2(p);

p += 2;

- if ((int)len > length) {

- printf(", length %u > packet size", len);

+ if (len > length) {

+ ND_PRINT(", length %u > packet size", len);

return;

}

length = len;

return;

}

length = len;

- if (length < (p - p0)) {

- printf(", length %u < PAP header length", length);

+ if (length < (size_t)(p - p0)) {

+ ND_PRINT(", length %u < PAP header length", length);

return;

}

switch (code) {

case PAP_AREQ:

return;

}

switch (code) {

case PAP_AREQ:

+ /* A valid Authenticate-Request is 6 or more octets long. */

+ if (len < 6)

+ goto trunc;

if (length - (p - p0) < 1)

return;

if (length - (p - p0) < 1)

return;

- TCHECK(*p);

- peerid_len = *p; /* Peer-ID Length */

+ peerid_len = GET_U_1(p); /* Peer-ID Length */

p++;

if (length - (p - p0) < peerid_len)

return;

p++;

if (length - (p - p0) < peerid_len)

return;

- printf(", Peer ");

+ ND_PRINT(", Peer ");

for (i = 0; i < peerid_len; i++) {

- TCHECK(*p);

- safeputchar(*p++);

+ fn_print_char(ndo, GET_U_1(p));

+ p++;

}

if (length - (p - p0) < 1)

return;

}

if (length - (p - p0) < 1)

return;

- TCHECK(*p);

- passwd_len = *p; /* Password Length */

+ passwd_len = GET_U_1(p); /* Password Length */

p++;

if (length - (p - p0) < passwd_len)

return;

p++;

if (length - (p - p0) < passwd_len)

return;

- printf(", Name ");

+ ND_PRINT(", Name ");

for (i = 0; i < passwd_len; i++) {

- TCHECK(*p);

- safeputchar(*p++);

+ fn_print_char(ndo, GET_U_1(p));

+ p++;

}

break;

case PAP_AACK:

case PAP_ANAK:

}

break;

case PAP_AACK:

case PAP_ANAK:

+ /* Although some implementations ignore truncation at

+ * this point and at least one generates a truncated

+ * packet, RFC 1334 section 2.2.2 clearly states that

+ * both AACK and ANAK are at least 5 bytes long.

+ */

+ if (len < 5)

+ goto trunc;

if (length - (p - p0) < 1)

return;

if (length - (p - p0) < 1)

return;

- TCHECK(*p);

- msg_len = *p; /* Msg-Length */

+ msg_len = GET_U_1(p); /* Msg-Length */

p++;

if (length - (p - p0) < msg_len)

return;

p++;

if (length - (p - p0) < msg_len)

return;

- printf(", Msg ");

+ ND_PRINT(", Msg ");

for (i = 0; i< msg_len; i++) {

- TCHECK(*p);

- safeputchar(*p++);

+ fn_print_char(ndo, GET_U_1(p));

+ p++;

}

break;

}

return;

trunc:

}

break;

}

return;

trunc:

- printf("[|pap]");

+ ND_PRINT("[|pap]");

}

/* BAP */

static void

}

/* BAP */

static void

-handle_bap(const u_char *p _U_, int length _U_)

+handle_bap(netdissect_options *ndo _U_,

+ const u_char *p _U_, u_int length _U_)

{

/* XXX: to be supported!! */

}

/* IPCP config options */

{

/* XXX: to be supported!! */

}

/* IPCP config options */

-static int

-print_ipcp_config_options(const u_char *p, int length)

+static u_int

+print_ipcp_config_options(netdissect_options *ndo,

+ const u_char *p, u_int length)

{

- int len, opt;

+ u_int opt, len;

u_int compproto, ipcomp_subopttotallen, ipcomp_subopt, ipcomp_suboptlen;

if (length < 2)

return 0;

u_int compproto, ipcomp_subopttotallen, ipcomp_subopt, ipcomp_suboptlen;

if (length < 2)

return 0;

- TCHECK2(*p, 2);

- len = p[1];

- opt = p[0];

+ ND_TCHECK_2(p);

+ opt = GET_U_1(p);

+ len = GET_U_1(p + 1);

if (length < len)

return 0;

if (len < 2) {

if (length < len)

return 0;

if (len < 2) {

- printf("\n\t %s Option (0x%02x), length %u (bogus, should be >= 2)",

+ ND_PRINT("\n\t %s Option (0x%02x), length %u (length bogus, should be >= 2)",

tok2str(ipcpopt_values,"unknown",opt),

opt,

tok2str(ipcpopt_values,"unknown",opt),

opt,

- len);

+ len);

return 0;

}

return 0;

}

- printf("\n\t %s Option (0x%02x), length %u: ",

+ ND_PRINT("\n\t %s Option (0x%02x), length %u",

tok2str(ipcpopt_values,"unknown",opt),

opt,

tok2str(ipcpopt_values,"unknown",opt),

opt,

- len);

+ len);

switch (opt) {

case IPCPOPT_2ADDR: /* deprecated */

switch (opt) {

case IPCPOPT_2ADDR: /* deprecated */

- if (len != 10)

- goto invlen;

- TCHECK2(*(p + 6), 4);

- printf("src %s, dst %s",

- ipaddr_string(p + 2),

- ipaddr_string(p + 6));

+ if (len != 10) {

+ ND_PRINT(" (length bogus, should be = 10)");

+ return len;

+ }

+ ND_PRINT(": src %s, dst %s",

+ GET_IPADDR_STRING(p + 2),

+ GET_IPADDR_STRING(p + 6));

break;

case IPCPOPT_IPCOMP:

break;

case IPCPOPT_IPCOMP:

- if (len < 4)

- goto invlen;

- TCHECK2(*(p + 2), 2);

- compproto = EXTRACT_16BITS(p+2);

+ if (len < 4) {

+ ND_PRINT(" (length bogus, should be >= 4)");

+ return 0;

+ }

+ compproto = GET_BE_U_2(p + 2);

- printf("%s (0x%02x):",

- tok2str(ipcpopt_compproto_values,"Unknown",compproto),

- compproto);

+ ND_PRINT(": %s (0x%02x):",

+ tok2str(ipcpopt_compproto_values, "Unknown", compproto),

+ compproto);

switch (compproto) {

case PPP_VJC:

/* XXX: VJ-Comp parameters should be decoded */

break;

case IPCPOPT_IPCOMP_HDRCOMP:

switch (compproto) {

case PPP_VJC:

/* XXX: VJ-Comp parameters should be decoded */

break;

case IPCPOPT_IPCOMP_HDRCOMP:

- if (len < IPCPOPT_IPCOMP_MINLEN)

- goto invlen;

+ if (len < IPCPOPT_IPCOMP_MINLEN) {

+ ND_PRINT(" (length bogus, should be >= %u)",

+ IPCPOPT_IPCOMP_MINLEN);

+ return 0;

+ }

- TCHECK2(*(p + 2), IPCPOPT_IPCOMP_MINLEN);

- printf("\n\t TCP Space %u, non-TCP Space %u" \

+ ND_TCHECK_LEN(p + 2, IPCPOPT_IPCOMP_MINLEN);

+ ND_PRINT("\n\t TCP Space %u, non-TCP Space %u"

", maxPeriod %u, maxTime %u, maxHdr %u",

- EXTRACT_16BITS(p+4),

- EXTRACT_16BITS(p+6),

- EXTRACT_16BITS(p+8),

- EXTRACT_16BITS(p+10),

- EXTRACT_16BITS(p+12));

+ GET_BE_U_2(p + 4),

+ GET_BE_U_2(p + 6),

+ GET_BE_U_2(p + 8),

+ GET_BE_U_2(p + 10),

+ GET_BE_U_2(p + 12));

/* suboptions present ? */

if (len > IPCPOPT_IPCOMP_MINLEN) {

ipcomp_subopttotallen = len - IPCPOPT_IPCOMP_MINLEN;

p += IPCPOPT_IPCOMP_MINLEN;

/* suboptions present ? */

if (len > IPCPOPT_IPCOMP_MINLEN) {

ipcomp_subopttotallen = len - IPCPOPT_IPCOMP_MINLEN;

p += IPCPOPT_IPCOMP_MINLEN;

- printf("\n\t Suboptions, length %u", ipcomp_subopttotallen);

+ ND_PRINT("\n\t Suboptions, length %u", ipcomp_subopttotallen);

while (ipcomp_subopttotallen >= 2) {

- TCHECK2(*p, 2);

- ipcomp_subopt = *p;

- ipcomp_suboptlen = *(p+1);

+ ND_TCHECK_2(p);

+ ipcomp_subopt = GET_U_1(p);

+ ipcomp_suboptlen = GET_U_1(p + 1);

/* sanity check */

if (ipcomp_subopt == 0 ||

/* sanity check */

if (ipcomp_subopt == 0 ||

break;

/* XXX: just display the suboptions for now */

break;

/* XXX: just display the suboptions for now */

- printf("\n\t\t%s Suboption #%u, length %u",

+ ND_PRINT("\n\t\t%s Suboption #%u, length %u",

tok2str(ipcpopt_compproto_subopt_values,

"Unknown",

ipcomp_subopt),

ipcomp_subopt,

ipcomp_suboptlen);

tok2str(ipcpopt_compproto_subopt_values,

"Unknown",

ipcomp_subopt),

ipcomp_subopt,

ipcomp_suboptlen);

-

+ if (ipcomp_subopttotallen < ipcomp_suboptlen) {

+ ND_PRINT(" [remaining suboptions length %u < %u]",

+ ipcomp_subopttotallen, ipcomp_suboptlen);

+ nd_print_invalid(ndo);

+ break;

+ }

ipcomp_subopttotallen -= ipcomp_suboptlen;

p += ipcomp_suboptlen;

}

ipcomp_subopttotallen -= ipcomp_suboptlen;

p += ipcomp_suboptlen;

}

case IPCPOPT_PRINBNS:

case IPCPOPT_SECDNS:

case IPCPOPT_SECNBNS:

case IPCPOPT_PRINBNS:

case IPCPOPT_SECDNS:

case IPCPOPT_SECNBNS:

- if (len != 6)

- goto invlen;

- TCHECK2(*(p + 2), 4);

- printf("%s", ipaddr_string(p + 2));

+ if (len != 6) {

+ ND_PRINT(" (length bogus, should be = 6)");

+ return 0;

+ }

+ ND_PRINT(": %s", GET_IPADDR_STRING(p + 2));

break;

default:

break;

default:

- if(vflag<2)

- print_unknown_data(gndo,&p[2],"\n\t ",len-2);

+ /*

+ * Unknown option; dump it as raw bytes now if we're

+ * not going to do so below.

+ */

+ if (ndo->ndo_vflag < 2)

+ print_unknown_data(ndo, p + 2, "\n\t ", len - 2);

break;

}

break;

}

- if (vflag>1)

- print_unknown_data(gndo,&p[2],"\n\t ",len-2); /* exclude TLV header */

+ if (ndo->ndo_vflag > 1)

+ print_unknown_data(ndo, p + 2, "\n\t ", len - 2); /* exclude TLV header */

return len;

-invlen:

- printf(", invalid-length-%d", opt);

- return 0;

-

trunc:

- printf("[|ipcp]");

+ ND_PRINT("[|ipcp]");

return 0;

}

/* IP6CP config options */

return 0;

}

/* IP6CP config options */

-static int

-print_ip6cp_config_options(const u_char *p, int length)

+static u_int

+print_ip6cp_config_options(netdissect_options *ndo,

+ const u_char *p, u_int length)

{

- int len, opt;

+ u_int opt, len;

if (length < 2)

return 0;

if (length < 2)

return 0;

- TCHECK2(*p, 2);

- len = p[1];

- opt = p[0];

+ ND_TCHECK_2(p);

+ opt = GET_U_1(p);

+ len = GET_U_1(p + 1);

if (length < len)

return 0;

if (len < 2) {

if (length < len)

return 0;

if (len < 2) {

- printf("\n\t %s Option (0x%02x), length %u (bogus, should be >= 2)",

+ ND_PRINT("\n\t %s Option (0x%02x), length %u (length bogus, should be >= 2)",

tok2str(ip6cpopt_values,"unknown",opt),

opt,

tok2str(ip6cpopt_values,"unknown",opt),

opt,

- len);

- return 0;

+ len);

+ return 0;

}

- printf("\n\t %s Option (0x%02x), length %u: ",

+ ND_PRINT("\n\t %s Option (0x%02x), length %u",

tok2str(ip6cpopt_values,"unknown",opt),

opt,

tok2str(ip6cpopt_values,"unknown",opt),

opt,

- len);

+ len);

switch (opt) {

case IP6CP_IFID:

switch (opt) {

case IP6CP_IFID:

- if (len != 10)

- goto invlen;

- TCHECK2(*(p + 2), 8);

- printf("%04x:%04x:%04x:%04x",

- EXTRACT_16BITS(p + 2),

- EXTRACT_16BITS(p + 4),

- EXTRACT_16BITS(p + 6),

- EXTRACT_16BITS(p + 8));

+ if (len != 10) {

+ ND_PRINT(" (length bogus, should be = 10)");

+ return len;

+ }

+ ND_TCHECK_8(p + 2);

+ ND_PRINT(": %04x:%04x:%04x:%04x",

+ GET_BE_U_2(p + 2),

+ GET_BE_U_2(p + 4),

+ GET_BE_U_2(p + 6),

+ GET_BE_U_2(p + 8));

break;

default:

break;

default:

- if(vflag<2)

- print_unknown_data(gndo,&p[2],"\n\t ",len-2);

+ /*

+ * Unknown option; dump it as raw bytes now if we're

+ * not going to do so below.

+ */

+ if (ndo->ndo_vflag < 2)

+ print_unknown_data(ndo, p + 2, "\n\t ", len - 2);

break;

}

break;

}

- if (vflag>1)

- print_unknown_data(gndo,&p[2],"\n\t ",len-2); /* exclude TLV header */

+ if (ndo->ndo_vflag > 1)

+ print_unknown_data(ndo, p + 2, "\n\t ", len - 2); /* exclude TLV header */

return len;

-invlen:

- printf(", invalid-length-%d", opt);

- return 0;

-

trunc:

- printf("[|ip6cp]");

+ ND_PRINT("[|ip6cp]");

return 0;

}

/* CCP config options */

return 0;

}

/* CCP config options */

-static int

-print_ccp_config_options(const u_char *p, int length)

+static u_int

+print_ccp_config_options(netdissect_options *ndo,

+ const u_char *p, u_int length)

{

- int len, opt;

+ u_int opt, len;

if (length < 2)

return 0;

if (length < 2)

return 0;

- TCHECK2(*p, 2);

- len = p[1];

- opt = p[0];

+ ND_TCHECK_2(p);

+ opt = GET_U_1(p);

+ len = GET_U_1(p + 1);

if (length < len)

return 0;

if (len < 2) {

if (length < len)

return 0;

if (len < 2) {

- printf("\n\t %s Option (0x%02x), length %u (bogus, should be >= 2)",

- tok2str(ccpconfopts_values, "Unknown", opt),

- opt,

- len);

- return 0;

- }

+ ND_PRINT("\n\t %s Option (0x%02x), length %u (length bogus, should be >= 2)",

+ tok2str(ccpconfopts_values, "Unknown", opt),

+ opt,

+ len);

+ return 0;

+ }

- printf("\n\t %s Option (0x%02x), length %u:",

- tok2str(ccpconfopts_values, "Unknown", opt),

- opt,

- len);

+ ND_PRINT("\n\t %s Option (0x%02x), length %u",

+ tok2str(ccpconfopts_values, "Unknown", opt),

+ opt,

+ len);

switch (opt) {

- /* fall through --> default: nothing supported yet */

+ case CCPOPT_BSDCOMP:

+ if (len < 3) {

+ ND_PRINT(" (length bogus, should be >= 3)");

+ return len;

+ }

+ ND_PRINT(": Version: %u, Dictionary Bits: %u",

+ GET_U_1(p + 2) >> 5,

+ GET_U_1(p + 2) & 0x1f);

+ break;

+ case CCPOPT_MVRCA:

+ if (len < 4) {

+ ND_PRINT(" (length bogus, should be >= 4)");

+ return len;

+ }

+ 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",

+ GET_U_1(p + 2) & 0x1f,

+ GET_U_1(p + 3));

+ break;

+ case CCPOPT_DEFLATE:

+ if (len < 4) {

+ ND_PRINT(" (length bogus, should be >= 4)");

+ return len;

+ }

+ 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",

+ GET_U_1(p + 2) & 0x0f,

+ (GET_U_1(p + 3) & 0xfc) >> 2,

+ GET_U_1(p + 3) & 0x03);

+ break;

+

+/* XXX: to be supported */

+#if 0

case CCPOPT_OUI:

case CCPOPT_PRED1:

case CCPOPT_PRED2:

case CCPOPT_OUI:

case CCPOPT_PRED1:

case CCPOPT_PRED2:

case CCPOPT_MPPC:

case CCPOPT_GFZA:

case CCPOPT_V42BIS:

case CCPOPT_MPPC:

case CCPOPT_GFZA:

case CCPOPT_V42BIS:

- case CCPOPT_BSDCOMP:

case CCPOPT_LZSDCP:

- case CCPOPT_MVRCA:

case CCPOPT_DEC:

- case CCPOPT_DEFLATE:

case CCPOPT_RESV:

+ break;

+#endif

default:

- if(vflag<2)

- print_unknown_data(gndo,&p[2],"\n\t ",len-2);

+ /*

+ * Unknown option; dump it as raw bytes now if we're

+ * not going to do so below.

+ */

+ if (ndo->ndo_vflag < 2)

+ print_unknown_data(ndo, p + 2, "\n\t ", len - 2);

break;

}

break;

}

- if (vflag>1)

- print_unknown_data(gndo,&p[2],"\n\t ",len-2); /* exclude TLV header */

+ if (ndo->ndo_vflag > 1)

+ print_unknown_data(ndo, p + 2, "\n\t ", len - 2); /* exclude TLV header */

return len;

trunc:

return len;

trunc:

- printf("[|ccp]");

+ ND_PRINT("[|ccp]");

return 0;

}

/* BACP config options */

return 0;

}

/* BACP config options */

-static int

-print_bacp_config_options(const u_char *p, int length)

+static u_int

+print_bacp_config_options(netdissect_options *ndo,

+ const u_char *p, u_int length)

{

- int len, opt;

+ u_int opt, len;

if (length < 2)

return 0;

if (length < 2)

return 0;

- TCHECK2(*p, 2);

- len = p[1];

- opt = p[0];

+ ND_TCHECK_2(p);

+ opt = GET_U_1(p);

+ len = GET_U_1(p + 1);

if (length < len)

return 0;

if (len < 2) {

if (length < len)

return 0;

if (len < 2) {

- printf("\n\t %s Option (0x%02x), length %u (bogus, should be >= 2)",

- tok2str(bacconfopts_values, "Unknown", opt),

- opt,

- len);

- return 0;

- }

+ ND_PRINT("\n\t %s Option (0x%02x), length %u (length bogus, should be >= 2)",

+ tok2str(bacconfopts_values, "Unknown", opt),

+ opt,

+ len);

+ return 0;

+ }

- printf("\n\t %s Option (0x%02x), length %u:",

- tok2str(bacconfopts_values, "Unknown", opt),

- opt,

- len);

+ ND_PRINT("\n\t %s Option (0x%02x), length %u",

+ tok2str(bacconfopts_values, "Unknown", opt),

+ opt,

+ len);

switch (opt) {

case BACPOPT_FPEER:

switch (opt) {

case BACPOPT_FPEER:

- TCHECK2(*(p + 2), 4);

- printf(", Magic-Num 0x%08x", EXTRACT_32BITS(p + 2));

- break;

+ if (len != 6) {

+ ND_PRINT(" (length bogus, should be = 6)");

+ return len;

+ }

+ ND_PRINT(": Magic-Num 0x%08x", GET_BE_U_4(p + 2));

+ break;

default:

- if(vflag<2)

- print_unknown_data(gndo,&p[2],"\n\t ",len-2);

+ /*

+ * Unknown option; dump it as raw bytes now if we're

+ * not going to do so below.

+ */

+ if (ndo->ndo_vflag < 2)

+ print_unknown_data(ndo, p + 2, "\n\t ", len - 2);

break;

}

break;

}

- if (vflag>1)

- print_unknown_data(gndo,&p[2],"\n\t ",len-2); /* exclude TLV header */

+ if (ndo->ndo_vflag > 1)

+ print_unknown_data(ndo, p + 2, "\n\t ", len - 2); /* exclude TLV header */

return len;

trunc:

return len;

trunc:

- printf("[|bacp]");

+ ND_PRINT("[|bacp]");

return 0;

}

return 0;

}

-

+/*

+ * Un-escape RFC 1662 PPP in HDLC-like framing, with octet escapes.

+ * The length argument is the on-the-wire length, not the captured

+ * length; we can only un-escape the captured part.

+ */

static void

-ppp_hdlc(const u_char *p, int length)

+ppp_hdlc(netdissect_options *ndo,

+ const u_char *p, u_int length)

{

- u_char *b, *s, *t, c;

- int i, proto;

- const void *se;

+ u_int caplen = ND_BYTES_AVAILABLE_AFTER(p);

+ u_char *b, *t, c;

+ const u_char *s;

+ u_int i, proto;

+ const void *sb, *se;

+

+ if (caplen == 0)

+ return;

- b = (u_int8_t *)malloc(length);

+ if (length == 0)

+ return;

+

+ b = (u_char *)nd_malloc(ndo, caplen);

if (b == NULL)

return;

/*

* Unescape all the data into a temporary, private, buffer.

if (b == NULL)

return;

/*

* 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.

*/

* contents.

*/

- for (s = (u_char *)p, t = b, i = length; i > 0; i--) {

- c = *s++;

+ for (s = p, t = b, i = caplen; i != 0; i--) {

+ c = GET_U_1(s);

+ s++;

if (c == 0x7d) {

- if (i > 1) {

- i--;

- c = *s++ ^ 0x20;

- } else

- continue;

+ if (i <= 1)

+ break;

+ i--;

+ c = GET_U_1(s) ^ 0x20;

+ s++;

}

*t++ = c;

}

*t++ = c;

}

- se = snapend;

- snapend = t;

+ /*

+ * 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);

/* now lets guess about the payload codepoint format */

- proto = *b; /* start with a one-octet codepoint guess */

+ if (length < 1)

+ goto trunc;

+ proto = GET_U_1(b); /* start with a one-octet codepoint guess */

switch (proto) {

case PPP_IP:

switch (proto) {

case PPP_IP:

- ip_print(gndo, b+1, t - b - 1);

+ ip_print(ndo, b + 1, length - 1);

goto cleanup;

-#ifdef INET6

case PPP_IPV6:

- ip6_print(gndo, b+1, t - b - 1);

+ ip6_print(ndo, b + 1, length - 1);

goto cleanup;

-#endif

default: /* no luck - try next guess */

break;

}

default: /* no luck - try next guess */

break;

}

- proto = EXTRACT_16BITS(b); /* next guess - load two octets */

+ if (length < 2)

+ goto trunc;

+ proto = GET_BE_U_2(b); /* next guess - load two octets */

switch (proto) {

case (PPP_ADDRESS << 8 | PPP_CONTROL): /* looks like a PPP frame */

switch (proto) {

case (PPP_ADDRESS << 8 | PPP_CONTROL): /* looks like a PPP frame */

- proto = EXTRACT_16BITS(b+2); /* load the PPP proto-id */

- handle_ppp(proto, b+4, t - b - 4);

+ if (length < 4)

+ goto trunc;

+ proto = GET_BE_U_2(b + 2); /* load the PPP proto-id */

+ 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 */

break;

default: /* last guess - proto must be a PPP proto-id */

- handle_ppp(proto, b+2, t - b - 2);

+ if ((proto & 0xff00) == 0x7e00)

+ ND_PRINT("(protocol 0x%04x invalid)", proto);

+ else

+ handle_ppp(ndo, proto, b + 2, length - 2);

break;

}

cleanup:

break;

}

cleanup:

- snapend = se;

- free(b);

+ ndo->ndo_packetp = sb;

+ ndo->ndo_snapend = se;

return;

+

+trunc:

+ ndo->ndo_packetp = sb;

+ ndo->ndo_snapend = se;

+ nd_print_trunc(ndo);

}

/* PPP */

static void

}

/* PPP */

static void

-handle_ppp(u_int proto, const u_char *p, int length)

+handle_ppp(netdissect_options *ndo,

+ u_int proto, const u_char *p, u_int length)

{

- if ((proto & 0xff00) == 0x7e00) {/* is this an escape code ? */

- ppp_hdlc(p-1, length);

- return;

- }

+ if ((proto & 0xff00) == 0x7e00) { /* is this an escape code ? */

+ ppp_hdlc(ndo, p - 1, length);

+ return;

+ }

switch (proto) {

case PPP_LCP: /* fall through */

switch (proto) {

case PPP_LCP: /* fall through */

case PPP_IPV6CP:

case PPP_CCP:

case PPP_BACP:

case PPP_IPV6CP:

case PPP_CCP:

case PPP_BACP:

- handle_ctrl_proto(proto, p, length);

+ handle_ctrl_proto(ndo, proto, p, length);

+ break;

+ case PPP_ML:

+ handle_mlppp(ndo, p, length);

break;

- case PPP_ML:

- handle_mlppp(p, length);

- break;

case PPP_CHAP:

- handle_chap(p, length);

+ handle_chap(ndo, p, length);

break;

case PPP_PAP:

break;

case PPP_PAP:

- handle_pap(p, length);

+ handle_pap(ndo, p, length);

break;

case PPP_BAP: /* XXX: not yet completed */

break;

case PPP_BAP: /* XXX: not yet completed */

- handle_bap(p, length);

+ handle_bap(ndo, p, length);

break;

case ETHERTYPE_IP: /*XXX*/

case PPP_VJNC:

case PPP_IP:

break;

case ETHERTYPE_IP: /*XXX*/

case PPP_VJNC:

case PPP_IP:

- ip_print(gndo, p, length);

+ ip_print(ndo, p, length);

break;

-#ifdef INET6

case ETHERTYPE_IPV6: /*XXX*/

case PPP_IPV6:

case ETHERTYPE_IPV6: /*XXX*/

case PPP_IPV6:

- ip6_print(gndo, p, length);

+ ip6_print(ndo, p, length);

break;

-#endif

case ETHERTYPE_IPX: /*XXX*/

case PPP_IPX:

case ETHERTYPE_IPX: /*XXX*/

case PPP_IPX:

- ipx_print(p, length);

+ ipx_print(ndo, p, length);

break;

case PPP_OSI:

break;

case PPP_OSI:

- isoclns_print(p, length, length);

- break;

+ isoclns_print(ndo, p, length);

+ break;

case PPP_MPLS_UCAST:

case PPP_MPLS_MCAST:

case PPP_MPLS_UCAST:

case PPP_MPLS_MCAST:

- mpls_print(p, length);

+ mpls_print(ndo, p, length);

break;

case PPP_COMP:

break;

case PPP_COMP:

- printf("compressed PPP data");

+ ND_PRINT("compressed PPP data");

break;

default:

break;

default:

- printf("%s ", tok2str(ppptype2str, "unknown PPP protocol (0x%04x)", proto));

- print_unknown_data(gndo,p,"\n\t",length);

+ ND_PRINT("%s ", tok2str(ppptype2str, "unknown PPP protocol (0x%04x)", proto));

+ print_unknown_data(ndo, p, "\n\t", length);

break;

}

/* Standard PPP printer */

u_int

break;

}

/* Standard PPP printer */

u_int

-ppp_print(register const u_char *p, u_int length)

+ppp_print(netdissect_options *ndo,

+ const u_char *p, u_int length)

{

u_int proto,ppp_header;

u_int olen = length; /* _o_riginal length */

u_int hdr_len = 0;

{

u_int proto,ppp_header;

u_int olen = length; /* _o_riginal length */

u_int hdr_len = 0;

+ ndo->ndo_protocol = "ppp";

/*

* Here, we assume that p points to the Address and Control

* field (if they present).

*/

if (length < 2)

goto trunc;

/*

* Here, we assume that p points to the Address and Control

* field (if they present).

*/

if (length < 2)

goto trunc;

- TCHECK2(*p, 2);

- ppp_header = EXTRACT_16BITS(p);

+ ppp_header = GET_BE_U_2(p);

switch(ppp_header) {

- case (PPP_WITHDIRECTION_IN << 8 | PPP_CONTROL):

- if (eflag) printf("In ");

+ case (PPP_PPPD_IN << 8 | PPP_CONTROL):

+ if (ndo->ndo_eflag) ND_PRINT("In ");

p += 2;

length -= 2;

hdr_len += 2;

break;

p += 2;

length -= 2;

hdr_len += 2;

break;

- case (PPP_WITHDIRECTION_OUT << 8 | PPP_CONTROL):

- if (eflag) printf("Out ");

+ case (PPP_PPPD_OUT << 8 | PPP_CONTROL):

+ if (ndo->ndo_eflag) ND_PRINT("Out ");

p += 2;

length -= 2;

hdr_len += 2;

p += 2;

length -= 2;

hdr_len += 2;

if (length < 2)

goto trunc;

if (length < 2)

goto trunc;

- TCHECK(*p);

- if (*p % 2) {

- proto = *p; /* PFC is used */

+ if (GET_U_1(p) % 2) {

+ proto = GET_U_1(p); /* PFC is used */

p++;

length--;

hdr_len++;

} else {

p++;

length--;

hdr_len++;

} else {

- TCHECK2(*p, 2);

- proto = EXTRACT_16BITS(p);

+ proto = GET_BE_U_2(p);

p += 2;

length -= 2;

hdr_len += 2;

}

p += 2;

length -= 2;

hdr_len += 2;

}

- if (eflag)

- printf("%s (0x%04x), length %u: ",

- tok2str(ppptype2str, "unknown", proto),

- proto,

- olen);

+ 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(proto, p, length);

+ handle_ppp(ndo, proto, p, length);

return (hdr_len);

trunc:

return (hdr_len);

trunc:

- printf("[|ppp]");

+ nd_print_trunc(ndo);

return (0);

}

/* PPP I/F printer */

return (0);

}

/* PPP I/F printer */

-u_int

-ppp_if_print(const struct pcap_pkthdr *h, register const u_char *p)

+void

+ppp_if_print(netdissect_options *ndo,

+ const struct pcap_pkthdr *h, const u_char *p)

{

- register u_int length = h->len;

- register u_int caplen = h->caplen;

+ u_int length = h->len;

+ u_int caplen = h->caplen;

+ ndo->ndo_protocol = "ppp";

if (caplen < PPP_HDRLEN) {

- printf("[|ppp]");

- return (caplen);

+ nd_print_trunc(ndo);

+ ndo->ndo_ll_hdr_len += caplen;

+ return;

}

+ ndo->ndo_ll_hdr_len += PPP_HDRLEN;

#if 0

/*

#if 0

/*

* (Is the Cisco framing in question what DLT_C_HDLC, in

* BSD/OS, is?)

*/

* (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]);

+ if (ndo->ndo_eflag)

+ ND_PRINT("%c %4d %02x ", GET_U_1(p) ? 'O' : 'I',

+ length, GET_U_1(p + 1));

#endif

- ppp_print(p, length);

-

- return (0);

+ ppp_print(ndo, p, length);

}

/*

}

/*

*

* This handles, for example, DLT_PPP_SERIAL in NetBSD.

*/

*

* 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)

+void

+ppp_hdlc_if_print(netdissect_options *ndo,

+ const struct pcap_pkthdr *h, const u_char *p)

{

- register u_int length = h->len;

- register u_int caplen = h->caplen;

+ u_int length = h->len;

+ u_int caplen = h->caplen;

u_int proto;

u_int hdrlen = 0;

u_int proto;

u_int hdrlen = 0;

+ ndo->ndo_protocol = "ppp_hdlc";

if (caplen < 2) {

- printf("[|ppp]");

- return (caplen);

+ nd_print_trunc(ndo);

+ ndo->ndo_ll_hdr_len += caplen;

+ return;

}

- switch (p[0]) {

+ switch (GET_U_1(p)) {

case PPP_ADDRESS:

if (caplen < 4) {

case PPP_ADDRESS:

if (caplen < 4) {

- printf("[|ppp]");

- return (caplen);

+ nd_print_trunc(ndo);

+ ndo->ndo_ll_hdr_len += caplen;

+ return;

}

- if (eflag)

- printf("%02x %02x %d ", p[0], p[1], length);

+ if (ndo->ndo_eflag)

+ ND_PRINT("%02x %02x %u ", GET_U_1(p),

+ GET_U_1(p + 1), length);

p += 2;

length -= 2;

hdrlen += 2;

p += 2;

length -= 2;

hdrlen += 2;

- proto = EXTRACT_16BITS(p);

+ proto = GET_BE_U_2(p);

p += 2;

length -= 2;

hdrlen += 2;

p += 2;

length -= 2;

hdrlen += 2;

- printf("%s: ", tok2str(ppptype2str, "unknown PPP protocol (0x%04x)", proto));

+ ND_PRINT("%s: ", tok2str(ppptype2str, "unknown PPP protocol (0x%04x)", proto));

- handle_ppp(proto, p, length);

+ handle_ppp(ndo, proto, p, length);

break;

case CHDLC_UNICAST:

case CHDLC_BCAST:

break;

case CHDLC_UNICAST:

case CHDLC_BCAST:

- return (chdlc_if_print(h, p));

+ chdlc_if_print(ndo, h, p);

+ return;

default:

- if (eflag)

- printf("%02x %02x %d ", p[0], p[1], length);

+ if (caplen < 4) {

+ nd_print_trunc(ndo);

+ ndo->ndo_ll_hdr_len += caplen;

+ return;

+ }

+

+ if (ndo->ndo_eflag)

+ ND_PRINT("%02x %02x %u ", GET_U_1(p),

+ GET_U_1(p + 1), length);

p += 2;

- length -= 2;

hdrlen += 2;

/*

hdrlen += 2;

/*

* the next two octets as an Ethernet type; does that

* ever happen?

*/

* the next two octets as an Ethernet type; does that

* ever happen?

*/

- printf("unknown addr %02x; ctrl %02x", p[0], p[1]);

+ ND_PRINT("unknown addr %02x; ctrl %02x", GET_U_1(p),

+ GET_U_1(p + 1));

break;

}

break;

}

- return (hdrlen);

+ ndo->ndo_ll_hdr_len += hdrlen;

}

#define PPP_BSDI_HDRLEN 24

/* BSD/OS specific PPP printer */

}

#define PPP_BSDI_HDRLEN 24

/* BSD/OS specific PPP printer */

-u_int

-ppp_bsdos_if_print(const struct pcap_pkthdr *h _U_, register const u_char *p _U_)

+void

+ppp_bsdos_if_print(netdissect_options *ndo,

+ const struct pcap_pkthdr *h _U_, const u_char *p _U_)

{

- register int hdrlength;

+ u_int hdrlength;

#ifdef __bsdi__

- register u_int length = h->len;

- register u_int caplen = h->caplen;

- u_int16_t ptype;

+ u_int length = h->len;

+ u_int caplen = h->caplen;

+ uint16_t ptype;

+ uint8_t llhl;

const u_char *q;

- int i;

+ u_int i;

+ ndo->ndo_protocol = "ppp_bsdos";

if (caplen < PPP_BSDI_HDRLEN) {

- printf("[|ppp]");

- return (caplen)

+ nd_print_trunc(ndo);

+ ndo->ndo_ll_hdr_len += caplen;

+ return;

}

hdrlength = 0;

#if 0

}

hdrlength = 0;

#if 0

- if (p[0] == PPP_ADDRESS && p[1] == PPP_CONTROL) {

- if (eflag)

- printf("%02x %02x ", p[0], p[1]);

+ 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;

}

p += 2;

hdrlength = 2;

}

- if (eflag)

- printf("%d ", length);

+ if (ndo->ndo_eflag)

+ ND_PRINT("%u ", length);

/* Retrieve the protocol type */

- if (*p & 01) {

+ if (GET_U_1(p) & 01) {

/* Compressed protocol field */

- ptype = *p;

- if (eflag)

- printf("%02x ", ptype);

+ ptype = GET_U_1(p);

+ if (ndo->ndo_eflag)

+ ND_PRINT("%02x ", ptype);

p++;

hdrlength += 1;

} else {

/* Un-compressed protocol field */

p++;

hdrlength += 1;

} else {

/* Un-compressed protocol field */

- ptype = EXTRACT_16BITS(p);

- if (eflag)

- printf("%04x ", ptype);

+ ptype = GET_BE_U_2(p);

+ if (ndo->ndo_eflag)

+ ND_PRINT("%04x ", ptype);

p += 2;

hdrlength += 2;

}

#else

ptype = 0; /*XXX*/

p += 2;

hdrlength += 2;

}

#else

ptype = 0; /*XXX*/

- if (eflag)

- printf("%c ", p[SLC_DIR] ? 'O' : 'I');

- if (p[SLC_LLHL]) {

+ 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;

/* link level header */

struct ppp_header *ph;

ph = (struct ppp_header *)q;

if (ph->phdr_addr == PPP_ADDRESS

&& ph->phdr_ctl == PPP_CONTROL) {

ph = (struct ppp_header *)q;

if (ph->phdr_addr == PPP_ADDRESS

&& ph->phdr_ctl == PPP_CONTROL) {

- if (eflag)

- printf("%02x %02x ", q[0], q[1]);

- ptype = EXTRACT_16BITS(&ph->phdr_type);

- if (eflag && (ptype == PPP_VJC || ptype == PPP_VJNC)) {

- printf("%s ", tok2str(ppptype2str,

- "proto-#%d", ptype));

+ 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 {

}

} else {

- if (eflag) {

- printf("LLH=[");

- for (i = 0; i < p[SLC_LLHL]; i++)

- printf("%02x", q[i]);

- printf("] ");

+ if (ndo->ndo_eflag) {

+ ND_PRINT("LLH=[");

+ for (i = 0; i < llhl; i++)

+ ND_PRINT("%02x", GET_U_1(q + i));

+ ND_PRINT("] ");

}

- if (eflag)

- printf("%d ", length);

- if (p[SLC_CHL]) {

- q = p + SLC_BPFHDRLEN + p[SLC_LLHL];

+ 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:

switch (ptype) {

case PPP_VJC:

- ptype = vjc_print(q, ptype);

+ ptype = vjc_print(ndo, q, ptype);

hdrlength = PPP_BSDI_HDRLEN;

p += hdrlength;

switch (ptype) {

case PPP_IP:

hdrlength = PPP_BSDI_HDRLEN;

p += hdrlength;

switch (ptype) {

case PPP_IP:

- ip_print(gndo, p, length);

+ ip_print(ndo, p, length);

break;

-#ifdef INET6

case PPP_IPV6:

- ip6_print(gndo, p, length);

+ ip6_print(ndo, p, length);

break;

-#endif

case PPP_MPLS_UCAST:

case PPP_MPLS_MCAST:

case PPP_MPLS_UCAST:

case PPP_MPLS_MCAST:

- mpls_print(p, length);

+ mpls_print(ndo, p, length);

break;

}

goto printx;

case PPP_VJNC:

break;

}

goto printx;

case PPP_VJNC:

- ptype = vjc_print(q, ptype);

+ ptype = vjc_print(ndo, q, ptype);

hdrlength = PPP_BSDI_HDRLEN;

p += hdrlength;

switch (ptype) {

case PPP_IP:

hdrlength = PPP_BSDI_HDRLEN;

p += hdrlength;

switch (ptype) {

case PPP_IP:

- ip_print(gndo, p, length);

+ ip_print(ndo, p, length);

break;

-#ifdef INET6

case PPP_IPV6:

- ip6_print(gndo, p, length);

+ ip6_print(ndo, p, length);

break;

-#endif

case PPP_MPLS_UCAST:

case PPP_MPLS_MCAST:

case PPP_MPLS_UCAST:

case PPP_MPLS_MCAST:

- mpls_print(p, length);

+ mpls_print(ndo, p, length);

break;

}

goto printx;

default:

break;

}

goto printx;

default:

- if (eflag) {

- printf("CH=[");

- for (i = 0; i < p[SLC_LLHL]; i++)

- printf("%02x", q[i]);

- printf("] ");

+ if (ndo->ndo_eflag) {

+ ND_PRINT("CH=[");

+ for (i = 0; i < llhl; i++)

+ ND_PRINT("%02x",

+ GET_U_1(q + i));

+ ND_PRINT("] ");

}

break;

}

break;

}

case PPP_IP:

ip_print(p, length);

break;

case PPP_IP:

ip_print(p, length);

break;

-#ifdef INET6

case PPP_IPV6:

- ip6_print(gndo, p, length);

+ ip6_print(ndo, p, length);

+ break;

+ case PPP_MPLS_UCAST:

+ case PPP_MPLS_MCAST:

+ mpls_print(ndo, p, length);

break;

-#endif

- case PPP_MPLS_UCAST:

- case PPP_MPLS_MCAST:

- mpls_print(gndo, p, length);

- break;

default:

- printf("%s ", tok2str(ppptype2str, "unknown PPP protocol (0x%04x)", ptype));

+ ND_PRINT("%s ", tok2str(ppptype2str, "unknown PPP protocol (0x%04x)", ptype));

}

printx:

#else /* __bsdi */

hdrlength = 0;

#endif /* __bsdi__ */

}

printx:

#else /* __bsdi */

hdrlength = 0;

#endif /* __bsdi__ */

- return (hdrlength);

+ ndo->ndo_ll_hdr_len += hdrlength;

}

-

-/*

- * Local Variables:

- * c-style: whitesmith

- * c-basic-offset: 8

- * End:

- */