Revert partially the commit 21b1273

[tcpdump] / print-ripng.c

diff --git a/print-ripng.c b/print-ripng.c
index 78ad5a676885c191a8930e8c6e0e9a36de5e554d..e030c000cdce74939e4be3b2bddb0b39dfddbbec 100644 (file)
--- a/print-ripng.c
+++ b/print-ripng.c
@@ -22,10 +22,10 @@
 /* \summary: IPv6 Routing Information Protocol (RIPng) printer */
 
 #ifdef HAVE_CONFIG_H
 /* \summary: IPv6 Routing Information Protocol (RIPng) printer */
 
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #endif
 

-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"

 
 #include "netdissect.h"
 #include "addrtoname.h"
 
 #include "netdissect.h"
 #include "addrtoname.h"


@@ -65,7 +65,7 @@
 #define        RIP6_RESPONSE   2
 
 struct netinfo6 {
 #define        RIP6_RESPONSE   2
 
 struct netinfo6 {

-       struct in6_addr rip6_dest;
+       nd_ipv6         rip6_dest;

        nd_uint16_t     rip6_tag;
        nd_uint8_t      rip6_plen;
        nd_uint8_t      rip6_metric;
        nd_uint16_t     rip6_tag;
        nd_uint8_t      rip6_plen;
        nd_uint8_t      rip6_metric;


@@ -85,13 +85,11 @@ struct      rip6 {
 
 #define        HOPCNT_INFINITY6        16
 
 
 #define        HOPCNT_INFINITY6        16
 

-#if !defined(IN6_IS_ADDR_UNSPECIFIED) && !defined(_MSC_VER) /* MSVC inline */
-static int IN6_IS_ADDR_UNSPECIFIED(const struct in6_addr *addr)
+static int ND_IN6_IS_ADDR_UNSPECIFIED(const nd_ipv6 *addr)

 {
 {

-    static const struct in6_addr in6addr_any;        /* :: */
-    return (memcmp(addr, &in6addr_any, sizeof(*addr)) == 0);
+    static const nd_ipv6 in6addr_any_val = { 0 };        /* :: */
+    return (memcmp(addr, &in6addr_any_val, sizeof(*addr)) == 0);

 }
 }

-#endif

 
 static int
 rip6_entry_print(netdissect_options *ndo, const struct netinfo6 *ni, u_int metric)
 
 static int
 rip6_entry_print(netdissect_options *ndo, const struct netinfo6 *ni, u_int metric)


@@ -99,12 +97,13 @@ rip6_entry_print(netdissect_options *ndo, const struct netinfo6 *ni, u_int metri
        int l;
        uint16_t tag;
 
        int l;
        uint16_t tag;
 

-       l = ND_PRINT((ndo, "%s/%u", ip6addr_string(ndo, &ni->rip6_dest), EXTRACT_U_1(ni->rip6_plen)));
-       tag = EXTRACT_BE_U_2(ni->rip6_tag);
+       l = ND_PRINT("%s/%u", GET_IP6ADDR_STRING(ni->rip6_dest),
+                    GET_U_1(ni->rip6_plen));
+       tag = GET_BE_U_2(ni->rip6_tag);

        if (tag)
        if (tag)

-               l += ND_PRINT((ndo, " [%u]", tag));
+               l += ND_PRINT(" [%u]", tag);

        if (metric)
        if (metric)

-               l += ND_PRINT((ndo, " (%u)", metric));
+               l += ND_PRINT(" (%u)", metric);

        return l;
 }
 
        return l;
 }
 


@@ -117,8 +116,8 @@ ripng_print(netdissect_options *ndo, const u_char *dat, unsigned int length)
        unsigned int length_left;
        u_int j;
 
        unsigned int length_left;
        u_int j;
 

-       ND_TCHECK(rp->rip6_cmd);
-       cmd = EXTRACT_U_1(rp->rip6_cmd);
+       ndo->ndo_protocol = "ripng";
+       cmd = GET_U_1(rp->rip6_cmd);

        switch (cmd) {
 
        case RIP6_REQUEST:
        switch (cmd) {
 
        case RIP6_REQUEST:


@@ -128,24 +127,24 @@ ripng_print(netdissect_options *ndo, const u_char *dat, unsigned int length)
                length_left -= (sizeof(struct rip6) - sizeof(struct netinfo6));
                j = length_left / sizeof(*ni);
                if (j == 1) {
                length_left -= (sizeof(struct rip6) - sizeof(struct netinfo6));
                j = length_left / sizeof(*ni);
                if (j == 1) {

-                       ND_TCHECK(rp->rip6_nets);
-                       if (EXTRACT_U_1(rp->rip6_nets->rip6_metric) == HOPCNT_INFINITY6
-                           &&  IN6_IS_ADDR_UNSPECIFIED(&rp->rip6_nets->rip6_dest)) {
-                               ND_PRINT((ndo, " ripng-req dump"));
+                       ND_TCHECK_SIZE(rp->rip6_nets);
+                       if (GET_U_1(rp->rip6_nets->rip6_metric) == HOPCNT_INFINITY6
+                           && ND_IN6_IS_ADDR_UNSPECIFIED(&rp->rip6_nets->rip6_dest)) {
+                               ND_PRINT(" ripng-req dump");

                                break;
                        }
                }
                if (j * sizeof(*ni) != length_left)
                                break;
                        }
                }
                if (j * sizeof(*ni) != length_left)

-                       ND_PRINT((ndo, " ripng-req %u[%u]:", j, length));
+                       ND_PRINT(" ripng-req %u[%u]:", j, length);

                else
                else

-                       ND_PRINT((ndo, " ripng-req %u:", j));
+                       ND_PRINT(" ripng-req %u:", j);

                for (ni = rp->rip6_nets; length_left >= sizeof(*ni);
                    length_left -= sizeof(*ni), ++ni) {
                        ND_TCHECK_SIZE(ni);
                        if (ndo->ndo_vflag > 1)
                for (ni = rp->rip6_nets; length_left >= sizeof(*ni);
                    length_left -= sizeof(*ni), ++ni) {
                        ND_TCHECK_SIZE(ni);
                        if (ndo->ndo_vflag > 1)

-                               ND_PRINT((ndo, "\n\t"));
+                               ND_PRINT("\n\t");

                        else
                        else

-                               ND_PRINT((ndo, " "));
+                               ND_PRINT(" ");

                        rip6_entry_print(ndo, ni, 0);
                }
                if (length_left != 0)
                        rip6_entry_print(ndo, ni, 0);
                }
                if (length_left != 0)


@@ -158,31 +157,30 @@ ripng_print(netdissect_options *ndo, const u_char *dat, unsigned int length)
                length_left -= (sizeof(struct rip6) - sizeof(struct netinfo6));
                j = length_left / sizeof(*ni);
                if (j * sizeof(*ni) != length_left)
                length_left -= (sizeof(struct rip6) - sizeof(struct netinfo6));
                j = length_left / sizeof(*ni);
                if (j * sizeof(*ni) != length_left)

-                       ND_PRINT((ndo, " ripng-resp %u[%u]:", j, length));
+                       ND_PRINT(" ripng-resp %u[%u]:", j, length);

                else
                else

-                       ND_PRINT((ndo, " ripng-resp %u:", j));
+                       ND_PRINT(" ripng-resp %u:", j);

                for (ni = rp->rip6_nets; length_left >= sizeof(*ni);
                    length_left -= sizeof(*ni), ++ni) {
                        ND_TCHECK_SIZE(ni);
                        if (ndo->ndo_vflag > 1)
                for (ni = rp->rip6_nets; length_left >= sizeof(*ni);
                    length_left -= sizeof(*ni), ++ni) {
                        ND_TCHECK_SIZE(ni);
                        if (ndo->ndo_vflag > 1)

-                               ND_PRINT((ndo, "\n\t"));
+                               ND_PRINT("\n\t");

                        else
                        else

-                               ND_PRINT((ndo, " "));
-                       rip6_entry_print(ndo, ni, EXTRACT_U_1(ni->rip6_metric));
+                               ND_PRINT(" ");
+                       rip6_entry_print(ndo, ni, GET_U_1(ni->rip6_metric));

                }
                if (length_left != 0)
                        goto trunc;
                break;
        default:
                }
                if (length_left != 0)
                        goto trunc;
                break;
        default:

-               ND_PRINT((ndo, " ripng-%u ?? %u", cmd, length));
+               ND_PRINT(" ripng-%u ?? %u", cmd, length);

                break;
        }
                break;
        }

-       ND_TCHECK(rp->rip6_vers);
-       if (EXTRACT_U_1(rp->rip6_vers) != RIP6_VERSION)
-               ND_PRINT((ndo, " [vers %u]", EXTRACT_U_1(rp->rip6_vers)));
+       if (GET_U_1(rp->rip6_vers) != RIP6_VERSION)
+               ND_PRINT(" [vers %u]", GET_U_1(rp->rip6_vers));

        return;
 
 trunc:
        return;
 
 trunc:

-       ND_PRINT((ndo, "[|ripng]"));
+       nd_print_trunc(ndo);

        return;
 }
        return;
 }