]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-ppp.c
projects / tcpdump / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
don't pass on src & dst MAC adresses to the isoclns decoder as MAC adresses
[tcpdump] / print-ppp.c
diff --git a/print-ppp.c b/print-ppp.c
index f184d09225891cacf3890768c08da1f2a5e228d3..3067bbdffaf2286d6a039953b9505f7892e8b2d4 100644 (file)
--- a/print-ppp.c
+++ b/print-ppp.c
@@ -31,45 +31,29 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ppp.c,v 1.44 2000-09-18 05:11:44 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ppp.c,v 1.88 2003-05-22 16:52:38 hannes Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
+#include <tcpdump-stdinc.h>
 
 
-struct mbuf;
-struct rtentry;
-#include <net/if.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/if_ether.h>
-
-#include <ctype.h>
-#include <netdb.h>
-#include <pcap.h>
-#include <stdio.h>
 #ifdef __bsdi__
 #include <net/slcompress.h>
 #include <net/if_ppp.h>
 #endif
 
 #ifdef __bsdi__
 #include <net/slcompress.h>
 #include <net/if_ppp.h>
 #endif
 
+#include <pcap.h>
+#include <stdio.h>
+
 #include "interface.h"
 #include "extract.h"
 #include "addrtoname.h"
 #include "ppp.h"
 #include "chdlc.h"
 #include "interface.h"
 #include "extract.h"
 #include "addrtoname.h"
 #include "ppp.h"
 #include "chdlc.h"
-
-/* XXX This goes somewhere else. */
-#define PPP_HDRLEN 4
+#include "ethertype.h"
 
 /*
  * The following constatns are defined by IANA. Please refer to
 
 /*
  * The following constatns are defined by IANA. Please refer to
@@ -77,7 +61,47 @@ struct rtentry;
  * for the up-to-date information.
  */
 
  * for the up-to-date information.
  */
 
-/* Control Protocols (LCP/IPCP/CCP etc.) Codes */
+/* Protocol Codes defined in ppp.h */
+
+struct tok ppptype2str[] = {
+        { PPP_IP,        "IP" },
+        { PPP_OSI,       "OSI" },
+        { PPP_NS,        "NS" },
+        { PPP_DECNET,    "DECNET" },
+        { PPP_APPLE,     "APPLE" },
+       { PPP_IPX,        "IPX" },
+       { PPP_VJC,        "VJC" },
+       { PPP_VJNC,       "VJNC" },
+       { PPP_BRPDU,      "BRPDU" },
+       { PPP_STII,       "STII" },
+       { PPP_VINES,      "VINES" },
+       { PPP_MPLS_UCAST, "MPLS" },
+       { PPP_MPLS_MCAST, "MPLS" },
+
+       { PPP_HELLO,      "HELLO" },
+       { PPP_LUXCOM,     "LUXCOM" },
+       { PPP_SNS,        "SNS" },
+       { PPP_IPCP,       "IPCP" },
+       { PPP_OSICP,      "OSICP" },
+       { PPP_NSCP,       "NSCP" },
+       { PPP_DECNETCP,   "DECNETCP" },
+       { PPP_APPLECP,    "APPLECP" },
+       { PPP_IPXCP,      "IPXCP" },
+       { PPP_STIICP,     "STIICP" },
+       { PPP_VINESCP,    "VINESCP" },
+       { PPP_MPLSCP,     "MPLSCP" },
+
+       { PPP_LCP,        "LCP" },
+       { PPP_PAP,        "PAP" },
+       { PPP_LQM,        "LQM" },
+       { PPP_CHAP,       "CHAP" },
+       { PPP_BACP,       "BACP" },
+       { PPP_BAP,        "BAP" },
+       { PPP_MP,         "ML" },
+       { 0,              NULL }
+};
+
+/* Control Protocols (LCP/IPCP/CCP etc.) Codes defined in RFC 1661 */
 
 #define CPCODES_VEXT           0       /* Vendor-Specific (RFC2153) */
 #define CPCODES_CONF_REQ       1       /* Configure-Request */
 
 #define CPCODES_VEXT           0       /* Vendor-Specific (RFC2153) */
 #define CPCODES_CONF_REQ       1       /* Configure-Request */
@@ -91,34 +115,29 @@ struct rtentry;
 #define CPCODES_ECHO_REQ       9       /* Echo-Request (LCP only) */
 #define CPCODES_ECHO_RPL       10      /* Echo-Reply (LCP only) */
 #define CPCODES_DISC_REQ       11      /* Discard-Request (LCP only) */
 #define CPCODES_ECHO_REQ       9       /* Echo-Request (LCP only) */
 #define CPCODES_ECHO_RPL       10      /* Echo-Reply (LCP only) */
 #define CPCODES_DISC_REQ       11      /* Discard-Request (LCP only) */
-#define CPCODES_ID             12      /* Identification (LCP only) */
-#define CPCODES_TIME_REM       13      /* Time-Remaining (LCP only) */
-#define CPCODES_RESET_REQ      14      /* Reset-Request (CCP only) */
+#define CPCODES_ID             12      /* Identification (LCP only) RFC1570 */
+#define CPCODES_TIME_REM       13      /* Time-Remaining (LCP only) RFC1570 */
+#define CPCODES_RESET_REQ      14      /* Reset-Request (CCP only) RFC1962 */
 #define CPCODES_RESET_REP      15      /* Reset-Reply (CCP only) */
 
 #define CPCODES_RESET_REP      15      /* Reset-Reply (CCP only) */
 
