Address Michael's comments.

[tcpdump] / route6d.h

diff --git a/route6d.h b/route6d.h
index 2289deed324ebc3ee77b469c9a81121f19f33842..53953fdb6d31449276dcd117ff451bd791306364 100644 (file)
--- a/route6d.h
+++ b/route6d.h
@@ -1,5 +1,33 @@
 /*
- * $Header: /tcpdump/master/tcpdump/route6d.h,v 1.1 1999-10-30 05:11:22 itojun Exp $
+ * Copyright (C) 1995, 1996, 1997 and 1998 WIDE Project.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+/*
+ * $Header: /tcpdump/master/tcpdump/route6d.h,v 1.5 2002-12-11 07:14:10 guy Exp $
  */
 
 #define        RIP6_VERSION    1
@@ -8,16 +36,16 @@
 #define        RIP6_RESPONSE   2
 
 struct netinfo6 {
-       struct  in6_addr        rip6_dest;
-       u_short rip6_tag;
-       u_char  rip6_plen;
-       u_char  rip6_metric;
+       struct in6_addr rip6_dest;
+       u_int16_t       rip6_tag;
+       u_int8_t        rip6_plen;
+       u_int8_t        rip6_metric;
 };
 
 struct rip6 {
-       u_char  rip6_cmd;
-       u_char  rip6_vers;
-       u_char  rip6_res1[2];
+       u_int8_t        rip6_cmd;
+       u_int8_t        rip6_vers;
+       u_int8_t        rip6_res1[2];
        union {
                struct  netinfo6        ru6_nets[1];
                char    ru6_tracefile[1];