- Refactoring the interface list. It now supports dynamically

  added/removed interfaces in a more consistent manner and reloading
  the configuration file.

- Add initial support for control socket.  RA information in the
  daemon can be obtained by rtadvctl(8) instead of SIGUSR1 in a similar
  manner to ifconfig(8).  The information dump has been removed in favor of it.

  (reload the configuration file)
  # rtadvctl reload

  (show RA messages being sent on each interfaces)
  # rtadvctl show
  em0: flags=<UP,CONFIGURED,PERSIST> status=<RA_SEND> mtu 1280
        DefaultLifetime: 30m
        MinAdvInterval/MaxAdvInterval: 3m20s/3m20s
        AdvLinkMTU: <none>, Flags: O, Preference: medium
        ReachableTime: 0s, RetransTimer: 0s, CurHopLimit: 64
        AdvIfPrefixes: yes

  (show RA messages being sent only on em0)
  # rtadvctl show em0

  (rtadvctl -v show provides additional information)
  # rtadvctl -v show em0
  em0: flags=<UP,CONFIGURED,PERSIST> status=<RA_SEND> mtu 1280
        DefaultLifetime: 30m
        MinAdvInterval/MaxAdvInterval: 3m20s/3m20s
        AdvLinkMTU: <none>, Flags: O, Preference: medium
        ReachableTime: 0s, RetransTimer: 0s, CurHopLimit: 64
        AdvIfPrefixes: yes
        Prefixes (1):
          2001:db8:1::/64 (CONFIG, vltime=30d, pltime=7d, flags=LA)
        RDNSS entries:
          2001:db8:1::128 (ltime=2m40s)

  (stop rtadvd)
  # rtadvctl shutdown

  A remaining issue when reloading the configuration file is that
  during that period rtadvd cannot communicate with rtadvctl due to some
  additional RA sending for graceful shutdown.  This will be fixed later.

1 files changed, 1 insertions, 21 deletions

diff --git a/usr.sbin/rtadvd/timer.h b/usr.sbin/rtadvd/timer.h
index e2e0c65..f70e0d1 100644
--- a/usr.sbin/rtadvd/timer.h
+++ b/usr.sbin/rtadvd/timer.h
@@ -30,22 +30,6 @@
  * SUCH DAMAGE.
  */
 
-/* a < b */
-#define	TIMEVAL_LT(a, b)				\
-		(((a)->tv_sec < (b)->tv_sec) ||		\
-		    (((a)->tv_sec == (b)->tv_sec) &&	\
-		    ((a)->tv_usec < (b)->tv_usec)))
-
-/* a <= b */
-#define	TIMEVAL_LEQ(a, b)				\
-		(((a)->tv_sec < (b)->tv_sec) ||		\
-		    (((a)->tv_sec == (b)->tv_sec) &&	\
-		    ((a)->tv_usec <= (b)->tv_usec)))
-
-#define	TIMEVAL_EQUAL(a,b)				\
-		(((a)->tv_sec == (b)->tv_sec) &&	\
-		    ((a)->tv_usec == (b)->tv_usec))
-
 extern TAILQ_HEAD(rtadvd_timer_head_t, rtadvd_timer) ra_timer;
 struct rtadvd_timer {
 	TAILQ_ENTRY(rtadvd_timer)	rat_next;
@@ -59,14 +43,10 @@ struct rtadvd_timer {
 };
 
 void			rtadvd_timer_init(void);
+void			rtadvd_update_timeout_handler(void);
 struct rtadvd_timer	*rtadvd_add_timer(struct rtadvd_timer *(*)(void *),
 			    void (*)(void *, struct timeval *), void *, void *);
 void			rtadvd_set_timer(struct timeval *,
 			    struct rtadvd_timer *);
 void			rtadvd_remove_timer(struct rtadvd_timer *);
 struct timeval		*rtadvd_check_timer(void);
-struct timeval		*rtadvd_timer_rest(struct rtadvd_timer *);
-void			TIMEVAL_ADD(struct timeval *, struct timeval *,
-			    struct timeval *);
-void			TIMEVAL_SUB(struct timeval *, struct timeval *,
-			    struct timeval *);