add boundary, infinite loop checks

[tcpdump] / print-mobility.c

diff --git a/print-mobility.c b/print-mobility.c
index 6b1d719508a5d7433f7d816099f6a04b034b4543..1490b72e721cf2f62515c0dc13ba450e16ef6c28 100644 (file)
--- a/print-mobility.c
+++ b/print-mobility.c
@@ -32,8 +32,8 @@
 #endif
 
 #ifndef lint
 #endif
 
 #ifndef lint

-static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/print-mobility.c,v 1.6 2002-11-09 17:19:28 itojun Exp $";
+static const char rcsid[] _U_ =
+     "@(#) $Header: /tcpdump/master/tcpdump/print-mobility.c,v 1.12 2005-04-20 22:21:00 guy Exp $";

 #endif
 
 #ifdef INET6
 #endif
 
 #ifdef INET6


@@ -49,15 +49,16 @@ static const char rcsid[] =
 
 /* Mobility header */
 struct ip6_mobility {
 
 /* Mobility header */
 struct ip6_mobility {

-        u_int8_t ip6m_pproto;   /* following payload protocol (for PG) */
-       u_int8_t ip6m_len;      /* length in units of 8 octets */
-       u_int16_t ip6m_type;    /* message type */
-       u_int16_t ip6m_cksum;   /* sum of IPv6 pseudo-header and MH */
+       u_int8_t ip6m_pproto;   /* following payload protocol (for PG) */
+       u_int8_t ip6m_len;      /* length in units of 8 octets */
+       u_int8_t ip6m_type;     /* message type */
+       u_int8_t reserved;      /* reserved */
+       u_int16_t ip6m_cksum;   /* sum of IPv6 pseudo-header and MH */

        union {
                u_int16_t       ip6m_un_data16[1]; /* type-specific field */
                u_int8_t        ip6m_un_data8[2];  /* type-specific fiedl */
        } ip6m_dataun;
        union {
                u_int16_t       ip6m_un_data16[1]; /* type-specific field */
                u_int8_t        ip6m_un_data8[2];  /* type-specific fiedl */
        } ip6m_dataun;

-} __attribute__((packed));
+};

 
 #define ip6m_data16    ip6m_dataun.ip6m_un_data16
 #define ip6m_data8     ip6m_dataun.ip6m_un_data8
 
 #define ip6m_data16    ip6m_dataun.ip6m_un_data16
 #define ip6m_data8     ip6m_dataun.ip6m_un_data8


