document SIGUSR1 in manual page

[tcpdump] / print-rt6.c

diff --git a/print-rt6.c b/print-rt6.c
index 5fce586c4299aaa8f031d0e4461a272cb2ee3153..3d5f9e3721a10d6c627309a53293dd9f14506cdb 100644 (file)
--- a/print-rt6.c
+++ b/print-rt6.c
@@ -19,96 +19,84 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-rt6.c,v 1.9 2000-06-16 19:41:31 assar Exp $";
-#endif
-
+#define NETDISSECT_REWORKED

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

-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <net/if.h>
+#include <tcpdump-stdinc.h>

 
 

-#include <netinet/in.h>
-#include <netinet/if_ether.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_icmp.h>
-#include <netinet/ip_var.h>
-#include <netinet/udp.h>
-#include <netinet/udp_var.h>
-#include <netinet/tcp.h>
+#include <string.h>

 
 

-#include <stdio.h>
-
-#include <netinet/ip6.h>
+#include "ip6.h"

 
 #include "interface.h"
 #include "addrtoname.h"
 
 #include "interface.h"
 #include "addrtoname.h"

+#include "extract.h"

 
 int
 
 int

-rt6_print(register const u_char *bp, register const u_char *bp2)
+rt6_print(netdissect_options *ndo, register const u_char *bp, const u_char *bp2 _U_)

 {
        register const struct ip6_rthdr *dp;
        register const struct ip6_rthdr0 *dp0;
 {
        register const struct ip6_rthdr *dp;
        register const struct ip6_rthdr0 *dp0;

-       register const struct ip6_hdr *ip;

        register const u_char *ep;
        int i, len;
        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 = (struct ip6_rthdr *)bp;

-       ip = (struct ip6_hdr *)bp2;

        len = dp->ip6r_len;
 
        len = dp->ip6r_len;
 

-       /* 'ep' points to the end of avaible data. */
-       ep = snapend;
+       /* 'ep' points to the end of available data. */
+       ep = ndo->ndo_snapend;

 
 

-#if 0
-       printf("%s > %s: ",
-              ip6addr_string(&ip->ip6_src),
-              ip6addr_string(&ip->ip6_dst));
-#endif
+       ND_TCHECK(dp->ip6r_segleft);

 
 

-       TCHECK(dp->ip6r_segleft);
-
-       printf("srcrt (len=%d", dp->ip6r_len);  /*)*/
-       printf(", type=%d", dp->ip6r_type);
-       printf(", segleft=%d", dp->ip6r_segleft);
+       ND_PRINT((ndo, "srcrt (len=%d", dp->ip6r_len)); /*)*/
+       ND_PRINT((ndo, ", type=%d", dp->ip6r_type));
+       ND_PRINT((ndo, ", segleft=%d", dp->ip6r_segleft));

 
        switch (dp->ip6r_type) {
 #ifndef IPV6_RTHDR_TYPE_0
 #define IPV6_RTHDR_TYPE_0 0
 
        switch (dp->ip6r_type) {
 #ifndef IPV6_RTHDR_TYPE_0
 #define IPV6_RTHDR_TYPE_0 0

+#endif
+#ifndef IPV6_RTHDR_TYPE_2
+#define IPV6_RTHDR_TYPE_2 2

 #endif
        case IPV6_RTHDR_TYPE_0:
 #endif
        case IPV6_RTHDR_TYPE_0:

+       case IPV6_RTHDR_TYPE_2:                 /* Mobile IPv6 ID-20 */

                dp0 = (struct ip6_rthdr0 *)dp;
 
                dp0 = (struct ip6_rthdr0 *)dp;
 

-               TCHECK(dp0->ip6r0_reserved);
-               if (dp0->ip6r0_reserved || vflag) {
-                       printf(", rsv=0x%0x",
-                           (u_int32_t)ntohl(dp0->ip6r0_reserved));
+               ND_TCHECK(dp0->ip6r0_reserved);
+               if (dp0->ip6r0_reserved || ndo->ndo_vflag) {
+                       ND_PRINT((ndo, ", rsv=0x%0x",
+                           EXTRACT_32BITS(&dp0->ip6r0_reserved)));

                }
 
                if (len % 2 == 1)
                        goto trunc;
                len >>= 1;
                }
 
                if (len % 2 == 1)
                        goto trunc;
                len >>= 1;

+               addr = &dp0->ip6r0_addr[0];

                for (i = 0; i < len; i++) {
                for (i = 0; i < len; i++) {

-                       struct in6_addr *addr;
-
-                       addr = ((struct in6_addr *)(dp0 + 1)) + i;
-                       if ((u_char *)addr > ep - sizeof(*addr))
+                       if ((u_char *)(addr + 1) > ep)

                                goto trunc;
 
                                goto trunc;
 

-                       printf(", [%d]%s", i, ip6addr_string((u_char *)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));

                }
                /*(*/
                }
                /*(*/

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

                return((dp0->ip6r0_len + 1) << 3);
                break;
        default:
                return((dp0->ip6r0_len + 1) << 3);
                break;
        default:


@@ -117,7 +105,7 @@ rt6_print(register const u_char *bp, register const u_char *bp2)
        }
 
  trunc:
        }
 
  trunc:

-       fputs("[|srcrt]", stdout);
-       return 65535;           /* XXX */
+       ND_PRINT((ndo, "[|srcrt]"));
+       return -1;

 }
 #endif /* INET6 */
 }
 #endif /* INET6 */