Add CAP_FCNTL and use cap_fcntls_limit().

[tcpdump] / print-igrp.c

diff --git a/print-igrp.c b/print-igrp.c
index 8234a88d6656c11676c68bca1981403fa74d48b4..fbb313427c72026ce5795ec508fe9618e33c48a7 100644 (file)
--- a/print-igrp.c
+++ b/print-igrp.c
@@ -21,13 +21,14 @@
  * Initial contribution from Francis Dupont ([email protected])
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
-#include "netdissect.h"
+#include "interface.h"
 #include "extract.h"                   /* must come after interface.h */
 
 /* Cisco IGRP definitions */
@@ -35,15 +36,15 @@
 /* IGRP Header */
 
 struct igrphdr {
-       u_int8_t ig_vop;        /* protocol version number / opcode */
+       uint8_t ig_vop; /* protocol version number / opcode */
 #define IGRP_V(x)      (((x) & 0xf0) >> 4)
 #define IGRP_OP(x)     ((x) & 0x0f)
-       u_int8_t ig_ed;         /* edition number */
-       u_int16_t ig_as;        /* autonomous system number */
-       u_int16_t ig_ni;        /* number of subnet in local net */
-       u_int16_t ig_ns;        /* number of networks in AS */
-       u_int16_t ig_nx;        /* number of networks ouside AS */
-       u_int16_t ig_sum;       /* checksum of IGRP header & data */
+       uint8_t ig_ed;          /* edition number */
+       uint16_t ig_as; /* autonomous system number */
+       uint16_t ig_ni; /* number of subnet in local net */
+       uint16_t ig_ns; /* number of networks in AS */
+       uint16_t ig_nx; /* number of networks ouside AS */
+       uint16_t ig_sum;        /* checksum of IGRP header & data */
 };
 
 #define IGRP_UPDATE    1
@@ -52,13 +53,13 @@ struct igrphdr {
 /* IGRP routing entry */
 
 struct igrprte {
-       u_int8_t igr_net[3];    /* 3 significant octets of IP address */
-       u_int8_t igr_dly[3];    /* delay in tens of microseconds */
-       u_int8_t igr_bw[3];     /* bandwidth in units of 1 kb/s */
-       u_int8_t igr_mtu[2];    /* MTU in octets */
-       u_int8_t igr_rel;       /* percent packets successfully tx/rx */
-       u_int8_t igr_ld;        /* percent of channel occupied */
-       u_int8_t igr_hct;       /* hop count */
+       uint8_t igr_net[3];     /* 3 significant octets of IP address */
+       uint8_t igr_dly[3];     /* delay in tens of microseconds */
+       uint8_t igr_bw[3];      /* bandwidth in units of 1 kb/s */
+       uint8_t igr_mtu[2];     /* MTU in octets */
+       uint8_t igr_rel;        /* percent packets successfully tx/rx */
+       uint8_t igr_ld; /* percent of channel occupied */
+       uint8_t igr_hct;        /* hop count */
 };
 
 #define IGRP_RTE_SIZE  14      /* don't believe sizeof ! */