do not use gcc-ism for macro, instead abuse C-syntax

[tcpdump] / print-isakmp.c

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

-    "@(#) $Header: /tcpdump/master/tcpdump/print-isakmp.c,v 1.46 2004-03-12 02:17:18 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-isakmp.c,v 1.48 2004-03-25 03:31:05 mcr Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -415,9 +415,10 @@ isakmp_attr_print(const u_char *p, const u_char *ep)
 }
 
 static const u_char *
 }
 
 static const u_char *

-isakmp_sa_print(const struct isakmp_gen *ext, u_int item_len,
-       const u_char *ep, u_int32_t phase, u_int32_t doi0 _U_,
-       u_int32_t proto0, int depth)
+isakmp_sa_print(const struct isakmp_gen *ext,
+               u_int item_len _U_,
+               const u_char *ep, u_int32_t phase, u_int32_t doi0 _U_,
+               u_int32_t proto0, int depth)

 {
        const struct isakmp_pl_sa *p;
        struct isakmp_pl_sa sa;
 {
        const struct isakmp_pl_sa *p;
        struct isakmp_pl_sa sa;


@@ -475,9 +476,9 @@ trunc:
 }
 
 static const u_char *
 }
 
 static const u_char *

-isakmp_p_print(const struct isakmp_gen *ext, u_int item_len,
-       const u_char *ep, u_int32_t phase, u_int32_t doi0,
-       u_int32_t proto0 _U_, int depth)
+isakmp_p_print(const struct isakmp_gen *ext, u_int item_len _U_,
+              const u_char *ep, u_int32_t phase, u_int32_t doi0,
+              u_int32_t proto0 _U_, int depth)

 {
        const struct isakmp_pl_p *p;
        struct isakmp_pl_p prop;
 {
        const struct isakmp_pl_p *p;
        struct isakmp_pl_p prop;


@@ -633,9 +634,9 @@ trunc:
 }
 
 static const u_char *
 }
 
 static const u_char *

-isakmp_ke_print(const struct isakmp_gen *ext, u_int item_len,
-       const u_char *ep, u_int32_t phase _U_, u_int32_t doi _U_,
-       u_int32_t proto _U_, int depth _U_)
+isakmp_ke_print(const struct isakmp_gen *ext, u_int item_len _U_,
+               const u_char *ep _U_, u_int32_t phase _U_, u_int32_t doi _U_,
+               u_int32_t proto _U_, int depth _U_)

 {
        struct isakmp_gen e;
 
 {
        struct isakmp_gen e;
 


@@ -656,9 +657,9 @@ trunc:
 }
 
 static const u_char *
 }
 
 static const u_char *

