svn commit: r224620 - user/hrs/ipv6/usr.sbin/rtadvd

[Hiroki Sato]

Author: hrs
Date: Wed Aug  3 02:02:23 2011
New Revision: 224620
URL: http://svn.freebsd.org/changeset/base/224620

Log:
  Ignore an interface that never sent RAs for graceful shut-down.

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

Modified: user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.c
==============================================================================
--- user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.c	Wed Aug  3 01:33:34 2011	(r224619)
+++ user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.c	Wed Aug  3 02:02:23 2011	(r224620)
@@ -405,6 +405,18 @@ rtadvd_shutdown(void)
 			continue;
 		if (ifi->ifi_ra_timer == NULL)
 			continue;
+		if (ifi->ifi_ra_lastsent.tv_sec == 0 &&
+		    ifi->ifi_ra_lastsent.tv_usec == 0 &&
+		    ifi->ifi_ra_timer != NULL) {
+			/*
+			 * When RA configured but never sent,
+			 * ignore the IF immediately.
+			 */
+			rtadvd_remove_timer(ifi->ifi_ra_timer);
+			ifi->ifi_ra_timer = NULL;
+			ifi->ifi_state = IFI_STATE_UNCONFIGURED;
+			continue;
+		}
 
 		ifi->ifi_state = IFI_STATE_TRANSITIVE;