Use more the EXTRACT_U_1() macro (40/n)

[tcpdump] / print-rt6.c

diff --git a/print-rt6.c b/print-rt6.c
index b8e16d599544e8ad88a9d431d086b46e38100d1f..0ba3ba6616e381e31afe934cf7e247dc2d24ca28 100644 (file)
--- a/print-rt6.c
+++ b/print-rt6.c
@@ -19,102 +19,75 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#ifndef lint
-static const char rcsid[] =
-    "@(#) /master/usr.sbin/tcpdump/tcpdump/print-icmp.c,v 2.1 1995/02/03 18:14:42 polk Exp (LBL)";
-#endif
+/* \summary: IPv6 routing header printer */

 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 
 #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 <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 <netdissect-stdinc.h>

 
 

-#include <stdio.h>
+#include <string.h>

 
 

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

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

+#include "extract.h"
+
+#include "ip6.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_rthdr0 *dp;
-       register const struct ip6_hdr *ip;
+       register const struct ip6_rthdr *dp;
+       register const struct ip6_rthdr0 *dp0;

        register const u_char *ep;
        register const u_char *ep;

-       u_long bitmap = 0x0800;
-       u_long slmap;

        int i, len;
        int i, len;

+       register const struct in6_addr *addr;

 
 

-#if 0
-#define TCHECK(var) if ((u_char *)&(var) >= ep - sizeof(var)) goto trunc
-#endif
+       dp = (const struct ip6_rthdr *)bp;

 
 

-       dp = (struct ip6_rthdr0 *)bp;
-       ip = (struct ip6_hdr *)bp2;
-       len = dp->ip6r0_len;
-
-       /* 'ep' points to the end of avaible data. */
-       ep = snapend;
-
-        printf("%s > %s: ",
-              ip6addr_string(&ip->ip6_src),
-              ip6addr_string(&ip->ip6_dst));
-       
-       TCHECK(dp->ip6r0_slmap[2]);
-       printf("srcrt (len=%d, ", dp->ip6r0_len);
-       printf("type=%d, ", dp->ip6r0_type);
-       printf("segleft=%d, ", dp->ip6r0_segleft);
-       if (dp->ip6r0_type != 0)
-               goto trunc;
-       slmap = (dp->ip6r0_slmap[0] << 16)
-             | (dp->ip6r0_slmap[1] <<  8)
-             | (dp->ip6r0_slmap[2]);
-       printf("bitmap=");
-       for (i = 24; i > 0; i--) {
-               if (slmap & bitmap)
-                       printf("S");
-               else
-                       printf("L");
-               bitmap >>= 1;
-       }
-       if (len % 2 == 1)
+       /* 'ep' points to the end of available data. */
+       ep = ndo->ndo_snapend;
+
+       ND_TCHECK(dp->ip6r_segleft);
+
+       len = dp->ip6r_len;
+       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) {
+       case IPV6_RTHDR_TYPE_0:
+       case IPV6_RTHDR_TYPE_2:                 /* Mobile IPv6 ID-20 */
+               dp0 = (const struct ip6_rthdr0 *)dp;
+
+               ND_TCHECK(dp0->ip6r0_reserved);
+               if (EXTRACT_BE_U_4(dp0->ip6r0_reserved) || ndo->ndo_vflag) {
+                       ND_PRINT((ndo, ", rsv=0x%0x",
+                           EXTRACT_BE_U_4(&dp0->ip6r0_reserved)));
+               }
+
+               if (len % 2 == 1)
+                       goto trunc;
+               len >>= 1;
+               addr = &dp0->ip6r0_addr[0];
+               for (i = 0; i < len; i++) {
+                       if ((const u_char *)(addr + 1) > ep)
+                               goto trunc;
+
+                       ND_PRINT((ndo, ", [%d]%s", i, ip6addr_string(ndo, addr)));
+                       addr++;
+               }
+               /*(*/
+               ND_PRINT((ndo, ") "));
+               return((dp0->ip6r0_len + 1) << 3);
+               break;
+       default:

                goto trunc;
                goto trunc;

-       len >>= 1;
-       printf(", ");
-       for (i = 0; i < len; i++) {
-               if ((((u_char *)&(dp->ip6r0_reserved)) + sizeof(u_long)
-                    + (i<<4)) > ep) goto trunc;
-               printf(" [%d]%s", i,
-                      ip6addr_string(((u_char *)&(dp->ip6r0_reserved)) +
-                                     sizeof(u_long) + (i<<4)));
-               if (i != len - 1)
-                       printf(", ");
-                  
+               break;

        }
        }

-       printf(")");
-       return((dp->ip6r0_len + 1) << 3);
+

  trunc:
  trunc:

-       fputs("[|srcrt]", stdout);
-       return 65535;
-#undef TCHECK
+       ND_PRINT((ndo, "[|srcrt]"));
+       return -1;

 }
 }

-#endif /* INET6 */