Add CAP_FCNTL and use cap_fcntls_limit().

[tcpdump] / print-token.c

diff --git a/print-token.c b/print-token.c
index 3aba5bcfccb51488665b8d64746c541935674d98..b88bcf7925207540c90547ae18c4f8c6a8cfe813 100644 (file)
--- a/print-token.c
+++ b/print-token.c
@@ -82,12 +82,12 @@
 #define SEGMENT_COUNT(trp)     ((int)((RIF_LENGTH(trp) - 2) / 2))
 
 struct token_header {
 #define SEGMENT_COUNT(trp)     ((int)((RIF_LENGTH(trp) - 2) / 2))
 
 struct token_header {

-       u_int8_t  token_ac;
-       u_int8_t  token_fc;
-       u_int8_t  token_dhost[TOKEN_RING_MAC_LEN];
-       u_int8_t  token_shost[TOKEN_RING_MAC_LEN];
-       u_int16_t token_rcf;
-       u_int16_t token_rseg[ROUTING_SEGMENT_MAX];
+       uint8_t  token_ac;
+       uint8_t  token_fc;
+       uint8_t  token_dhost[TOKEN_RING_MAC_LEN];
+       uint8_t  token_shost[TOKEN_RING_MAC_LEN];
+       uint16_t token_rcf;
+       uint16_t token_rseg[ROUTING_SEGMENT_MAX];

 };
 
 static const char tstr[] = "[|token-ring]";
 };
 
 static const char tstr[] = "[|token-ring]";


@@ -110,8 +110,8 @@ token_hdr_print(netdissect_options *ndo,
 {
        const char *srcname, *dstname;
 
 {
        const char *srcname, *dstname;
 

-       srcname = etheraddr_string(fsrc);
-       dstname = etheraddr_string(fdst);
+       srcname = etheraddr_string(ndo, fsrc);
+       dstname = etheraddr_string(ndo, fdst);

 
        if (ndo->ndo_vflag)
                ND_PRINT((ndo, "%02x %02x %s %s %d: ",
 
        if (ndo->ndo_vflag)
                ND_PRINT((ndo, "%02x %02x %s %s %d: ",