Revert partially the commit 21b1273

[tcpdump] / print-ripng.c

diff --git a/print-ripng.c b/print-ripng.c
index 384fe9cacf2d340c5bfa7ea7aca008fb74add7f4..e030c000cdce74939e4be3b2bddb0b39dfddbbec 100644 (file)
--- a/print-ripng.c
+++ b/print-ripng.c
@@ -97,7 +97,7 @@ rip6_entry_print(netdissect_options *ndo, const struct netinfo6 *ni, u_int metri
        int l;
        uint16_t tag;
 
-       l = ND_PRINT("%s/%u", ip6addr_string(ndo, ni->rip6_dest),
+       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)
@@ -117,7 +117,6 @@ ripng_print(netdissect_options *ndo, const u_char *dat, unsigned int length)
        u_int j;
 
        ndo->ndo_protocol = "ripng";
-       ND_TCHECK_1(rp->rip6_cmd);
        cmd = GET_U_1(rp->rip6_cmd);
        switch (cmd) {
 
@@ -177,7 +176,6 @@ ripng_print(netdissect_options *ndo, const u_char *dat, unsigned int length)
                ND_PRINT(" ripng-%u ?? %u", cmd, length);
                break;
        }
-       ND_TCHECK_1(rp->rip6_vers);
        if (GET_U_1(rp->rip6_vers) != RIP6_VERSION)
                ND_PRINT(" [vers %u]", GET_U_1(rp->rip6_vers));
        return;