Add program_name field in the netdissect_options structure

[tcpdump] / print-rt6.c

diff --git a/print-rt6.c b/print-rt6.c
index 9cd13de1ce7ad7eadb6762074c57fee5cbe4abab..0f944e7b3e44159c51b702f2b077bad958cbb97a 100644 (file)
--- a/print-rt6.c
+++ b/print-rt6.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif


@@ -28,9 +27,11 @@
 
 #include <tcpdump-stdinc.h>
 
 
 #include <tcpdump-stdinc.h>
 

+#include <string.h>
+

 #include "ip6.h"
 
 #include "ip6.h"
 

-#include "interface.h"
+#include "netdissect.h"

 #include "addrtoname.h"
 #include "extract.h"
 
 #include "addrtoname.h"
 #include "extract.h"
 


@@ -42,8 +43,9 @@ 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;
        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;
+       dp = (const struct ip6_rthdr *)bp;

        len = dp->ip6r_len;
 
        /* 'ep' points to the end of available data. */
        len = dp->ip6r_len;
 
        /* 'ep' points to the end of available data. */


@@ -64,7 +66,7 @@ rt6_print(netdissect_options *ndo, register const u_char *bp, const u_char *bp2
 #endif
        case IPV6_RTHDR_TYPE_0:
        case IPV6_RTHDR_TYPE_2:                 /* Mobile IPv6 ID-20 */
 #endif
        case IPV6_RTHDR_TYPE_0:
        case IPV6_RTHDR_TYPE_2:                 /* Mobile IPv6 ID-20 */

-               dp0 = (struct ip6_rthdr0 *)dp;
+               dp0 = (const struct ip6_rthdr0 *)dp;

 
                ND_TCHECK(dp0->ip6r0_reserved);
                if (dp0->ip6r0_reserved || ndo->ndo_vflag) {
 
                ND_TCHECK(dp0->ip6r0_reserved);
                if (dp0->ip6r0_reserved || ndo->ndo_vflag) {


@@ -77,12 +79,21 @@ rt6_print(netdissect_options *ndo, register const u_char *bp, const u_char *bp2
                len >>= 1;
                addr = &dp0->ip6r0_addr[0];
                for (i = 0; i < len; i++) {
                len >>= 1;
                addr = &dp0->ip6r0_addr[0];
                for (i = 0; i < len; i++) {

-                       if ((u_char *)(addr + 1) > ep)
+                       if ((const u_char *)(addr + 1) > ep)

                                goto trunc;
 
                                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++;
                }
                        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) {
+                       const struct ip6_hdr *ip6 = (const struct ip6_hdr *)bp2;
+                       UNALIGNED_MEMCPY(&ip6->ip6_dst, last_addr, sizeof (struct in6_addr));
+               }

                /*(*/
                ND_PRINT((ndo, ") "));
                return((dp0->ip6r0_len + 1) << 3);
                /*(*/
                ND_PRINT((ndo, ") "));
                return((dp0->ip6r0_len + 1) << 3);