-#define CPCODES_MIN    CPCODES_VEXT
-#define CPCODES_MAX    CPCODES_RESET_REP
-
-static const char *cpcodes[] = {
-       /*
-        * Control Protocol code values (RFC1661)
-        */
-       "Vend-Ext",     /* (0) RFC2153 */
-       "Conf-Req",     /* (1) */
-       "Conf-Ack",     /* (2) */
-       "Conf-Nak",     /* (3) */
-       "Conf-Rej",     /* (4) */
-       "Term-Req",     /* (5) */
-       "Term-Ack",     /* (6) */
-       "Code-Rej",     /* (7) */
-       "Prot-Rej",     /* (8) */
-       "Echo-Req",     /* (9) */
-       "Echo-Rep",     /* (10) */
-       "Disc-Req",     /* (11) */
-       "Ident",        /* (12) RFC1570 */
-       "Time-Rem",     /* (13) RFC1570 */
-       "Reset-Req",    /* (14) RFC1962 */
-       "Reset-Ack",    /* (15) RFC1962 */
+struct tok cpcodes[] = {
+       {CPCODES_VEXT,      "Vendor-Extension"}, /* RFC2153 */
+       {CPCODES_CONF_REQ,  "Conf-Request"},
+        {CPCODES_CONF_ACK,  "Conf-Ack"},
+       {CPCODES_CONF_NAK,  "Conf-Nack"},
+       {CPCODES_CONF_REJ,  "Conf-Reject"},
+       {CPCODES_TERM_REQ,  "Term-Request"},
+       {CPCODES_TERM_ACK,  "Term-Ack"},
+       {CPCODES_CODE_REJ,  "Code-Reject"},
+       {CPCODES_PROT_REJ,  "Prot-Reject"},
+       {CPCODES_ECHO_REQ,  "Echo-Request"},
+       {CPCODES_ECHO_RPL,  "Echo-Reply"},
+       {CPCODES_DISC_REQ,  "Disc-Req"},
+       {CPCODES_ID,        "Ident"},            /* RFC1570 */
+       {CPCODES_TIME_REM,  "Time-Rem"},         /* RFC1570 */
+       {CPCODES_RESET_REQ, "Reset-Req"},        /* RFC1962 */
+       {CPCODES_RESET_REP, "Reset-Ack"},        /* RFC1962 */
+        {0,                 NULL}
 };
 
 /* LCP Config Options */
 };
 
 /* LCP Config Options */
@@ -272,6 +291,7 @@ static const char *ccpconfopts[] = {
 /* BVCP - to be supported */
 /* BCP - to be supported */
 /* IPXCP - to be supported */
 /* BVCP - to be supported */
 /* BCP - to be supported */
 /* IPXCP - to be supported */
+/* MPLSCP - to be supported */
 
 /* Auth Algorithms */
 
 
 /* Auth Algorithms */
 
@@ -340,99 +360,40 @@ static const char *papcode[] = {
 #define BAP_CSIND      7
 #define BAP_CSRES      8
 
 #define BAP_CSIND      7
 #define BAP_CSRES      8
 
-static const char *ppp_protoname __P((u_int proto));
-static void handle_ctrl_proto __P((u_int proto,const u_char *p, int length));
-static void handle_chap __P((const u_char *p, int length));
-static void handle_pap __P((const u_char *p, int length));
-static void handle_bap __P((const u_char *p, int length));
-static int print_lcp_config_options __P((const u_char *p, int));
-static int print_ipcp_config_options __P((const u_char *p, int));
-static int print_ccp_config_options __P((const u_char *p, int));
-static int print_bacp_config_options __P((const u_char *p, int));
-static void handle_ppp __P((u_int proto, const u_char *p, int length));
-
-static const char *
-ppp_protoname(u_int proto)
-{
-       static char buf[20];
-
-       switch (proto) {
-       case PPP_IP:    return "IP";
-#ifdef PPP_XNS
-       case PPP_XNS:   return "XNS";
-#endif
-#ifdef PPP_IPX
-       case PPP_IPX:   return "IPX";
-#endif
-#ifdef PPP_COMP
-       case PPP_COMP:  return "COMP";
-#endif
-#ifdef PPP_IPCP
-       case PPP_IPCP:  return "IPCP";
-#endif
-#ifdef PPP_IPV6CP
-       case PPP_IPV6CP: return "IPV6CP";
-#endif
-#ifdef PPP_IPXCP
-       case PPP_IPXCP: return "IPXCP";
-#endif
-#ifdef PPP_CCP
-       case PPP_CCP:   return "CCP";
-#endif
-#ifdef PPP_LCP
-       case PPP_LCP:   return "LCP";
-#endif
-#ifdef PPP_PAP
-       case PPP_PAP:   return "PAP";
-#endif
-#ifdef PPP_LQR
-       case PPP_LQR:   return "LQR";
-#endif
-#ifdef PPP_CHAP
-       case PPP_CHAP:  return "CHAP";
-#endif
-#ifdef PPP_BACP
-       case PPP_BACP:  return "BACP";
-#endif
-#ifdef PPP_BAP
-       case PPP_BAP:   return "BAP";
-#endif
-       default:
-               snprintf(buf, sizeof(buf), "unknown-0x%04x", proto);
-               return buf;
-       }
-}
+static void handle_ctrl_proto (u_int proto,const u_char *p, int length);
+static void handle_chap (const u_char *p, int length);
+static void handle_pap (const u_char *p, int length);
+static void handle_bap (const u_char *p, int length);
+static int print_lcp_config_options (const u_char *p, int);
+static int print_ipcp_config_options (const u_char *p, int);
+static int print_ccp_config_options (const u_char *p, int);
+static int print_bacp_config_options (const u_char *p, int);
+static void handle_ppp (u_int proto, const u_char *p, int length);
 
 /* 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 *p, int length)
+handle_ctrl_proto(u_int proto, const u_char *pptr, int length)
 {
        u_int code, len;
        int (*pfunc)(const u_char *, int);
        int x, j;
 {
        u_int code, len;
        int (*pfunc)(const u_char *, int);
        int x, j;
+        const u_char *tptr;
 
 
-       if (length < 1) {
-               printf("[|%s]", ppp_protoname(proto));
-               return;
-       } else if (length < 4) {
-               printf("[|%s 0x%02x]", ppp_protoname(proto), *p);
-               return;
-       }
+        tptr=pptr;
 
 
-       code = *p;
-       if ((code >= CPCODES_MIN) && (code <= CPCODES_MAX))
-               printf("%s", cpcodes[code]);
-       else {
-               printf("0x%02x", code);
+        printf("%s, ",tok2str(ppptype2str, "unknown", proto));
+
+       if (length < 4) /* FIXME weak boundary checking */
                return;
                return;
-       }
-       p++;
 
 
-       printf("(%u)", *p);             /* ID */
-       p++;
+       code = *tptr++;
+       
+        printf("%s, id %u",
+               tok2str(cpcodes, "Unknown Opcode 0x%02x",code),
+               *tptr++); /* ID */
 
 
-       len = EXTRACT_16BITS(p);
-       p += 2;
+       len = EXTRACT_16BITS(tptr);
+       tptr += 2;
 
        if (length <= 4)
                return;         /* there may be a NULL confreq etc. */
 
        if (length <= 4)
                return;         /* there may be a NULL confreq etc. */
@@ -441,9 +402,9 @@ handle_ctrl_proto(u_int proto, const u_char *p, int length)
        case CPCODES_VEXT:
                if (length < 11)
                        break;
        case CPCODES_VEXT:
                if (length < 11)
                        break;
-               printf(", Magic-Num=%08x", EXTRACT_32BITS(p));
-               p += 4;
-               printf(" OUI=%02x%02x%02x", p[0], p[1], p[2]);
+               printf(", Magic-Num 0x%08x", EXTRACT_32BITS(tptr));
+               tptr += 4;
+               printf(" OUI 0x%06x", 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:
@@ -465,11 +426,19 @@ handle_ctrl_proto(u_int proto, const u_char *p, int length)
                        case PPP_BACP:
                                pfunc = print_bacp_config_options;
                                break;
                        case PPP_BACP:
                                pfunc = print_bacp_config_options;
                                break;
+                       default:
+                               /*
+                                * This should never happen, but we set
+                                * "pfunc" to squelch uninitialized
+                                * variable warnings from compilers.
+                                */
+                               pfunc = NULL;
+                               break;
                        }
                        }
