More flexible RA configuration.

CHANGELOG

@@ -40,7 +40,20 @@ version 2.61
 
 	    Set the environment variable DNSMASQ_LOG_DHCP when running
 	    the script id --log-dhcp is in effect, so that script can
-	    taylor their logging verbosity. Suggestion from Malte Forkel.
+	    taylor their logging verbosity. Suggestion from Malte
+	    Forkel.
+	    
+	    Arrange that addresses specified with --listen-address
+	    work even if there is no interface carrying the
+	    address. This is chiefly useful for IPv4 loopback
+	    addresses, where any address in 127.0.0.0/8 is a valid
+	    loopback address, but normally only 127.0.0.1 appears on
+	    the lo interface. Thanks to Mathieu Trudel-Lapierre for
+	    the idea and initial patch. 
+
+	    Fix crash, introduced in 2.60, when a DHCPINFORM is
+	    received from a network which has no valid dhcp-range.
+	    Thanks to Stephane Glondu for the bug report.
 
  
 version 2.60

debian/changelog

@@ -7,6 +7,12 @@ dnsmasq (2.61-1) unstable; urgency=low
 	
  -- Simon Kelley <simon@thekelleys.org.uk>  Tue, 6 Mar 2012 19:45:43 +0000
 
+dnsmasq (2.60-2) unstable; urgency=high
+
+   * Fix DHCPv4 segfault. (closes: #665008)
+
+ -- Simon Kelley <simon@thekelleys.org.uk>  Fri, 23 Mar 2012 09:37:23 +0000
+
 dnsmasq (2.60-1) unstable; urgency=low
 
    * New upstream.

src/dhcp6.c

@@ -229,7 +229,7 @@ int address6_allocate(struct dhcp_context *context,  unsigned char *clid, int cl
   
   for (pass = 0; pass <= 1; pass++)
     for (c = context; c; c = c->current)
-      if (c->flags & (CONTEXT_STATIC | CONTEXT_PROXY))
+      if (c->flags & (CONTEXT_STATIC | CONTEXT_RA_STATELESS))
 	continue;
       else if (!match_netid(c->filter, netids, pass))
 	continue;

src/dnsmasq.c

@@ -209,13 +209,6 @@ int main (int argc, char **argv)
       for (if_tmp = daemon->if_names; if_tmp; if_tmp = if_tmp->next)
 	if (if_tmp->name && !if_tmp->used)
 	  die(_("unknown interface %s"), if_tmp->name, EC_BADNET);
-  
-      for (if_tmp = daemon->if_addrs; if_tmp; if_tmp = if_tmp->next)
-	if (!if_tmp->used)
-	  {
-	    prettyprint_addr(&if_tmp->addr, daemon->namebuff);
-	    die(_("no interface with address %s"), daemon->namebuff, EC_BADNET);
-	  }
     }
   else 
     create_wildcard_listeners();
@@ -556,23 +549,30 @@ int main (int argc, char **argv)
 	    {
 	      start = &dhcp_tmp->start6;
 	      end = &dhcp_tmp->end6;
+	      struct in6_addr subnet = dhcp_tmp->start6;
+	      setaddr6part(&subnet, 0);
+	      inet_ntop(AF_INET6, &subnet, daemon->dhcp_buff2, 256);
 	    }
 #endif
 	  
-	  prettyprint_time(daemon->dhcp_buff2, dhcp_tmp->lease_time);
+	  prettyprint_time(daemon->namebuff, dhcp_tmp->lease_time);
 	  inet_ntop(family, start, daemon->dhcp_buff, 256);
 	  inet_ntop(family, end, daemon->dhcp_buff3, 256);
-	  my_syslog(MS_DHCP | LOG_INFO, 
-		    (dhcp_tmp->flags & CONTEXT_STATIC) ? 
-		    _("DHCP, static leases only on %.0s%s, lease time %s") :
-		    (dhcp_tmp->flags & CONTEXT_RA_NAME) ? 
-		    _("router advertisement with DHCPv4-derived names on %.0s%s, lifetime %s") :
-		    (dhcp_tmp->flags & CONTEXT_RA_ONLY) ? 
-		    _("router advertisement only on %.0s%s, lifetime %s") :
-		    (dhcp_tmp->flags & CONTEXT_PROXY) ?
-		    _("DHCP, proxy on subnet %.0s%s%.0s") :
-		    _("DHCP, IP range %s -- %s, lease time %s"),
-		    daemon->dhcp_buff, daemon->dhcp_buff3, daemon->dhcp_buff2);
+	  if ((dhcp_tmp->flags & CONTEXT_DHCP) || family == AF_INET) 
+	    my_syslog(MS_DHCP | LOG_INFO, 
+		      (dhcp_tmp->flags & CONTEXT_STATIC) ? 
+		      _("DHCP, static leases only on %.0s%s, lease time %s") :
+		      (dhcp_tmp->flags & CONTEXT_RA_STATELESS) ? 
+		      _("SLAAC and stateless DHCPv6 on %.0s%s%.0s") :
+		      (dhcp_tmp->flags & CONTEXT_PROXY) ?
+		      _("DHCP, proxy on subnet %.0s%s%.0s") :
+		      _("DHCP, IP range %s -- %s, lease time %s"),
+		      daemon->dhcp_buff, daemon->dhcp_buff3, daemon->namebuff);
+	  if (dhcp_tmp->flags & CONTEXT_RA_NAME)
+	    my_syslog(MS_DHCP | LOG_INFO, _("SLAAC and DHCPv4-derived names on %s"), daemon->dhcp_buff2);
+	  if (dhcp_tmp->flags & CONTEXT_RA_ONLY)
+	    my_syslog(MS_DHCP | LOG_INFO, _("SLAAC on %s"), daemon->dhcp_buff2);
+ 
 	}
       
 #ifdef HAVE_DHCP6
