Add CAP_FCNTL and use cap_fcntls_limit().

[tcpdump] / print-mobile.c

diff --git a/print-mobile.c b/print-mobile.c
index cebbea045cfd40ad391b780f6272f90ec071af56..df412eeb289799e6f8801b0692c612c1382ff83d 100644 (file)
--- a/print-mobile.c
+++ b/print-mobile.c
@@ -36,6 +36,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -49,10 +50,10 @@
 #define MOBILE_SIZE (8)
 
 struct mobile_ip {
-       u_int16_t proto;
-       u_int16_t hcheck;
-       u_int32_t odst;
-       u_int32_t osrc;
+       uint16_t proto;
+       uint16_t hcheck;
+       uint32_t odst;
+       uint32_t osrc;
 };
 
 #define OSRC_PRES      0x0080  /* old source is present */
@@ -85,15 +86,15 @@ mobile_print(netdissect_options *ndo, const u_char *bp, u_int length)
        if (osp)  {
                ND_PRINT((ndo, "[S] "));
                if (ndo->ndo_vflag)
-                       ND_PRINT((ndo, "%s ", ipaddr_string(&mob->osrc)));
+                       ND_PRINT((ndo, "%s ", ipaddr_string(ndo, &mob->osrc)));
        } else {
                ND_PRINT((ndo, "[] "));
        }
        if (ndo->ndo_vflag) {
-               ND_PRINT((ndo, "> %s ", ipaddr_string(&mob->odst)));
+               ND_PRINT((ndo, "> %s ", ipaddr_string(ndo, &mob->odst)));
                ND_PRINT((ndo, "(oproto=%d)", proto>>8));
        }
-       vec[0].ptr = (const u_int8_t *)(void *)mob;
+       vec[0].ptr = (const uint8_t *)(void *)mob;
        vec[0].len = osp ? 12 : 8;
        if (in_cksum(vec, 1)!=0) {
                ND_PRINT((ndo, " (bad checksum %d)", crc));