-                       if ((j = (*pfunc)(p, len)) == 0)
+                       if ((j = (*pfunc)(tptr, len)) == 0)
                                break;
                        x -= j;
                                break;
                        x -= j;
-                       p += j;
+                       tptr += j;
                } while (x > 0);
                break;
 
                } while (x > 0);
                break;
 
@@ -483,7 +452,9 @@ handle_ctrl_proto(u_int proto, const u_char *p, int length)
        case CPCODES_PROT_REJ:
                if (length < 6)
                        break;
        case CPCODES_PROT_REJ:
                if (length < 6)
                        break;
-               printf(", Rejected-Protocol=%04x", EXTRACT_16BITS(p));
+               printf(", Rejected %s Protocol (0x%04x)",
+                      tok2str(ppptype2str,"unknown", EXTRACT_16BITS(tptr)),
+                      EXTRACT_16BITS(tptr));
                /* XXX: need to decode Rejected-Information? */
                break;
        case CPCODES_ECHO_REQ:
                /* XXX: need to decode Rejected-Information? */
                break;
        case CPCODES_ECHO_REQ:
@@ -492,20 +463,28 @@ handle_ctrl_proto(u_int proto, const u_char *p, int length)
        case CPCODES_ID:
                if (length < 8)
                        break;
        case CPCODES_ID:
                if (length < 8)
                        break;
-               printf(", Magic-Num=%08x", EXTRACT_32BITS(p));
+               printf(", Magic-Num 0x%08x", EXTRACT_32BITS(tptr));
                /* XXX: need to decode Data? */
                break;
        case CPCODES_TIME_REM:
                if (length < 12)
                        break;
                /* XXX: need to decode Data? */
                break;
        case CPCODES_TIME_REM:
                if (length < 12)
                        break;
-               printf(", Magic-Num=%08x", EXTRACT_32BITS(p));
-               printf(" Seconds-Remaining=%u", EXTRACT_32BITS(p + 4));
+               printf(", Magic-Num 0x%08x", EXTRACT_32BITS(tptr));
+               printf(", Seconds-Remaining %us", EXTRACT_32BITS(tptr + 4));
                /* XXX: need to decode Message? */
                break;
        default:
                /* XXX: need to decode Message? */
                break;
        default:
-               printf(", unknown-Codes-0x%02x", code);
+            /* XXX this is dirty but we do not get the
+             * original pointer passed to the begin
+             * the PPP packet */
+                if (vflag <= 1)
+                    print_unknown_data(pptr-2,"\n\t",length+2);
                break;
        }
                break;
        }
+       printf(", length %u", length);
+
+        if (vflag >1)
+            print_unknown_data(pptr-2,"\n\t",length+2);
 }
 
 /* LCP config options */
 }
 
 /* LCP config options */
