Regenerate config files.

[tcpdump] / print-ppp.c
diff --git a/print-ppp.c b/print-ppp.c

index 6fbfe2506e9c9d49122c0c6e623f48400bdc4449..ee8239c779250bfa7ba84c9984d6143af24ea19c 100644 (file)
--- a/print-ppp.c
+++ b/print-ppp.c
@@ -22,6 +22,8 @@
   * 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
@@ -29,31 +31,26 @@
   * o BAP support
   */
  
   * o BAP support
   */
  
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ppp.c,v 1.89 2003-10-20 08:26:49 hannes Exp $ (LBL)";
-#endif
-
  #ifdef HAVE_CONFIG_H
  #include "config.h"
  #endif
  
  #ifdef HAVE_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 "extract.h"
  #include "addrtoname.h"
  #include "ppp.h"
  #include "chdlc.h"
  #include "ethertype.h"
+#include "oui.h"
  
  /*
   * The following constatns are defined by IANA. Please refer to
  
  /*
   * The following constatns are defined by IANA. Please refer to
@@ -63,20 +60,23 @@ static const char rcsid[] =
  
  /* Protocol Codes defined in ppp.h */
  
  
  /* Protocol Codes defined in ppp.h */
  
-struct tok ppptype2str[] = {
+static const struct tok ppptype2str[] = {
          { PPP_IP,        "IP" },
          { PPP_OSI,       "OSI" },
          { PPP_NS,        "NS" },
          { PPP_DECNET,    "DECNET" },
          { PPP_APPLE,     "APPLE" },
         { PPP_IPX,        "IPX" },
          { 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_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_BRPDU,      "BRPDU" },
         { PPP_STII,       "STII" },
         { PPP_VINES,      "VINES" },
         { PPP_MPLS_UCAST, "MPLS" },
         { PPP_MPLS_MCAST, "MPLS" },
+        { PPP_COMP,       "Compressed"},
+        { PPP_ML,         "MLPPP"},
+        { PPP_IPV6,       "IP6"},
  
         { PPP_HELLO,      "HELLO" },
         { PPP_LUXCOM,     "LUXCOM" },
  
         { PPP_HELLO,      "HELLO" },
         { PPP_LUXCOM,     "LUXCOM" },
@@ -89,15 +89,20 @@ struct tok ppptype2str[] = {
         { PPP_IPXCP,      "IPXCP" },
         { PPP_STIICP,     "STIICP" },
         { PPP_VINESCP,    "VINESCP" },
         { PPP_IPXCP,      "IPXCP" },
         { PPP_STIICP,     "STIICP" },
         { PPP_VINESCP,    "VINESCP" },
+        { PPP_IPV6CP,     "IP6CP" },
         { PPP_MPLSCP,     "MPLSCP" },
  
         { PPP_LCP,        "LCP" },
         { PPP_PAP,        "PAP" },
         { PPP_LQM,        "LQM" },
         { PPP_CHAP,       "CHAP" },
         { PPP_MPLSCP,     "MPLSCP" },
  
         { PPP_LCP,        "LCP" },
         { PPP_PAP,        "PAP" },
         { PPP_LQM,        "LQM" },
         { PPP_CHAP,       "CHAP" },
+       { PPP_EAP,        "EAP" },
+       { PPP_SPAP,       "SPAP" },
+       { PPP_SPAP_OLD,   "Old-SPAP" },
         { PPP_BACP,       "BACP" },
         { PPP_BAP,        "BAP" },
         { PPP_BACP,       "BACP" },
         { PPP_BAP,        "BAP" },
-       { PPP_MP,         "ML" },
+       { PPP_MPCP,       "MLPPP-CP" },
+       { PPP_CCP,        "CCP" },
         { 0,              NULL }
  };
  
         { 0,              NULL }
  };
  
@@ -120,7 +125,7 @@ struct tok ppptype2str[] = {
  #define CPCODES_RESET_REQ      14      /* Reset-Request (CCP only) RFC1962 */
  #define CPCODES_RESET_REP      15      /* Reset-Reply (CCP only) */
  
  #define CPCODES_RESET_REQ      14      /* Reset-Request (CCP only) RFC1962 */
  #define CPCODES_RESET_REP      15      /* Reset-Reply (CCP only) */
  
-struct tok cpcodes[] = {
+static const struct tok cpcodes[] = {
         {CPCODES_VEXT,      "Vendor-Extension"}, /* RFC2153 */
         {CPCODES_CONF_REQ,  "Conf-Request"},
          {CPCODES_CONF_ACK,  "Conf-Ack"},
         {CPCODES_VEXT,      "Vendor-Extension"}, /* RFC2153 */
         {CPCODES_CONF_REQ,  "Conf-Request"},
          {CPCODES_CONF_ACK,  "Conf-Ack"},
@@ -196,7 +201,7 @@ static const char *lcpconfopts[] = {
         "deprecated(15)",       /* used to be a Compund-Frames */
         "deprecated(16)",       /* used to be a Nominal-Data-Encap */
         "MRRU",                 /* (17) */
         "deprecated(15)",       /* used to be a Compund-Frames */
         "deprecated(16)",       /* used to be a Nominal-Data-Encap */
         "MRRU",                 /* (17) */
-       "SSNHF",                /* (18) */
+       "12-Bit seq #",         /* (18) */
         "End-Disc",             /* (19) */
         "Proprietary",          /* (20) */
         "DCE-Id",               /* (21) */
         "End-Disc",             /* (19) */
         "Proprietary",          /* (20) */
         "DCE-Id",               /* (21) */
@@ -211,7 +216,6 @@ static const char *lcpconfopts[] = {
         "PPP-Muxing",           /* (30) */
  };
  
         "PPP-Muxing",           /* (30) */
  };
  
-/* IPV6CP - to be supported */
  /* ECP - to be supported */
  
  /* CCP Config Options */
  /* ECP - to be supported */
  
  /* CCP Config Options */
@@ -235,57 +239,82 @@ static const char *lcpconfopts[] = {
  /* 27-254 unassigned */
  #define CCPOPT_RESV    255     /* RFC1962 */
  
  /* 27-254 unassigned */
  #define CCPOPT_RESV    255     /* RFC1962 */
  
-#define CCPOPT_MIN CCPOPT_OUI
-#define CCPOPT_MAX CCPOPT_DEFLATE    /* XXX: should be CCPOPT_RESV but... */
-
-static const char *ccpconfopts[] = {
-       "OUI",                  /* (0) */
-       "Pred-1",               /* (1) */
-       "Pred-2",               /* (2) */
-       "Puddle",               /* (3) */
-       "unassigned(4)",        /* (4) */
-       "unassigned(5)",        /* (5) */
-       "unassigned(6)",        /* (6) */
-       "unassigned(7)",        /* (7) */
-       "unassigned(8)",        /* (8) */
-       "unassigned(9)",        /* (9) */
-       "unassigned(10)",       /* (10) */
-       "unassigned(11)",       /* (11) */
-       "unassigned(12)",       /* (12) */
-       "unassigned(13)",       /* (13) */
-       "unassigned(14)",       /* (14) */
-       "unassigned(15)",       /* (15) */
-       "HP-PPC",               /* (16) */
-       "Stac-LZS",             /* (17) */
-       "MPPC",                 /* (18) */
-       "Gand-FZA",             /* (19) */
-       "V.42bis",              /* (20) */
-       "BSD-Comp",             /* (21) */
-       "unassigned(22)",       /* (22) */
-       "LZS-DCP",              /* (23) */
-       "MVRCA",                /* (24) */
-       "DEC",                  /* (25) */
-       "Deflate",              /* (26) */
+static const struct tok ccpconfopts_values[] = {
+        { CCPOPT_OUI, "OUI" },
+        { CCPOPT_PRED1, "Pred-1" },
+        { CCPOPT_PRED2, "Pred-2" },
+        { CCPOPT_PJUMP, "Puddle" },
+        { CCPOPT_HPPPC, "HP-PPC" },
+        { CCPOPT_STACLZS, "Stac-LZS" },
+        { CCPOPT_MPPC, "MPPC" },
+        { CCPOPT_GFZA, "Gand-FZA" },
+        { CCPOPT_V42BIS, "V.42bis" },
+        { CCPOPT_BSDCOMP, "BSD-Comp" },
+        { CCPOPT_LZSDCP, "LZS-DCP" },
+        { CCPOPT_MVRCA, "MVRCA" },
+        { CCPOPT_DEC, "DEC" },
+        { CCPOPT_DEFLATE, "Deflate" },
+        { CCPOPT_RESV, "Reserved"},
+        {0,                 NULL}
  };
  
  /* BACP Config Options */
  
  #define BACPOPT_FPEER  1       /* RFC2125 */
  
  };
  
  /* BACP Config Options */
  
  #define BACPOPT_FPEER  1       /* RFC2125 */
  
+static const struct tok bacconfopts_values[] = {
+        { BACPOPT_FPEER, "Favored-Peer" },
+        {0,                 NULL}
+};
+
+
  /* SDCP - to be supported */
  
  /* IPCP Config Options */
  /* SDCP - to be supported */
  
  /* IPCP Config Options */
-
  #define IPCPOPT_2ADDR  1       /* RFC1172, RFC1332 (deprecated) */
  #define IPCPOPT_IPCOMP 2       /* RFC1332 */
  #define IPCPOPT_ADDR   3       /* RFC1332 */
  #define IPCPOPT_MOBILE4        4       /* RFC2290 */
  #define IPCPOPT_2ADDR  1       /* RFC1172, RFC1332 (deprecated) */
  #define IPCPOPT_IPCOMP 2       /* RFC1332 */
  #define IPCPOPT_ADDR   3       /* RFC1332 */
  #define IPCPOPT_MOBILE4        4       /* RFC2290 */
-
  #define IPCPOPT_PRIDNS 129     /* RFC1877 */
  #define IPCPOPT_PRINBNS        130     /* RFC1877 */
  #define IPCPOPT_SECDNS 131     /* RFC1877 */
  #define IPCPOPT_SECNBNS        132     /* RFC1877 */
  
  #define IPCPOPT_PRIDNS 129     /* RFC1877 */
  #define IPCPOPT_PRINBNS        130     /* RFC1877 */
  #define IPCPOPT_SECDNS 131     /* RFC1877 */
  #define IPCPOPT_SECNBNS        132     /* RFC1877 */
  
+static const struct tok ipcpopt_values[] = {
+        { IPCPOPT_2ADDR, "IP-Addrs" },
+        { IPCPOPT_IPCOMP, "IP-Comp" },
+        { IPCPOPT_ADDR, "IP-Addr" },
+        { IPCPOPT_MOBILE4, "Home-Addr" },
+        { IPCPOPT_PRIDNS, "Pri-DNS" },
+        { IPCPOPT_PRINBNS, "Pri-NBNS" },
+        { IPCPOPT_SECDNS, "Sec-DNS" },
+        { IPCPOPT_SECNBNS, "Sec-NBNS" },
+       { 0,              NULL }
+};
+
+#define IPCPOPT_IPCOMP_HDRCOMP 0x61  /* rfc3544 */
+#define IPCPOPT_IPCOMP_MINLEN    14
+
+static const struct tok ipcpopt_compproto_values[] = {
+        { PPP_VJC, "VJ-Comp" },
+        { IPCPOPT_IPCOMP_HDRCOMP, "IP Header Compression" },
+       { 0,              NULL }
+};
+
+static const struct tok ipcpopt_compproto_subopt_values[] = {
+        { 1, "RTP-Compression" },
+        { 2, "Enhanced RTP-Compression" },
+       { 0,              NULL }
+};
+
+/* IP6CP Config Options */
+#define IP6CP_IFID      1
+
+static const struct tok ip6cpopt_values[] = {
+        { IP6CP_IFID, "Interface-ID" },
+       { 0,              NULL }
+};
+
  /* ATCP - to be supported */
  /* OSINLCP - to be supported */
  /* BVCP - to be supported */
  /* ATCP - to be supported */
  /* OSINLCP - to be supported */
  /* BVCP - to be supported */
@@ -300,6 +329,13 @@ static const char *ccpconfopts[] = {
  #define AUTHALG_MSCHAP1        128     /* RFC2433 */
  #define AUTHALG_MSCHAP2        129     /* RFC2795 */
  
  #define AUTHALG_MSCHAP1        128     /* RFC2433 */
  #define AUTHALG_MSCHAP2        129     /* RFC2795 */
  
+static const struct tok authalg_values[] = {
+        { AUTHALG_CHAPMD5, "MD5" },
+        { AUTHALG_MSCHAP1, "MS-CHAPv1" },
+        { AUTHALG_MSCHAP2, "MS-CHAPv2" },
+       { 0,              NULL }
+};
+
  /* FCS Alternatives - to be supported */
  
  /* Multilink Endpoint Discriminator (RFC1717) */
  /* FCS Alternatives - to be supported */
  
  /* Multilink Endpoint Discriminator (RFC1717) */
@@ -318,6 +354,16 @@ static const char *ccpconfopts[] = {
  #define CALLBACK_X500  4       /* X.500 distinguished name */
  #define CALLBACK_CBCP  6       /* Location is determined during CBCP nego */
  
  #define CALLBACK_X500  4       /* X.500 distinguished name */
  #define CALLBACK_CBCP  6       /* Location is determined during CBCP nego */
  
+static const struct tok ppp_callback_values[] = {
+        { CALLBACK_AUTH, "UserAuth" },
+        { CALLBACK_DSTR, "DialString" },
+        { CALLBACK_LID, "LocalID" },
+        { CALLBACK_E164, "E.164" },
+        { CALLBACK_X500, "X.500" },
+        { CALLBACK_CBCP, "CBCP" },
+       { 0,              NULL }
+};
+
  /* CHAP */
  
  #define CHAP_CHAL      1
  /* CHAP */
  
  #define CHAP_CHAL      1
@@ -325,14 +371,12 @@ static const char *ccpconfopts[] = {
  #define CHAP_SUCC      3
  #define CHAP_FAIL      4
  
  #define CHAP_SUCC      3
  #define CHAP_FAIL      4
  
-#define CHAP_CODEMIN CHAP_CHAL
-#define CHAP_CODEMAX CHAP_FAIL
-
-static const char *chapcode[] = {
-       "Chal",         /* (1) */
-       "Resp",         /* (2) */
-       "Succ",         /* (3) */
-       "Fail",         /* (4) */
+static const struct tok chapcode_values[] = {
+       { CHAP_CHAL, "Challenge" },
+       { CHAP_RESP, "Response" },
+       { CHAP_SUCC, "Success" },
+       { CHAP_FAIL, "Fail" },
+        { 0, NULL}
  };
  
  /* PAP */
  };
  
  /* PAP */
@@ -341,13 +385,11 @@ static const char *chapcode[] = {
  #define PAP_AACK       2
  #define PAP_ANAK       3
  
  #define PAP_AACK       2
  #define PAP_ANAK       3
  
-#define PAP_CODEMIN    PAP_AREQ
-#define PAP_CODEMAX    PAP_ANAK
-
-static const char *papcode[] = {
-       "Auth-Req",     /* (1) */
-       "Auth-Ack",     /* (2) */
-       "Auth-Nak",     /* (3) */
+static const struct tok papcode_values[] = {
+        { PAP_AREQ, "Auth-Req" },
+        { PAP_AACK, "Auth-ACK" },
+        { PAP_ANAK, "Auth-NACK" },
+        { 0, NULL }
  };
  
  /* BAP */
  };
  
  /* BAP */
@@ -360,52 +402,68 @@ static const char *papcode[] = {
  #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 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 int print_lcp_config_options(netdissect_options *, const u_char *p, int);
+static int print_ipcp_config_options(netdissect_options *, const u_char *p, int);
+static int print_ip6cp_config_options(netdissect_options *, const u_char *p, int);
+static int print_ccp_config_options(netdissect_options *, const u_char *p, int);
+static int print_bacp_config_options(netdissect_options *, const u_char *p, int);
+static void handle_ppp(netdissect_options *, u_int proto, const u_char *p, 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, int length)
  {
  {
+       const char *typestr;
         u_int code, len;
         u_int code, len;
-       int (*pfunc)(const u_char *, int);
+       int (*pfunc)(netdissect_options *, const u_char *, int);
         int x, j;
          const u_char *tptr;
  
          tptr=pptr;
  
         int x, j;
          const u_char *tptr;
  
          tptr=pptr;
  
-        printf("%s, ",tok2str(ppptype2str, "unknown", proto));
+        typestr = tok2str(ppptype2str, "unknown ctrl-proto (0x%04x)", proto);
+       ND_PRINT((ndo, "%s, ", typestr));
  
         if (length < 4) /* FIXME weak boundary checking */
  
         if (length < 4) /* FIXME weak boundary checking */
-               return;
+               goto trunc;
+       ND_TCHECK2(*tptr, 2);
  
         code = *tptr++;
  
         code = *tptr++;
-       
-        printf("%s (0x%02x), id %u",
-               tok2str(cpcodes, "Unknown Opcode",code),
-              code,
-               *tptr++); /* ID */
  
  
+       ND_PRINT((ndo, "%s (0x%02x), id %u, length %u",
+                 tok2str(cpcodes, "Unknown Opcode",code),
+                 code,
+                 *tptr++, /* ID */
+                 length + 2));
+
+       if (!ndo->ndo_vflag)
+               return;
+
+       if (length <= 4)
+               return;    /* there may be a NULL confreq etc. */
+
+       ND_TCHECK2(*tptr, 2);
         len = EXTRACT_16BITS(tptr);
         tptr += 2;
  
         len = EXTRACT_16BITS(tptr);
         tptr += 2;
  
-       if (length <= 4)
-               return;         /* there may be a NULL confreq etc. */
+       ND_PRINT((ndo, "\n\tencoded length %u (=Option(s) length %u)", len, len - 4));
+
+       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;
-               printf(", Magic-Num 0x%08x", EXTRACT_32BITS(tptr));
+               ND_TCHECK2(*tptr, 4);
+               ND_PRINT((ndo, "\n\t  Magic-Num 0x%08x", EXTRACT_32BITS(tptr)));
                 tptr += 4;
                 tptr += 4;
-               printf(" OUI 0x%06x", EXTRACT_24BITS(tptr));
+               ND_TCHECK2(*tptr, 3);
+               ND_PRINT((ndo, " 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:
                 /* XXX: need to decode Kind and Value(s)? */
                 break;
         case CPCODES_CONF_REQ:
@@ -421,6 +479,9 @@ handle_ctrl_proto(u_int proto, const u_char *pptr, int length)
                         case PPP_IPCP:
                                 pfunc = print_ipcp_config_options;
                                 break;
                         case PPP_IPCP:
                                 pfunc = print_ipcp_config_options;
                                 break;
+                       case PPP_IPV6CP:
+                               pfunc = print_ip6cp_config_options;
+                               break;
                         case PPP_CCP:
                                 pfunc = print_ccp_config_options;
                                 break;
                         case PPP_CCP:
                                 pfunc = print_ccp_config_options;
                                 break;
@@ -429,14 +490,17 @@ handle_ctrl_proto(u_int proto, const u_char *pptr, int length)
                                 break;
                         default:
                                 /*
                                 break;
                         default:
                                 /*
-                                * This should never happen, but we set
-                                * "pfunc" to squelch uninitialized
-                                * variable warnings from compilers.
+                                * No print routine for the options for
+                                * this protocol.
                                  */
                                 pfunc = NULL;
                                 break;
                         }
                                  */
                                 pfunc = NULL;
                                 break;
                         }
-                       if ((j = (*pfunc)(tptr, len)) == 0)
+
+                       if (pfunc == NULL) /* catch the above null pointer if unknown CP */
+                               break;
+
+                       if ((j = (*pfunc)(ndo, tptr, len)) == 0)
                                 break;
                         x -= j;
                         tptr += j;
                                 break;
                         x -= j;
                         tptr += j;
@@ -453,195 +517,239 @@ handle_ctrl_proto(u_int proto, const u_char *pptr, int length)
         case CPCODES_PROT_REJ:
                 if (length < 6)
                         break;
         case CPCODES_PROT_REJ:
                 if (length < 6)
                         break;
-               printf(", Rejected %s Protocol (0x%04x)",
+               ND_TCHECK2(*tptr, 2);
+               ND_PRINT((ndo, "\n\t  Rejected %s Protocol (0x%04x)",
                        tok2str(ppptype2str,"unknown", EXTRACT_16BITS(tptr)),
                        tok2str(ppptype2str,"unknown", EXTRACT_16BITS(tptr)),
-                      EXTRACT_16BITS(tptr));
-               /* XXX: need to decode Rejected-Information? */
+                      EXTRACT_16BITS(tptr)));
+               /* XXX: need to decode Rejected-Information? - hexdump for now */
+               if (len > 6) {
+                       ND_PRINT((ndo, "\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:
                 break;
         case CPCODES_ECHO_REQ:
         case CPCODES_ECHO_RPL:
         case CPCODES_DISC_REQ:
+               if (length < 8)
+                       break;
+               ND_TCHECK2(*tptr, 4);
+               ND_PRINT((ndo, "\n\t  Magic-Num 0x%08x", EXTRACT_32BITS(tptr)));
+               /* XXX: need to decode Data? - hexdump for now */
+               if (len > 8) {
+                       ND_PRINT((ndo, "\n\t  -----trailing data-----"));
+                       ND_TCHECK2(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;
-               printf(", Magic-Num 0x%08x", EXTRACT_32BITS(tptr));
-               /* XXX: need to decode Data? */
+               ND_TCHECK2(*tptr, 4);
+               ND_PRINT((ndo, "\n\t  Magic-Num 0x%08x", EXTRACT_32BITS(tptr)));
+               /* RFC 1661 says this is intended to be human readable */
+               if (len > 8) {
+                       ND_PRINT((ndo, "\n\t  Message\n\t    "));
+                       if (fn_printn(ndo, tptr + 4, len - 4, ndo->ndo_snapend))
+                               goto trunc;
+               }
                 break;
         case CPCODES_TIME_REM:
                 if (length < 12)
                         break;
                 break;
         case CPCODES_TIME_REM:
                 if (length < 12)
                         break;
-               printf(", Magic-Num 0x%08x", EXTRACT_32BITS(tptr));
-               printf(", Seconds-Remaining %us", EXTRACT_32BITS(tptr + 4));
+               ND_TCHECK2(*tptr, 4);
+               ND_PRINT((ndo, "\n\t  Magic-Num 0x%08x", EXTRACT_32BITS(tptr)));
+               ND_TCHECK2(*(tptr + 4), 4);
+               ND_PRINT((ndo, ", Seconds-Remaining %us", EXTRACT_32BITS(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(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;
         }
                 break;
         }
-       printf(", length %u", length);
+       return;
  
  
-        if (vflag >1)
-            print_unknown_data(pptr-2,"\n\t",length+2);
+trunc:
+       ND_PRINT((ndo, "[|%s]", typestr));
  }
  
  /* LCP config options */
  static int
  }
  
  /* LCP config options */
  static int
-print_lcp_config_options(const u_char *p, int length)
+print_lcp_config_options(netdissect_options *ndo,
+                         const u_char *p, int length)
  {
         int len, opt;
  
         if (length < 2)
                 return 0;
  {
         int len, opt;
  
         if (length < 2)
                 return 0;
+       ND_TCHECK2(*p, 2);
         len = p[1];
         opt = p[0];
         if (length < len)
                 return 0;
         len = p[1];
         opt = p[0];
         if (length < len)
                 return 0;
+       if (len < 2) {
+               if ((opt >= LCPOPT_MIN) && (opt <= LCPOPT_MAX))
+                       ND_PRINT((ndo, "\n\t  %s Option (0x%02x), length %u (length bogus, should be >= 2)",
+                                 lcpconfopts[opt], opt, len));
+               else
+                       ND_PRINT((ndo, "\n\tunknown LCP option 0x%02x", opt));
+               return 0;
+       }
         if ((opt >= LCPOPT_MIN) && (opt <= LCPOPT_MAX))
         if ((opt >= LCPOPT_MIN) && (opt <= LCPOPT_MAX))
-               printf(", %s ", lcpconfopts[opt]);
+               ND_PRINT((ndo, "\n\t  %s Option (0x%02x), length %u", lcpconfopts[opt], opt, len));
         else {
         else {
-               printf(", unknown LCP option 0x%02x", opt);
+               ND_PRINT((ndo, "\n\tunknown LCP option 0x%02x", opt));
                 return len;
         }
  
         switch (opt) {
         case LCPOPT_VEXT:
                 return len;
         }
  
         switch (opt) {
         case LCPOPT_VEXT:
-               if (len >= 6) {
-                       printf(" OUI 0x%06x", EXTRACT_24BITS(p+2));
+               if (len < 6) {
+                       ND_PRINT((ndo, " (length bogus, should be >= 6)"));
+                       return len;
+               }
+               ND_TCHECK2(*(p + 2), 3);
+               ND_PRINT((ndo, ": Vendor: %s (%u)",
+                       tok2str(oui_values,"Unknown",EXTRACT_24BITS(p+2)),
+                       EXTRACT_24BITS(p + 2)));
  #if 0
  #if 0
-                       printf(" kind 0x%02x", p[5]);
-                       printf(" val 0x")
-                       for (i = 0; i < len - 6; i++) {
-                               printf("%02x", p[6 + i]);
-                       }
-#endif
+               ND_TCHECK(p[5]);
+               ND_PRINT((ndo, ", kind: 0x%02x", p[5]));
+               ND_PRINT((ndo, ", Value: 0x"));
+               for (i = 0; i < len - 6; i++) {
+                       ND_TCHECK(p[6 + i]);
+                       ND_PRINT((ndo, "%02x", p[6 + i]));
                 }
                 }
+#endif
                 break;
         case LCPOPT_MRU:
                 break;
         case LCPOPT_MRU:
-               if (len == 4)
-                       printf(" %u", EXTRACT_16BITS(p + 2));
+               if (len != 4) {
+                       ND_PRINT((ndo, " (length bogus, should be = 4)"));
+                       return len;
+               }
+               ND_TCHECK2(*(p + 2), 2);
+               ND_PRINT((ndo, ": %u", EXTRACT_16BITS(p + 2)));
                 break;
         case LCPOPT_ACCM:
                 break;
         case LCPOPT_ACCM:
-               if (len == 6)
-                       printf(" %08x", EXTRACT_32BITS(p + 2));
+               if (len != 6) {
+                       ND_PRINT((ndo, " (length bogus, should be = 6)"));
+                       return len;
+               }
+               ND_TCHECK2(*(p + 2), 4);
+               ND_PRINT((ndo, ": 0x%08x", EXTRACT_32BITS(p + 2)));
                 break;
         case LCPOPT_AP:
                 break;
         case LCPOPT_AP:
-               if (len >= 4) {
-                   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;
-                       }
-                       break;
-                   case PPP_EAP:
-                       printf(" EAP");
-                       break;
-                   case PPP_SPAP:
-                       printf(" SPAP");
-                       break;
-                   case PPP_SPAP_OLD:
-                       printf(" Old-SPAP");
+               if (len < 4) {
+                       ND_PRINT((ndo, " (length bogus, should be >= 4)"));
+                       return len;
+               }
+               ND_TCHECK2(*(p + 2), 2);
+               ND_PRINT((ndo, ": %s", tok2str(ppptype2str, "Unknown Auth Proto (0x04x)", EXTRACT_16BITS(p + 2))));
+
+               switch (EXTRACT_16BITS(p+2)) {
+               case PPP_CHAP:
+                       ND_TCHECK(p[4]);
+                       ND_PRINT((ndo, ", %s", tok2str(authalg_values, "Unknown Auth Alg %u", p[4])));
                         break;
                         break;
-                   default:
-                     printf("unknown");
-                   }
+               case PPP_PAP: /* fall through */
+               case PPP_EAP:
+               case PPP_SPAP:
+               case PPP_SPAP_OLD:
+                        break;
+               default:
+                       print_unknown_data(ndo, p, "\n\t", len);
                 }
                 break;
         case LCPOPT_QP:
                 }
                 break;
         case LCPOPT_QP:
-               if (len >= 4) {
-                       if (EXTRACT_16BITS(p+2) == PPP_LQM)
-                               printf(" LQR");
-                       else
-                               printf(" unknown");
+               if (len < 4) {
+                       ND_PRINT((ndo, " (length bogus, should be >= 4)"));
+                       return 0;
                 }
                 }
+               ND_TCHECK2(*(p + 2), 2);
+               if (EXTRACT_16BITS(p+2) == PPP_LQM)
+                       ND_PRINT((ndo, ": LQR"));
+               else
+                       ND_PRINT((ndo, ": unknown"));
                 break;
         case LCPOPT_MN:
                 break;
         case LCPOPT_MN:
-               if (len == 6)
-                       printf(" 0x%08x", EXTRACT_32BITS(p + 2));
+               if (len != 6) {
+                       ND_PRINT((ndo, " (length bogus, should be = 6)"));
+                       return 0;
+               }
+               ND_TCHECK2(*(p + 2), 4);
+               ND_PRINT((ndo, ": 0x%08x", EXTRACT_32BITS(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)
-                       printf(" 0x%04x", EXTRACT_16BITS(p + 2));
+               if (len != 4) {
+                       ND_PRINT((ndo, " (length bogus, should be = 4)"));
+                       return 0;
+               }
+               ND_TCHECK2(*(p + 2), 2);
+               ND_PRINT((ndo, ": 0x%04x", EXTRACT_16BITS(p + 2)));
                 break;
         case LCPOPT_CBACK:
                 break;
         case LCPOPT_CBACK:
-               if (len < 3)
-                       break;
-               switch (p[2]) {         /* Operation */
-               case CALLBACK_AUTH:
-                       printf(" UserAuth");
-                       break;
-               case CALLBACK_DSTR:
-                       printf(" DialString");
-                       break;
-               case CALLBACK_LID:
-                       printf(" LocalID");
-                       break;
-               case CALLBACK_E164:
-                       printf(" E.164");
-                       break;
-               case CALLBACK_X500:
-                       printf(" X.500");
-                       break;
-               case CALLBACK_CBCP:
-                       printf(" CBCP");
-                       break;
-               default:
-                       printf(" unknown-operation=%u", p[2]);
-                       break;
+               if (len < 3) {
+                       ND_PRINT((ndo, " (length bogus, should be >= 3)"));
+                       return 0;
                 }
                 }
+               ND_PRINT((ndo, ": "));
+               ND_TCHECK(p[2]);
+               ND_PRINT((ndo, ": Callback Operation %s (%u)",
+                       tok2str(ppp_callback_values, "Unknown", p[2]),
+                       p[2]));
                 break;
         case LCPOPT_MLMRRU:
                 break;
         case LCPOPT_MLMRRU:
-               if (len == 4)
-                       printf(" %u", EXTRACT_16BITS(p + 2));
+               if (len != 4) {
+                       ND_PRINT((ndo, " (length bogus, should be = 4)"));
+                       return 0;
+               }
+               ND_TCHECK2(*(p + 2), 2);
+               ND_PRINT((ndo, ": %u", EXTRACT_16BITS(p + 2)));
                 break;
         case LCPOPT_MLED:
                 break;
         case LCPOPT_MLED:
-               if (len < 3)
-                       break;
+               if (len < 3) {
+                       ND_PRINT((ndo, " (length bogus, should be >= 3)"));
+                       return 0;
+               }
+               ND_TCHECK(p[2]);
                 switch (p[2]) {         /* class */
                 case MEDCLASS_NULL:
                 switch (p[2]) {         /* class */
                 case MEDCLASS_NULL:
-                       printf(" Null");
+                       ND_PRINT((ndo, ": Null"));
                         break;
                 case MEDCLASS_LOCAL:
                         break;
                 case MEDCLASS_LOCAL:
-                       printf(" Local"); /* XXX */
+                       ND_PRINT((ndo, ": Local")); /* XXX */
                         break;
                 case MEDCLASS_IPV4:
                         break;
                 case MEDCLASS_IPV4:
-                       if (len != 7)
-                               break;
-                       printf(" IPv4 %s", ipaddr_string(p + 3));
+                       if (len != 7) {
+                               ND_PRINT((ndo, " (length bogus, should be = 7)"));
+                               return 0;
+                       }
+                       ND_TCHECK2(*(p + 3), 4);
+                       ND_PRINT((ndo, ": IPv4 %s", ipaddr_string(ndo, p + 3)));
                         break;
                 case MEDCLASS_MAC:
                         break;
                 case MEDCLASS_MAC:
-                       if (len != 9)
-                               break;
-                       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((ndo, " (length bogus, should be = 9)"));
+                               return 0;
+                       }
+                       ND_TCHECK2(*(p + 3), 6);
+                       ND_PRINT((ndo, ": MAC %s", etheraddr_string(ndo, p + 3)));
                         break;
                 case MEDCLASS_MNB:
                         break;
                 case MEDCLASS_MNB:
-                       printf(" Magic-Num-Block"); /* XXX */
+                       ND_PRINT((ndo, ": Magic-Num-Block")); /* XXX */
                         break;
                 case MEDCLASS_PSNDN:
                         break;
                 case MEDCLASS_PSNDN:
-                       printf(" PSNDN"); /* XXX */
+                       ND_PRINT((ndo, ": PSNDN")); /* XXX */
+                       break;
+               default:
+                       ND_PRINT((ndo, ": Unknown class %u", p[2]));
                         break;
                 }
                 break;
                         break;
                 }
                 break;
@@ -656,7 +764,7 @@ print_lcp_config_options(const u_char *p, int length)
         case LCPOPT_DEP14:
         case LCPOPT_DEP15:
         case LCPOPT_DEP16:
         case LCPOPT_DEP14:
         case LCPOPT_DEP15:
         case LCPOPT_DEP16:
-       case LCPOPT_MLSSNHF:
+        case LCPOPT_MLSSNHF:
         case LCPOPT_PROP:
         case LCPOPT_DCEID:
         case LCPOPT_MPP:
         case LCPOPT_PROP:
         case LCPOPT_DCEID:
         case LCPOPT_MPP:
@@ -669,13 +777,50 @@ print_lcp_config_options(const u_char *p, int length)
         case LCPOPT_PPPMUX:
                 break;
  #endif
         case LCPOPT_PPPMUX:
                 break;
  #endif
+       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 (ndo->ndo_vflag > 1)
+               print_unknown_data(ndo, &p[2], "\n\t    ", len - 2); /* exclude TLV header */
+
         return len;
         return len;
+
+trunc:
+       ND_PRINT((ndo, "[|lcp]"));
+       return 0;
+}
+
+/* ML-PPP*/
+static const struct tok ppp_ml_flag_values[] = {
+    { 0x80, "begin" },
+    { 0x40, "end" },
+    { 0, NULL }
+};
+
+static void
+handle_mlppp(netdissect_options *ndo,
+             const u_char *p, int length)
+{
+    if (!ndo->ndo_eflag)
+        ND_PRINT((ndo, "MLPPP, "));
+
+    ND_PRINT((ndo, "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),
+           length));
  }
  
  /* CHAP */
  static void
  }
  
  /* CHAP */
  static void
-handle_chap(const u_char *p, int length)
+handle_chap(netdissect_options *ndo,
+            const u_char *p, int length)
  {
         u_int code, len;
         int val_size, name_size, msg_size;
  {
         u_int code, len;
         int val_size, name_size, msg_size;
@@ -684,25 +829,26 @@ handle_chap(const u_char *p, int length)
  
         p0 = p;
         if (length < 1) {
  
         p0 = p;
         if (length < 1) {
-               printf("[|chap]");
+               ND_PRINT((ndo, "[|chap]"));
                 return;
         } else if (length < 4) {
                 return;
         } else if (length < 4) {
-               printf("[|chap 0x%02x]", *p);
+               ND_TCHECK(*p);
+               ND_PRINT((ndo, "[|chap 0x%02x]", *p));
                 return;
         }
  
                 return;
         }
  
+       ND_TCHECK(*p);
         code = *p;
         code = *p;
-       if ((code >= CHAP_CODEMIN) && (code <= CHAP_CODEMAX))
-               printf("%s", chapcode[code - 1]);
-       else {
-               printf("0x%02x", code);
-               return;
-       }
+       ND_PRINT((ndo, "CHAP, %s (0x%02x)",
+               tok2str(chapcode_values,"unknown",code),
+               code));
         p++;
  
         p++;
  
-       printf("(%u)", *p);             /* ID */
+       ND_TCHECK(*p);
+       ND_PRINT((ndo, ", id %u", *p));         /* ID */
         p++;
  
         p++;
  
+       ND_TCHECK2(*p, 2);
         len = EXTRACT_16BITS(p);
         p += 2;
  
         len = EXTRACT_16BITS(p);
         p += 2;
  
@@ -718,31 +864,43 @@ handle_chap(const u_char *p, int length)
         case CHAP_RESP:
                 if (length - (p - p0) < 1)
                         return;
         case CHAP_RESP:
                 if (length - (p - p0) < 1)
                         return;
+               ND_TCHECK(*p);
                 val_size = *p;          /* value size */
                 p++;
                 if (length - (p - p0) < val_size)
                         return;
                 val_size = *p;          /* value size */
                 p++;
                 if (length - (p - p0) < val_size)
                         return;
-               printf(", Value ");
-               for (i = 0; i < val_size; i++)
-                       printf("%02x", *p++);
+               ND_PRINT((ndo, ", Value "));
+               for (i = 0; i < val_size; i++) {
+                       ND_TCHECK(*p);
+                       ND_PRINT((ndo, "%02x", *p++));
+               }
                 name_size = len - (p - p0);
                 name_size = len - (p - p0);
-               printf(", Name ");
-               for (i = 0; i < name_size; i++)
-                       safeputchar(*p++);
+               ND_PRINT((ndo, ", Name "));
+               for (i = 0; i < name_size; i++) {
+                       ND_TCHECK(*p);
+                       safeputchar(ndo, *p++);
+               }
                 break;
         case CHAP_SUCC:
         case CHAP_FAIL:
                 msg_size = len - (p - p0);
                 break;
         case CHAP_SUCC:
         case CHAP_FAIL:
                 msg_size = len - (p - p0);
-               printf(", Msg ");
-               for (i = 0; i< msg_size; i++)
-                       safeputchar(*p++);
+               ND_PRINT((ndo, ", Msg "));
+               for (i = 0; i< msg_size; i++) {
+                       ND_TCHECK(*p);
+                       safeputchar(ndo, *p++);
+               }
                 break;
         }
                 break;
         }
+       return;
+
+trunc:
+       ND_PRINT((ndo, "[|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, int length)
  {
         u_int code, len;
         int peerid_len, passwd_len, msg_len;
  {
         u_int code, len;
         int peerid_len, passwd_len, msg_len;
@@ -751,69 +909,103 @@ handle_pap(const u_char *p, int length)
  
         p0 = p;
         if (length < 1) {
  
         p0 = p;
         if (length < 1) {
-               printf("[|pap]");
+               ND_PRINT((ndo, "[|pap]"));
                 return;
         } else if (length < 4) {
                 return;
         } else if (length < 4) {
-               printf("[|pap 0x%02x]", *p);
+               ND_TCHECK(*p);
+               ND_PRINT((ndo, "[|pap 0x%02x]", *p));
                 return;
         }
  
                 return;
         }
  
+       ND_TCHECK(*p);
         code = *p;
         code = *p;
-       if ((code >= PAP_CODEMIN) && (code <= PAP_CODEMAX))
-               printf("%s", papcode[code - 1]);
-       else {
-               printf("0x%02x", code);
-               return;
-       }
+       ND_PRINT((ndo, "PAP, %s (0x%02x)",
+                 tok2str(papcode_values, "unknown", code),
+                 code));
         p++;
  
         p++;
  
-       printf("(%u)", *p);             /* ID */
+       ND_TCHECK(*p);
+       ND_PRINT((ndo, ", id %u", *p));         /* ID */
         p++;
  
         p++;
  
+       ND_TCHECK2(*p, 2);
         len = EXTRACT_16BITS(p);
         p += 2;
  
         len = EXTRACT_16BITS(p);
         p += 2;
  
+       if ((int)len > length) {
+               ND_PRINT((ndo, ", length %u > packet size", len));
+               return;
+       }
+       length = len;
+       if (length < (p - p0)) {
+               ND_PRINT((ndo, ", length %u < PAP header length", length));
+               return;
+       }
+
         switch (code) {
         case PAP_AREQ:
         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;
+               ND_TCHECK(*p);
                 peerid_len = *p;        /* Peer-ID Length */
                 p++;
                 if (length - (p - p0) < peerid_len)
                         return;
                 peerid_len = *p;        /* Peer-ID Length */
                 p++;
                 if (length - (p - p0) < peerid_len)
                         return;
-               printf(", Peer ");
-               for (i = 0; i < peerid_len; i++)
-                       safeputchar(*p++);
+               ND_PRINT((ndo, ", Peer "));
+               for (i = 0; i < peerid_len; i++) {
+                       ND_TCHECK(*p);
+                       safeputchar(ndo, *p++);
+               }
  
                 if (length - (p - p0) < 1)
                         return;
  
                 if (length - (p - p0) < 1)
                         return;
+               ND_TCHECK(*p);
                 passwd_len = *p;        /* Password Length */
                 p++;
                 if (length - (p - p0) < passwd_len)
                         return;
                 passwd_len = *p;        /* Password Length */
                 p++;
                 if (length - (p - p0) < passwd_len)
                         return;
-               printf(", Name ");
-               for (i = 0; i < passwd_len; i++)
-                       safeputchar(*p++);
+               ND_PRINT((ndo, ", Name "));
+               for (i = 0; i < passwd_len; i++) {
+                       ND_TCHECK(*p);
+                       safeputchar(ndo, *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;
+               ND_TCHECK(*p);
                 msg_len = *p;           /* Msg-Length */
                 p++;
                 if (length - (p - p0) < msg_len)
                         return;
                 msg_len = *p;           /* Msg-Length */
                 p++;
                 if (length - (p - p0) < msg_len)
                         return;
-               printf(", Msg ");
-               for (i = 0; i< msg_len; i++)
-                       safeputchar(*p++);
+               ND_PRINT((ndo, ", Msg "));
+               for (i = 0; i< msg_len; i++) {
+                       ND_TCHECK(*p);
+                       safeputchar(ndo, *p++);
+               }
                 break;
         }
         return;
                 break;
         }
         return;
+
+trunc:
+       ND_PRINT((ndo, "[|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_, int length _U_)
  {
         /* XXX: to be supported!! */
  }
  {
         /* XXX: to be supported!! */
  }
@@ -821,91 +1013,263 @@ handle_bap(const u_char *p _U_, int length _U_)
  
  /* IPCP config options */
  static int
  
  /* IPCP config options */
  static int
-print_ipcp_config_options(const u_char *p, int length)
+print_ipcp_config_options(netdissect_options *ndo,
+                          const u_char *p, int length)
  {
         int len, opt;
  {
         int len, opt;
+        u_int compproto, ipcomp_subopttotallen, ipcomp_subopt, ipcomp_suboptlen;
  
         if (length < 2)
                 return 0;
  
         if (length < 2)
                 return 0;
+       ND_TCHECK2(*p, 2);
         len = p[1];
         opt = p[0];
         if (length < len)
                 return 0;
         len = p[1];
         opt = p[0];
         if (length < len)
                 return 0;
+       if (len < 2) {
+               ND_PRINT((ndo, "\n\t  %s Option (0x%02x), length %u (length bogus, should be >= 2)",
+                      tok2str(ipcpopt_values,"unknown",opt),
+                      opt,
+                      len));
+               return 0;
+       }
+
+       ND_PRINT((ndo, "\n\t  %s Option (0x%02x), length %u",
+              tok2str(ipcpopt_values,"unknown",opt),
+              opt,
+              len));
+
         switch (opt) {
         case IPCPOPT_2ADDR:             /* deprecated */
         switch (opt) {
         case IPCPOPT_2ADDR:             /* deprecated */
-               if (len != 10)
-                       goto invlen;
-               printf(", IP-Addrs src %s, dst %s",
-                      ipaddr_string(p + 2),
-                      ipaddr_string(p + 6));
+               if (len != 10) {
+                       ND_PRINT((ndo, " (length bogus, should be = 10)"));
+                       return len;
+               }
+               ND_TCHECK2(*(p + 6), 4);
+               ND_PRINT((ndo, ": src %s, dst %s",
+                      ipaddr_string(ndo, p + 2),
+                      ipaddr_string(ndo, p + 6)));
                 break;
         case IPCPOPT_IPCOMP:
                 break;
         case IPCPOPT_IPCOMP:
-               if (len < 4)
-                       goto invlen;
-               printf(", IP-Comp");
-               if (EXTRACT_16BITS(p + 2) == PPP_VJC) {
-                       printf(" VJ-Comp");
+               if (len < 4) {
+                       ND_PRINT((ndo, " (length bogus, should be >= 4)"));
+                       return 0;
+               }
+               ND_TCHECK2(*(p + 2), 2);
+               compproto = EXTRACT_16BITS(p+2);
+
+               ND_PRINT((ndo, ": %s (0x%02x):",
+                         tok2str(ipcpopt_compproto_values, "Unknown", compproto),
+                         compproto));
+
+               switch (compproto) {
+                case PPP_VJC:
                         /* XXX: VJ-Comp parameters should be decoded */
                         /* XXX: VJ-Comp parameters should be decoded */
-               } else
-                       printf(" unknown-comp-proto=%04x", EXTRACT_16BITS(p + 2));
-               break;
-       case IPCPOPT_ADDR:
-               if (len != 6)
-                       goto invlen;
-               printf(", IP-Addr %s", ipaddr_string(p + 2));
+                        break;
+                case IPCPOPT_IPCOMP_HDRCOMP:
+                        if (len < IPCPOPT_IPCOMP_MINLEN) {
+                               ND_PRINT((ndo, " (length bogus, should be >= %u)",
+                                       IPCPOPT_IPCOMP_MINLEN));
+                               return 0;
+                        }
+
+                        ND_TCHECK2(*(p + 2), IPCPOPT_IPCOMP_MINLEN);
+                        ND_PRINT((ndo, "\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)));
+
+                        /* suboptions present ? */
+                        if (len > IPCPOPT_IPCOMP_MINLEN) {
+                                ipcomp_subopttotallen = len - IPCPOPT_IPCOMP_MINLEN;
+                                p += IPCPOPT_IPCOMP_MINLEN;
+
+                                ND_PRINT((ndo, "\n\t      Suboptions, length %u", ipcomp_subopttotallen));
+
+                                while (ipcomp_subopttotallen >= 2) {
+                                        ND_TCHECK2(*p, 2);
+                                        ipcomp_subopt = *p;
+                                        ipcomp_suboptlen = *(p+1);
+
+                                        /* sanity check */
+                                        if (ipcomp_subopt == 0 ||
+                                            ipcomp_suboptlen == 0 )
+                                                break;
+
+                                        /* XXX: just display the suboptions for now */
+                                        ND_PRINT((ndo, "\n\t\t%s Suboption #%u, length %u",
+                                               tok2str(ipcpopt_compproto_subopt_values,
+                                                       "Unknown",
+                                                       ipcomp_subopt),
+                                               ipcomp_subopt,
+                                               ipcomp_suboptlen));
+
+                                        ipcomp_subopttotallen -= ipcomp_suboptlen;
+                                        p += ipcomp_suboptlen;
+                                }
+                        }
+                        break;
+                default:
+                        break;
+               }
                 break;
                 break;
+
+       case IPCPOPT_ADDR:     /* those options share the same format - fall through */
         case IPCPOPT_MOBILE4:
         case IPCPOPT_MOBILE4:
-               if (len != 6)
-                       goto invlen;
-               printf(", Home-Addr %s", ipaddr_string(p + 2));
-               break;
         case IPCPOPT_PRIDNS:
         case IPCPOPT_PRIDNS:
-               if (len != 6)
-                       goto invlen;
-               printf(", Pri-DNS %s", ipaddr_string(p + 2));
-               break;
         case IPCPOPT_PRINBNS:
         case IPCPOPT_PRINBNS:
-               if (len != 6)
-                       goto invlen;
-               printf(", Pri-NBNS %s", ipaddr_string(p + 2));
-               break;
         case IPCPOPT_SECDNS:
         case IPCPOPT_SECDNS:
-               if (len != 6)
-                       goto invlen;
-               printf(", Sec-DNS %s", ipaddr_string(p + 2));
-               break;
         case IPCPOPT_SECNBNS:
         case IPCPOPT_SECNBNS:
-               if (len != 6)
-                       goto invlen;
-               printf(", Sec-NBNS %s", ipaddr_string(p + 2));
+               if (len != 6) {
+                       ND_PRINT((ndo, " (length bogus, should be = 6)"));
+                       return 0;
+               }
+               ND_TCHECK2(*(p + 2), 4);
+               ND_PRINT((ndo, ": %s", ipaddr_string(ndo, p + 2)));
                 break;
         default:
                 break;
         default:
-               printf(", unknown-%d", opt);
+               /*
+                * 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 (ndo->ndo_vflag > 1)
+               print_unknown_data(ndo, &p[2], "\n\t    ", len - 2); /* exclude TLV header */
         return len;
  
         return len;
  
-invlen:
-       printf(", invalid-length-%d", opt);
+trunc:
+       ND_PRINT((ndo, "[|ipcp]"));
         return 0;
  }
  
         return 0;
  }
  
+/* IP6CP config options */
+static int
+print_ip6cp_config_options(netdissect_options *ndo,
+                           const u_char *p, int length)
+{
+       int len, opt;
+
+       if (length < 2)
+               return 0;
+       ND_TCHECK2(*p, 2);
+       len = p[1];
+       opt = p[0];
+       if (length < len)
+               return 0;
+       if (len < 2) {
+               ND_PRINT((ndo, "\n\t  %s Option (0x%02x), length %u (length bogus, should be >= 2)",
+                      tok2str(ip6cpopt_values,"unknown",opt),
+                      opt,
+                      len));
+               return 0;
+       }
+
+       ND_PRINT((ndo, "\n\t  %s Option (0x%02x), length %u",
+              tok2str(ip6cpopt_values,"unknown",opt),
+              opt,
+              len));
+
+       switch (opt) {
+       case IP6CP_IFID:
+               if (len != 10) {
+                       ND_PRINT((ndo, " (length bogus, should be = 10)"));
+                       return len;
+               }
+               ND_TCHECK2(*(p + 2), 8);
+               ND_PRINT((ndo, ": %04x:%04x:%04x:%04x",
+                      EXTRACT_16BITS(p + 2),
+                      EXTRACT_16BITS(p + 4),
+                      EXTRACT_16BITS(p + 6),
+                      EXTRACT_16BITS(p + 8)));
+               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 (ndo->ndo_vflag > 1)
+               print_unknown_data(ndo, &p[2], "\n\t    ", len - 2); /* exclude TLV header */
+
+       return len;
+
+trunc:
+       ND_PRINT((ndo, "[|ip6cp]"));
+       return 0;
+}
+
+
  /* CCP config options */
  static int
  /* CCP config options */
  static int
-print_ccp_config_options(const u_char *p, int length)
+print_ccp_config_options(netdissect_options *ndo,
+                         const u_char *p, int length)
  {
         int len, opt;
  
         if (length < 2)
                 return 0;
  {
         int len, opt;
  
         if (length < 2)
                 return 0;
+       ND_TCHECK2(*p, 2);
         len = p[1];
         opt = p[0];
         if (length < len)
                 return 0;
         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 */
+       if (len < 2) {
+               ND_PRINT((ndo, "\n\t  %s Option (0x%02x), length %u (length bogus, should be >= 2)",
+                         tok2str(ccpconfopts_values, "Unknown", opt),
+                         opt,
+                         len));
+               return 0;
+       }
+
+       ND_PRINT((ndo, "\n\t  %s Option (0x%02x), length %u",
+                 tok2str(ccpconfopts_values, "Unknown", opt),
+                 opt,
+                 len));
+
         switch (opt) {
         switch (opt) {
+       case CCPOPT_BSDCOMP:
+               if (len < 3) {
+                       ND_PRINT((ndo, " (length bogus, should be >= 3)"));
+                       return len;
+               }
+               ND_TCHECK2(*(p + 2), 1);
+               ND_PRINT((ndo, ": Version: %u, Dictionary Bits: %u",
+                       p[2] >> 5, p[2] & 0x1f));
+               break;
+       case CCPOPT_MVRCA:
+               if (len < 4) {
+                       ND_PRINT((ndo, " (length bogus, should be >= 4)"));
+                       return len;
+               }
+               ND_TCHECK2(*(p + 2), 1);
+               ND_PRINT((ndo, ": Features: %u, PxP: %s, History: %u, #CTX-ID: %u",
+                               (p[2] & 0xc0) >> 6,
+                               (p[2] & 0x20) ? "Enabled" : "Disabled",
+                               p[2] & 0x1f, p[3]));
+               break;
+       case CCPOPT_DEFLATE:
+               if (len < 4) {
+                       ND_PRINT((ndo, " (length bogus, should be >= 4)"));
+                       return len;
+               }
+               ND_TCHECK2(*(p + 2), 1);
+               ND_PRINT((ndo, ": Window: %uK, Method: %s (0x%x), MBZ: %u, CHK: %u",
+                       (p[2] & 0xf0) >> 4,
+                       ((p[2] & 0x0f) == 8) ? "zlib" : "unkown",
+                       p[2] & 0x0f, (p[3] & 0xfc) >> 2, 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:
@@ -915,100 +1279,233 @@ print_ccp_config_options(const u_char *p, int length)
         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_LZSDCP:
-       case CCPOPT_MVRCA:
         case CCPOPT_DEC:
         case CCPOPT_DEC:
-       case CCPOPT_DEFLATE:
         case CCPOPT_RESV:
                 break;
         case CCPOPT_RESV:
                 break;
-
+#endif
         default:
         default:
-               printf(", unknown-%d", opt);
+               /*
+                * 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;
         }
-#endif
+       if (ndo->ndo_vflag > 1)
+               print_unknown_data(ndo, &p[2], "\n\t    ", len - 2); /* exclude TLV header */
+
         return len;
         return len;
+
+trunc:
+       ND_PRINT((ndo, "[|ccp]"));
+       return 0;
  }
  
  /* BACP config options */
  static int
  }
  
  /* BACP config options */
  static int
-print_bacp_config_options(const u_char *p, int length)
+print_bacp_config_options(netdissect_options *ndo,
+                          const u_char *p, int length)
  {
         int len, opt;
  
         if (length < 2)
                 return 0;
  {
         int len, opt;
  
         if (length < 2)
                 return 0;
+       ND_TCHECK2(*p, 2);
         len = p[1];
         opt = p[0];
         if (length < len)
                 return 0;
         len = p[1];
         opt = p[0];
         if (length < len)
                 return 0;
-       if (opt == BACPOPT_FPEER) {
-               printf(", Favored-Peer");
-               printf(", Magic-Num 0x%08x", EXTRACT_32BITS(p + 2));
-       } else {
-               printf(", unknown-option-%d", opt);
+       if (len < 2) {
+               ND_PRINT((ndo, "\n\t  %s Option (0x%02x), length %u (length bogus, should be >= 2)",
+                         tok2str(bacconfopts_values, "Unknown", opt),
+                         opt,
+                         len));
+               return 0;
+       }
+
+       ND_PRINT((ndo, "\n\t  %s Option (0x%02x), length %u",
+                 tok2str(bacconfopts_values, "Unknown", opt),
+                 opt,
+                 len));
+
+       switch (opt) {
+       case BACPOPT_FPEER:
+               if (len != 6) {
+                       ND_PRINT((ndo, " (length bogus, should be = 6)"));
+                       return len;
+               }
+               ND_TCHECK2(*(p + 2), 4);
+               ND_PRINT((ndo, ": Magic-Num 0x%08x", EXTRACT_32BITS(p + 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 (ndo->ndo_vflag > 1)
+               print_unknown_data(ndo, &p[2], "\n\t    ", len - 2); /* exclude TLV header */
+
         return len;
         return len;
+
+trunc:
+       ND_PRINT((ndo, "[|bacp]"));
+       return 0;
+}
+
+static void
+ppp_hdlc(netdissect_options *ndo,
+         const u_char *p, int length)
+{
+       u_char *b, *t, c;
+       const u_char *s;
+       int i, proto;
+       const void *se;
+
+        if (length <= 0)
+                return;
+
+       b = (u_char *)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 = p, t = b, i = length; i > 0 && ND_TTEST(*s); i--) {
+               c = *s++;
+               if (c == 0x7d) {
+                       if (i <= 1 || !ND_TTEST(*s))
+                               break;
+                       i--;
+                       c = *s++ ^ 0x20;
+               }
+               *t++ = c;
+       }
+
+       se = ndo->ndo_snapend;
+       ndo->ndo_snapend = t;
+       length = t - b;
+
+        /* now lets guess about the payload codepoint format */
+        if (length < 1)
+                goto trunc;
+        proto = *b; /* start with a one-octet codepoint guess */
+
+        switch (proto) {
+        case PPP_IP:
+               ip_print(ndo, b + 1, length - 1);
+               goto cleanup;
+        case PPP_IPV6:
+               ip6_print(ndo, b + 1, length - 1);
+               goto cleanup;
+        default: /* no luck - try next guess */
+               break;
+        }
+
+        if (length < 2)
+                goto trunc;
+        proto = EXTRACT_16BITS(b); /* next guess - load two octets */
+
+        switch (proto) {
+        case (PPP_ADDRESS << 8 | PPP_CONTROL): /* looks like a PPP frame */
+            if (length < 4)
+                goto trunc;
+            proto = EXTRACT_16BITS(b+2); /* load the PPP proto-id */
+            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);
+            break;
+        }
+
+cleanup:
+       ndo->ndo_snapend = se;
+       free(b);
+        return;
+
+trunc:
+       ndo->ndo_snapend = se;
+       free(b);
+       ND_PRINT((ndo, "[|ppp]"));
  }
  
  
  /* 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, int length)
  {
  {
+       if ((proto & 0xff00) == 0x7e00) { /* is this an escape code ? */
+               ppp_hdlc(ndo, p - 1, length);
+               return;
+       }
+
         switch (proto) {
         switch (proto) {
-       case PPP_LCP:
+       case PPP_LCP: /* fall through */
         case PPP_IPCP:
         case PPP_OSICP:
         case PPP_MPLSCP:
         case PPP_IPV6CP:
         case PPP_CCP:
         case PPP_BACP:
         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_ctrl_proto(ndo, proto, p, length);
+               break;
+       case PPP_ML:
+               handle_mlppp(ndo, p, length);
                 break;
         case PPP_CHAP:
                 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*/
                 break;
         case ETHERTYPE_IP:      /*XXX*/
+        case PPP_VJNC:
         case PPP_IP:
         case PPP_IP:
-               ip_print(p, length);
+               ip_print(ndo, p, length);
                 break;
                 break;
-#ifdef INET6
         case ETHERTYPE_IPV6:    /*XXX*/
         case PPP_IPV6:
         case ETHERTYPE_IPV6:    /*XXX*/
         case PPP_IPV6:
-               ip6_print(p, length);
+               ip6_print(ndo, p, length);
                 break;
                 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, 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:
+               ND_PRINT((ndo, "compressed PPP data"));
                 break;
         default:
                 break;
         default:
-                printf("unknown PPP protocol (0x%04x)", proto);
-                print_unknown_data(p,"\n\t",length);
-                break;
+               ND_PRINT((ndo, "%s ", tok2str(ppptype2str, "unknown PPP protocol (0x%04x)", proto)));
+               print_unknown_data(ndo, p, "\n\t", length);
+               break;
         }
  }
  
  /* Standard PPP printer */
  u_int
         }
  }
  
  /* Standard PPP printer */
  u_int
-ppp_print(register const u_char *p, u_int length)
+ppp_print(netdissect_options *ndo,
+          register const u_char *p, u_int length)
  {
  {
-       u_int proto;
+       u_int proto,ppp_header;
          u_int olen = length; /* _o_riginal length */
         u_int hdr_len = 0;
  
          u_int olen = length; /* _o_riginal length */
         u_int hdr_len = 0;
  
@@ -1018,49 +1515,72 @@ ppp_print(register const u_char *p, u_int length)
          */
         if (length < 2)
                 goto trunc;
          */
         if (length < 2)
                 goto trunc;
-       if (*p == PPP_ADDRESS && *(p + 1) == PPP_CONTROL) {
-               p += 2;                 /* ACFC not used */
-               length -= 2;
-               hdr_len += 2;
-       }
+       ND_TCHECK2(*p, 2);
+        ppp_header = EXTRACT_16BITS(p);
+
+        switch(ppp_header) {
+        case (PPP_WITHDIRECTION_IN  << 8 | PPP_CONTROL):
+            if (ndo->ndo_eflag) ND_PRINT((ndo, "In  "));
+            p += 2;
+            length -= 2;
+            hdr_len += 2;
+            break;
+        case (PPP_WITHDIRECTION_OUT << 8 | PPP_CONTROL):
+            if (ndo->ndo_eflag) ND_PRINT((ndo, "Out "));
+            p += 2;
+            length -= 2;
+            hdr_len += 2;
+            break;
+        case (PPP_ADDRESS << 8 | PPP_CONTROL):
+            p += 2;                    /* ACFC not used */
+            length -= 2;
+            hdr_len += 2;
+            break;
+
+        default:
+            break;
+        }
  
         if (length < 2)
                 goto trunc;
  
         if (length < 2)
                 goto trunc;
+       ND_TCHECK(*p);
         if (*p % 2) {
                 proto = *p;             /* PFC is used */
                 p++;
                 length--;
                 hdr_len++;
         } else {
         if (*p % 2) {
                 proto = *p;             /* PFC is used */
                 p++;
                 length--;
                 hdr_len++;
         } else {
+               ND_TCHECK2(*p, 2);
                 proto = EXTRACT_16BITS(p);
                 p += 2;
                 length -= 2;
                 hdr_len += 2;
         }
  
                 proto = EXTRACT_16BITS(p);
                 p += 2;
                 length -= 2;
                 hdr_len += 2;
         }
  
-        if (eflag)
-            printf("PPP-%s (0x%04x), length %u: ",
-                   tok2str(ppptype2str, "unknown", proto),
-                   proto,
-                   olen);
+       if (ndo->ndo_eflag)
+               ND_PRINT((ndo, "%s (0x%04x), length %u: ",
+                         tok2str(ppptype2str, "unknown", proto),
+                         proto,
+                         olen));
  
  
-       handle_ppp(proto, p, length);
+       handle_ppp(ndo, proto, p, length);
         return (hdr_len);
  trunc:
         return (hdr_len);
  trunc:
-       printf("[|ppp]");
+       ND_PRINT((ndo, "[|ppp]"));
         return (0);
  }
  
  
  /* PPP I/F printer */
  u_int
         return (0);
  }
  
  
  /* PPP I/F printer */
  u_int
-ppp_if_print(const struct pcap_pkthdr *h, register const u_char *p)
+ppp_if_print(netdissect_options *ndo,
+             const struct pcap_pkthdr *h, register const u_char *p)
  {
         register u_int length = h->len;
         register u_int caplen = h->caplen;
  
         if (caplen < PPP_HDRLEN) {
  {
         register u_int length = h->len;
         register u_int caplen = h->caplen;
  
         if (caplen < PPP_HDRLEN) {
-               printf("[|ppp]");
+               ND_PRINT((ndo, "[|ppp]"));
                 return (caplen);
         }
  
                 return (caplen);
         }
  
@@ -1101,11 +1621,11 @@ ppp_if_print(const struct pcap_pkthdr *h, register const u_char *p)
          * (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((ndo, "%c %4d %02x ", p[0] ? 'O' : 'I', length, p[1]));
  #endif
  
  #endif
  
-       ppp_print(p, length);
+       ppp_print(ndo, p, length);
  
         return (0);
  }
  
         return (0);
  }
@@ -1120,7 +1640,8 @@ ppp_if_print(const struct pcap_pkthdr *h, register const u_char *p)
   * This handles, for example, DLT_PPP_SERIAL in NetBSD.
   */
  u_int
   * 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)
+ppp_hdlc_if_print(netdissect_options *ndo,
+                  const struct pcap_pkthdr *h, register const u_char *p)
  {
         register u_int length = h->len;
         register u_int caplen = h->caplen;
  {
         register u_int length = h->len;
         register u_int caplen = h->caplen;
@@ -1128,7 +1649,7 @@ ppp_hdlc_if_print(const struct pcap_pkthdr *h, register const u_char *p)
         u_int hdrlen = 0;
  
         if (caplen < 2) {
         u_int hdrlen = 0;
  
         if (caplen < 2) {
-               printf("[|ppp]");
+               ND_PRINT((ndo, "[|ppp]"));
                 return (caplen);
         }
  
                 return (caplen);
         }
  
@@ -1136,12 +1657,12 @@ ppp_hdlc_if_print(const struct pcap_pkthdr *h, register const u_char *p)
  
         case PPP_ADDRESS:
                 if (caplen < 4) {
  
         case PPP_ADDRESS:
                 if (caplen < 4) {
-                       printf("[|ppp]");
+                       ND_PRINT((ndo, "[|ppp]"));
                         return (caplen);
                 }
  
                         return (caplen);
                 }
  
-               if (eflag)
-                       printf("%02x %02x %d ", p[0], p[1], length);
+               if (ndo->ndo_eflag)
+                       ND_PRINT((ndo, "%02x %02x %d ", p[0], p[1], length));
                 p += 2;
                 length -= 2;
                 hdrlen += 2;
                 p += 2;
                 length -= 2;
                 hdrlen += 2;
@@ -1150,20 +1671,24 @@ ppp_hdlc_if_print(const struct pcap_pkthdr *h, register const u_char *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((ndo, "%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));
+               return (chdlc_if_print(ndo, h, p));
  
         default:
  
         default:
-               if (eflag)
-                       printf("%02x %02x %d ", p[0], p[1], length);
+               if (caplen < 4) {
+                       ND_PRINT((ndo, "[|ppp]"));
+                       return (caplen);
+               }
+
+               if (ndo->ndo_eflag)
+                       ND_PRINT((ndo, "%02x %02x %d ", p[0], p[1], length));
                 p += 2;
                 p += 2;
-               length -= 2;
                 hdrlen += 2;
  
                 /*
                 hdrlen += 2;
  
                 /*
@@ -1171,7 +1696,7 @@ ppp_hdlc_if_print(const struct pcap_pkthdr *h, register const u_char *p)
                  * 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((ndo, "unknown addr %02x; ctrl %02x", p[0], p[1]));
                 break;
         }
  
                 break;
         }
  
@@ -1182,18 +1707,19 @@ ppp_hdlc_if_print(const struct pcap_pkthdr *h, register const u_char *p)
  
  /* BSD/OS specific PPP printer */
  u_int
  
  /* BSD/OS specific PPP printer */
  u_int
-ppp_bsdos_if_print(const struct pcap_pkthdr *h _U_, register const u_char *p _U_)
+ppp_bsdos_if_print(netdissect_options *ndo _U_,
+                   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;
  #ifdef __bsdi__
         register u_int length = h->len;
         register u_int caplen = h->caplen;
-       u_int16_t ptype;
+       uint16_t ptype;
         const u_char *q;
         int i;
  
         if (caplen < PPP_BSDI_HDRLEN) {
         const u_char *q;
         int i;
  
         if (caplen < PPP_BSDI_HDRLEN) {
-               printf("[|ppp]");
+               ND_PRINT((ndo, "[|ppp]"));
                 return (caplen)
         }
  
                 return (caplen)
         }
  
@@ -1201,34 +1727,34 @@ ppp_bsdos_if_print(const struct pcap_pkthdr *h _U_, register const u_char *p _U_
  
  #if 0
         if (p[0] == PPP_ADDRESS && p[1] == PPP_CONTROL) {
  
  #if 0
         if (p[0] == PPP_ADDRESS && p[1] == PPP_CONTROL) {
-               if (eflag)
-                       printf("%02x %02x ", p[0], p[1]);
+               if (ndo->ndo_eflag)
+                       ND_PRINT((ndo, "%02x %02x ", p[0], p[1]));
                 p += 2;
                 hdrlength = 2;
         }
  
                 p += 2;
                 hdrlength = 2;
         }
  
-       if (eflag)
-               printf("%d ", length);
+       if (ndo->ndo_eflag)
+               ND_PRINT((ndo, "%d ", length));
         /* Retrieve the protocol type */
         if (*p & 01) {
                 /* Compressed protocol field */
                 ptype = *p;
         /* Retrieve the protocol type */
         if (*p & 01) {
                 /* Compressed protocol field */
                 ptype = *p;
-               if (eflag)
-                       printf("%02x ", ptype);
+               if (ndo->ndo_eflag)
+                       ND_PRINT((ndo, "%02x ", ptype));
                 p++;
                 hdrlength += 1;
         } else {
                 /* Un-compressed protocol field */
                 p++;
                 hdrlength += 1;
         } else {
                 /* Un-compressed protocol field */
-               ptype = ntohs(*(u_int16_t *)p);
-               if (eflag)
-                       printf("%04x ", ptype);
+               ptype = EXTRACT_16BITS(p);
+               if (ndo->ndo_eflag)
+                       ND_PRINT((ndo, "%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 (ndo->ndo_eflag)
+               ND_PRINT((ndo, "%c ", p[SLC_DIR] ? 'O' : 'I'));
         if (p[SLC_LLHL]) {
                 /* link level header */
                 struct ppp_header *ph;
         if (p[SLC_LLHL]) {
                 /* link level header */
                 struct ppp_header *ph;
@@ -1237,72 +1763,68 @@ ppp_bsdos_if_print(const struct pcap_pkthdr *h _U_, register const u_char *p _U_
                 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 = ntohs(ph->phdr_type);
-                       if (eflag && (ptype == PPP_VJC || ptype == PPP_VJNC)) {
-                               printf("%s ", tok2str(ppptype2str,
-                                               "proto-#%d", ptype));
+                       if (ndo->ndo_eflag)
+                               ND_PRINT((ndo, "%02x %02x ", q[0], q[1]));
+                       ptype = EXTRACT_16BITS(&ph->phdr_type);
+                       if (ndo->ndo_eflag && (ptype == PPP_VJC || ptype == PPP_VJNC)) {
+                               ND_PRINT((ndo, "%s ", tok2str(ppptype2str,
+                                               "proto-#%d", ptype)));
                         }
                 } else {
                         }
                 } else {
-                       if (eflag) {
-                               printf("LLH=[");
+                       if (ndo->ndo_eflag) {
+                               ND_PRINT((ndo, "LLH=["));
                                 for (i = 0; i < p[SLC_LLHL]; i++)
                                 for (i = 0; i < p[SLC_LLHL]; i++)
-                                       printf("%02x", q[i]);
-                               printf("] ");
+                                       ND_PRINT((ndo, "%02x", q[i]));
+                               ND_PRINT((ndo, "] "));
                         }
                 }
         }
                         }
                 }
         }
-       if (eflag)
-               printf("%d ", length);
+       if (ndo->ndo_eflag)
+               ND_PRINT((ndo, "%d ", length));
         if (p[SLC_CHL]) {
                 q = p + SLC_BPFHDRLEN + p[SLC_LLHL];
  
                 switch (ptype) {
                 case PPP_VJC:
         if (p[SLC_CHL]) {
                 q = p + SLC_BPFHDRLEN + p[SLC_LLHL];
  
                 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(p, length);
+                               ip_print(ndo, p, length);
                                 break;
                                 break;
-#ifdef INET6
                         case PPP_IPV6:
                         case PPP_IPV6:
-                               ip6_print(p, length);
+                               ip6_print(ndo, p, length);
                                 break;
                                 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(p, length);
+                               ip_print(ndo, p, length);
                                 break;
                                 break;
-#ifdef INET6
                         case PPP_IPV6:
                         case PPP_IPV6:
-                               ip6_print(p, length);
+                               ip6_print(ndo, p, length);
                                 break;
                                 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=[");
+                       if (ndo->ndo_eflag) {
+                               ND_PRINT((ndo, "CH=["));
                                 for (i = 0; i < p[SLC_LLHL]; i++)
                                 for (i = 0; i < p[SLC_LLHL]; i++)
-                                       printf("%02x", q[i]);
-                               printf("] ");
+                                       ND_PRINT((ndo, "%02x", q[i]));
+                               ND_PRINT((ndo, "] "));
                         }
                         break;
                 }
                         }
                         break;
                 }
@@ -1318,17 +1840,15 @@ ppp_bsdos_if_print(const struct pcap_pkthdr *h _U_, register const u_char *p _U_
         case PPP_IP:
                 ip_print(p, length);
                 break;
         case PPP_IP:
                 ip_print(p, length);
                 break;
-#ifdef INET6
         case PPP_IPV6:
         case PPP_IPV6:
-               ip6_print(p, length);
+               ip6_print(ndo, p, length);
+               break;
+       case PPP_MPLS_UCAST:
+       case PPP_MPLS_MCAST:
+               mpls_print(ndo, p, length);
                 break;
                 break;
-#endif
-        case PPP_MPLS_UCAST:
-        case PPP_MPLS_MCAST:
-                mpls_print(p, length);
-                break;
         default:
         default:
-               printf("%s ", tok2str(ppptype2str, "unknown PPP protocol (0x%04x)", ptype));
+               ND_PRINT((ndo, "%s ", tok2str(ppptype2str, "unknown PPP protocol (0x%04x)", ptype)));
         }
  
  printx:
         }
  
  printx:
@@ -1337,3 +1857,11 @@ printx:
  #endif /* __bsdi__ */
         return (hdrlength);
  }
  #endif /* __bsdi__ */
         return (hdrlength);
  }
+
+
+/*
+ * Local Variables:
+ * c-style: whitesmith
+ * c-basic-offset: 8
+ * End:
+ */