@@ -65,29 +66,27 @@ struct ip6_mobility {
 #define IP6M_MINLEN    8
 
 /* message type */
 #define IP6M_MINLEN    8
 
 /* message type */

-#define IP6M_BINDING_REQUEST   0x0000  /* Binding Refresh Request */
-#define IP6M_HOME_TEST_INIT    0x0001  /* Home Test Init */
-#define IP6M_CAREOF_TEST_INIT  0x0002  /* Care-of Test Init */
-#define IP6M_HOME_TEST         0x0003  /* Home Test */
-#define IP6M_CAREOF_TEST       0x0004  /* Care-of Test */
-#define IP6M_BINDING_UPDATE    0x0005  /* Binding Update */
-#define IP6M_BINDING_ACK       0x0006  /* Binding Acknowledgement */
-#define IP6M_BINDING_ERROR     0x0007  /* Binding Error */
+#define IP6M_BINDING_REQUEST   0       /* Binding Refresh Request */
+#define IP6M_HOME_TEST_INIT    1       /* Home Test Init */
+#define IP6M_CAREOF_TEST_INIT  2       /* Care-of Test Init */
+#define IP6M_HOME_TEST         3       /* Home Test */
+#define IP6M_CAREOF_TEST       4       /* Care-of Test */
+#define IP6M_BINDING_UPDATE    5       /* Binding Update */
+#define IP6M_BINDING_ACK       6       /* Binding Acknowledgement */
+#define IP6M_BINDING_ERROR     7       /* Binding Error */

 
 /* Mobility Header Options */
 #define IP6MOPT_MINLEN         2
 
 /* Mobility Header Options */
 #define IP6MOPT_MINLEN         2

-#define IP6MOPT_PAD1          0x0
-#define IP6MOPT_PADN          0x1
-#define IP6MOPT_UI            0x2
-#define IP6MOPT_UI_MINLEN       4
-#define IP6MOPT_ALTCOA        0x3
+#define IP6MOPT_PAD1          0x0      /* Pad1 */
+#define IP6MOPT_PADN          0x1      /* PadN */
+#define IP6MOPT_REFRESH              0x2       /* Binding Refresh Advice */
+#define IP6MOPT_REFRESH_MINLEN  4
+#define IP6MOPT_ALTCOA        0x3      /* Alternate Care-of Address */

 #define IP6MOPT_ALTCOA_MINLEN  18
 #define IP6MOPT_ALTCOA_MINLEN  18

-#define IP6MOPT_NONCEID       0x4
+#define IP6MOPT_NONCEID       0x4      /* Nonce Indices */

 #define IP6MOPT_NONCEID_MINLEN  6
 #define IP6MOPT_NONCEID_MINLEN  6

-#define IP6MOPT_AUTH          0x5
-#define IP6MOPT_AUTH_MINLEN     2 /* 2+len */
-#define IP6MOPT_REFRESH              0x7
-#define IP6MOPT_REFRESH_MINLEN  4
+#define IP6MOPT_AUTH          0x5      /* Binding Authorization Data */
+#define IP6MOPT_AUTH_MINLEN    12

 
 static void
 mobility_opt_print(const u_char *bp, int len)
 
 static void
 mobility_opt_print(const u_char *bp, int len)


@@ -118,12 +117,14 @@ mobility_opt_print(const u_char *bp, int len)
                        }
                        printf("(padn)");
                        break;
                        }
                        printf("(padn)");
                        break;

-               case IP6MOPT_UI:
-                       if (len - i < IP6MOPT_UI_MINLEN) {
-                               printf("(ui: trunc)");
+               case IP6MOPT_REFRESH:
+                       if (len - i < IP6MOPT_REFRESH_MINLEN) {
+                               printf("(refresh: trunc)");

                                goto trunc;
                        }
                                goto trunc;
                        }

-                       printf("(ui: 0x%04x)", EXTRACT_16BITS(&bp[i+2]));
+                       /* units of 4 secs */
+                       printf("(refresh: %d)",
+                               EXTRACT_16BITS(&bp[i+2]) << 2);

                        break;
                case IP6MOPT_ALTCOA:
                        if (len - i < IP6MOPT_ALTCOA_MINLEN) {
                        break;
                case IP6MOPT_ALTCOA:
                        if (len - i < IP6MOPT_ALTCOA_MINLEN) {


@@ -137,7 +138,7 @@ mobility_opt_print(const u_char *bp, int len)
                                printf("(ni: trunc)");
                                goto trunc;
                        }
                                printf("(ni: trunc)");
                                goto trunc;
                        }

-                       printf("(ni: ho=0x%04x ci=0x%04x)",
+                       printf("(ni: ho=0x%04x co=0x%04x)",

                                EXTRACT_16BITS(&bp[i+2]),
                                EXTRACT_16BITS(&bp[i+4]));
                        break;
                                EXTRACT_16BITS(&bp[i+2]),
                                EXTRACT_16BITS(&bp[i+4]));
                        break;


@@ -148,15 +149,6 @@ mobility_opt_print(const u_char *bp, int len)
                        }
                        printf("(auth)");
                        break;
                        }
                        printf("(auth)");
                        break;

