Send prefix-class in DHCPREPLY as well as DHCPADVERTISE.

CHANGELOG

@@ -48,8 +48,11 @@ version 2.66
 
 	    Don't erroneously reject some option names in --dhcp-match
 	    options. Thnaks to Benedikt Hochstrasser for the bug report.
+	    
+	    Allow a trailing '*' wildcard in all interface-name
+	    configurations. Thanks to Christian Parpart for the patch.
 
-
+  
 version 2.65
 	    Fix regression which broke forwarding of queries sent via
 	    TCP which are not for A and AAAA and which were directed to

man/dnsmasq.8

@@ -171,7 +171,12 @@ options. IP alias interfaces (eg "eth1:0") cannot be used with
 .B --interface
 or
 .B --except-interface
-options, use --listen-address instead. 
+options, use --listen-address instead. A simple wildcard, consisting
+of a trailing '*', can be used in 
+.B \--interface 
+and
+.B \--except-interface
+options. 
 .TP
 .B \-I, --except-interface=<interface name>
 Do not listen on the specified interface. Note that the order of
@@ -553,7 +558,8 @@ Define a DNS zone for which dnsmasq acts as authoritative server. Locally define
 will be served, except that A and AAAA records must be in one of the
 specified subnets, or in a subnet corresponding to a contructed DHCP
 range. The subnet(s) are also used to define in-addr.arpa and
-ipv6.arpa domains which are served for reverse-DNS queries.
+ipv6.arpa domains which are served for reverse-DNS queries. For IPv4
+subnets, the prefix length is limited to the values 8, 16 or 24.
 .TP
 .B --auth-soa=<serial>[,<hostmaster>[,<refresh>[,<retry>[,<expiry>]]]]
 Specify fields in the SOA record associated with authoritative
@@ -1753,7 +1759,7 @@ we have
 .fi
 
 .nf
-our.zone.com             A    192.0.43.10
+our.zone.com             A    1.2.3.4
 our.zone.com            NS    our.zone.com
 .fi
 
@@ -1766,11 +1772,23 @@ record. If the external address is static, this can be done with an
 .B /etc/hosts 
 entry or 
 .B --host-record.
-If the external address is dynamic,
-then it must be done using something like
 
 .nf
-.B --interface-name=our.zone.com,eth0
+.B auth-server=our.zone.com,eth0
+.B host-record=our.zone.com,1.2.3.4
+.B auth-zone=our.zone.com,1.2.3.0/24
+.fi
+
+If the external address is dynamic, the address
+associated with our.zone.com must be derived from the address of the
+relvant interface. This is done using 
+.B interface-name
+Something like:
+
+.nf
+.B auth-server=our.zone.com,eth0
+.B interface-name=our.zone.com,eth0
+.B auth-zone=our.zone.com,1.2.3.0/24
 .fi
 
 Our final configuration builds on that above, but also adds a

src/dhcp-common.c

@@ -714,8 +714,7 @@ void log_context(int family, struct dhcp_context *context)
       template = p;
       p += sprintf(p, ", ");
        
-      sprintf(p, "template for %s%s", context->template_interface, 
-	      (context->flags & CONTEXT_WILDCARD) ? "*" : "");  
+      sprintf(p, "template for %s", context->template_interface);  
     }
 #endif
      

src/dhcp.c

@@ -252,7 +252,7 @@ void dhcp_packet(time_t now, int pxe_fd)
     }
   
   for (tmp = daemon->dhcp_except; tmp; tmp = tmp->next)
-    if (tmp->name && (strcmp(tmp->name, ifr.ifr_name) == 0))
+    if (tmp->name && wildcard_match(tmp->name, ifr.ifr_name))
       return;
   
   /* unlinked contexts are marked by context->current == context */

src/dhcp6.c

@@ -120,11 +120,11 @@ void dhcp6_packet(time_t now)
     return;
     
   for (tmp = daemon->if_except; tmp; tmp = tmp->next)
-    if (tmp->name && (strcmp(tmp->name, ifr.ifr_name) == 0))
+    if (tmp->name && wildcard_match(tmp->name, ifr.ifr_name))
       return;
 
   for (tmp = daemon->dhcp_except; tmp; tmp = tmp->next)
-    if (tmp->name && (strcmp(tmp->name, ifr.ifr_name) == 0))
+    if (tmp->name && wildcard_match(tmp->name, ifr.ifr_name))
       return;
  
   parm.current = NULL;
