X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/ce1fc8263da72437c1df54b8b3ee682413d9e6ed..refs/pull/435/head:/print-rt6.c

diff --git a/print-rt6.c b/print-rt6.c
index 798598be..3d5f9e37 100644
--- a/print-rt6.c
+++ b/print-rt6.c
@@ -19,6 +19,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -27,9 +28,11 @@
 
 #include <tcpdump-stdinc.h>
 
+#include <string.h>
+
 #include "ip6.h"
 
-#include "netdissect.h"
+#include "interface.h"
 #include "addrtoname.h"
 #include "extract.h"
 
@@ -41,6 +44,7 @@ rt6_print(netdissect_options *ndo, register const u_char *bp, const u_char *bp2
 	register const u_char *ep;
 	int i, len;
 	register const struct in6_addr *addr;
+	const struct in6_addr *last_addr = NULL;
 
 	dp = (struct ip6_rthdr *)bp;
 	len = dp->ip6r_len;
@@ -79,9 +83,18 @@ rt6_print(netdissect_options *ndo, register const u_char *bp, const u_char *bp2
 			if ((u_char *)(addr + 1) > ep)
 				goto trunc;
 
-			ND_PRINT((ndo, ", [%d]%s", i, ip6addr_string(addr)));
+			ND_PRINT((ndo, ", [%d]%s", i, ip6addr_string(ndo, addr)));
+			last_addr = addr;
 			addr++;
 		}
+		/*
+		 * the destination address used in the pseudo-header is that of the final
+		 * destination : the last address of the routing header
+		 */
+		if (last_addr != NULL) {
+			struct ip6_hdr *ip6 = (struct ip6_hdr *)bp2;
+			UNALIGNED_MEMCPY(&ip6->ip6_dst, last_addr, sizeof (struct in6_addr));
+		}
 		/*(*/
 		ND_PRINT((ndo, ") "));
 		return((dp0->ip6r0_len + 1) << 3);