@@ -513,7 +492,6 @@ static int
 print_lcp_config_options(const u_char *p, int length)
 {
        int len, opt;
 print_lcp_config_options(const u_char *p, int length)
 {
        int len, opt;
-       int i;
 
        if (length < 2)
                return 0;
 
        if (length < 2)
                return 0;
@@ -522,19 +500,19 @@ print_lcp_config_options(const u_char *p, int length)
        if (length < len)
                return 0;
        if ((opt >= LCPOPT_MIN) && (opt <= LCPOPT_MAX))
        if (length < len)
                return 0;
        if ((opt >= LCPOPT_MIN) && (opt <= LCPOPT_MAX))
-               printf(", %s", lcpconfopts[opt]);
+               printf(", %s ", lcpconfopts[opt]);
        else {
        else {
-               printf(", unknwhown-%d", opt);
+               printf(", unknown LCP option 0x%02x", opt);
                return len;
        }
 
        switch (opt) {
        case LCPOPT_VEXT:
                if (len >= 6) {
                return len;
        }
 
        switch (opt) {
        case LCPOPT_VEXT:
                if (len >= 6) {
-                       printf(" OUI=%02x%02x%02x", p[2], p[3], p[4]);
+                       printf(" OUI 0x%06x", EXTRACT_24BITS(p+2));
 #if 0
 #if 0
-                       printf(" kind=%02x", p[5]);
-                       printf(" val=")
+                       printf(" kind 0x%02x", p[5]);
+                       printf(" val 0x")
                        for (i = 0; i < len - 6; i++) {
                                printf("%02x", p[6 + i]);
                        }
                        for (i = 0; i < len - 6; i++) {
                                printf("%02x", p[6 + i]);
                        }
@@ -543,46 +521,52 @@ print_lcp_config_options(const u_char *p, int length)
                break;
        case LCPOPT_MRU:
                if (len == 4)
                break;
        case LCPOPT_MRU:
                if (len == 4)
-                       printf("=%u", EXTRACT_16BITS(p + 2));
+                       printf(" %u", EXTRACT_16BITS(p + 2));
                break;
        case LCPOPT_ACCM:
                if (len == 6)
                break;
        case LCPOPT_ACCM:
                if (len == 6)
-                       printf("=%08x", EXTRACT_32BITS(p + 2));
+                       printf(" %08x", EXTRACT_32BITS(p + 2));
                break;
        case LCPOPT_AP:
                if (len >= 4) {
                break;
        case LCPOPT_AP:
                if (len >= 4) {
-                       if (p[2] == 0xc0 && p[3] == 0x23)
-                               printf(" PAP");
-                       else if (p[2] == 0xc2 && p[3] == 0x23) {
-                               printf(" CHAP/");
-                               switch (p[4]) {
-                               default:
-                                       printf("unknown-algorithm-%u", p[4]);
-                                       break;
-                               case AUTHALG_CHAPMD5:
-                                       printf("MD5");
-                                       break;
-                               case AUTHALG_MSCHAP1:
-                                       printf("MSCHAPv1");
-                                       break;
-                               case AUTHALG_MSCHAP2:
-                                       printf("MSCHAPv2");
-                                       break;
-                               }
+                   switch (EXTRACT_16BITS(p+2)) {
+                   case PPP_PAP:
+                       printf(" PAP");
+                       break;
+                   case PPP_CHAP:
+                       printf(" CHAP");
+                       switch (p[4]) {
+                       default:
+                           printf(", unknown-algorithm-%u", p[4]);
+                           break;
+                       case AUTHALG_CHAPMD5:
+                           printf(", MD5");
+                           break;
+                       case AUTHALG_MSCHAP1:
+                           printf(", MSCHAPv1");
+                           break;
+                       case AUTHALG_MSCHAP2:
+                           printf(", MSCHAPv2");
+                           break;
                        }
                        }
-                       else if (p[2] == 0xc2 && p[3] == 0x27)
-                               printf(" EAP");
-                       else if (p[2] == 0xc0 && p[3] == 0x27)
-                               printf(" SPAP");
-                       else if (p[2] == 0xc1 && p[3] == 0x23)
-                               printf(" Old-SPAP");
-                       else
-                               printf("unknown");
+                       break;
+                   case PPP_EAP:
+                       printf(" EAP");
+                       break;
+                   case PPP_SPAP:
+                       printf(" SPAP");
+                       break;
+                   case PPP_SPAP_OLD:
+                       printf(" Old-SPAP");
+                       break;
+                   default:
+                     printf("unknown");
+                   }
                }
                break;
        case LCPOPT_QP:
                if (len >= 4) {
                }
                break;
        case LCPOPT_QP:
                if (len >= 4) {
-                       if (p[2] == 0xc0 && p[3] == 0x25)
+                       if (EXTRACT_16BITS(p+2) == PPP_LQM)
                                printf(" LQR");
                        else
                                printf(" unknown");
                                printf(" LQR");
                        else
                                printf(" unknown");
@@ -590,7 +574,7 @@ print_lcp_config_options(const u_char *p, int length)
                break;
        case LCPOPT_MN:
                if (len == 6)
                break;
        case LCPOPT_MN:
                if (len == 6)
-                       printf("=%08x", EXTRACT_32BITS(p + 2));
+                       printf(" 0x%08x", EXTRACT_32BITS(p + 2));
                break;
        case LCPOPT_PFC:
                break;
                break;
        case LCPOPT_PFC:
                break;
@@ -598,7 +582,7 @@ print_lcp_config_options(const u_char *p, int length)
                break;
        case LCPOPT_LD:
                if (len == 4)
                break;
        case LCPOPT_LD:
                if (len == 4)
-                       printf("=%04x", EXTRACT_16BITS(p + 2));
+                       printf(" 0x%04x", EXTRACT_16BITS(p + 2));
                break;
        case LCPOPT_CBACK:
                if (len < 3)
                break;
        case LCPOPT_CBACK:
                if (len < 3)
@@ -629,7 +613,7 @@ print_lcp_config_options(const u_char *p, int length)
                break;
        case LCPOPT_MLMRRU:
                if (len == 4)
                break;
        case LCPOPT_MLMRRU:
                if (len == 4)
-                       printf("=%u", EXTRACT_16BITS(p + 2));
+                       printf(" %u", EXTRACT_16BITS(p + 2));
                break;
        case LCPOPT_MLED:
                if (len < 3)
                break;
        case LCPOPT_MLED:
                if (len < 3)
@@ -644,12 +628,12 @@ print_lcp_config_options(const u_char *p, int length)
                case MEDCLASS_IPV4:
                        if (len != 7)
                                break;
                case MEDCLASS_IPV4:
                        if (len != 7)
                                break;
-                       printf(" IPv4=%s", ipaddr_string(p + 3));
+                       printf(" IPv4 %s", ipaddr_string(p + 3));
                        break;
                case MEDCLASS_MAC:
                        if (len != 9)
                                break;
                        break;
                case MEDCLASS_MAC:
                        if (len != 9)
                                break;
-                       printf(" MAC=%02x:%02x:%02x:%02x:%02x:%02x",
+                       printf(" MAC %02x:%02x:%02x:%02x:%02x:%02x",
                               p[3], p[4], p[5], p[6], p[7], p[8]);
                        break;
                case MEDCLASS_MNB:
                               p[3], p[4], p[5], p[6], p[7], p[8]);
                        break;
                case MEDCLASS_MNB:
@@ -737,25 +721,25 @@ handle_chap(const u_char *p, int length)
                p++;
                if (length - (p - p0) < val_size)
                        return;
                p++;
                if (length - (p - p0) < val_size)
                        return;
-               printf(", Value=");
+               printf(", Value ");
                for (i = 0; i < val_size; i++)
                        printf("%02x", *p++);
                name_size = len - (p - p0);
                for (i = 0; i < val_size; i++)
                        printf("%02x", *p++);
                name_size = len - (p - p0);
-               printf(", Name=");
+               printf(", Name ");
                for (i = 0; i < name_size; i++)
                        safeputchar(*p++);
                break;
        case CHAP_SUCC:
        case CHAP_FAIL:
                msg_size = len - (p - p0);
                for (i = 0; i < name_size; i++)
                        safeputchar(*p++);
                break;
        case CHAP_SUCC:
        case CHAP_FAIL:
                msg_size = len - (p - p0);
-               printf(", Msg=");
+               printf(", Msg ");
                for (i = 0; i< msg_size; i++)
                        safeputchar(*p++);
                break;
        }
 }
 
                for (i = 0; i< msg_size; i++)
                        safeputchar(*p++);
                break;
        }
 }
 
-/* PAP */
+/* PAP (see RFC 1334) */
 static void
 handle_pap(const u_char *p, int length)
 {
 static void
 handle_pap(const u_char *p, int length)
 {
@@ -774,7 +758,6 @@ handle_pap(const u_char *p, int length)
        }
 
        code = *p;
        }
 
        code = *p;
-       if (length < 4)
        if ((code >= PAP_CODEMIN) && (code <= PAP_CODEMAX))
                printf("%s", papcode[code - 1]);
        else {
        if ((code >= PAP_CODEMIN) && (code <= PAP_CODEMAX))
                printf("%s", papcode[code - 1]);
        else {
@@ -797,7 +780,7 @@ handle_pap(const u_char *p, int length)
                p++;
                if (length - (p - p0) < peerid_len)
                        return;
                p++;
                if (length - (p - p0) < peerid_len)
                        return;
-               printf(", Peer=");
+               printf(", Peer ");
                for (i = 0; i < peerid_len; i++)
                        safeputchar(*p++);
 
                for (i = 0; i < peerid_len; i++)
                        safeputchar(*p++);
 
@@ -807,7 +790,7 @@ handle_pap(const u_char *p, int length)
                p++;
                if (length - (p - p0) < passwd_len)
                        return;
                p++;
                if (length - (p - p0) < passwd_len)
                        return;
-               printf(", Name=");
+               printf(", Name ");
                for (i = 0; i < passwd_len; i++)
                        safeputchar(*p++);
                break;
                for (i = 0; i < passwd_len; i++)
                        safeputchar(*p++);
                break;
@@ -817,9 +800,9 @@ handle_pap(const u_char *p, int length)
                        return;
                msg_len = *p;           /* Msg-Length */
                p++;
                        return;
                msg_len = *p;           /* Msg-Length */
                p++;
-               if (length - (p - p0) < passwd_len)
+               if (length - (p - p0) < msg_len)
                        return;
                        return;
-               printf(", Msg=");
+               printf(", Msg ");
                for (i = 0; i< msg_len; i++)
                        safeputchar(*p++);
                break;
                for (i = 0; i< msg_len; i++)
                        safeputchar(*p++);
                break;
@@ -829,7 +812,7 @@ handle_pap(const u_char *p, int length)
 
 /* BAP */
 static void
 
 /* BAP */
 static void
-handle_bap(const u_char *p, int length)
+handle_bap(const u_char *p _U_, int length _U_)
 {
        /* XXX: to be supported!! */
 }
 {
        /* XXX: to be supported!! */
 }
@@ -851,12 +834,12 @@ print_ipcp_config_options(const u_char *p, int length)
        case IPCPOPT_2ADDR:             /* deprecated */
                if (len != 10)
                        goto invlen;
        case IPCPOPT_2ADDR:             /* deprecated */
                if (len != 10)
                        goto invlen;
-               printf(", IP-Addrs src=%s dst=%s",
+               printf(", IP-Addrs src %s, dst %s",
                       ipaddr_string(p + 2),
                       ipaddr_string(p + 6));
                break;
        case IPCPOPT_IPCOMP:
                       ipaddr_string(p + 2),
                       ipaddr_string(p + 6));
                break;
        case IPCPOPT_IPCOMP:
-               if (len != 4)
+               if (len < 4)
                        goto invlen;
                printf(", IP-Comp");
                if (EXTRACT_16BITS(p + 2) == PPP_VJC) {
                        goto invlen;
                printf(", IP-Comp");
                if (EXTRACT_16BITS(p + 2) == PPP_VJC) {
@@ -868,32 +851,32 @@ print_ipcp_config_options(const u_char *p, int length)
        case IPCPOPT_ADDR:
                if (len != 6)
                        goto invlen;
        case IPCPOPT_ADDR:
                if (len != 6)
                        goto invlen;
-               printf(", IP-Addr=%s", ipaddr_string(p + 2));
+               printf(", IP-Addr %s", ipaddr_string(p + 2));
                break;
        case IPCPOPT_MOBILE4:
                if (len != 6)
                        goto invlen;
                break;
        case IPCPOPT_MOBILE4:
                if (len != 6)
                        goto invlen;
-               printf(", Home-Addr=%s", ipaddr_string(p + 2));
+               printf(", Home-Addr %s", ipaddr_string(p + 2));
                break;
        case IPCPOPT_PRIDNS:
                if (len != 6)
                        goto invlen;
                break;
        case IPCPOPT_PRIDNS:
                if (len != 6)
                        goto invlen;
-               printf(", Pri-DNS=%s", ipaddr_string(p + 2));
+               printf(", Pri-DNS %s", ipaddr_string(p + 2));
                break;
        case IPCPOPT_PRINBNS:
                if (len != 6)
                        goto invlen;
                break;
        case IPCPOPT_PRINBNS:
                if (len != 6)
                        goto invlen;
-               printf(", Pri-NBNS=%s", ipaddr_string(p + 2));
+               printf(", Pri-NBNS %s", ipaddr_string(p + 2));
                break;
        case IPCPOPT_SECDNS:
                if (len != 6)
                        goto invlen;
                break;
        case IPCPOPT_SECDNS:
                if (len != 6)
                        goto invlen;
-               printf(", Sec-DNS=%s", ipaddr_string(p + 2));
+               printf(", Sec-DNS %s", ipaddr_string(p + 2));
                break;
        case IPCPOPT_SECNBNS:
                if (len != 6)
                        goto invlen;
                break;
        case IPCPOPT_SECNBNS:
                if (len != 6)
                        goto invlen;
-               printf(", Sec-NBNS=%s", ipaddr_string(p + 2));
+               printf(", Sec-NBNS %s", ipaddr_string(p + 2));
                break;
        default:
                printf(", unknown-%d", opt);
                break;
        default:
                printf(", unknown-%d", opt);
@@ -961,7 +944,7 @@ print_bacp_config_options(const u_char *p, int length)
                return 0;
        if (opt == BACPOPT_FPEER) {
                printf(", Favored-Peer");
                return 0;
        if (opt == BACPOPT_FPEER) {
                printf(", Favored-Peer");
-               printf(" Magic-Num=%08x", EXTRACT_32BITS(p + 2));
+               printf(", Magic-Num 0x%08x", EXTRACT_32BITS(p + 2));
        } else {
                printf(", unknown-option-%d", opt);
        }
        } else {
                printf(", unknown-option-%d", opt);
        }
@@ -976,6 +959,9 @@ handle_ppp(u_int proto, const u_char *p, int length)
        switch (proto) {
        case PPP_LCP:
        case PPP_IPCP:
        switch (proto) {
        case PPP_LCP:
        case PPP_IPCP:
+       case PPP_OSICP:
+       case PPP_MPLSCP:
+       case PPP_IPV6CP:
        case PPP_CCP:
        case PPP_BACP:
                handle_ctrl_proto(proto, p, length);
        case PPP_CCP:
        case PPP_BACP:
                handle_ctrl_proto(proto, p, length);
@@ -999,14 +985,31 @@ handle_ppp(u_int proto, const u_char *p, int length)
                ip6_print(p, length);
                break;
 #endif
                ip6_print(p, length);
                break;
 #endif
+       case ETHERTYPE_IPX:     /*XXX*/
+       case PPP_IPX:
+               ipx_print(p, length);
+               break;
+       case PPP_OSI:
+               isoclns_print(p, length, length);
+               break;
+       case PPP_MPLS_UCAST:
+       case PPP_MPLS_MCAST:
+               mpls_print(p, length);
+               break;
+       default:
+                printf("unknown PPP protocol (0x%04x)", proto);
+                print_unknown_data(p,"\n\t",length);
+                break;
        }
 }
 
 /* Standard PPP printer */
        }
 }
 
 /* Standard PPP printer */
-void
+u_int
 ppp_print(register const u_char *p, u_int length)
 {
        u_int proto;
 ppp_print(register const u_char *p, u_int length)
 {
        u_int proto;
+        u_int olen = length; /* _o_riginal length */
+       u_int hdr_len = 0;
 
        /*
         * Here, we assume that p points to the Address and Control
 
        /*
         * Here, we assume that p points to the Address and Control
@@ -1017,6 +1020,7 @@ ppp_print(register const u_char *p, u_int length)
        if (*p == PPP_ADDRESS && *(p + 1) == PPP_CONTROL) {
                p += 2;                 /* ACFC not used */
                length -= 2;
        if (*p == PPP_ADDRESS && *(p + 1) == PPP_CONTROL) {
                p += 2;                 /* ACFC not used */
                length -= 2;
+               hdr_len += 2;
        }
 
        if (length < 2)
        }
 
        if (length < 2)
@@ -1025,46 +1029,40 @@ ppp_print(register const u_char *p, u_int length)
                proto = *p;             /* PFC is used */
                p++;
                length--;
                proto = *p;             /* PFC is used */
                p++;
                length--;
+               hdr_len++;
        } else {
                proto = EXTRACT_16BITS(p);
                p += 2;
                length -= 2;
        } else {
                proto = EXTRACT_16BITS(p);
                p += 2;
                length -= 2;
+               hdr_len += 2;
        }
 
        }
 
-       printf("%s: ", ppp_protoname(proto));
+        if (eflag)
+            printf("PPP-%s (0x%04x), length %u: ",
+                   tok2str(ppptype2str, "unknown", proto),
+                   proto,
+                   olen);
 
        handle_ppp(proto, p, length);
 
        handle_ppp(proto, p, length);
-       return;
+       return (hdr_len);
 trunc:
        printf("[|ppp]");
 trunc:
        printf("[|ppp]");
+       return (0);
 }
 
 
 /* PPP I/F printer */
 }
 
 
 /* PPP I/F printer */
-void
-ppp_if_print(u_char *user, const struct pcap_pkthdr *h,
-            register const u_char *p)
+u_int
+ppp_if_print(const struct pcap_pkthdr *h, register const u_char *p)
 {
        register u_int length = h->len;
        register u_int caplen = h->caplen;
 {
        register u_int length = h->len;
        register u_int caplen = h->caplen;
-       const struct ip *ip;
-       u_int proto;
-
-       ts_print(&h->ts);
 
        if (caplen < PPP_HDRLEN) {
                printf("[|ppp]");
 
        if (caplen < PPP_HDRLEN) {
                printf("[|ppp]");
-               goto out;
+               return (caplen);
        }
 
        }
 
-       /*
-        * Some printers want to get back at the link level addresses,
-        * and/or check that they're not walking off the end of the packet.
-        * Rather than pass them all the way down, we set these globals.  */
-
-       packetp = p;
-       snapend = p + caplen;
-
 #if 0
        /*
         * XXX: seems to assume that there are 2 octets prepended to an
 #if 0
        /*
         * XXX: seems to assume that there are 2 octets prepended to an
@@ -1108,10 +1106,7 @@ ppp_if_print(u_char *user, const struct pcap_pkthdr *h,
 
        ppp_print(p, length);
 
 
        ppp_print(p, length);
 
-       if (xflag)
-               default_print(p, caplen);
-out:
-       putchar('\n');
+       return (0);
 }
 
 /*
 }
 
 /*
@@ -1123,63 +1118,52 @@ out:
  *
  * This handles, for example, DLT_PPP_SERIAL in NetBSD.
  */
  *
  * This handles, for example, DLT_PPP_SERIAL in NetBSD.
  */
-void
-ppp_hdlc_if_print(u_char *user, const struct pcap_pkthdr *h,
-            register const u_char *p)
+u_int
+ppp_hdlc_if_print(const struct pcap_pkthdr *h, register const u_char *p)
 {
        register u_int length = h->len;
        register u_int caplen = h->caplen;
        u_int proto;
 {
        register u_int length = h->len;
        register u_int caplen = h->caplen;
        u_int proto;
+       u_int hdrlen = 0;
 
        if (caplen < 2) {
                printf("[|ppp]");
 
        if (caplen < 2) {
                printf("[|ppp]");
-               goto out;
+               return (caplen);
        }
 
        }
 
-       /*
-        * Some printers want to get back at the link level addresses,
-        * and/or check that they're not walking off the end of the packet.
-        * Rather than pass them all the way down, we set these globals.
-        */
-       packetp = p;
-       snapend = p + caplen;
-
        switch (p[0]) {
 
        case PPP_ADDRESS:
                if (caplen < 4) {
                        printf("[|ppp]");
        switch (p[0]) {
 
        case PPP_ADDRESS:
                if (caplen < 4) {
                        printf("[|ppp]");
-                       goto out;
+                       return (caplen);
                }
 
                }
 
-               ts_print(&h->ts);
                if (eflag)
                        printf("%02x %02x %d ", p[0], p[1], length);
                p += 2;
                length -= 2;
                if (eflag)
                        printf("%02x %02x %d ", p[0], p[1], length);
                p += 2;
                length -= 2;
+               hdrlen += 2;
 
                proto = EXTRACT_16BITS(p);
                p += 2;
                length -= 2;
 
                proto = EXTRACT_16BITS(p);
                p += 2;
                length -= 2;
-               printf("%s: ", ppp_protoname(proto));
+               hdrlen += 2;
+               printf("%s: ", tok2str(ppptype2str, "unknown PPP protocol (0x%04x)", proto));
 
                handle_ppp(proto, p, length);
                break;
 
        case CHDLC_UNICAST:
        case CHDLC_BCAST:
 
                handle_ppp(proto, p, length);
                break;
 
        case CHDLC_UNICAST:
        case CHDLC_BCAST:
-               /*
-                * Have the Cisco HDLC print routine do all the work.
-                */
-               chdlc_if_print(user, h, p);
-               return;
+               return (chdlc_if_print(h, p));
 
        default:
 
        default:
-               ts_print(&h->ts);
                if (eflag)
                        printf("%02x %02x %d ", p[0], p[1], length);
                p += 2;
                length -= 2;
                if (eflag)
                        printf("%02x %02x %d ", p[0], p[1], length);
                p += 2;
                length -= 2;
+               hdrlen += 2;
 
                /*
                 * XXX - NetBSD's "ppp_netbsd_serial_if_print()" treats
 
                /*
                 * XXX - NetBSD's "ppp_netbsd_serial_if_print()" treats
@@ -1190,78 +1174,28 @@ ppp_hdlc_if_print(u_char *user, const struct pcap_pkthdr *h,
                break;
        }
 
                break;
        }
 
-       if (xflag)
-               default_print(p, caplen);
-out:
-       putchar('\n');
+       return (hdrlen);
 }
 
 }
 
-
-
-struct tok ppptype2str[] = {
-       { PPP_IP,       "IP" },
-       { PPP_OSI,      "OSI" },
-       { PPP_NS,       "NS" },
-       { PPP_DECNET,   "DECNET" },
-       { PPP_APPLE,    "APPLE" },
-       { PPP_IPX,      "IPX" },
-       { PPP_VJC,      "VJC" },
-       { PPP_VJNC,     "VJNC" },
-       { PPP_BRPDU,    "BRPDU" },
-       { PPP_STII,     "STII" },
-       { PPP_VINES,    "VINES" },
-
-       { PPP_HELLO,    "HELLO" },
-       { PPP_LUXCOM,   "LUXCOM" },
-       { PPP_SNS,      "SNS" },
-       { PPP_IPCP,     "IPCP" },
-       { PPP_OSICP,    "OSICP" },
-       { PPP_NSCP,     "NSCP" },
-       { PPP_DECNETCP, "DECNETCP" },
-       { PPP_APPLECP,  "APPLECP" },
-       { PPP_IPXCP,    "IPXCP" },
-       { PPP_STIICP,   "STIICP" },
-       { PPP_VINESCP,  "VINESCP" },
-
-       { PPP_LCP,      "LCP" },
-       { PPP_PAP,      "PAP" },
-       { PPP_LQM,      "LQM" },
-       { PPP_CHAP,     "CHAP" },
-       { PPP_BACP,     "BACP" },
-       { PPP_BAP,      "BAP" },
-       { PPP_MP,       "MP" },
-       { 0,            NULL }
-};
-
 #define PPP_BSDI_HDRLEN 24
 
 /* BSD/OS specific PPP printer */
 #define PPP_BSDI_HDRLEN 24
 
 /* BSD/OS specific PPP printer */
-void
-ppp_bsdos_if_print(u_char *user, const struct pcap_pkthdr *h,
-            register const u_char *p)
+u_int
+ppp_bsdos_if_print(const struct pcap_pkthdr *h _U_, register const u_char *p _U_)
 {
 {
+       register int hdrlength;
 #ifdef __bsdi__
        register u_int length = h->len;
        register u_int caplen = h->caplen;
 #ifdef __bsdi__
        register u_int length = h->len;
        register u_int caplen = h->caplen;
-       register int hdrlength;
        u_int16_t ptype;
        const u_char *q;
        int i;
 
        u_int16_t ptype;
        const u_char *q;
        int i;
 
-       ts_print(&h->ts);
-
        if (caplen < PPP_BSDI_HDRLEN) {
                printf("[|ppp]");
        if (caplen < PPP_BSDI_HDRLEN) {
                printf("[|ppp]");
-               goto out;
+               return (caplen)
        }
 
        }
 
-       /*
-        * Some printers want to get back at the link level addresses,
-        * and/or check that they're not walking off the end of the packet.
-        * Rather than pass them all the way down, we set these globals.
-        */
-       packetp = p;
-       snapend = p + caplen;
        hdrlength = 0;
 
 #if 0
        hdrlength = 0;
 
 #if 0
@@ -1317,15 +1251,15 @@ ppp_bsdos_if_print(u_char *user, const struct pcap_pkthdr *h,
                                printf("] ");
                        }
                }
                                printf("] ");
                        }
                }
-               if (eflag)
-                       printf("%d ", length);
        }
        }
+       if (eflag)
+               printf("%d ", length);
        if (p[SLC_CHL]) {
                q = p + SLC_BPFHDRLEN + p[SLC_LLHL];
 
                switch (ptype) {
                case PPP_VJC:
        if (p[SLC_CHL]) {
                q = p + SLC_BPFHDRLEN + p[SLC_LLHL];
 
                switch (ptype) {
                case PPP_VJC:
-                       ptype = vjc_print(q, length - (q - p), ptype);
+                       ptype = vjc_print(q, ptype);
                        hdrlength = PPP_BSDI_HDRLEN;
                        p += hdrlength;
                        switch (ptype) {
                        hdrlength = PPP_BSDI_HDRLEN;
                        p += hdrlength;
                        switch (ptype) {
@@ -1337,10 +1271,14 @@ ppp_bsdos_if_print(u_char *user, const struct pcap_pkthdr *h,
                                ip6_print(p, length);
                                break;
 #endif
                                ip6_print(p, length);
                                break;
 #endif
+                       case PPP_MPLS_UCAST:
+                       case PPP_MPLS_MCAST:
+                               mpls_print(p, length);
+                               break;
                        }
                        goto printx;
                case PPP_VJNC:
                        }
                        goto printx;
                case PPP_VJNC:
-                       ptype = vjc_print(q, length - (q - p), ptype);
+                       ptype = vjc_print(q, ptype);
                        hdrlength = PPP_BSDI_HDRLEN;
                        p += hdrlength;
                        switch (ptype) {
                        hdrlength = PPP_BSDI_HDRLEN;
                        p += hdrlength;
                        switch (ptype) {
@@ -1352,6 +1290,10 @@ ppp_bsdos_if_print(u_char *user, const struct pcap_pkthdr *h,
                                ip6_print(p, length);
                                break;
 #endif
                                ip6_print(p, length);
                                break;
 #endif
+                       case PPP_MPLS_UCAST:
+                       case PPP_MPLS_MCAST:
+                               mpls_print(p, length);
+                               break;
                        }
                        goto printx;
                default:
                        }
                        goto printx;
                default:
@@ -1380,14 +1322,17 @@ ppp_bsdos_if_print(u_char *user, const struct pcap_pkthdr *h,
                ip6_print(p, length);
                break;
 #endif
                ip6_print(p, length);
                break;
 #endif
+        case PPP_MPLS_UCAST:
+        case PPP_MPLS_MCAST:
+                mpls_print(p, length);
+                break;
        default:
        default:
-               printf("%s ", tok2str(ppptype2str, "proto-#%d", ptype));
+               printf("%s ", tok2str(ppptype2str, "unknown PPP protocol (0x%04x)", ptype));
        }
 
 printx:
        }
 
 printx:
-       if (xflag)
-               default_print((const u_char *)p, caplen - hdrlength);
-out:
-       putchar('\n');
+#else /* __bsdi */
+       hdrlength = 0;
 #endif /* __bsdi__ */
 #endif /* __bsdi__ */
+       return (hdrlength);
 }
 }
[mirror] the TCPdump network dissector