ICMPv6: Make some code clearer

diff --git a/print-icmp6.c b/print-icmp6.c
index f0e6d594a55d94e51ba30bf4f878f0959a5ea302..c81cb7d0a69ccb85318045ad55775f2193119de2 100644 (file)
--- a/print-icmp6.c
+++ b/print-icmp6.c
@@ -1239,20 +1239,22 @@ icmp6_print(netdissect_options *ndo,
            }
                break;
        case ND_REDIRECT:
-#define RDR(i) ((const struct nd_redirect *)(i))
-                         ND_TCHECK(RDR(dp)->nd_rd_dst);
-                         ND_PRINT(", %s", ip6addr_string(ndo, &RDR(dp)->nd_rd_dst));
-               ND_TCHECK(RDR(dp)->nd_rd_target);
-               ND_PRINT(" to %s",
-                          ip6addr_string(ndo, &RDR(dp)->nd_rd_target));
+           {
+               const struct nd_redirect *p;
+
+               p = (const struct nd_redirect *)dp;
+               ND_TCHECK(p->nd_rd_dst);
+               ND_PRINT(", %s", ip6addr_string(ndo, &p->nd_rd_dst));
+               ND_TCHECK(p->nd_rd_target);
+               ND_PRINT(" to %s", ip6addr_string(ndo, &p->nd_rd_target));
 #define REDIRECTLEN 40
                if (ndo->ndo_vflag) {
                        icmp6_opt_print(ndo, (const u_char *)dp + REDIRECTLEN,
                                        length - REDIRECTLEN);
+#undef REDIRECTLEN
                }
+           }
                break;
-#undef REDIRECTLEN
-#undef RDR
        case ICMP6_ROUTER_RENUMBERING:
                icmp6_rrenum_print(ndo, bp, ep);
                break;