sync router renumbering flag bit to conform to 2292bis-02 and RR RFC.

sync with latest kame rtadvd (again).  mostly cosmetic.

4 files changed, 27 insertions, 29 deletions

diff --git a/usr.sbin/rtadvd/if.c b/usr.sbin/rtadvd/if.c
index 55fbb335a3b..03da5f24662 100644
--- a/usr.sbin/rtadvd/if.c
+++ b/usr.sbin/rtadvd/if.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: if.c,v 1.8 2001/01/21 15:11:18 itojun Exp $	*/
-/*	$KAME: if.c,v 1.16 2001/01/19 03:07:18 itojun Exp $	*/
+/*	$OpenBSD: if.c,v 1.9 2001/01/21 15:42:35 itojun Exp $	*/
+/*	$KAME: if.c,v 1.17 2001/01/21 15:27:30 itojun Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -346,7 +346,7 @@ get_next_msg(char *buf, char *lim, int ifindex, size_t *lenp, int filter)
 
 	return (char *)rtm;
 }
-#undef FILTER_MATCH(type, filter)
+#undef FILTER_MATCH
 
 struct in6_addr *
 get_addr(char *buf)
diff --git a/usr.sbin/rtadvd/if.h b/usr.sbin/rtadvd/if.h
index 9112cc8ef75..67e79483912 100644
--- a/usr.sbin/rtadvd/if.h
+++ b/usr.sbin/rtadvd/if.h
@@ -1,5 +1,5 @@
-/*	$OpenBSD: if.h,v 1.6 2001/01/21 15:11:18 itojun Exp $	*/
-/*	$KAME: if.h,v 1.5 2001/01/19 03:07:18 itojun Exp $	*/
+/*	$OpenBSD: if.h,v 1.7 2001/01/21 15:42:36 itojun Exp $	*/
+/*	$KAME: if.h,v 1.6 2001/01/21 15:37:14 itojun Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
@@ -37,23 +37,22 @@ extern size_t ifblock_size;
 extern char *ifblock;
 
 struct nd_opt_hdr;
-struct sockaddr_dl *if_nametosdl __P((char *name));
-int if_getmtu __P((char *name));
-int if_getflags __P((int ifindex, int oifflags));
-int lladdropt_length __P((struct sockaddr_dl *sdl));
-void lladdropt_fill __P((struct sockaddr_dl *sdl, struct nd_opt_hdr *ndopt));
+struct sockaddr_dl *if_nametosdl __P((char *));
+int if_getmtu __P((char *));
+int if_getflags __P((int, int));
+int lladdropt_length __P((struct sockaddr_dl *));
+void lladdropt_fill __P((struct sockaddr_dl *, struct nd_opt_hdr *));
 int rtbuf_len __P((void));
-char *get_next_msg __P((char *buf, char *lim, int ifindex, size_t *lenp,
-			   int filter));
-struct in6_addr *get_addr __P((char *buf));
-int get_rtm_ifindex __P((char *buf));
-int get_ifm_ifindex __P((char *buf));
-int get_ifam_ifindex __P((char *buf));
-int get_ifm_flags __P((char *buf));
-int get_prefixlen __P((char *buf));
+char *get_next_msg __P((char *, char *, int, size_t *, int));
+struct in6_addr *get_addr __P((char *));
+int get_rtm_ifindex __P((char *));
+int get_ifm_ifindex __P((char *));
+int get_ifam_ifindex __P((char *));
+int get_ifm_flags __P((char *));
+int get_prefixlen __P((char *));
 int prefixlen __P((u_char *, u_char *));
-int rtmsg_type __P((char *buf));
-int ifmsg_type __P((char *buf));
-int rtmsg_len __P((char *buf));
-int ifmsg_len __P((char *buf));
+int rtmsg_type __P((char *));
+int ifmsg_type __P((char *));
+int rtmsg_len __P((char *));
+int ifmsg_len __P((char *));
 void init_iflist __P((void));
diff --git a/usr.sbin/rtadvd/rrenum.c b/usr.sbin/rtadvd/rrenum.c
index 0d371cc7f00..9dc2ac5e3f9 100644
--- a/usr.sbin/rtadvd/rrenum.c
+++ b/usr.sbin/rtadvd/rrenum.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: rrenum.c,v 1.6 2001/01/15 11:06:27 itojun Exp $	*/
-/*	$KAME: rrenum.c,v 1.8 2000/11/11 16:37:07 itojun Exp $	*/
+/*	$OpenBSD: rrenum.c,v 1.7 2001/01/21 15:42:36 itojun Exp $	*/
+/*	$KAME: rrenum.c,v 1.10 2001/01/21 15:32:16 itojun Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
diff --git a/usr.sbin/rtadvd/rrenum.h b/usr.sbin/rtadvd/rrenum.h
index a126f6de52f..49f1758ec6a 100644
--- a/usr.sbin/rtadvd/rrenum.h
+++ b/usr.sbin/rtadvd/rrenum.h
@@ -1,5 +1,5 @@
-/*	$OpenBSD: rrenum.h,v 1.3 2000/05/23 11:23:23 itojun Exp $	*/
-/*	$KAME: rrenum.h,v 1.2 2000/05/16 13:34:14 itojun Exp $	*/
+/*	$OpenBSD: rrenum.h,v 1.4 2001/01/21 15:42:36 itojun Exp $	*/
+/*	$KAME: rrenum.h,v 1.3 2001/01/21 15:37:14 itojun Exp $	*/
 
 /*
  * Copyright (C) 1998 WIDE Project.
@@ -30,6 +30,5 @@
  * SUCH DAMAGE.
  */
 
-void rr_input __P((int len, struct icmp6_router_renum *rr,
-		   struct in6_pktinfo *pi, struct sockaddr_in6 *from,
-		   struct in6_addr *dst));
+void rr_input __P((int, struct icmp6_router_renum *, struct in6_pktinfo *,
+	struct sockaddr_in6 *, struct in6_addr *));