@@ -153,7 +153,7 @@ void dhcp6_packet(time_t now)
     {
       
       for (tmp = daemon->if_names; tmp; tmp = tmp->next)
-	if (tmp->name && (strcmp(tmp->name, ifr.ifr_name) == 0))
+	if (tmp->name && wildcard_match(tmp->name, ifr.ifr_name))
 	  break;
 
       if (!tmp && !parm.addr_match)
@@ -371,31 +371,38 @@ struct dhcp_context *address6_valid(struct dhcp_context *context,
   return NULL;
 }
 
-static int is_config_in_context6(struct dhcp_context *context, struct dhcp_config *config)
+int config_valid(struct dhcp_config *config, struct dhcp_context *context, struct in6_addr *addr)
 {
-  /* expand wildcard on contructed contexts */
-  if ((config->flags & CONFIG_WILDCARD) && 
-      (context->flags & CONTEXT_CONSTRUCTED))
+  if (!config || !(config->flags & CONFIG_ADDR6))
+    return 0;
+
+  if ((config->flags & CONFIG_WILDCARD) && context->prefix == 64)
     {
-      u64 addrpart = addr6part(&config->addr6);
-      config->addr6 = context->start6;
-      setaddr6part(&config->addr6, addrpart);
+      *addr = context->start6;
+      setaddr6part(addr, addr6part(&config->addr6));
+      return 1;
+    }
+  
+  if (is_same_net6(&context->start6, &config->addr6, context->prefix))
+    {
+      *addr = config->addr6;
       return 1;
     }
   
-  if (!(config->flags & CONFIG_ADDR6) || is_addr_in_context6(context, &config->addr6))
-    return 1;
-      
   return 0;
 }
 
-
-int is_addr_in_context6(struct dhcp_context *context, struct in6_addr *addr)
+static int is_config_in_context6(struct dhcp_context *context, struct dhcp_config *config)
 {
-  for (; context; context = context->current)
-    if (is_same_net6(addr, &context->start6, context->prefix))
-      return 1;
+  if (!(config->flags & CONFIG_ADDR6) || 
+      (config->flags & CONFIG_WILDCARD))
+
+    return 1;
   
+  for (; context; context = context->current)
+    if (is_same_net6(&config->addr6, &context->start6, context->prefix))
+      return 1;
+      
   return 0;
 }
 
@@ -523,9 +530,7 @@ static int construct_worker(struct in6_addr *local, int prefix,
 	  }
 	
       }
