It compiles and it allocates a lease! No renewals yet.

src/dhcp6.c

@@ -24,10 +24,10 @@ struct iface_param {
 };
 
 static int join_multicast(struct in6_addr *local, int prefix, 
-			  int scope, int if_index, void *vparam);
+			  int scope, int if_index, int dad, void *vparam);
 
 static int complete_context6(struct in6_addr *local,  int prefix,
-			     int scope, int if_index, void *vparam);
+			     int scope, int if_index, int dad, void *vparam);
 
 void dhcp6_init(void)
 {
@@ -58,10 +58,15 @@ void dhcp6_init(void)
   
   daemon->dhcp6fd = fd;
   
+  /* If we've already inited DHCPv4, this becomes a no-op,
+     othewise sizeof(struct dhcp_packet) is as good an initial
+     size as any. */
+  expand_buf(&daemon->dhcp_packet, sizeof(struct dhcp_packet));
+  expand_buf(&daemon->outpacket, sizeof(struct dhcp_packet));
 }
 
 static int join_multicast(struct in6_addr *local, int prefix, 
-			  int scope, int if_index, void *vparam)
+			  int scope, int if_index, int dad, void *vparam)
 {
   char ifrn_name[IFNAMSIZ];
   struct ipv6_mreq mreq;
@@ -71,7 +76,10 @@ static int join_multicast(struct in6_addr *local, int prefix,
   struct iname *tmp;
 
   (void)prefix;
-  (void)scope; /* warnings */
+  
+  /* scope == link */
+  if (scope != 253)
+    return 1;
 
   if (!indextoname(fd, if_index, ifrn_name))
     return 0;
@@ -85,7 +93,7 @@ static int join_multicast(struct in6_addr *local, int prefix,
       return 1;
 
   /* weird libvirt-inspired access control */
-  for (context = daemon->dhcp; context; context = context->next)
+  for (context = daemon->dhcp6; context; context = context->next)
     if (!context->interface || strcmp(context->interface, ifrn_name) == 0)
       break;
 
@@ -93,14 +101,14 @@ static int join_multicast(struct in6_addr *local, int prefix,
     return 1;
 
   mreq.ipv6mr_interface = if_index;
-  inet_pton(AF_INET6, ALL_RELAY_AGENTS_AND_SERVERS, &maddr);
+  inet_pton(AF_INET6, ALL_RELAY_AGENTS_AND_SERVERS, &mreq.ipv6mr_multiaddr);
   
-  if (!setsockopt(fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, &mreq, sizeof(mreq)) == -1)
+  if (setsockopt(fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, &mreq, sizeof(mreq)) == -1)
     return 0;
 
-  inet_pton(AF_INET6, ALL_SERVERS, &maddr);
+  inet_pton(AF_INET6, ALL_SERVERS, &mreq.ipv6mr_multiaddr);
   
-  if (!setsockopt(fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, &mreq, sizeof(mreq)) == -1)
+  if (setsockopt(fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, &mreq, sizeof(mreq)) == -1)
     return 0;
   
   return 1;
@@ -135,7 +143,7 @@ void dhcp6_packet(time_t now)
   msg.msg_iov =  &daemon->dhcp_packet;
   msg.msg_iovlen = 1;
   
-  if ((sz = recv_dhcp_packet(daemon->dhcp6fd, &msg) == -1) || sz <= 4)
+  if ((sz = recv_dhcp_packet(daemon->dhcp6fd, &msg)) == -1 || sz <= 4)
     return;
   
   for (cmptr = CMSG_FIRSTHDR(&msg); cmptr; cmptr = CMSG_NXTHDR(&msg, cmptr))
@@ -153,7 +161,7 @@ void dhcp6_packet(time_t now)
 
   if (!indextoname(daemon->dhcp6fd, if_index, ifr.ifr_name))
     return;
-ls -l    
+    
   if (!iface_check(AF_INET6, (struct all_addr *)&dest, ifr.ifr_name))
     return;
   
@@ -162,7 +170,7 @@ ls -l
       return;
  
   /* weird libvirt-inspired access control */
-  for (context = daemon->dhcp; context; context = context->next)
+  for (context = daemon->dhcp6; context; context = context->next)
     if (!context->interface || strcmp(context->interface, ifr.ifr_name) == 0)
       break;
   
@@ -170,7 +178,7 @@ ls -l
     return;
   
   /* unlinked contexts are marked by context->current == context */
-  for (context = daemon->dhcp; context; context = context->next)
+  for (context = daemon->dhcp6; context; context = context->next)
     context->current = context;
   
   parm.current = NULL;
@@ -182,7 +190,7 @@ ls -l
   lease_prune(NULL, now); /* lose any expired leases */
 
   msg.msg_iov =  &daemon->dhcp_packet;
-  sz = dhcp6_reply(parm.current, sz);
+  sz = dhcp6_reply(parm.current, sz, now);
   /* ifr.ifr_name, if_index, (size_t)sz, 
      now, unicast_dest, &is_inform, pxe_fd, iface_addr); */
   lease_update_file(now);
@@ -193,15 +201,15 @@ ls -l
 }
 
 static int complete_context6(struct in6_addr *local,  int prefix,
-			     int scope, int if_index, void *vparam)
+			     int scope, int if_index, int dad, void *vparam)
 {
   struct dhcp_context *context;
   struct iface_param *param = vparam;
-  
+  (void)scope; /* warning */
+
   for (context = daemon->dhcp6; context; context = context->next)
     {
-      if ((context->flags & CONTEXT_IPV6) &&
-	  prefix == context->prefix &&
+      if (prefix == context->prefix &&
 	  is_same_net6(local, &context->start6, prefix) &&
           is_same_net6(local, &context->end6, prefix))
         {
@@ -215,6 +223,141 @@ static int complete_context6(struct in6_addr *local,  int prefix,
     }          
   return 1;
 }
+
+struct dhcp_config *config_find_by_address6(struct dhcp_config *configs, struct in6_addr *net, int prefix, u64 addr)
+{
+  struct dhcp_config *config;
+  
+  for (config = configs; config; config = config->next)
+    if ((config->flags & CONFIG_ADDR6) &&
+	is_same_net6(&config->addr6, net, prefix) &&
+	(prefix == 128 || addr6part(&config->addr6) == addr))
+      return config;
+  
+  return NULL;
+}
+
+int address6_allocate(struct dhcp_context *context,  unsigned char *clid, int clid_len, 
+		      struct dhcp_netid *netids, struct in6_addr *ans)   
+{
+  /* Find a free address: exclude anything in use and anything allocated to
+     a particular hwaddr/clientid/hostname in our configuration.
+     Try to return from contexts which match netids first. 
+     
+     Note that we assume the address prefix lengths are 64 or greater, so we can
+     get by with 64 bit arithmetic.
+*/
+
+  u64 start, addr;
+  struct dhcp_context *c, *d;
+  int i, pass;
+  u64 j; 
+
+  /* hash hwaddr: use the SDBM hashing algorithm.  This works
+     for MAC addresses, let's see how it manages with client-ids! */
+  for (j = 0, i = 0; i < clid_len; i++)
+    j += clid[i] + (j << 6) + (j << 16) - j;
+  
+  for (pass = 0; pass <= 1; pass++)
+    for (c = context; c; c = c->current)
+      if (c->flags & (CONTEXT_STATIC | CONTEXT_PROXY))
+	continue;
+      else if (!match_netid(c->filter, netids, pass))
+	continue;
+      else
+	{
+	  start = addr6part(&c->start6) + ((j + c->addr_epoch) % (1 + addr6part(&c->end6) - addr6part(&c->start6)));
+
+	  /* iterate until we find a free address. */
+	  addr = start;
+	  
+	  do {
+	    /* eliminate addresses in use by the server. */
+	    for (d = context; d; d = d->current)
+	      if (addr == addr6part(&d->router6))
+		break;
+
+	    if (!d &&
+		!lease6_find_by_addr(&c->start6, c->prefix, addr) && 
+		!config_find_by_address6(daemon->dhcp_conf, &c->start6, c->prefix, addr))
+	      {
+		*ans = c->start6;
+		setaddr6part (ans, addr);
+		return 1;
+	      }
+	
+	    addr++;
+	    
+	    if (addr  == addr6part(&c->end6) + 1)
+	      addr = addr6part(&c->start6);
+	    
+	  } while (addr != start);
+	}
+  
+  return 0;
+}
+
+struct dhcp_context *address6_available(struct dhcp_context *context, 
+					struct in6_addr *taddr,
+					struct dhcp_netid *netids)
+{
+  u64 start, end, addr = addr6part(taddr);
+  struct dhcp_context *tmp;
+ 
+  for (tmp = context; tmp; tmp = tmp->current)
+    {
+      start = addr6part(&tmp->start6);
+      end = addr6part(&tmp->end6);
+
+      if (!(tmp->flags & (CONTEXT_STATIC | CONTEXT_PROXY)) &&
+          is_same_net6(&context->start6, taddr, context->prefix) &&
+	  is_same_net6(&context->end6, taddr, context->prefix) &&
+	  addr >= start &&
+          addr <= end &&
+          match_netid(tmp->filter, netids, 1))
+        return tmp;
+    }
+
+  return NULL;
+}
+
+struct dhcp_context *narrow_context6(struct dhcp_context *context, 
+				     struct in6_addr *taddr,
+				     struct dhcp_netid *netids)
+{
+  /* We start of with a set of possible contexts, all on the current physical interface.
+     These are chained on ->current.
+     Here we have an address, and return the actual context correponding to that
+     address. Note that none may fit, if the address came a dhcp-host and is outside
+     any dhcp-range. In that case we return a static range if possible, or failing that,
+     any context on the correct subnet. (If there's more than one, this is a dodgy 
+     configuration: maybe there should be a warning.) */
+  
+  struct dhcp_context *tmp;
+
+  if (!(tmp = address6_available(context, taddr, netids)))
+    {
+      for (tmp = context; tmp; tmp = tmp->current)
+        if (match_netid(tmp->filter, netids, 1) &&
+            is_same_net6(taddr, &tmp->start6, tmp->prefix) && 
+            (tmp->flags & CONTEXT_STATIC))
+          break;
+      
+      if (!tmp)
+        for (tmp = context; tmp; tmp = tmp->current)
+          if (match_netid(tmp->filter, netids, 1) &&
+              is_same_net6(taddr, &tmp->start6, tmp->prefix) &&
+              !(tmp->flags & CONTEXT_PROXY))
+            break;
+    }
+  
+  /* Only one context allowed now */
+  if (tmp)
+    tmp->current = NULL;
+  
+  return tmp;
+}
+
 #endif