Remove libpcap-layer issues from tests/pktap-heap-overflow.pcap.

[tcpdump] / print-decnet.c

diff --git a/print-decnet.c b/print-decnet.c
index cd88dfac10ff12d2b2a9d9aa8c90b14192e95ebc..6e2c7913f5ecdda6272881439840587555cca302 100644 (file)
--- a/print-decnet.c
+++ b/print-decnet.c
@@ -19,6 +19,8 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+/* \summary: DECnet printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -28,10 +30,6 @@
 struct mbuf;
 struct rtentry;
 
-#ifdef HAVE_NETDNET_DNETDB_H
-#include <netdnet/dnetdb.h>
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -73,12 +71,6 @@ typedef union etheraddress etheraddr;        /* Ethernet address */
 #define        AREASHIFT       10              /* bit-offset for area field */
 #define NODEMASK       01777           /* mask for node address field */
 
-#define DN_MAXADDL     20              /* max size of DECnet address */
-struct dn_naddr {
-       uint16_t        a_len;          /* length of address */
-       uint8_t a_addr[DN_MAXADDL]; /* address as bytes */
-};
-
 /*
  * Define long and short header formats.
  */
@@ -324,7 +316,6 @@ union controlmsg
 #define COS_NONE 0                     /* no flow control */
 #define COS_SEGMENT 04                 /* segment flow control */
 #define COS_MESSAGE 010                        /* message flow control */
-#define COS_CRYPTSER 020               /* cryptographic services requested */
 #define COS_DEFAULT 1                  /* default value for field */
 
 #define COI_MASK 3                     /* mask for version field */
@@ -490,13 +481,6 @@ static void print_i_info(netdissect_options *, int);
 static int print_elist(const char *, u_int);
 static int print_nsp(netdissect_options *, const u_char *, u_int);
 static void print_reason(netdissect_options *, int);