@@ -700,12 +700,12 @@ int main (int argc, char **argv)
 	{
 	  FD_SET(daemon->dhcp6fd, &rset);
 	  bump_maxfd(daemon->dhcp6fd, &maxfd);
-	  
-	  if (daemon->ra_contexts)
-	    {
-	      FD_SET(daemon->icmp6fd, &rset);
-	      bump_maxfd(daemon->icmp6fd, &maxfd); 
-	    }
+	}
+
+      if (daemon->ra_contexts)
+	{
+	  FD_SET(daemon->icmp6fd, &rset);
+	  bump_maxfd(daemon->icmp6fd, &maxfd); 
 	}
 #endif
 
@@ -1284,18 +1284,19 @@ static void check_dns_listeners(fd_set *set, time_t now)
 	  int confd;
 	  struct irec *iface = NULL;
 	  pid_t p;
+	  union mysockaddr tcp_addr;
+	  socklen_t tcp_len = sizeof(union mysockaddr);
+
+	  while ((confd = accept(listener->tcpfd, NULL, NULL)) == -1 && errno == EINTR);
 	  
-	  while((confd = accept(listener->tcpfd, NULL, NULL)) == -1 && errno == EINTR);
-	  
-	  if (confd == -1)
+	  if (confd == -1 ||
+	      getsockname(confd, (struct sockaddr *)&tcp_addr, &tcp_len) == -1)
 	    continue;
 	  
 	  if (option_bool(OPT_NOWILD))
-	    iface = listener->iface;
+	    iface = listener->iface; /* May be NULL */
 	  else
 	    {
-	      union mysockaddr tcp_addr;
-	      socklen_t tcp_len = sizeof(union mysockaddr);
 	      /* Check for allowed interfaces when binding the wildcard address:
 		 we do this by looking for an interface with the same address as 
 		 the local address of the TCP connection, then looking to see if that's
@@ -1303,14 +1304,13 @@ static void check_dns_listeners(fd_set *set, time_t now)
 		 interface too, for localisation. */
 	      
 	      /* interface may be new since startup */
-	      if (enumerate_interfaces() &&
-		  getsockname(confd, (struct sockaddr *)&tcp_addr, &tcp_len) != -1)
+	      if (enumerate_interfaces())
 		for (iface = daemon->interfaces; iface; iface = iface->next)
 		  if (sockaddr_isequal(&iface->addr, &tcp_addr))
 		    break;
 	    }
 	  