-               case IP6MOPT_REFRESH:
-                       if (len - i < IP6MOPT_REFRESH_MINLEN) {
-                               printf("(refresh: trunc)");
-                               goto trunc;
-                       }
-                       /* units of 4 secs */
-                       printf("(refresh: %d)",
-                               EXTRACT_16BITS(&bp[i+2]) << 2);
-                       break;

                default:
                        if (len - i < IP6MOPT_MINLEN) {
                                printf("(sopt_type %d: trunc)", bp[i]);
                default:
                        if (len - i < IP6MOPT_MINLEN) {
                                printf("(sopt_type %d: trunc)", bp[i]);


@@ -176,15 +168,13 @@ trunc:
  * Mobility Header
  */
 int
  * Mobility Header
  */
 int

-mobility_print(const u_char *bp, const u_char *bp2)
+mobility_print(const u_char *bp, const u_char *bp2 _U_)

 {
        const struct ip6_mobility *mh;
 {
        const struct ip6_mobility *mh;

-       const struct ip6_hdr *ip6;

        const u_char *ep;
        int mhlen, hlen, type;
 
        mh = (struct ip6_mobility *)bp;
        const u_char *ep;
        int mhlen, hlen, type;
 
        mh = (struct ip6_mobility *)bp;

-       ip6 = (struct ip6_hdr *)bp2;

 
        /* 'ep' points to the end of available data. */
        ep = snapend;
 
        /* 'ep' points to the end of available data. */
        ep = snapend;


@@ -205,14 +195,12 @@ mobility_print(const u_char *bp, const u_char *bp2)
                mhlen = ep - bp;
                goto trunc;
        }
                mhlen = ep - bp;
                goto trunc;
        }

-       mhlen = (int)(mh->ip6m_len << 3);
-       if (mhlen < IP6M_MINLEN)
-               mhlen = IP6M_MINLEN;    /* XXX */
+       mhlen = (int)((mh->ip6m_len + 1) << 3);

 
        /* XXX ip6m_cksum */
 
        TCHECK(mh->ip6m_type);
 
        /* XXX ip6m_cksum */
 
        TCHECK(mh->ip6m_type);

-       type = ntohs(mh->ip6m_type);
+       type = mh->ip6m_type;

        switch (type) {
        case IP6M_BINDING_REQUEST:
                printf("mobility: BRR");
        switch (type) {
        case IP6M_BINDING_REQUEST:
                printf("mobility: BRR");


@@ -225,8 +213,8 @@ mobility_print(const u_char *bp, const u_char *bp2)
                hlen = IP6M_MINLEN;
                if (vflag) {
                        TCHECK2(*mh, hlen + 8);
                hlen = IP6M_MINLEN;
                if (vflag) {
                        TCHECK2(*mh, hlen + 8);

-                       printf(" %soT cookie=%08x:%08x",
-                              type == IP6M_HOME_TEST_INIT ? "H" : "C",
+                       printf(" %s Init Cookie=%08x:%08x",
+                              type == IP6M_HOME_TEST_INIT ? "Home" : "Care-of",

                               EXTRACT_32BITS(&bp[hlen]),
                               EXTRACT_32BITS(&bp[hlen + 4]));
                }
                               EXTRACT_32BITS(&bp[hlen]),
                               EXTRACT_32BITS(&bp[hlen + 4]));
                }


@@ -241,15 +229,15 @@ mobility_print(const u_char *bp, const u_char *bp2)
                hlen = IP6M_MINLEN;
                if (vflag) {
                        TCHECK2(*mh, hlen + 8);
                hlen = IP6M_MINLEN;
                if (vflag) {
                        TCHECK2(*mh, hlen + 8);

-                       printf(" %soT cookie=%08x:%08x",
-                              type == IP6M_HOME_TEST ? "H" : "C",
+                       printf(" %s Init Cookie=%08x:%08x",
+                              type == IP6M_HOME_TEST ? "Home" : "Care-of",

                               EXTRACT_32BITS(&bp[hlen]),
                               EXTRACT_32BITS(&bp[hlen + 4]));
                }
                hlen += 8;
                if (vflag) {
                        TCHECK2(*mh, hlen + 8);
                               EXTRACT_32BITS(&bp[hlen]),
                               EXTRACT_32BITS(&bp[hlen + 4]));
                }
                hlen += 8;
                if (vflag) {
                        TCHECK2(*mh, hlen + 8);

-                       printf(" %s cookie=%08x:%08x",
+                       printf(" %s Keygen Token=%08x:%08x",

                               type == IP6M_HOME_TEST ? "Home" : "Care-of",
                               EXTRACT_32BITS(&bp[hlen]),
                               EXTRACT_32BITS(&bp[hlen + 4]));
                               type == IP6M_HOME_TEST ? "Home" : "Care-of",
                               EXTRACT_32BITS(&bp[hlen]),
                               EXTRACT_32BITS(&bp[hlen + 4]));


@@ -262,19 +250,17 @@ mobility_print(const u_char *bp, const u_char *bp2)
                printf(" seq#=%d", EXTRACT_16BITS(&mh->ip6m_data16[0]));
                hlen = IP6M_MINLEN;
                TCHECK2(*mh, hlen + 1);
                printf(" seq#=%d", EXTRACT_16BITS(&mh->ip6m_data16[0]));
                hlen = IP6M_MINLEN;
                TCHECK2(*mh, hlen + 1);

-               if (bp[hlen] & 0xf8)
+               if (bp[hlen] & 0xf0)

                        printf(" ");
                if (bp[hlen] & 0x80)
                        printf("A");
                if (bp[hlen] & 0x40)
                        printf("H");
                if (bp[hlen] & 0x20)
                        printf(" ");
                if (bp[hlen] & 0x80)
                        printf("A");
                if (bp[hlen] & 0x40)
                        printf("H");
                if (bp[hlen] & 0x20)

-                       printf("S");
-               if (bp[hlen] & 0x10)
-                       printf("D");
-               if (bp[hlen] & 0x08)

                        printf("L");
                        printf("L");

-               /* Reserved (3bits) */
+               if (bp[hlen] & 0x10)
+                       printf("K");
+               /* Reserved (4bits) */

                hlen += 1;
                /* Reserved (8bits) */
                hlen += 1;
                hlen += 1;
                /* Reserved (8bits) */
                hlen += 1;


@@ -287,6 +273,9 @@ mobility_print(const u_char *bp, const u_char *bp2)
                printf("mobility: BA");
                TCHECK(mh->ip6m_data8[0]);
                printf(" status=%d", mh->ip6m_data8[0]);
                printf("mobility: BA");
                TCHECK(mh->ip6m_data8[0]);
                printf(" status=%d", mh->ip6m_data8[0]);

+               if (mh->ip6m_data8[1] & 0x80)
+                       printf(" K");
+               /* Reserved (7bits) */

                hlen = IP6M_MINLEN;
                TCHECK2(*mh, hlen + 2);
                printf(" seq#=%d", EXTRACT_16BITS(&bp[hlen]));
                hlen = IP6M_MINLEN;
                TCHECK2(*mh, hlen + 2);
                printf(" seq#=%d", EXTRACT_16BITS(&bp[hlen]));


@@ -300,6 +289,7 @@ mobility_print(const u_char *bp, const u_char *bp2)
                printf("mobility: BE");
                TCHECK(mh->ip6m_data8[0]);
                printf(" status=%d", mh->ip6m_data8[0]);
                printf("mobility: BE");
                TCHECK(mh->ip6m_data8[0]);
                printf(" status=%d", mh->ip6m_data8[0]);

+               /* Reserved */

                hlen = IP6M_MINLEN;
                TCHECK2(*mh, hlen + 16);
                printf(" homeaddr %s", ip6addr_string(&bp[hlen]));
                hlen = IP6M_MINLEN;
                TCHECK2(*mh, hlen + 16);
                printf(" homeaddr %s", ip6addr_string(&bp[hlen]));