-#ifdef PRINT_NSPDATA
-static void pdata(netdissect_options *, u_char *, u_int);
-#endif
-
-#ifndef HAVE_NETDNET_DNETDB_H_DNET_HTOA
-extern char *dnet_htoa(struct dn_naddr *);
-#endif
 
 void
 decnet_print(netdissect_options *ndo,
@@ -544,6 +528,7 @@ decnet_print(netdissect_options *ndo,
            length -= padlen;
            caplen -= padlen;
            rhp = (const union routehdr *)&(ap[sizeof(short)]);
+           ND_TCHECK(rhp->rh_short.sh_flags);
            mflags = EXTRACT_LE_8BITS(rhp->rh_short.sh_flags);
        }
 
@@ -615,6 +600,7 @@ print_decnet_ctlmsg(netdissect_options *ndo,
                     register const union routehdr *rhp, u_int length,
                     u_int caplen)
 {
+       /* Our caller has already checked for mflags */
        int mflags = EXTRACT_LE_8BITS(rhp->rh_short.sh_flags);
        register const union controlmsg *cmp = (const union controlmsg *)rhp;
        int src, dst, info, blksize, eco, ueco, hello, other, vers;
@@ -875,9 +861,6 @@ print_nsp(netdissect_options *ndo,
                {
                    const struct seghdr *shp = (const struct seghdr *)nspp;
                    int ack;
-#ifdef PRINT_NSPDATA
-                   const u_char *dp;
-#endif
                    u_int data_off = sizeof(struct minseghdr);
 
                    if (nsplen < data_off)
@@ -907,13 +890,6 @@ print_nsp(netdissect_options *ndo,
                        }
                    }
                    ND_PRINT((ndo, "seg %d ", ack & SGQ_MASK));
-#ifdef PRINT_NSPDATA
-                   if (nsplen > data_off) {
-                       dp = &(nspp[data_off]);
-                       ND_TCHECK2(*dp, nsplen - data_off);
-                       pdata(ndo, dp, nsplen - data_off);
-                   }
-#endif
                }
                break;
            case MFS_ILS+MFS_INT:
@@ -921,9 +897,6 @@ print_nsp(netdissect_options *ndo,
                {
                    const struct seghdr *shp = (const struct seghdr *)nspp;
                    int ack;
-#ifdef PRINT_NSPDATA
-                   const u_char *dp;
-#endif
                    u_int data_off = sizeof(struct minseghdr);
 
                    if (nsplen < data_off)
@@ -953,13 +926,6 @@ print_nsp(netdissect_options *ndo,
                        }
                    }
                    ND_PRINT((ndo, "seg %d ", ack & SGQ_MASK));
-#ifdef PRINT_NSPDATA
-                   if (nsplen > data_off) {
-                       dp = &(nspp[data_off]);
-                       ND_TCHECK2(*dp, nsplen - data_off);
-                       pdata(ndo, dp, nsplen - data_off);
-                   }
-#endif
                }
                break;
            case MFS_ILS:
@@ -1099,9 +1065,6 @@ print_nsp(netdissect_options *ndo,
                {
                    const struct cimsg *cimp = (const struct cimsg *)nspp;
                    int services, info, segsize;
-#ifdef PRINT_NSPDATA
-                   const u_char *dp;
-#endif
 
                    if (nsplen < sizeof(struct cimsg))
                        goto trunc;
@@ -1119,9 +1082,6 @@ print_nsp(netdissect_options *ndo,
                    case COS_MESSAGE:
                        ND_PRINT((ndo, "msg "));
                        break;
-                   case COS_CRYPTSER:
-                       ND_PRINT((ndo, "crypt "));
-                       break;
                    }
                    switch (info & COI_MASK) {
                    case COI_32:
@@ -1138,13 +1098,6 @@ print_nsp(netdissect_options *ndo,
                        break;
                    }
                    ND_PRINT((ndo, "segsize %d ", segsize));
-#ifdef PRINT_NSPDATA
-                   if (nsplen > sizeof(struct cimsg)) {
-                       dp = &(nspp[sizeof(struct cimsg)]);
-                       ND_TCHECK2(*dp, nsplen - sizeof(struct cimsg));
-                       pdata(ndo, dp, nsplen - sizeof(struct cimsg));
-                   }
-#endif
                }
                break;
            case MFS_CC:
@@ -1153,9 +1106,6 @@ print_nsp(netdissect_options *ndo,
                    const struct ccmsg *ccmp = (const struct ccmsg *)nspp;
                    int services, info;
                    u_int segsize, optlen;
-#ifdef PRINT_NSPDATA
-                   const u_char *dp;
-#endif
 
                    if (nsplen < sizeof(struct ccmsg))
                        goto trunc;
@@ -1174,9 +1124,6 @@ print_nsp(netdissect_options *ndo,
                    case COS_MESSAGE:
                        ND_PRINT((ndo, "msg "));
                        break;
-                   case COS_CRYPTSER:
-                       ND_PRINT((ndo, "crypt "));
-                       break;
                    }
                    switch (info & COI_MASK) {
                    case COI_32:
@@ -1195,13 +1142,6 @@ print_nsp(netdissect_options *ndo,
                    ND_PRINT((ndo, "segsize %d ", segsize));
                    if (optlen) {
                        ND_PRINT((ndo, "optlen %d ", optlen));
-#ifdef PRINT_NSPDATA
-                       if (optlen > nsplen - sizeof(struct ccmsg))
-                           goto trunc;
-                       dp = &(nspp[sizeof(struct ccmsg)]);
-                       ND_TCHECK2(*dp, optlen);
-                       pdata(ndo, dp, optlen);
-#endif
                    }
                }
                break;
@@ -1211,9 +1151,6 @@ print_nsp(netdissect_options *ndo,
                    const struct dimsg *dimp = (const struct dimsg *)nspp;
                    int reason;
                    u_int optlen;
-#ifdef PRINT_NSPDATA
-                   const u_char *dp;
-#endif
 
                    if (nsplen < sizeof(struct dimsg))
                        goto trunc;
@@ -1224,13 +1161,6 @@ print_nsp(netdissect_options *ndo,
                    print_reason(ndo, reason);
                    if (optlen) {
                        ND_PRINT((ndo, "optlen %d ", optlen));
-#ifdef PRINT_NSPDATA
-                       if (optlen > nsplen - sizeof(struct dimsg))
-                           goto trunc;
-                       dp = &(nspp[sizeof(struct dimsg)]);
-                       ND_TCHECK2(*dp, optlen);
-                       pdata(ndo, dp, optlen);
-#endif
                    }
                }
                break;
@@ -1308,37 +1238,3 @@ dnnum_string(netdissect_options *ndo, u_short dnaddr)
        snprintf(str, siz, "%d.%d", area, node);
        return(str);
 }
-
-const char *
-dnname_string(netdissect_options *ndo, u_short dnaddr)
-{
-#ifdef HAVE_DNET_HTOA
-       struct dn_naddr dna;
-       char *dnname;
-
-       dna.a_len = sizeof(short);
-       memcpy((char *)dna.a_addr, (char *)&dnaddr, sizeof(short));
-       dnname = dnet_htoa(&dna);
-       if(dnname != NULL)
-               return (strdup(dnname));
-       else
-               return(dnnum_string(ndo, dnaddr));
-#else
-       return(dnnum_string(ndo, dnaddr));      /* punt */
-#endif
-}
-
-#ifdef PRINT_NSPDATA
-static void
-pdata(netdissect_options *ndo,
-      u_char *dp, u_int maxlen)
-{
-       char c;
-       u_int x = maxlen;
-
-       while (x-- > 0) {
-           c = *dp++;
-           safeputchar(ndo, c);
-       }
-}
-#endif