-    else if (addr6part(local) == addr6part(&template->start6) &&
-	     strncmp(template->template_interface, ifrn_name, strlen(template->template_interface)) == 0 &&
-	     (strlen(template->template_interface) == strlen(ifrn_name) || (template->flags & CONTEXT_WILDCARD)))
+    else if (addr6part(local) == addr6part(&template->start6) && wildcard_match(template->template_interface, ifrn_name))
       {
 	start6 = *local;
 	setaddr6part(&start6, addr6part(&template->start6));

src/dnsmasq.h

@@ -721,7 +721,7 @@ struct dhcp_context {
 #define CONTEXT_CONSTRUCTED 2048
 #define CONTEXT_GC          4096
 #define CONTEXT_RA          8192
-#define CONTEXT_WILDCARD   16384
+#define CONTEXT_CONF_USED  16384
 #define CONTEXT_USED       32768
 
 struct ping_result {
@@ -979,6 +979,8 @@ char *print_mac(char *buff, unsigned char *mac, int len);
 void bump_maxfd(int fd, int *max);
 int read_write(int fd, unsigned char *packet, int size, int rw);
 
+int wildcard_match(const char* wildcard, const char* match);
+
 /* log.c */
 void die(char *message, char *arg1, int exit_code);
 int log_start(struct passwd *ent_pw, int errfd);
@@ -1175,7 +1177,7 @@ void dhcp6_init(void);
 void dhcp6_packet(time_t now);
 struct dhcp_context *address6_allocate(struct dhcp_context *context,  unsigned char *clid, int clid_len, 
 				       int iaid, int serial, struct dhcp_netid *netids, int plain_range, struct in6_addr *ans);
-int is_addr_in_context6(struct dhcp_context *context, struct in6_addr *addr);
+int config_valid(struct dhcp_config *config, struct dhcp_context *context, struct in6_addr *addr);
 struct dhcp_context *address6_available(struct dhcp_context *context, 
 					struct in6_addr *taddr,
 					struct dhcp_netid *netids,

src/network.c

@@ -123,7 +123,7 @@ int iface_check(int family, struct all_addr *addr, char *name, int *auth)
       ret = 0;
 
       for (tmp = daemon->if_names; tmp; tmp = tmp->next)
-	if (tmp->name && (strcmp(tmp->name, name) == 0))
+	if (tmp->name && wildcard_match(tmp->name, name))
 	  ret = tmp->used = 1;
 	        
       if (addr)
@@ -143,7 +143,7 @@ int iface_check(int family, struct all_addr *addr, char *name, int *auth)
     }
   
   for (tmp = daemon->if_except; tmp; tmp = tmp->next)
-    if (tmp->name && (strcmp(tmp->name, name) == 0))
+    if (tmp->name && wildcard_match(tmp->name, name))
       ret = 0;
     
 
@@ -291,7 +291,7 @@ static int iface_allowed(struct irec **irecp, int if_index,
     }
   else
     for (tmp = daemon->dhcp_except; tmp; tmp = tmp->next)
-      if (tmp->name && (strcmp(tmp->name, ifr.ifr_name) == 0))
+      if (tmp->name && wildcard_match(tmp->name, ifr.ifr_name))
 	{
 	  tftp_ok = 0;
 	  dhcp_ok = 0;

src/option.c

@@ -2375,11 +2375,6 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
 		  new->flags |= CONTEXT_DHCP; 
 		else if (strstr(a[leasepos], "constructor:") == a[leasepos])
 		  {
-		    if (a[leasepos][strlen(a[leasepos])-1] == '*')
-		      {
-			a[leasepos][strlen(a[leasepos])-1] = 0;
-			new->flags |= CONTEXT_WILDCARD;
-		      }
 		    new->template_interface = opt_string_alloc(a[leasepos] + 12);
 		    new->flags |= CONTEXT_TEMPLATE;
 		  }

src/radv.c

@@ -158,7 +158,7 @@ void icmp6_packet(time_t now)
     return;
   
   for (tmp = daemon->dhcp_except; tmp; tmp = tmp->next)
-    if (tmp->name && (strcmp(tmp->name, interface) == 0))
+    if (tmp->name && wildcard_match(tmp->name, interface))
       return;
  
   if (packet[1] != 0)
@@ -533,7 +533,7 @@ time_t periodic_ra(time_t now)
 	{
 	  struct iname *tmp;
 	  for (tmp = daemon->dhcp_except; tmp; tmp = tmp->next)
-	    if (tmp->name && (strcmp(tmp->name, interface) == 0))
+	    if (tmp->name && wildcard_match(tmp->name, interface))
 	      break;
 	  if (!tmp)
 	    send_ra(now, param.iface, interface, NULL); 

src/rfc3315.c

@@ -52,11 +52,15 @@ static void end_ia(int t1cntr, unsigned int min_time, int do_fuzz);
 static struct prefix_class *prefix_class_from_context(struct dhcp_context *context);
 #endif
 static void mark_context_used(struct state *state, struct dhcp_context *context, struct in6_addr *addr);
+static void mark_config_used(struct dhcp_context *context, struct in6_addr *addr);
+static int check_address(struct state *state, struct in6_addr *addr);
 static void add_address(struct state *state, struct dhcp_context *context, unsigned int lease_time, unsigned int requested_time, 
 			unsigned int *min_time, struct in6_addr *addr, int update_lease, time_t now);
 static void update_leases(struct state *state, struct dhcp_context *context, struct in6_addr *addr, unsigned int lease_time, time_t now);
 static int add_local_addrs(struct dhcp_context *context);
 struct dhcp_netid *add_options(struct state *state, struct in6_addr *fallback, struct dhcp_context *context);
+static void calculate_times(struct dhcp_context *context, unsigned int *min_time, unsigned int *valid_timep, 
+			    unsigned int *preferred_timep, unsigned int lease_time, unsigned int requested_time);
 
 #define opt6_len(opt) ((int)(opt6_uint(opt, -2, 2)))
 #define opt6_type(opt) (opt6_uint(opt, -4, 2))
@@ -212,7 +216,8 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
   unsigned int ignore = 0;
   struct state state;
 #ifdef OPTION6_PREFIX_CLASS
- struct prefix_class *p;
+  struct prefix_class *p;
+  int dump_all_prefix_classes = 0;
 #endif
 
   state.packet_options = inbuff + 4;
@@ -474,21 +479,32 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
 	ignore = 1;
     }
 
-  tagif = state.tags;
-
 #ifdef OPTION6_PREFIX_CLASS
-  /* Add the tags associated with prefix classes so we can use the DHCP ranges.
-     These are removed and added back one-at-time for SOLICITs
-     Neccessary to allow REQUEST or RENEW of addresses ADVERTISED under
-     specific classes. */
-  for (p = daemon->prefix_classes; p ; p = p->next)
+  /* OPTION_PREFIX_CLASS in ORO, send addresses in all prefix classes */
+  if (daemon->prefix_classes && (msg_type == DHCP6SOLICIT || msg_type == DHCP6REQUEST))
     {
-      p->tag.next = tagif;
-      tagif = &p->tag;
-    }	
+      void *oro;
+      
+      if ((oro = opt6_find(state.packet_options, state.end, OPTION6_ORO, 0)))
+	for (i = 0; i <  opt6_len(oro) - 1; i += 2)
+	  if (opt6_uint(oro, i, 2) == OPTION6_PREFIX_CLASS)
+	    {
+	      dump_all_prefix_classes = 1;
+	      break;
+	    }
+      
+      if (msg_type != DHCP6SOLICIT || dump_all_prefix_classes)
+	/* Add the tags associated with prefix classes so we can use the DHCP ranges.
+	   Not done for SOLICIT as we add them  one-at-time. */
+	for (p = daemon->prefix_classes; p ; p = p->next)
+	  {
+	    p->tag.next = state.tags;
+	    state.tags = &p->tag;
+	  }
+    }    
 #endif
 
-  tagif = run_tag_if(tagif);
+  tagif = run_tag_if(state.tags);
   
   /* if all the netids in the ignore list are present, ignore this client */
   if (daemon->dhcp_ignore)
@@ -522,9 +538,10 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
     case DHCP6SOLICIT:
       {
 	void *rapid_commit = opt6_find(state.packet_options, state.end, OPTION6_RAPID_COMMIT, 0);
-      	int used_config = 0, address_assigned = 0;
+      	int address_assigned = 0;
 	/* tags without all prefix-class tags */
-	struct dhcp_netid *solicit_tags = run_tag_if(state.tags);
+	struct dhcp_netid *solicit_tags = tagif;
+	struct dhcp_context *c;
 
 	if (rapid_commit)
 	  {
@@ -535,49 +552,35 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
 	/* set reply message type */
 	*outmsgtypep = rapid_commit ? DHCP6REPLY : DHCP6ADVERTISE;
 
-	log6_packet(&state, "DHCPSOLICIT", NULL, ignore ? "ignored" : NULL);
+	log6_packet(&state, "DHCPSOLICIT", NULL, ignore ? _("ignored") : NULL);
 	
 	if (ignore)
 	  return 0;
 	
 	/* reset USED bits in leases */
 	lease6_reset();
-	
+
+	/* Can use configured address max once per prefix */
+	for (c = context; c; c = c->current)
+	  c->flags &= ~CONTEXT_CONF_USED;
+
 	for (opt = state.packet_options; opt; opt = opt6_next(opt, state.end))
 	  {   
 	    void *ia_option, *ia_end;
 	    unsigned int min_time = 0xffffffff;
 	    int t1cntr;
-	    int config_ok = 0;
 	    int ia_counter;
 	    /* set unless we're sending a particular prefix-class, when we
 	       want only dhcp-ranges with the correct tags set and not those without any tags. */
 	    int plain_range = 1;
-	    struct dhcp_context *c;
 	    u32 lease_time, requested_time;
 	    struct dhcp_lease *ltmp;
 	    struct in6_addr *req_addr;
 	    struct in6_addr addr;
-#ifdef OPTION6_PREFIX_CLASS
-	    int dump_all_prefix_classes = 0;
-#endif
 
 	    if (!check_ia(&state, opt, &ia_end, &ia_option))
 	      continue;
 	    
-	    if (have_config(config, CONFIG_ADDR6))
-	      {
-		struct dhcp_lease *config_lease = lease6_find_by_addr(&config->addr6, 128, 0);
-		
-		config_ok = 1;
-		
-		if (config_lease && 
-		    (config_lease->clid_len != state.clid_len || 
-		     memcmp(config_lease->clid, state.clid, state.clid_len) != 0 ||
-		     config_lease->hwaddr_type != state.iaid))
-		  config_ok = 0; /* configured address leased elsewhere */
-	      }
-	      
 	    /* reset USED bits in contexts - one address per prefix per IAID */
 	    for (c = context; c; c = c->current)
 	      c->flags &= ~CONTEXT_USED;
@@ -585,20 +588,12 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
 #ifdef OPTION6_PREFIX_CLASS
 	    if (daemon->prefix_classes && state.ia_type == OPTION6_IA_NA)
 	      {
-		void *prefix_opt, *oro;
+		void *prefix_opt;
 		int prefix_class;
 		
-		if ((oro = opt6_find(state.packet_options, state.end, OPTION6_ORO, 0)))
-		  for (i = 0; i <  opt6_len(oro) - 1; i += 2)
-		    if (opt6_uint(oro, i, 2) == OPTION6_PREFIX_CLASS)
-		      break;
-		
-		if (oro && (i < opt6_len(oro) - 1))
-		  {
-		    /* OPTION_PREFIX_CLASS in ORO, send addresses in all prefix classes */
-		    plain_range = 0;
-		    dump_all_prefix_classes = 1;
-		  }
+		if (dump_all_prefix_classes)
+		  /* OPTION_PREFIX_CLASS in ORO, send addresses in all prefix classes */
+		  plain_range = 0;
 		else 
 		  { 
 		    if ((prefix_opt = opt6_find(opt6_ptr(opt, 12), ia_end, OPTION6_PREFIX_CLASS, 2)))
@@ -649,33 +644,29 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
 	    for (ia_counter = 0; ia_option; ia_counter++, ia_option = opt6_find(opt6_next(ia_option, ia_end), ia_end, OPTION6_IAADDR, 24))
 	      {
 		req_addr = opt6_ptr(ia_option, 0);
-		ltmp = lease6_find_by_addr(req_addr, 128, 0);
 		requested_time = opt6_uint(ia_option, 16, 4);
-
+		
 		if ((c = address6_valid(context, req_addr, solicit_tags, plain_range)))
 		  {
 		    lease_time = c->lease_time;
 		    /* If the client asks for an address on the same network as a configured address, 
 		       offer the configured address instead, to make moving to newly-configured
 		       addresses automatic. */
-		    if (!used_config && config_ok && is_same_net6(req_addr, &config->addr6, c->prefix))
+		    if (!(c->flags & CONTEXT_CONF_USED) && config_valid(config, c, &addr) && check_address(&state, &addr))
 		      {
-			req_addr = &config->addr6;
-			used_config = 1;
+			req_addr = &addr;
+			mark_config_used(c, &addr);
 			if (have_config(config, CONFIG_TIME))
 			  lease_time = config->lease_time;
 		      }
 		    else if (!(c = address6_available(context, req_addr, solicit_tags, plain_range)))
 		      continue; /* not an address we're allowed */
-		    else if (ltmp && 
-			     (ltmp->clid_len != state.clid_len || 
-			      memcmp(ltmp->clid, state.clid, state.clid_len) != 0 ||
-			      ltmp->hwaddr_type != state.iaid))
+		    else if (!check_address(&state, req_addr))
 		      continue; /* address leased elsewhere */
 		    
 		    /* add address to output packet */
 #ifdef OPTION6_PREFIX_CLASS
-		    if (dump_all_prefix_classes)
+		    if (dump_all_prefix_classes && state.ia_type == OPTION6_IA_NA)
 		      state.send_prefix_class = prefix_class_from_context(c);
 #endif		    
 		    add_address(&state, c, lease_time, requested_time, &min_time, req_addr, rapid_commit != NULL, now);
@@ -685,23 +676,29 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
 		  }
 	      }
 	    
-	    /* Suggest configured address */
-	    if (!used_config && config_ok && (c = address6_valid(context, &config->addr6, solicit_tags, plain_range)))
-	      {
-		used_config = 1;
-		if (have_config(config, CONFIG_TIME))
-		  lease_time = config->lease_time;
-		/* add address to output packet */
+	    /* Suggest configured address(es) */
+	    for (c = context; c; c = c->current) 
+	      if (!(c->flags & CONTEXT_CONF_USED) &&
+		  match_netid(c->filter, solicit_tags, plain_range) &&
+		  config_valid(config, c, &addr) && 
+		  check_address(&state, &addr))
+		{
+		  mark_config_used(context, &addr);
+		  if (have_config(config, CONFIG_TIME))
+		    lease_time = config->lease_time;
+		  else
+		    lease_time = c->lease_time;
+		  /* add address to output packet */
 #ifdef OPTION6_PREFIX_CLASS
-		if (dump_all_prefix_classes)
-		  state.send_prefix_class = prefix_class_from_context(c);
+		  if (dump_all_prefix_classes && state.ia_type == OPTION6_IA_NA)
+		    state.send_prefix_class = prefix_class_from_context(c);
 #endif
-		add_address(&state, c, lease_time, requested_time, &min_time, &config->addr6, rapid_commit != NULL, now);
-		mark_context_used(&state, context, &config->addr6);
-		get_context_tag(&state, c);
-		address_assigned = 1;
-	      }
-
+		  add_address(&state, c, lease_time, requested_time, &min_time, &addr, rapid_commit != NULL, now);
+		  mark_context_used(&state, context, &addr);
+		  get_context_tag(&state, c);
+		  address_assigned = 1;
+		}
+	    
 	    /* return addresses for existing leases */
 	    ltmp = NULL;
 	    while ((ltmp = lease6_find_by_client(ltmp, state.ia_type == OPTION6_IA_NA ? LEASE_NA : LEASE_TA, state.clid, state.clid_len, state.iaid)))
@@ -710,7 +707,7 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
 		if ((c = address6_available(context, req_addr, solicit_tags, plain_range)))
 		  {
 #ifdef OPTION6_PREFIX_CLASS
-		    if (dump_all_prefix_classes)
+		    if (dump_all_prefix_classes && state.ia_type == OPTION6_IA_NA)
 		      state.send_prefix_class = prefix_class_from_context(c);
 #endif
 		    add_address(&state, c, c->lease_time, c->lease_time, &min_time, req_addr, rapid_commit != NULL, now);
@@ -724,7 +721,7 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
 	    while ((c = address6_allocate(context, state.clid, state.clid_len, state.iaid, ia_counter, solicit_tags, plain_range, &addr)))
 	      {
 #ifdef OPTION6_PREFIX_CLASS
-		if (dump_all_prefix_classes)
+		if (dump_all_prefix_classes && state.ia_type == OPTION6_IA_NA)
 		  state.send_prefix_class = prefix_class_from_context(c);
 #endif
 		add_address(&state, c, c->lease_time, c->lease_time, &min_time, &addr, rapid_commit != NULL, now);
@@ -741,7 +738,7 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
 	  {
 	    o1 = new_opt6(OPTION6_STATUS_CODE);
 	    put_opt6_short(DHCP6SUCCESS);
-	    put_opt6_string("Oh hai from dnsmasq");
+	    put_opt6_string(_("success"));
 	    end_opt6(o1);
 	    
 	    /* If --dhcp-authoritative is set, we can tell client not to wait for
@@ -756,9 +753,9 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
 	    /* no address, return error */
 	    o1 = new_opt6(OPTION6_STATUS_CODE);
 	    put_opt6_short(DHCP6NOADDRS);
-	    put_opt6_string("No addresses available");
+	    put_opt6_string(_("no addresses available"));
 	    end_opt6(o1);
-	    log6_packet(&state, "DHCPADVERTISE", NULL, _("No addresses available"));
+	    log6_packet(&state, "DHCPADVERTISE", NULL, _("no addresses available"));
 	  }
 
 	break;
@@ -771,7 +768,7 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
 	/* set reply message type */
 	*outmsgtypep = DHCP6REPLY;
 
-	log6_packet(&state, "DHCPREQUEST", NULL, ignore ? "ignored" : NULL);
+	log6_packet(&state, "DHCPREQUEST", NULL, ignore ? _("ignored") : NULL);
 	
 	if (ignore)
 	  return 0;
@@ -793,24 +790,28 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
 		u32 requested_time = opt6_uint(ia_option, 16, 4);
 		struct dhcp_context *dynamic, *c;
 		unsigned int lease_time;
-	
-		if ((dynamic = address6_available(context, req_addr, tagif, 1)) || (c = address6_valid(context, req_addr, tagif, 1)))
+		struct in6_addr addr;
+		int config_ok = 0;
+		
+		if ((c = address6_valid(context, req_addr, tagif, 1)))
+		  config_ok = config_valid(config, c, &addr) && IN6_ARE_ADDR_EQUAL(&addr, req_addr);
+		
+		if ((dynamic = address6_available(context, req_addr, tagif, 1)) || c)
 		  {
-		    if (!dynamic && !(have_config(config, CONFIG_ADDR6) || !IN6_ARE_ADDR_EQUAL(&config->addr6, req_addr)))
+		    if (!dynamic && !config_ok)
 		      {
 			/* Static range, not configured. */
 			o1 = new_opt6(OPTION6_STATUS_CODE);
 			put_opt6_short(DHCP6UNSPEC);
-			put_opt6_string("Address unavailable");
+			put_opt6_string(_("address unavailable"));
 			end_opt6(o1);
 		      }
-		    else if (lease6_find_by_addr(req_addr, 128, 0) &&
-			     !lease6_find(state.clid, state.clid_len, state.ia_type == OPTION6_IA_NA ? LEASE_NA : LEASE_TA, state.iaid, req_addr))
+		    else if (!check_address(&state, req_addr))
 		      {
 			/* Address leased to another DUID/IAID */
 			o1 = new_opt6(OPTION6_STATUS_CODE);
 			put_opt6_short(DHCP6UNSPEC);
-			put_opt6_string("Address in use");
+			put_opt6_string(_("address in use"));
 			end_opt6(o1);
 		      } 
 		    else 
@@ -820,22 +821,24 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
 
 			lease_time = dynamic->lease_time;
 			
-			if (have_config(config, CONFIG_ADDR6) && 
-			    IN6_ARE_ADDR_EQUAL(&config->addr6, req_addr) &&
-			    have_config(config, CONFIG_TIME))
+			if (config_ok && have_config(config, CONFIG_TIME))
 			  lease_time = config->lease_time;
 
+#ifdef OPTION6_PREFIX_CLASS
+			if (dump_all_prefix_classes && state.ia_type == OPTION6_IA_NA)
+			  state.send_prefix_class = prefix_class_from_context(c);
+#endif
 			add_address(&state, dynamic, lease_time, requested_time, &min_time, req_addr, 1, now);
 			get_context_tag(&state, dynamic);
 			address_assigned = 1;
 		      }
 		  }
-		else if (msg_type == DHCP6REQUEST)
+		else 
 		  {
 		    /* requested address not on the correct link */
 		    o1 = new_opt6(OPTION6_STATUS_CODE);
 		    put_opt6_short(DHCP6NOTONLINK);
-		    put_opt6_string("Not on link");
+		    put_opt6_string(_("not on link"));
 		    end_opt6(o1);
 		  }
 	      }
@@ -848,7 +851,7 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
 	  {
 	    o1 = new_opt6(OPTION6_STATUS_CODE);
 	    put_opt6_short(DHCP6SUCCESS);
-	    put_opt6_string("Oh hai from dnsmasq");
+	    put_opt6_string(_("success"));
 	    end_opt6(o1);
 	  }
 	else
@@ -856,9 +859,9 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
 	    /* no address, return error */
 	    o1 = new_opt6(OPTION6_STATUS_CODE);
 	    put_opt6_short(DHCP6NOADDRS);
-	    put_opt6_string("No addresses available");
+	    put_opt6_string(_("no addresses available"));
 	    end_opt6(o1);
-	    log6_packet(&state, "DHCPREPLY", NULL, _("No addresses available"));
+	    log6_packet(&state, "DHCPREPLY", NULL, _("no addresses available"));
 	  }
 
 	tagif = add_options(&state, fallback, context);
@@ -890,14 +893,11 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
 		struct dhcp_lease *lease = NULL;
 		struct in6_addr *req_addr = opt6_ptr(ia_option, 0);
 		u32 requested_time = opt6_uint(ia_option, 16, 4);
-		unsigned int lease_time;
+		unsigned int preferred_time = 0; /* in case renewal inappropriate */
+		unsigned int valid_time = 0;
+		char *message = NULL;
 		struct dhcp_context *this_context;
-		struct dhcp_config *valid_config = config;
 		
-		/* don't use a config to set lease time if it specifies an address which isn't this. */
-		if (have_config(config, CONFIG_ADDR6) && !IN6_ARE_ADDR_EQUAL(&config->addr6, req_addr))
-		  valid_config = NULL;
-
 		if (!(lease = lease6_find(state.clid, state.clid_len,
 					  state.ia_type == OPTION6_IA_NA ? LEASE_NA : LEASE_TA, 
 					  state.iaid, req_addr)))
@@ -908,11 +908,11 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
 		    save_counter(iacntr);
 		    t1cntr = 0;
 		    
-		    log6_packet(&state, "DHCPREPLY", req_addr, "lease not found");
+		    log6_packet(&state, "DHCPREPLY", req_addr, _("lease not found"));
 		    
 		    o1 = new_opt6(OPTION6_STATUS_CODE);
 		    put_opt6_short(DHCP6NOBINDING);
-		    put_opt6_string("No binding found");
+		    put_opt6_string(_("no binding found"));
 		    end_opt6(o1);
 		    break;
 		  }
@@ -921,35 +921,41 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
 		if ((this_context = address6_available(context, req_addr, tagif, 1)) ||
 		    (this_context = address6_valid(context, req_addr, tagif, 1)))
 		  {
+		    struct in6_addr addr;
+		    unsigned int lease_time;
+
 		    get_context_tag(&state, this_context);
 		    
-		    lease_time = have_config(valid_config, CONFIG_TIME) ? valid_config->lease_time : this_context->lease_time;
+		    if (config_valid(config, this_context, &addr) && IN6_ARE_ADDR_EQUAL(&addr, req_addr) && have_config(config, CONFIG_TIME))
+		      lease_time = config->lease_time;
+		    else 
+		      lease_time = this_context->lease_time;
 		    
-		    if (requested_time < 120u )
-		      requested_time = 120u; /* sanity */
-		    if (lease_time == 0xffffffff || (requested_time != 0xffffffff && requested_time < lease_time))
-		      lease_time = requested_time;
+		    calculate_times(this_context, &min_time, &valid_time, &preferred_time, lease_time, requested_time); 
 		    
-		    lease_set_expires(lease, lease_time, now);
+		    lease_set_expires(lease, valid_time, now);
 		    if (state.ia_type == OPTION6_IA_NA && state.hostname)
 		      {
 			char *addr_domain = get_domain6(req_addr);
 			if (!state.send_domain)
 			  state.send_domain = addr_domain;
-			lease_set_hostname(lease, state.hostname, state.hostname_auth, addr_domain, state.domain);
+			lease_set_hostname(lease, state.hostname, state.hostname_auth, addr_domain, state.domain); 
+			message = state.hostname;
 		      }
 		    
-		    if (lease_time < min_time)
-		      min_time = lease_time;
+		    
+		    if (preferred_time == 0)
+		      message = _("deprecated");
 		  }
+		else
+		  message = _("address invalid");
 		
-		log6_packet(&state, "DHCPREPLY", req_addr, state.hostname);	
+		log6_packet(&state, "DHCPREPLY", req_addr, message);	
 		
 		o1 =  new_opt6(OPTION6_IAADDR);
 		put_opt6(req_addr, sizeof(*req_addr));
-		/* preferred lifetime */
-		put_opt6_long(!this_context || (this_context->flags & CONTEXT_DEPRECATE) ? 0 : lease_time);
-		put_opt6_long(!this_context ?  0 : lease_time); /* valid lifetime */
+		put_opt6_long(preferred_time);
+		put_opt6_long(valid_time);
 		end_opt6(o1);
 	      }
 	    
@@ -983,7 +989,7 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
 		  {
 		    o1 = new_opt6(OPTION6_STATUS_CODE);
 		    put_opt6_short(DHCP6NOTONLINK);
-		    put_opt6_string("Confirm failed");
+		    put_opt6_string(_("confirm failed"));
 		    end_opt6(o1);
 		    return 1;
 		  }
@@ -994,7 +1000,7 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
 
 	o1 = new_opt6(OPTION6_STATUS_CODE);
 	put_opt6_short(DHCP6SUCCESS );
-	put_opt6_string("All addresses still on link");
+	put_opt6_string(_("all addresses still on link"));
 	end_opt6(o1);
 	break;
     }
@@ -1008,7 +1014,7 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
 	    context->netid.next = NULL;
 	    state.context_tags =  &context->netid;
 	  }
-	log6_packet(&state, "DHCPINFORMATION-REQUEST", NULL, ignore ? "ignored" : state.hostname);
+	log6_packet(&state, "DHCPINFORMATION-REQUEST", NULL, ignore ? _("ignored") : state.hostname);
 	if (ignore)
 	  return 0;
 	*outmsgtypep = DHCP6REPLY;
@@ -1064,7 +1070,7 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
 	      {
 		o1 = new_opt6(OPTION6_STATUS_CODE);
 		put_opt6_short(DHCP6NOBINDING);
-		put_opt6_string("No binding found");
+		put_opt6_string(_("no binding found"));
 		end_opt6(o1);
 		
 		end_opt6(o);
@@ -1073,7 +1079,7 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
 	
 	o1 = new_opt6(OPTION6_STATUS_CODE);
 	put_opt6_short(DHCP6SUCCESS);
-	put_opt6_string("Release received");
+	put_opt6_string(_("release received"));
 	end_opt6(o1);
 	
 	break;
@@ -1141,7 +1147,7 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
 	      {
 		o1 = new_opt6(OPTION6_STATUS_CODE);
 		put_opt6_short(DHCP6NOBINDING);
-		put_opt6_string("No binding found");
+		put_opt6_string(_("no binding found"));
 		end_opt6(o1);
 		
 		end_opt6(o);
@@ -1459,24 +1465,16 @@ static void end_ia(int t1cntr, unsigned int min_time, int do_fuzz)
 static void add_address(struct state *state, struct dhcp_context *context, unsigned int lease_time, unsigned int requested_time, 
 			unsigned int *min_time, struct in6_addr *addr, int do_update, time_t now)
 {
-  unsigned int valid_time = (context->valid < lease_time) ? context->valid : lease_time;
+  unsigned int valid_time, preferred_time;
   int o = new_opt6(OPTION6_IAADDR);
   struct dhcp_lease *lease;
 
+  calculate_times(context, min_time, &valid_time, &preferred_time, lease_time, requested_time); 
+  
   put_opt6(addr, sizeof(*addr));
+  put_opt6_long(preferred_time);
+  put_opt6_long(valid_time); 		    
   
-  /* preferred lifetime */
-  if (requested_time < 120u )
-    requested_time = 120u; /* sanity */
-  if (lease_time == 0xffffffff || (requested_time != 0xffffffff && requested_time < lease_time))
-    lease_time = requested_time;
- 	
-  if (lease_time < *min_time)
-    *min_time = lease_time;
-
-  put_opt6_long((context->preferred < lease_time) ? context->preferred : lease_time);
-  put_opt6_long(valid_time); /* valid lifetime */		    
- 
 #ifdef OPTION6_PREFIX_CLASS
   if (state->send_prefix_class)
     {
@@ -1532,6 +1530,55 @@ static void mark_context_used(struct state *state, struct dhcp_context *context,
 #endif
 }
 
+static void mark_config_used(struct dhcp_context *context, struct in6_addr *addr)
+{
+  for (; context; context = context->current)
+    if (is_same_net6(addr, &context->start6, context->prefix))
+      context->flags |= CONTEXT_CONF_USED;
+}
+
+/* make sure address not leased to another CLID/IAID */
+static int check_address(struct state *state, struct in6_addr *addr)
+{ 
+  struct dhcp_lease *lease;
+
+  if (!(lease = lease6_find_by_addr(addr, 128, 0)))
+    return 1;
+
+  if (lease->clid_len != state->clid_len || 
+      memcmp(lease->clid, state->clid, state->clid_len) != 0 ||
+      lease->hwaddr_type != state->iaid)
+    return 0;
+
+  return 1;
+}
+
+static void calculate_times(struct dhcp_context *context, unsigned int *min_time, unsigned int *valid_timep, 
+			    unsigned int *preferred_timep, unsigned int lease_time, unsigned int requested_time)
+{
+  unsigned int preferred_time, valid_time;
+
+  if (requested_time < 120u )
+    requested_time = 120u; /* sanity */
+  if (lease_time == 0xffffffff || (requested_time != 0xffffffff && requested_time < lease_time))
+    lease_time = requested_time;
+		    
+  valid_time = (context->valid < lease_time) ? context->valid : lease_time;
+  preferred_time = (context->preferred < lease_time) ? context->preferred : lease_time;
+
+  if (context->flags & CONTEXT_DEPRECATE)
+    preferred_time = 0;
+
+  if (preferred_time != 0 && preferred_time < *min_time)
+    *min_time = preferred_time;
+  
+  if (valid_time != 0 && valid_time < *min_time)
+    *min_time = valid_time;
+  
+  *valid_timep = valid_time;
+  *preferred_timep = preferred_time;
+}
+
 static void update_leases(struct state *state, struct dhcp_context *context, struct in6_addr *addr, unsigned int lease_time, time_t now)
 {
   struct dhcp_lease *lease = lease6_find_by_addr(addr, 128, 0);

src/tftp.c

@@ -209,7 +209,7 @@ void tftp_request(struct listener *listen, time_t now)
 #ifdef HAVE_DHCP      
       /* allowed interfaces are the same as for DHCP */
       for (tmp = daemon->dhcp_except; tmp; tmp = tmp->next)
-	if (tmp->name && (strcmp(tmp->name, name) == 0))
+	if (tmp->name && wildcard_match(tmp->name, name))
 	  return;
 #endif
       

src/util.c

@@ -581,3 +581,20 @@ int read_write(int fd, unsigned char *packet, int size, int rw)
   return 1;
 }
 
+/* Basically match a string value against a wildcard pattern.  */
+int wildcard_match(const char* wildcard, const char* match)
+{
+  while (*wildcard && *match)
+    {
+      if (*wildcard == '*')
+        return 1;
+
+      if (*wildcard != *match)
+        return 0; 
+
+      ++wildcard;
+      ++match;
+    }
+
+  return *wildcard == *match;
+}