Add CAP_FCNTL and use cap_fcntls_limit().

[tcpdump] / print-decnet.c

diff --git a/print-decnet.c b/print-decnet.c
index a154621790e31bece3c6e4f5c3397ea7821a2312..5414ec20b5cdf486287f090ae4185a71c3144a7a 100644 (file)
--- a/print-decnet.c
+++ b/print-decnet.c
@@ -44,7 +44,7 @@ struct rtentry;
 static const char tstr[] = "[|decnet]";
 
 #ifndef WIN32
-typedef u_int8_t byte[1];              /* single byte field */
+typedef uint8_t byte[1];               /* single byte field */
 #else
 /*
  * the keyword 'byte' generates conflicts in Windows
@@ -52,17 +52,17 @@ typedef u_int8_t byte[1];           /* single byte field */
 typedef unsigned char Byte[1];         /* single byte field */
 #define byte Byte
 #endif /* WIN32 */
-typedef u_int8_t word[2];              /* 2 byte field */
-typedef u_int8_t longword[4];          /* 4 bytes field */
+typedef uint8_t word[2];               /* 2 byte field */
+typedef uint8_t longword[4];           /* 4 bytes field */
 
 /*
  * Definitions for DECNET Phase IV protocol headers
  */
 union etheraddress {
-       u_int8_t   dne_addr[6];         /* full ethernet address */
+       uint8_t   dne_addr[6];          /* full ethernet address */
        struct {
-               u_int8_t dne_hiord[4];  /* DECnet HIORD prefix */
-               u_int8_t dne_nodeaddr[2]; /* DECnet node address */
+               uint8_t dne_hiord[4];   /* DECnet HIORD prefix */
+               uint8_t dne_nodeaddr[2]; /* DECnet node address */
        } dne_remote;
 };
 
@@ -76,8 +76,8 @@ typedef union etheraddress etheraddr; /* Ethernet address */
 
 #define DN_MAXADDL     20              /* max size of DECnet address */
 struct dn_naddr {
-       u_int16_t       a_len;          /* length of address */
-       u_int8_t a_addr[DN_MAXADDL]; /* address as bytes */
+       uint16_t        a_len;          /* length of address */
+       uint8_t a_addr[DN_MAXADDL]; /* address as bytes */
 };
 
 /*
@@ -271,7 +271,7 @@ union controlmsg
 /* Macros for decoding routing-info fields */
 #define        RI_COST(x)      ((x)&0777)
 #define        RI_HOPS(x)      (((x)>>10)&037)
-\f
+
 /*
  * NSP protocol fields and values.
  */
@@ -1315,10 +1315,15 @@ dnname_string(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));
-       return (strdup(dnet_htoa(&dna)));
+       dnname = dnet_htoa(&dna);
+       if(dnname != NULL)
+               return (strdup(dnname));
+       else
+               return(dnnum_string(dnaddr));
 #else
        return(dnnum_string(dnaddr));   /* punt */
 #endif