Fix incompatible pointer types with time functions calls on Windows

[tcpdump] / print-ip-demux.c

diff --git a/print-ip-demux.c b/print-ip-demux.c
index 8b53187cc29172e65daec8b91d00742e5e20d54d..50693569819ebb2fa7e810b6ae379b47df3b5870 100644 (file)
--- a/print-ip-demux.c
+++ b/print-ip-demux.c
@@ -21,14 +21,10 @@
 
 /* \summary: IPv4/IPv6 payload printer */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
-#include <string.h>
-
 #include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
@@ -106,7 +102,7 @@ again:
 
        case IPPROTO_ICMP:
                if (ver == 4)
-                       icmp_print(ndo, bp, length, iph, fragmented);
+                       icmp_print(ndo, bp, length, fragmented);
                else {
                        ND_PRINT("[%s requires IPv4]",
                                 tok2str(ipproto_values,"unknown",nh));
@@ -200,7 +196,7 @@ again:
                if (ndo->ndo_packettype == PT_CARP) {
                        carp_print(ndo, bp, length, ttl_hl);
                } else {
-                       vrrp_print(ndo, bp, length, iph, ttl_hl);
+                       vrrp_print(ndo, bp, length, iph, ttl_hl, ver);
                }
                break;
 
@@ -218,6 +214,10 @@ again:
                }
                break;
 
+       case IPPROTO_NHRP:
+               nhrp_print(ndo, bp, length);
+               break;
+
        case IPPROTO_NONE:
                ND_PRINT("no next header");
                break;