Handle very large -f files by rejecting them.

[tcpdump] / print-mobile.c

diff --git a/print-mobile.c b/print-mobile.c
index 64c7d5564c46fa9587c4df8013e2423a6dc1c149..6d31648cb47ce7ab1794c79d70f0a0b823130aea 100644 (file)
--- a/print-mobile.c
+++ b/print-mobile.c
@@ -36,24 +36,25 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define NETDISSECT_REWORKED
+/* \summary: IPv4 mobility printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
-#include "extract.h"           /* must come after interface.h */
+#include "extract.h"
 
 #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 */
@@ -86,15 +87,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 *)(const void *)mob;
        vec[0].len = osp ? 12 : 8;
        if (in_cksum(vec, 1)!=0) {
                ND_PRINT((ndo, " (bad checksum %d)", crc));