-isakmp_id_print(const struct isakmp_gen *ext, u_int item_len,
-       const u_char *ep, u_int32_t phase, u_int32_t doi _U_,
-       u_int32_t proto _U_, int depth _U_)
+isakmp_id_print(const struct isakmp_gen *ext, u_int item_len _U_,
+               const u_char *ep _U_, u_int32_t phase, u_int32_t doi _U_,
+               u_int32_t proto _U_, int depth _U_)

 {
 #define USE_IPSECDOI_IN_PHASE1 1
        const struct isakmp_pl_id *p;
 {
 #define USE_IPSECDOI_IN_PHASE1 1
        const struct isakmp_pl_id *p;


@@ -735,7 +736,10 @@ isakmp_id_print(const struct isakmp_gen *ext, u_int item_len,
                TCHECK2(*data, len);
                switch (id.type) {
                case IPSECDOI_ID_IPV4_ADDR:
                TCHECK2(*data, len);
                switch (id.type) {
                case IPSECDOI_ID_IPV4_ADDR:

-                       printf(" len=%d %s", len, ipaddr_string(data));
+                       if (len < 4)
+                               printf(" len=%d [bad: < 4]", len);
+                       else
+                               printf(" len=%d %s", len, ipaddr_string(data));

                        len = 0;
                        break;
                case IPSECDOI_ID_FQDN:
                        len = 0;
                        break;
                case IPSECDOI_ID_FQDN:


@@ -751,39 +755,60 @@ isakmp_id_print(const struct isakmp_gen *ext, u_int item_len,
                case IPSECDOI_ID_IPV4_ADDR_SUBNET:
                    {
                        const u_char *mask;
                case IPSECDOI_ID_IPV4_ADDR_SUBNET:
                    {
                        const u_char *mask;

-                       mask = data + sizeof(struct in_addr);
-                       printf(" len=%d %s/%u.%u.%u.%u", len,
-                               ipaddr_string(data),
-                               mask[0], mask[1], mask[2], mask[3]);
+                       if (len < 8)
+                               printf(" len=%d [bad: < 8]", len);
+                       else {
+                               mask = data + sizeof(struct in_addr);
+                               printf(" len=%d %s/%u.%u.%u.%u", len,
+                                       ipaddr_string(data),
+                                       mask[0], mask[1], mask[2], mask[3]);
+                       }

                        len = 0;
                        break;
                    }
 #ifdef INET6
                case IPSECDOI_ID_IPV6_ADDR:
                        len = 0;
                        break;
                    }
 #ifdef INET6
                case IPSECDOI_ID_IPV6_ADDR:

-                       printf(" len=%d %s", len, ip6addr_string(data));
+                       if (len < 16)
+                               printf(" len=%d [bad: < 16]", len);
+                       else
+                               printf(" len=%d %s", len, ip6addr_string(data));

                        len = 0;
                        break;
                case IPSECDOI_ID_IPV6_ADDR_SUBNET:
                    {
                        const u_int32_t *mask;
                        len = 0;
                        break;
                case IPSECDOI_ID_IPV6_ADDR_SUBNET:
                    {
                        const u_int32_t *mask;

-                       mask = (u_int32_t *)(data + sizeof(struct in6_addr));
-                       /*XXX*/
-                       printf(" len=%d %s/0x%08x%08x%08x%08x", len,
-                               ip6addr_string(data),
-                               mask[0], mask[1], mask[2], mask[3]);
+                       if (len < 20)
+                               printf(" len=%d [bad: < 20]", len);
+                       else {
+                               mask = (u_int32_t *)(data + sizeof(struct in6_addr));
+                               /*XXX*/
+                               printf(" len=%d %s/0x%08x%08x%08x%08x", len,
+                                       ip6addr_string(data),
+                                       mask[0], mask[1], mask[2], mask[3]);
+                       }

                        len = 0;
                        break;
                    }
 #endif /*INET6*/
                case IPSECDOI_ID_IPV4_ADDR_RANGE:
                        len = 0;
                        break;
                    }
 #endif /*INET6*/
                case IPSECDOI_ID_IPV4_ADDR_RANGE:

-                       printf(" len=%d %s-%s", len, ipaddr_string(data),
-                               ipaddr_string(data + sizeof(struct in_addr)));
+                       if (len < 8)
+                               printf(" len=%d [bad: < 8]", len);
+                       else {
+                               printf(" len=%d %s-%s", len,
+                                       ipaddr_string(data),
+                                       ipaddr_string(data + sizeof(struct in_addr)));
+                       }

                        len = 0;
                        break;
 #ifdef INET6
                case IPSECDOI_ID_IPV6_ADDR_RANGE:
                        len = 0;
                        break;
 #ifdef INET6
                case IPSECDOI_ID_IPV6_ADDR_RANGE:

-                       printf(" len=%d %s-%s", len, ip6addr_string(data),
-                               ip6addr_string(data + sizeof(struct in6_addr)));
+                       if (len < 32)
+                               printf(" len=%d [bad: < 32]", len);
+                       else {
+                               printf(" len=%d %s-%s", len,
+                                       ip6addr_string(data),
+                                       ip6addr_string(data + sizeof(struct in6_addr)));
+                       }

                        len = 0;
                        break;
 #endif /*INET6*/
                        len = 0;
                        break;
 #endif /*INET6*/


@@ -810,9 +835,10 @@ trunc:
 }
 
 static const u_char *
 }
 
 static const u_char *

-isakmp_cert_print(const struct isakmp_gen *ext, u_int item_len,
-       const u_char *ep, u_int32_t phase _U_, u_int32_t doi0 _U_,
-       u_int32_t proto0 _U_, int depth _U_)
+isakmp_cert_print(const struct isakmp_gen *ext, u_int item_len _U_,
+                 const u_char *ep _U_, u_int32_t phase _U_,
+                 u_int32_t doi0 _U_,
+                 u_int32_t proto0 _U_, int depth _U_)

 {
        const struct isakmp_pl_cert *p;
        struct isakmp_pl_cert cert;
 {
        const struct isakmp_pl_cert *p;
        struct isakmp_pl_cert cert;


@@ -841,9 +867,9 @@ trunc:
 }
 
 static const u_char *
 }
 
 static const u_char *

-isakmp_cr_print(const struct isakmp_gen *ext, u_int item_len,
-       const u_char *ep, u_int32_t phase _U_, u_int32_t doi0 _U_,
-       u_int32_t proto0 _U_, int depth _U_)
+isakmp_cr_print(const struct isakmp_gen *ext, u_int item_len _U_,
+               const u_char *ep _U_, u_int32_t phase _U_, u_int32_t doi0 _U_,
+               u_int32_t proto0 _U_, int depth _U_)

 {
        const struct isakmp_pl_cert *p;
        struct isakmp_pl_cert cert;
 {
        const struct isakmp_pl_cert *p;
        struct isakmp_pl_cert cert;


@@ -872,9 +898,9 @@ trunc:
 }
 
 static const u_char *
 }
 
 static const u_char *

-isakmp_hash_print(const struct isakmp_gen *ext, u_int item_len,
-       const u_char *ep, u_int32_t phase _U_, u_int32_t doi _U_,
-       u_int32_t proto _U_, int depth _U_)
+isakmp_hash_print(const struct isakmp_gen *ext, u_int item_len _U_,
+                 const u_char *ep _U_, u_int32_t phase _U_, u_int32_t doi _U_,
+                 u_int32_t proto _U_, int depth _U_)

 {
        struct isakmp_gen e;
 
 {
        struct isakmp_gen e;
 


@@ -895,9 +921,9 @@ trunc:
 }
 
 static const u_char *
 }
 
 static const u_char *

-isakmp_sig_print(const struct isakmp_gen *ext, u_int item_len,
-       const u_char *ep, u_int32_t phase _U_, u_int32_t doi _U_,
-       u_int32_t proto _U_, int depth _U_)
+isakmp_sig_print(const struct isakmp_gen *ext, u_int item_len _U_,
+                const u_char *ep _U_, u_int32_t phase _U_, u_int32_t doi _U_,
+                u_int32_t proto _U_, int depth _U_)

 {
        struct isakmp_gen e;
 
 {
        struct isakmp_gen e;
 


@@ -918,9 +944,11 @@ trunc:
 }
 
 static const u_char *
 }
 
 static const u_char *

-isakmp_nonce_print(const struct isakmp_gen *ext, u_int item_len,
-       const u_char *ep, u_int32_t phase _U_, u_int32_t doi _U_,
-       u_int32_t proto _U_, int depth _U_)
+isakmp_nonce_print(const struct isakmp_gen *ext,
+                  u_int item_len _U_,
+                  const u_char *ep _U_,
+                  u_int32_t phase _U_, u_int32_t doi _U_,
+                  u_int32_t proto _U_, int depth _U_)

 {
        struct isakmp_gen e;
 
 {
        struct isakmp_gen e;
 


@@ -1080,9 +1108,9 @@ trunc:
 }
 
 static const u_char *
 }
 
 static const u_char *

-isakmp_d_print(const struct isakmp_gen *ext, u_int item_len,
-       const u_char *ep, u_int32_t phase _U_, u_int32_t doi0 _U_,
-       u_int32_t proto0 _U_, int depth _U_)
+isakmp_d_print(const struct isakmp_gen *ext, u_int item_len _U_,
+              const u_char *ep _U_, u_int32_t phase _U_, u_int32_t doi0 _U_,
+              u_int32_t proto0 _U_, int depth _U_)

 {
        const struct isakmp_pl_d *p;
        struct isakmp_pl_d d;
 {
        const struct isakmp_pl_d *p;
        struct isakmp_pl_d d;


@@ -1123,9 +1151,10 @@ trunc:
 }
 
 static const u_char *
 }
 
 static const u_char *

-isakmp_vid_print(const struct isakmp_gen *ext, u_int item_len,
-       const u_char *ep, u_int32_t phase _U_, u_int32_t doi _U_,
-       u_int32_t proto _U_, int depth _U_)
+isakmp_vid_print(const struct isakmp_gen *ext,
+                u_int item_len _U_, const u_char *ep _U_,
+                u_int32_t phase _U_, u_int32_t doi _U_,
+                u_int32_t proto _U_, int depth _U_)

 {
        struct isakmp_gen e;
 
 {
        struct isakmp_gen e;