From owner-svn-src-user@FreeBSD.ORG  Thu Jun 16 12:57:34 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0D4D11065670;
	Thu, 16 Jun 2011 12:57:34 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D8C028FC0A;
	Thu, 16 Jun 2011 12:57:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p5GCvXaG030195;
	Thu, 16 Jun 2011 12:57:33 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5GCvXTj030191;
	Thu, 16 Jun 2011 12:57:33 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201106161257.p5GCvXTj030191@svn.freebsd.org>
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Thu, 16 Jun 2011 12:57:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r223150 - user/hrs/ipv6/usr.sbin/rtadvd
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Jun 2011 12:57:34 -0000

Author: hrs
Date: Thu Jun 16 12:57:33 2011
New Revision: 223150
URL: http://svn.freebsd.org/changeset/base/223150

Log:
  - Check RTM_VERSION.
  - Fix WARNS.

Modified:
  user/hrs/ipv6/usr.sbin/rtadvd/Makefile
  user/hrs/ipv6/usr.sbin/rtadvd/if.c
  user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.c

Modified: user/hrs/ipv6/usr.sbin/rtadvd/Makefile
==============================================================================
--- user/hrs/ipv6/usr.sbin/rtadvd/Makefile	Thu Jun 16 12:41:37 2011	(r223149)
+++ user/hrs/ipv6/usr.sbin/rtadvd/Makefile	Thu Jun 16 12:57:33 2011	(r223150)
@@ -23,6 +23,6 @@ LDADD=	-lutil
 
 CFLAGS+= -DHAVE_ARC4RANDOM -DHAVE_POLL_H -DROUTEINFO
 
-WARNS?=	6
+WARNS?=	3
 
 .include <bsd.prog.mk>

Modified: user/hrs/ipv6/usr.sbin/rtadvd/if.c
==============================================================================
--- user/hrs/ipv6/usr.sbin/rtadvd/if.c	Thu Jun 16 12:41:37 2011	(r223149)
+++ user/hrs/ipv6/usr.sbin/rtadvd/if.c	Thu Jun 16 12:57:33 2011	(r223150)
@@ -105,6 +105,12 @@ if_nametosdl(char *name)
 	lim = buf + len;
 	for (next = buf; next < lim; next += ifm->ifm_msglen) {
 		ifm = (struct if_msghdr *)next;
+		if (ifm->ifm_version != RTM_VERSION) {
+			syslog(LOG_ERR,
+			    "<%s> RTM_VERSION mismatch (%d != %d).",
+			    __func__, ifm->ifm_version, RTM_VERSION);
+			continue;
+		}
 		if (ifm->ifm_type == RTM_IFINFO) {
 			sa = (struct sockaddr *)(ifm + 1);
 			get_rtaddrs(ifm->ifm_addrs, sa, rti_info);

Modified: user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.c
==============================================================================
--- user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.c	Thu Jun 16 12:41:37 2011	(r223149)
+++ user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.c	Thu Jun 16 12:57:33 2011	(r223150)
@@ -503,6 +503,13 @@ rtmsg_input(void)
 		    RTADV_TYPE2BITMASK(RTM_IFANNOUNCE));
 		if (len == 0)
 			break;
+		if (((struct rt_msghdr *)next)->rtm_version != RTM_VERSION) {
+			syslog(LOG_ERR,
+			    "<%s> RTM_VERSION mismatch (%d != %d).",
+			    __func__, ((struct rt_msghdr *)next)->rtm_version,
+			    RTM_VERSION);
+			continue;
+		}
 		type = rtmsg_type(next);
 		switch (type) {
 		case RTM_ADD: