Translate UDP/1700 as RADIUS

[tcpdump] / print-aodv.c

diff --git a/print-aodv.c b/print-aodv.c
index 9b3523a532b971783522070bff39c14b390336ea..db293bb6231bfc16c729a78dd1e78193a94bc8c4 100644 (file)
--- a/print-aodv.c
+++ b/print-aodv.c
@@ -30,16 +30,15 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
  * POSSIBILITY OF SUCH DAMAGE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #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 "addrtoname.h"

-#include "extract.h"                   /* must come after interface.h */
+#include "extract.h"

 
 
 struct aodv_rreq {
 
 
 struct aodv_rreq {


@@ -53,7 +52,6 @@ struct aodv_rreq {
        uint32_t        rreq_oa;        /* originator IPv4 address */
        uint32_t        rreq_os;        /* originator sequence number */
 };
        uint32_t        rreq_oa;        /* originator IPv4 address */
        uint32_t        rreq_os;        /* originator sequence number */
 };

-#ifdef INET6

 struct aodv_rreq6 {
        uint8_t         rreq_type;      /* AODV message type (1) */
        uint8_t         rreq_flags;     /* various flags */
 struct aodv_rreq6 {
        uint8_t         rreq_type;      /* AODV message type (1) */
        uint8_t         rreq_flags;     /* various flags */


@@ -76,7 +74,6 @@ struct aodv_rreq6_draft_01 {
        struct in6_addr rreq_da;        /* destination IPv6 address */
        struct in6_addr rreq_oa;        /* originator IPv6 address */
 };
        struct in6_addr rreq_da;        /* destination IPv6 address */
        struct in6_addr rreq_oa;        /* originator IPv6 address */
 };

-#endif

 
 #define        RREQ_JOIN       0x80            /* join (reserved for multicast */
 #define        RREQ_REPAIR     0x40            /* repair (reserved for multicast */
 
 #define        RREQ_JOIN       0x80            /* join (reserved for multicast */
 #define        RREQ_REPAIR     0x40            /* repair (reserved for multicast */


@@ -95,7 +92,6 @@ struct aodv_rrep {
        uint32_t        rrep_oa;        /* originator IPv4 address */
        uint32_t        rrep_life;      /* lifetime of this route */
 };
        uint32_t        rrep_oa;        /* originator IPv4 address */
        uint32_t        rrep_life;      /* lifetime of this route */
 };

-#ifdef INET6

 struct aodv_rrep6 {
        uint8_t         rrep_type;      /* AODV message type (2) */
        uint8_t         rrep_flags;     /* various flags */
 struct aodv_rrep6 {
        uint8_t         rrep_type;      /* AODV message type (2) */
        uint8_t         rrep_flags;     /* various flags */


@@ -116,7 +112,6 @@ struct aodv_rrep6_draft_01 {
        struct in6_addr rrep_oa;        /* originator IPv6 address */
        uint32_t        rrep_life;      /* lifetime of this route */
 };
        struct in6_addr rrep_oa;        /* originator IPv6 address */
        uint32_t        rrep_life;      /* lifetime of this route */
 };

-#endif

 
 #define        RREP_REPAIR             0x80    /* repair (reserved for multicast */
 #define        RREP_ACK                0x40    /* acknowledgement required */
 
 #define        RREP_REPAIR             0x80    /* repair (reserved for multicast */
 #define        RREP_ACK                0x40    /* acknowledgement required */


@@ -127,7 +122,6 @@ struct rerr_unreach {
        uint32_t        u_da;   /* IPv4 address */
        uint32_t        u_ds;   /* sequence number */
 };
        uint32_t        u_da;   /* IPv4 address */
        uint32_t        u_ds;   /* sequence number */
 };

-#ifdef INET6

 struct rerr_unreach6 {
        struct in6_addr u_da;   /* IPv6 address */
        uint32_t        u_ds;   /* sequence number */
 struct rerr_unreach6 {
        struct in6_addr u_da;   /* IPv6 address */
        uint32_t        u_ds;   /* sequence number */


@@ -136,7 +130,6 @@ struct rerr_unreach6_draft_01 {
        struct in6_addr u_da;   /* IPv6 address */
        uint32_t        u_ds;   /* sequence number */
 };
        struct in6_addr u_da;   /* IPv6 address */
        uint32_t        u_ds;   /* sequence number */
 };

-#endif

 
 struct aodv_rerr {
        uint8_t         rerr_type;      /* AODV message type (3 or 18) */
 
 struct aodv_rerr {
        uint8_t         rerr_type;      /* AODV message type (3 or 18) */


@@ -275,16 +268,17 @@ aodv_rerr(netdissect_options *ndo, const u_char *dat, u_int length)
        ND_PRINT((ndo, " rerr %s [items %u] [%u]:",
            ap->rerr_flags & RERR_NODELETE ? "[D]" : "",
            ap->rerr_dc, length));
        ND_PRINT((ndo, " rerr %s [items %u] [%u]:",
            ap->rerr_flags & RERR_NODELETE ? "[D]" : "",
            ap->rerr_dc, length));

-       dp = (struct rerr_unreach *)(dat + sizeof(*ap));
+       dp = (const struct rerr_unreach *)(dat + sizeof(*ap));

        i = length - sizeof(*ap);
        i = length - sizeof(*ap);

-       for (dc = ap->rerr_dc; dc != 0 && i >= sizeof(*dp);
-           ++dp, --dc, i -= sizeof(*dp)) {
+       for (dc = ap->rerr_dc; dc != 0; dc--) {

                ND_TCHECK(*dp);
                ND_TCHECK(*dp);

+               if (i < sizeof(*dp))
+                       goto trunc;

                ND_PRINT((ndo, " {%s}(%ld)", ipaddr_string(ndo, &dp->u_da),
                    (unsigned long)EXTRACT_32BITS(&dp->u_ds)));
                ND_PRINT((ndo, " {%s}(%ld)", ipaddr_string(ndo, &dp->u_da),
                    (unsigned long)EXTRACT_32BITS(&dp->u_ds)));

+               dp++;
+               i -= sizeof(*dp);

        }
        }

-       if ((i % sizeof(*dp)) != 0)
-               goto trunc;

        return;
 
 trunc:
        return;
 
 trunc:


@@ -292,13 +286,8 @@ trunc:
 }
 
 static void
 }
 
 static void

-#ifdef INET6

 aodv_v6_rreq(netdissect_options *ndo, const u_char *dat, u_int length)
 aodv_v6_rreq(netdissect_options *ndo, const u_char *dat, u_int length)

-#else
-aodv_v6_rreq(netdissect_options *ndo, const u_char *dat _U_, u_int length)
-#endif

 {
 {

-#ifdef INET6

        u_int i;
        const struct aodv_rreq6 *ap = (const struct aodv_rreq6 *)dat;
 
        u_int i;
        const struct aodv_rreq6 *ap = (const struct aodv_rreq6 *)dat;
 


@@ -325,19 +314,11 @@ aodv_v6_rreq(netdissect_options *ndo, const u_char *dat _U_, u_int length)
 
 trunc:
        ND_PRINT((ndo, " [|rreq"));
 
 trunc:
        ND_PRINT((ndo, " [|rreq"));

-#else
-       ND_PRINT((ndo, " v6 rreq %u", length));
-#endif

 }
 
 static void
 }
 
 static void

-#ifdef INET6

 aodv_v6_rrep(netdissect_options *ndo, const u_char *dat, u_int length)
 aodv_v6_rrep(netdissect_options *ndo, const u_char *dat, u_int length)

-#else
-aodv_v6_rrep(netdissect_options *ndo, const u_char *dat _U_, u_int length)
-#endif

 {
 {

-#ifdef INET6

        u_int i;
        const struct aodv_rrep6 *ap = (const struct aodv_rrep6 *)dat;
 
        u_int i;
        const struct aodv_rrep6 *ap = (const struct aodv_rrep6 *)dat;
 


@@ -361,19 +342,11 @@ aodv_v6_rrep(netdissect_options *ndo, const u_char *dat _U_, u_int length)
 
 trunc:
        ND_PRINT((ndo, " [|rreq"));
 
 trunc:
        ND_PRINT((ndo, " [|rreq"));

-#else
-       ND_PRINT((ndo, " rrep %u", length));
-#endif

 }
 
 static void
 }
 
 static void

-#ifdef INET6

 aodv_v6_rerr(netdissect_options *ndo, const u_char *dat, u_int length)
 aodv_v6_rerr(netdissect_options *ndo, const u_char *dat, u_int length)

-#else
-aodv_v6_rerr(netdissect_options *ndo, const u_char *dat _U_, u_int length)
-#endif

 {
 {

-#ifdef INET6

        u_int i, dc;
        const struct aodv_rerr *ap = (const struct aodv_rerr *)dat;
        const struct rerr_unreach6 *dp6;
        u_int i, dc;
        const struct aodv_rerr *ap = (const struct aodv_rerr *)dat;
        const struct rerr_unreach6 *dp6;


@@ -384,33 +357,26 @@ aodv_v6_rerr(netdissect_options *ndo, const u_char *dat _U_, u_int length)
        ND_PRINT((ndo, " rerr %s [items %u] [%u]:",
            ap->rerr_flags & RERR_NODELETE ? "[D]" : "",
            ap->rerr_dc, length));
        ND_PRINT((ndo, " rerr %s [items %u] [%u]:",
            ap->rerr_flags & RERR_NODELETE ? "[D]" : "",
            ap->rerr_dc, length));

-       dp6 = (struct rerr_unreach6 *)(void *)(ap + 1);
+       dp6 = (const struct rerr_unreach6 *)(const void *)(ap + 1);

        i = length - sizeof(*ap);
        i = length - sizeof(*ap);

-       for (dc = ap->rerr_dc; dc != 0 && i >= sizeof(*dp6);
-           ++dp6, --dc, i -= sizeof(*dp6)) {
+       for (dc = ap->rerr_dc; dc != 0; dc--) {

                ND_TCHECK(*dp6);
                ND_TCHECK(*dp6);

+               if (i < sizeof(*dp6))
+                       goto trunc;

                ND_PRINT((ndo, " {%s}(%ld)", ip6addr_string(ndo, &dp6->u_da),
                    (unsigned long)EXTRACT_32BITS(&dp6->u_ds)));
                ND_PRINT((ndo, " {%s}(%ld)", ip6addr_string(ndo, &dp6->u_da),
                    (unsigned long)EXTRACT_32BITS(&dp6->u_ds)));

+               dp6++;
+               i -= sizeof(*dp6);

        }
        }

-       if ((i % sizeof(*dp6)) != 0)
-               goto trunc;

        return;
 
 trunc:
        ND_PRINT((ndo, "[|rerr]"));
        return;
 
 trunc:
        ND_PRINT((ndo, "[|rerr]"));

-#else
-       ND_PRINT((ndo, " rerr %u", length));
-#endif

 }
 
 static void
 }
 
 static void

-#ifdef INET6

 aodv_v6_draft_01_rreq(netdissect_options *ndo, const u_char *dat, u_int length)
 aodv_v6_draft_01_rreq(netdissect_options *ndo, const u_char *dat, u_int length)

-#else
-aodv_v6_draft_01_rreq(netdissect_options *ndo, const u_char *dat _U_, u_int length)
-#endif

 {
 {

-#ifdef INET6

        u_int i;
        const struct aodv_rreq6_draft_01 *ap = (const struct aodv_rreq6_draft_01 *)dat;
 
        u_int i;
        const struct aodv_rreq6_draft_01 *ap = (const struct aodv_rreq6_draft_01 *)dat;
 


@@ -437,19 +403,11 @@ aodv_v6_draft_01_rreq(netdissect_options *ndo, const u_char *dat _U_, u_int leng
 
 trunc:
        ND_PRINT((ndo, " [|rreq"));
 
 trunc:
        ND_PRINT((ndo, " [|rreq"));

-#else
-       ND_PRINT((ndo, " rreq %u", length));
-#endif

 }
 
 static void
 }
 
 static void

-#ifdef INET6

 aodv_v6_draft_01_rrep(netdissect_options *ndo, const u_char *dat, u_int length)
 aodv_v6_draft_01_rrep(netdissect_options *ndo, const u_char *dat, u_int length)

-#else
-aodv_v6_draft_01_rrep(netdissect_options *ndo, const u_char *dat _U_, u_int length)
-#endif

 {
 {

-#ifdef INET6

        u_int i;
        const struct aodv_rrep6_draft_01 *ap = (const struct aodv_rrep6_draft_01 *)dat;
 
        u_int i;
        const struct aodv_rrep6_draft_01 *ap = (const struct aodv_rrep6_draft_01 *)dat;
 


@@ -473,19 +431,11 @@ aodv_v6_draft_01_rrep(netdissect_options *ndo, const u_char *dat _U_, u_int leng
 
 trunc:
        ND_PRINT((ndo, " [|rreq"));
 
 trunc:
        ND_PRINT((ndo, " [|rreq"));

-#else
-       ND_PRINT((ndo, " rrep %u", length));
-#endif

 }
 
 static void
 }
 
 static void

-#ifdef INET6

 aodv_v6_draft_01_rerr(netdissect_options *ndo, const u_char *dat, u_int length)
 aodv_v6_draft_01_rerr(netdissect_options *ndo, const u_char *dat, u_int length)

-#else
-aodv_v6_draft_01_rerr(netdissect_options *ndo, const u_char *dat _U_, u_int length)
-#endif

 {
 {

-#ifdef INET6

        u_int i, dc;
        const struct aodv_rerr *ap = (const struct aodv_rerr *)dat;
        const struct rerr_unreach6_draft_01 *dp6;
        u_int i, dc;
        const struct aodv_rerr *ap = (const struct aodv_rerr *)dat;
        const struct rerr_unreach6_draft_01 *dp6;


@@ -496,23 +446,21 @@ aodv_v6_draft_01_rerr(netdissect_options *ndo, const u_char *dat _U_, u_int leng
        ND_PRINT((ndo, " rerr %s [items %u] [%u]:",
            ap->rerr_flags & RERR_NODELETE ? "[D]" : "",
            ap->rerr_dc, length));
        ND_PRINT((ndo, " rerr %s [items %u] [%u]:",
            ap->rerr_flags & RERR_NODELETE ? "[D]" : "",
            ap->rerr_dc, length));

-       dp6 = (struct rerr_unreach6_draft_01 *)(void *)(ap + 1);
+       dp6 = (const struct rerr_unreach6_draft_01 *)(const void *)(ap + 1);

        i = length - sizeof(*ap);
        i = length - sizeof(*ap);

-       for (dc = ap->rerr_dc; dc != 0 && i >= sizeof(*dp6);
-           ++dp6, --dc, i -= sizeof(*dp6)) {
+       for (dc = ap->rerr_dc; dc != 0; dc--) {

                ND_TCHECK(*dp6);
                ND_TCHECK(*dp6);

+               if (i < sizeof(*dp6))
+                       goto trunc;

                ND_PRINT((ndo, " {%s}(%ld)", ip6addr_string(ndo, &dp6->u_da),
                    (unsigned long)EXTRACT_32BITS(&dp6->u_ds)));
                ND_PRINT((ndo, " {%s}(%ld)", ip6addr_string(ndo, &dp6->u_da),
                    (unsigned long)EXTRACT_32BITS(&dp6->u_ds)));

+               dp6++;
+               i -= sizeof(*dp6);

        }
        }

-       if ((i % sizeof(*dp6)) != 0)
-               goto trunc;

        return;
 
 trunc:
        ND_PRINT((ndo, "[|rerr]"));
        return;
 
 trunc:
        ND_PRINT((ndo, "[|rerr]"));

-#else
-       ND_PRINT((ndo, " rerr %u", length));
-#endif

 }
 
 void
 }
 
 void