always use u_intXX_t for protocol format declaration. char/short/int may not

[tcpdump] / print-isakmp.c

diff --git a/print-isakmp.c b/print-isakmp.c
index 90c802685f968b5e4b0f9efd5772449274d402b6..a3963f2ad345e8dad2abdea425e9f99a3f307a0a 100644 (file)
--- a/print-isakmp.c
+++ b/print-isakmp.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-    "@(#) $Header: /tcpdump/master/tcpdump/print-isakmp.c,v 1.21 2000-09-29 04:58:42 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-isakmp.c,v 1.22 2000-10-03 02:54:59 itojun Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -200,7 +200,7 @@ cookie_record(cookie_t *in, const u_char *bp2)
        }
 
        ip = (struct ip *)bp2;
        }
 
        ip = (struct ip *)bp2;

-       switch (ip->ip_v) {
+       switch (IP_V(ip)) {

        case 4:
                memset(&cookiecache[ninitiator].iaddr, 0,
                        sizeof(cookiecache[ninitiator].iaddr));
        case 4:
                memset(&cookiecache[ninitiator].iaddr, 0,
                        sizeof(cookiecache[ninitiator].iaddr));


@@ -266,7 +266,7 @@ cookie_sidecheck(int i, const u_char *bp2, int initiator)
 
        memset(&ss, 0, sizeof(ss));
        ip = (struct ip *)bp2;
 
        memset(&ss, 0, sizeof(ss));
        ip = (struct ip *)bp2;

-       switch (ip->ip_v) {
+       switch (IP_V(ip)) {

        case 4:
                sin = (struct sockaddr_in *)&ss;
 #ifdef HAVE_SOCKADDR_SA_LEN
        case 4:
                sin = (struct sockaddr_in *)&ss;
 #ifdef HAVE_SOCKADDR_SA_LEN