From 741c2952d4f97d966567c9de63eff04a71dbde2b Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@thekelleys.org.uk>
Date: Sat, 25 Feb 2012 13:09:18 +0000
Subject: [PATCH] Tidy up RA scheduling.

---
 src/dnsmasq.c | 5 +++++
 src/dnsmasq.h | 1 +
 src/netlink.c | 2 +-
 src/radv.c    | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/dnsmasq.c b/src/dnsmasq.c
index d24300c..cd59dd2 100644
--- a/src/dnsmasq.c
+++ b/src/dnsmasq.c
@@ -831,6 +831,11 @@ static void sig_handler(int sig)
     }
 }
 
+void send_alarm(void)
+{
+  send_event(pipewrite, EVENT_ALARM, 0, NULL);
+}
+
 void send_event(int fd, int event, int data, char *msg)
 {
   struct event_desc ev;
diff --git a/src/dnsmasq.h b/src/dnsmasq.h
index a30fb17..a3e1ad5 100644
--- a/src/dnsmasq.h
+++ b/src/dnsmasq.h
@@ -967,6 +967,7 @@ unsigned char *extended_hwaddr(int hwtype, int hwlen, unsigned char *hwaddr,
 int make_icmp_sock(void);
 int icmp_ping(struct in_addr addr);
 #endif
+void send_alarm(void);
 void send_event(int fd, int event, int data, char *msg);
 void clear_cache_and_reload(time_t now);
 void poll_resolv(int force, int do_reload, time_t now);
diff --git a/src/netlink.c b/src/netlink.c
index 820b0a8..a8cea33 100644
--- a/src/netlink.c
+++ b/src/netlink.c
@@ -348,7 +348,7 @@ static void nl_routechange(struct nlmsghdr *h)
 	  ra_start_unsolicted(dnsmasq_time());
 	  /* cause lease_update_file to run after we return, in case we were called from
 	     iface_enumerate and can't re-enter it now */
-	  alarm(1);
+	  send_alarm();
 	}
 #endif
 
diff --git a/src/radv.c b/src/radv.c
index f768760..19b58b2 100644
--- a/src/radv.c
+++ b/src/radv.c
@@ -399,7 +399,7 @@ static int iface_search(struct in6_addr *local,  int prefix,
 			int scope, int if_index, int dad, void *vparam)
 {
   struct search_param *param = vparam;
-  struct dhcp_context *context, *tmp;
+  struct dhcp_context *context;
 
   (void)scope;
   (void)dad;