-	  if (!iface)
+	  if (!iface && !option_bool(OPT_NOWILD))
 	    {
 	      shutdown(confd, SHUT_RDWR);
 	      close(confd);
@@ -1336,7 +1336,13 @@ static void check_dns_listeners(fd_set *set, time_t now)
 	      unsigned char *buff;
 	      struct server *s; 
 	      int flags;
-	      
+	      struct in_addr netmask;
+
+	      if (iface)
+		netmask = iface->netmask;
+	      else
+		netmask.s_addr = 0;
+
 #ifndef NO_FORK
 	      /* Arrange for SIGALARM after CHILD_LIFETIME seconds to
 		 terminate the process. */
@@ -1354,7 +1360,7 @@ static void check_dns_listeners(fd_set *set, time_t now)
 	      if ((flags = fcntl(confd, F_GETFL, 0)) != -1)
 		fcntl(confd, F_SETFL, flags & ~O_NONBLOCK);
 	      
-	      buff = tcp_request(confd, now, &iface->addr, iface->netmask);
+	      buff = tcp_request(confd, now, &tcp_addr, netmask);
 	       
 	      shutdown(confd, SHUT_RDWR);
 	      close(confd);

src/dnsmasq.h

@@ -395,7 +395,7 @@ struct irec {
 
 struct listener {
   int fd, tcpfd, tftpfd, family;
-  struct irec *iface; /* only valid for non-wildcard */
+  struct irec *iface; /* only sometimes valid for non-wildcard */
   struct listener *next;
 };
 
@@ -646,13 +646,15 @@ struct dhcp_context {
   struct dhcp_context *next, *current;
 };
 
-#define CONTEXT_STATIC    1
-#define CONTEXT_NETMASK   2
-#define CONTEXT_BRDCAST   4
-#define CONTEXT_PROXY     8
-#define CONTEXT_RA_ONLY  16
-#define CONTEXT_RA_DONE  32
-#define CONTEXT_RA_NAME  64
+#define CONTEXT_STATIC         1
+#define CONTEXT_NETMASK        2
+#define CONTEXT_BRDCAST        4
+#define CONTEXT_PROXY          8
+#define CONTEXT_RA_ONLY       16
+#define CONTEXT_RA_DONE       32
+#define CONTEXT_RA_NAME       64
+#define CONTEXT_RA_STATELESS 128
+#define CONTEXT_DHCP         256
 
 struct ping_result {
   struct in_addr addr;
@@ -911,9 +913,9 @@ unsigned char *tcp_request(int confd, time_t now,
 			   union mysockaddr *local_addr, struct in_addr netmask);
 void server_gone(struct server *server);
 struct frec *get_new_frec(time_t now, int *wait);
-void send_from(int fd, int nowild, char *packet, size_t len, 
+int send_from(int fd, int nowild, char *packet, size_t len, 
 	       union mysockaddr *to, struct all_addr *source,
-	       unsigned int iface);
+	       unsigned int iface, int *errp);
 
 /* network.c */
 int indextoname(int fd, int index, char *name);

src/forward.c

@@ -26,9 +26,9 @@ static struct randfd *allocate_rfd(int family);
 
 /* Send a UDP packet with its source address set as "source" 
    unless nowild is true, when we just send it with the kernel default */
-void send_from(int fd, int nowild, char *packet, size_t len, 
-	       union mysockaddr *to, struct all_addr *source,
-	       unsigned int iface)
+int send_from(int fd, int nowild, char *packet, size_t len, 
+	      union mysockaddr *to, struct all_addr *source,
+	      unsigned int iface, int *errp)
 {
   struct msghdr msg;
   struct iovec iov[1]; 
@@ -110,8 +110,15 @@ void send_from(int fd, int nowild, char *packet, size_t len,
       if (retry_send())
 	goto retry;
       
-      my_syslog(LOG_ERR, _("failed to send packet: %s"), strerror(errno));
+      if (errp)
+	*errp = errno;
+      else
+	my_syslog(LOG_ERR, _("failed to send packet: %s"), strerror(errno));
+      
+      return 0;
     }
+
+  return 1;
 }
           
 static unsigned int search_servers(time_t now, struct all_addr **addrpp, 
@@ -432,7 +439,7 @@ static int forward_query(int udpfd, union mysockaddr *udpaddr,
   if (udpfd != -1)
     {
       plen = setup_reply(header, plen, addrp, flags, daemon->local_ttl);
-      send_from(udpfd, option_bool(OPT_NOWILD), (char *)header, plen, udpaddr, dst_addr, dst_iface);
+      send_from(udpfd, option_bool(OPT_NOWILD), (char *)header, plen, udpaddr, dst_addr, dst_iface, NULL);
     }
 
   return 0;
@@ -621,7 +628,7 @@ void reply_query(int fd, int family, time_t now)
 	  header->id = htons(forward->orig_id);
 	  header->hb4 |= HB4_RA; /* recursion if available */
 	  send_from(forward->fd, option_bool(OPT_NOWILD), daemon->packet, nn, 
-		    &forward->source, &forward->dest, forward->iface);
+		    &forward->source, &forward->dest, forward->iface, NULL);
 	}
       free_frec(forward); /* cancel */
     }
@@ -660,7 +667,7 @@ void receive_query(struct listener *listen, time_t now)
   /* packet buffer overwritten */
   daemon->srv_save = NULL;
   
-  if (listen->family == AF_INET && option_bool(OPT_NOWILD))
+  if (listen->iface && listen->family == AF_INET && option_bool(OPT_NOWILD))
     {
       dst_addr_4 = listen->iface->addr.in.sin_addr;
       netmask = listen->iface->netmask;
@@ -816,7 +823,7 @@ void receive_query(struct listener *listen, time_t now)
   if (m >= 1)
     {
       send_from(listen->fd, option_bool(OPT_NOWILD), (char *)header, 
-		m, &source_addr, &dst_addr, if_index);
+		m, &source_addr, &dst_addr, if_index, NULL);
       daemon->local_answer++;
     }
   else if (forward_query(listen->fd, &source_addr, &dst_addr, if_index,

src/network.c

@@ -511,6 +511,7 @@ void create_bound_listeners(int dienow)
 {
   struct listener *new;
   struct irec *iface;
+  struct iname *if_tmp;
 
   for (iface = daemon->interfaces; iface; iface = iface->next)
     if (!iface->done && !iface->dad && 
@@ -521,6 +522,25 @@ void create_bound_listeners(int dienow)
 	daemon->listeners = new;
 	iface->done = 1;
       }
+
+  /* Check for --listen-address options that haven't been used because there's
+     no interface with a matching address. These may be valid: eg it's possible
+     to listen on 127.0.1.1 even if the loopback interface is 127.0.0.1
+
+     If the address isn't valid the bind() will fail and we'll die().
+
+     The resulting listeners have the ->iface field NULL, and this has to be
+     handled by the DNS and TFTP code. It disables --localise-queries processing
+     (no netmask) and some MTU login the tftp code. */
+
+  for (if_tmp = daemon->if_addrs; if_tmp; if_tmp = if_tmp->next)
+    if (!if_tmp->used && 
+	(new = create_listeners(&if_tmp->addr, 1, dienow)))
+      {
+	new->iface = NULL;
+	new->next = daemon->listeners;
+	daemon->listeners = new;
+      }
 }
 
 int is_dad_listeners(void)

src/option.c

@@ -1959,7 +1959,7 @@ static char *one_opt(int option, char *arg, char *gen_prob, int command_line)
     case 'F':  /* --dhcp-range */
       {
 	int k, leasepos = 2;
-	char *cp, *a[5] = { NULL, NULL, NULL, NULL, NULL };
+	char *cp, *a[7] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL };
 	struct dhcp_context *new = opt_malloc(sizeof(struct dhcp_context));
 	
 	memset (new, 0, sizeof(*new));
@@ -2010,7 +2010,7 @@ static char *one_opt(int option, char *arg, char *gen_prob, int command_line)
 	      }
 	  }
 	
-	for (k = 1; k < 5; k++)
+	for (k = 1; k < 7; k++)
 	  if (!(a[k] = split(a[k-1])))
 	    break;
 	
@@ -2020,17 +2020,12 @@ static char *one_opt(int option, char *arg, char *gen_prob, int command_line)
 	  {
 	    new->next = daemon->dhcp;
 	    daemon->dhcp = new;
+	    new->end = new->start;
 	    if (strcmp(a[1], "static") == 0)
-	      {
-		new->end = new->start;
-		new->flags |= CONTEXT_STATIC;
-	      }
+	      new->flags |= CONTEXT_STATIC;
 	    else if (strcmp(a[1], "proxy") == 0)
-	      {
-		new->end = new->start;
-		new->flags |= CONTEXT_PROXY;
-	      }
-	    else if ((new->end.s_addr = inet_addr(a[1])) == (in_addr_t)-1)
+	      new->flags |= CONTEXT_PROXY;
+	    else if (!inet_pton(AF_INET, a[1], &new->end))
 	      option = '?';
 	    
 	    if (ntohl(new->start.s_addr) > ntohl(new->end.s_addr))
@@ -2060,53 +2055,54 @@ static char *one_opt(int option, char *arg, char *gen_prob, int command_line)
 	else if (inet_pton(AF_INET6, a[0], &new->start6))
 	  {
 	    new->prefix = 64; /* default */
+	    new->end6 = new->start6;
+
+	    for (leasepos = 1; leasepos < k; leasepos++)
+	      {
+		if (strcmp(a[leasepos], "static") == 0)
+		  new->flags |= CONTEXT_STATIC | CONTEXT_DHCP;
+		else if (strcmp(a[leasepos], "ra-only") == 0 || strcmp(a[leasepos], "slaac") == 0 )
+		  new->flags |= CONTEXT_RA_ONLY;
+		else if (strcmp(a[leasepos], "ra-names") == 0)
+		  new->flags |= CONTEXT_RA_NAME;
+		else if (strcmp(a[leasepos], "ra-stateless") == 0)
+		  new->flags |= CONTEXT_RA_STATELESS | CONTEXT_DHCP;
+		else if (leasepos == 1 && inet_pton(AF_INET6, a[leasepos], &new->end6))
+		  new->flags |= CONTEXT_DHCP; 
+		else  
+		  break;
+	      }
 	    
-	    if (strcmp(a[1], "static") == 0)
-	      {
-		memcpy(&new->end6, &new->start6, IN6ADDRSZ);
-		new->flags |= CONTEXT_STATIC;
-	      }
-	    else if (strcmp(a[1], "ra-only") == 0)
-	      {
-		memcpy(&new->end6, &new->start6, IN6ADDRSZ);
-		new->flags |= CONTEXT_RA_ONLY;
-	      }
-	    else if (strcmp(a[1], "ra-names") == 0)
-	      {
-		memcpy(&new->end6, &new->start6, IN6ADDRSZ);
-		new->flags |= CONTEXT_RA_NAME | CONTEXT_RA_ONLY;
-	      }
-	    else if (!inet_pton(AF_INET6, a[1], &new->end6))
-	      option = '?';
-	    
-	    if (new->flags & CONTEXT_RA_ONLY)
-	      {
-		new->next = daemon->ra_contexts;
-		daemon->ra_contexts = new;
-	      }
-	    else
+	    if (new->flags & CONTEXT_DHCP)
 	      {
 		new->next = daemon->dhcp6;
 		daemon->dhcp6 = new;
 	      }
-
+	    else
+	      {
+		new->next = daemon->ra_contexts;
+		daemon->ra_contexts = new;
+	      }
+	     
 	    /* bare integer < 128 is prefix value */
-	    if (option != '?' && k >= 3)
+	    if (option != '?' && leasepos < k)
 	      {
 		int pref;
-		for (cp = a[2]; *cp; cp++)
+		for (cp = a[leasepos]; *cp; cp++)
 		  if (!(*cp >= '0' && *cp <= '9'))
 		    break;
-		if (!*cp && (pref = atoi(a[2])) <= 128)
+		if (!*cp && (pref = atoi(a[leasepos])) <= 128)
 		  {
 		    new->prefix = pref;
-		    leasepos = 3;
-		    if ((new->flags & CONTEXT_RA_ONLY) && new->prefix != 64)
+		    leasepos++;
+		    if ((new->flags & (CONTEXT_RA_ONLY | CONTEXT_RA_NAME | CONTEXT_RA_STATELESS)) && 
+			new->prefix != 64)
 		      problem = _("prefix must be exactly 64 for RA subnets");
 		    else if (new->prefix < 64)
 		      problem = _("prefix must be at least 64");
 		  }
 	      }
+	    
 	    if (!problem && !is_same_net6(&new->start6, &new->end6, new->prefix))
 	      problem = _("inconsistent DHCPv6 range");
 	    else if (addr6part(&new->start6) > addr6part(&new->end6))
@@ -2118,7 +2114,7 @@ static char *one_opt(int option, char *arg, char *gen_prob, int command_line)
 	  }
 #endif
 	
-	if (k >= leasepos+1)
+	if (leasepos < k)
 	  {
 	    if (strcmp(a[leasepos], "infinite") == 0)
 	      new->lease_time = 0xffffffff;

src/radv.c

@@ -27,7 +27,7 @@
 #include <netinet/icmp6.h>
 
 struct ra_param {
-  int ind, managed, found_context, first;
+  int ind, managed, other, found_context, first;
   char *if_name;
   struct in6_addr link_local;
 };
@@ -199,7 +199,7 @@ static void send_ra(int iface, char *iface_name, struct in6_addr *dest)
   struct ifreq ifr;
   struct sockaddr_in6 addr;
   struct dhcp_context *context;
- 
+
   save_counter(0);
   ra = expand(sizeof(struct ra_packet));
   
@@ -213,6 +213,7 @@ static void send_ra(int iface, char *iface_name, struct in6_addr *dest)
 
   parm.ind = iface;
   parm.managed = 0;
+  parm.other = 0;
   parm.found_context = 0;
   parm.if_name = iface_name;
   parm.first = 1;
@@ -246,8 +247,10 @@ static void send_ra(int iface, char *iface_name, struct in6_addr *dest)
 
   /* set managed bits unless we're providing only RA on this link */
   if (parm.managed)
-    ra->flags = 0xc0; /* M flag, managed, O flag, other */ 
-
+    ra->flags |= 0x80; /* M flag, managed, */
+   if (parm.other)
+    ra->flags |= 0x40; /* O flag, other */ 
+			
   /* decide where we're sending */
   memset(&addr, 0, sizeof(addr));
 #ifdef HAVE_SOCKADDR_SA_LEN
@@ -266,7 +269,7 @@ static void send_ra(int iface, char *iface_name, struct in6_addr *dest)
     inet_pton(AF_INET6, ALL_HOSTS, &addr.sin6_addr); 
   
   send_from(daemon->icmp6fd, 0, daemon->outpacket.iov_base, save_counter(0),
-	    (union mysockaddr *)&addr, (struct all_addr *)&parm.link_local, iface); 
+	    (union mysockaddr *)&addr, (struct all_addr *)&parm.link_local, iface, NULL); 
   
 }
 
@@ -295,14 +298,20 @@ static int add_prefixes(struct in6_addr *local,  int prefix,
 	      {
 		int do_slaac = 0;
 
-		if (context->flags & CONTEXT_RA_ONLY)
-		  do_slaac = 1;
+		if ((context->flags & 
+		     (CONTEXT_RA_ONLY | CONTEXT_RA_NAME | CONTEXT_RA_STATELESS)))
+		  {
+		    do_slaac = 1;
+		    if (context->flags & CONTEXT_RA_STATELESS)
+		      param->other = 1; 
+		  }
 		else
 		  {
 		    /* don't do RA for non-ra-only unless --enable-ra is set */
 		    if (!option_bool(OPT_RA))
 		      continue;
 		    param->managed = 1;
+		    param->other = 1;
 		  }
 
 		if (context->flags & CONTEXT_RA_DONE)
@@ -321,14 +330,27 @@ static int add_prefixes(struct in6_addr *local,  int prefix,
 		      is_same_net6(local, &tmp->start6, prefix) &&
 		      is_same_net6(local, &tmp->end6, prefix))
 		    {
-		      /* if any dhcp-range with ra-only on this subnet
-			 set the "do_slaac" bit */
-		      if (tmp->flags & CONTEXT_RA_ONLY)
-			do_slaac = 1;
 		      tmp->flags |= CONTEXT_RA_DONE;
 		      context->ra_time = 0;
+		      /* if any dhcp-range with ra-only on this subnet
+			 set the "do_slaac" bit */
+		      if (tmp->flags & 
+			  (CONTEXT_RA_ONLY | CONTEXT_RA_NAME | CONTEXT_RA_STATELESS))
+			{
+			  do_slaac = 1;
+			  if (context->flags & CONTEXT_RA_STATELESS)
+			    param->other = 1; 
+			}
+		      else
+			{
+			  /* don't do RA for non-ra-only unless --enable-ra is set */
+			  if (!option_bool(OPT_RA))
+			    continue;
+			  param->managed = 1;
+			  param->other = 1;
+			}
 		    }
-
+		
 		if ((opt = expand(sizeof(struct prefix_opt))))
 		  {
 		    u64 addrpart = addr6part(&context->start6);
@@ -395,11 +417,11 @@ time_t periodic_ra(time_t now)
       for (next_event = 0, context = daemon->ra_contexts; context; context = context->next)
 	if (context->ra_time != 0)
 	  {
-	    if (difftime(context->ra_time, now) < 0.0)
+	    if (difftime(context->ra_time, now) <= 0.0)
 	      break; /* overdue */
 	    
-	    if (next_event == 0 || difftime(next_event, context->ra_time + 2) > 0.0)
-	      next_event = context->ra_time + 2;
+	    if (next_event == 0 || difftime(next_event, context->ra_time) > 0.0)
+	      next_event = context->ra_time;
 	  }
       
       /* none overdue */

src/rfc2131.c

@@ -2095,7 +2095,8 @@ static void do_options(struct dhcp_context *context,
   struct dhcp_netid_list *id_list;
 
   /* filter options based on tags, those we want get DHOPT_TAGOK bit set */
-  context->netid.next = NULL;
+  if (context)
+    context->netid.next = NULL;
   tagif = option_filter(netid, context && context->netid.net ? &context->netid : NULL, config_opts);
 	
   /* logging */

src/slaac.c

@@ -131,14 +131,15 @@ time_t periodic_slaac(time_t now, struct dhcp_lease *leases)
   for (lease = leases; lease; lease = lease->next)
     for (slaac = lease->slaac_address; slaac; slaac = slaac->next)
       {
-	/* confirmed? */
-	if (slaac->backoff == 0)
+	/* confirmed or given up? */
+	if (slaac->backoff == 0 || slaac->ping_time == 0)
 	  continue;
 	
 	if (difftime(slaac->ping_time, now) <= 0.0)
 	  {
 	    struct ping_packet *ping;
 	    struct sockaddr_in6 addr;
+	    int err;
 	    
 	    save_counter(0);
 	    ping = expand(sizeof(struct ping_packet));
@@ -155,16 +156,22 @@ time_t periodic_slaac(time_t now, struct dhcp_lease *leases)
 	    addr.sin6_port = htons(IPPROTO_ICMPV6);
 	    addr.sin6_addr = slaac->addr;
 	    
-	    send_from(daemon->icmp6fd, 0, daemon->outpacket.iov_base, save_counter(0),
-		      (union mysockaddr *)&addr, (struct all_addr *)&slaac->local, lease->last_interface); 
-	    
-	    slaac->ping_time += (1 << (slaac->backoff - 1)) + (rand16()/21785); /* 0 - 3 */
-	    if (slaac->backoff > 4)
-	      slaac->ping_time += rand16()/4000; /* 0 - 15 */
-	    slaac->backoff++;
+	    if (send_from(daemon->icmp6fd, 0, daemon->outpacket.iov_base, save_counter(0),
+			  (union mysockaddr *)&addr, (struct all_addr *)&slaac->local, 
+			  lease->last_interface, &err)) 
+	      {
+		slaac->ping_time += (1 << (slaac->backoff - 1)) + (rand16()/21785); /* 0 - 3 */
+		if (slaac->backoff > 4)
+		  slaac->ping_time += rand16()/4000; /* 0 - 15 */
+		if (slaac->backoff < 12)
+		  slaac->backoff++;
+	      }
+	    else if (err == EHOSTUNREACH)
+	      slaac->ping_time = 0; /* Give up */
 	  }
 	
-	if (next_event == 0 || difftime(next_event, slaac->ping_time) >= 0.0)
+	if (slaac->ping_time != 0 &&
+	    (next_event == 0 || difftime(next_event, slaac->ping_time) >= 0.0))
 	  next_event = slaac->ping_time;
       }
 

src/tftp.c

@@ -57,7 +57,7 @@ void tftp_request(struct listener *listen, time_t now)
   int mtuflag = IP_PMTUDISC_DONT;
 #endif
   char namebuff[IF_NAMESIZE];
-  char *name;
+  char *name = NULL;
   char *prefix = daemon->tftp_prefix;
   struct tftp_prefix *pref;
   struct interface_list *ir;
@@ -95,9 +95,20 @@ void tftp_request(struct listener *listen, time_t now)
   
   if (option_bool(OPT_NOWILD))
     {
-      addr = listen->iface->addr;
-      mtu = listen->iface->mtu;
-      name = listen->iface->name;
+      if (listen->iface)
+	{
+	  addr = listen->iface->addr;
+	  mtu = listen->iface->mtu;
+	  name = listen->iface->name;
+	}
+      else
+	{
+	  /* we're listening on an address that doesn't appear on an interface,
+	     ask the kernel what the socket is bound to */
+	  socklen_t tcp_len = sizeof(union mysockaddr);
+	  if (getsockname(listen->tftpfd, (struct sockaddr *)&addr, &tcp_len) == -1)
+	    return;
+	}
     }
   else
     {
@@ -211,15 +222,18 @@ void tftp_request(struct listener *listen, time_t now)
 	mtu = ifr.ifr_mtu;      
     }
   
-  /* check for per-interface prefix */ 
-  for (pref = daemon->if_prefix; pref; pref = pref->next)
-    if (strcmp(pref->interface, name) == 0)
-      prefix = pref->prefix;
-
-  /* wierd TFTP interfaces disable special options. */
-  for (ir = daemon->tftp_interfaces; ir; ir = ir->next)
-    if (strcmp(ir->interface, name) == 0)
-      special = 1;
+  if (name)
+    {
+      /* check for per-interface prefix */ 
+      for (pref = daemon->if_prefix; pref; pref = pref->next)
+	if (strcmp(pref->interface, name) == 0)
+	  prefix = pref->prefix;
+      
+      /* wierd TFTP interfaces disable special options. */
+      for (ir = daemon->tftp_interfaces; ir; ir = ir->next)
+	if (strcmp(ir->interface, name) == 0)
+	  special = 1;
+    }
 
   if (listen->family == AF_INET)
     {