From 989461c95c82ac183eb3b01d2636b54e0731568f Mon Sep 17 00:00:00 2001

From: Tomas Hozza <thozza@redhat.com>

Date: Thu, 19 Feb 2015 17:37:52 +0100

Subject: [PATCH] Support IPv6 assignment based on MAC for DHCPv6

Support added to --dhcp-host and --dhcp-mac

Signed-off-by: Tomas Hozza <thozza@redhat.com>

---

 man/dnsmasq.8        |  15 ++++---

 src/dhcp-common.c    | 104 ++++++++++++++++++++++++++++++++++++++++++

 src/dhcp.c           |  83 ----------------------------------

 src/dhcp6-protocol.h |   1 +

 src/dhcp6.c          | 124 +++++++++++++++++++++++++++++++++------------------

 src/dnsmasq.c        |   2 +-

 src/dnsmasq.h        |  28 ++++++------

 src/helper.c         |  69 ++++++++++++++--------------

 src/lease.c          |  60 +++++++++++++++----------

 src/option.c         |   1 +

 src/radv-protocol.h  |   7 +++

 src/radv.c           |  14 +++---

 src/rfc3315.c        | 104 ++++++++++++++++++++++++++++++++----------

 13 files changed, 376 insertions(+), 236 deletions(-)

diff --git a/man/dnsmasq.8 b/man/dnsmasq.8

index 045dee5..d0eb895 100644

--- a/man/dnsmasq.8

+++ b/man/dnsmasq.8

@@ -733,7 +733,8 @@ the same subnet as some valid dhcp-range.  For

 subnets which don't need a pool of dynamically allocated addresses,

 use the "static" keyword in the dhcp-range declaration.

-It is allowed to use client identifiers rather than

+It is allowed to use client identifiers (called client

+DUID in IPv6-land rather than

 hardware addresses to identify hosts by prefixing with 'id:'. Thus: 

 .B --dhcp-host=id:01:02:03:04,..... 

 refers to the host with client identifier 01:02:03:04. It is also

@@ -748,11 +749,11 @@ IPv6 addresses may contain only the host-identifier part:

 .B --dhcp-host=laptop,[::56]

 in which case they act as wildcards in constructed dhcp ranges, with

 the appropriate network part inserted. 

-Note that in IPv6 DHCP, the hardware address is not normally

-available, so a client must be identified by client-id (called client

-DUID in IPv6-land) or hostname. 

+Note that in IPv6 DHCP, the hardware address may not be

+available, though it normally is for direct-connected clients, or

+clients using DHCP relays which support RFC 6939.

-The special option id:* means "ignore any client-id 

+For DHCPv4, the  special option id:* means "ignore any client-id

 and use MAC addresses only." This is useful when a client presents a client-id sometimes 

 but not others.

@@ -968,7 +969,7 @@ this to set a different printer server for hosts in the class

 "accounts" than for hosts in the class "engineering".

 .TP

 .B \-4, --dhcp-mac=set:<tag>,<MAC address>

-(IPv4 only) Map from a MAC address to a tag. The MAC address may include

+Map from a MAC address to a tag. The MAC address may include

 wildcards. For example

 .B --dhcp-mac=set:3com,01:34:23:*:*:*

 will set the tag "3com" for any host whose MAC address matches the pattern.

@@ -1274,7 +1275,7 @@ every call to the script.

 DNSMASQ_IAID containing the IAID for the lease. If the lease is a

 temporary allocation, this is prefixed to 'T'.

-

+DNSMASQ_MAC containing the MAC address of the client, if known.

 Note that the supplied hostname, vendorclass and userclass data is

 only  supplied for

diff --git a/src/dhcp-common.c b/src/dhcp-common.c

index 9321e92..242bd72 100644

--- a/src/dhcp-common.c

+++ b/src/dhcp-common.c

@@ -253,6 +253,110 @@ int match_bytes(struct dhcp_opt *o, unsigned char *p, int len)

   return 0;

 }

+int config_has_mac(struct dhcp_config *config, unsigned char *hwaddr, int len, int type)

+{

+  struct hwaddr_config *conf_addr;

+  

+  for (conf_addr = config->hwaddr; conf_addr; conf_addr = conf_addr->next)

+    if (conf_addr->wildcard_mask == 0 &&

+	conf_addr->hwaddr_len == len &&

+	(conf_addr->hwaddr_type == type || conf_addr->hwaddr_type == 0) &&

+	memcmp(conf_addr->hwaddr, hwaddr, len) == 0)

+      return 1;

+  

+  return 0;

+}

+

+static int is_config_in_context(struct dhcp_context *context, struct dhcp_config *config)

+{

+  if (!context) /* called via find_config() from lease_update_from_configs() */

+    return 1; 

+

+  if (!(context->flags & CONTEXT_V6))

+    {

+      if (!(config->flags & CONFIG_ADDR))

+	return 1;

+

+      for (; context; context = context->current)

+	if (is_same_net(config->addr, context->start, context->netmask))

+	  return 1;

+    }

+#ifdef HAVE_DHCP6

+  else 

+    {

+      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;

+    }

+#endif

+  

+  return 0;

+}

+

+struct dhcp_config *find_config(struct dhcp_config *configs,

+				struct dhcp_context *context,

+				unsigned char *clid, int clid_len,

+				unsigned char *hwaddr, int hw_len, 

+				int hw_type, char *hostname)

+{

+  int count, new;

+  struct dhcp_config *config, *candidate; 

+  struct hwaddr_config *conf_addr;

+

+  if (clid)

+    for (config = configs; config; config = config->next)

+      if (config->flags & CONFIG_CLID)

+	{

+	  if (config->clid_len == clid_len && 

+	      memcmp(config->clid, clid, clid_len) == 0 &&

+	      is_config_in_context(context, config))

+	    return config;

+	  

+	  /* dhcpcd prefixes ASCII client IDs by zero which is wrong, but we try and

+	     cope with that here */

+	  if (!(context->flags & CONTEXT_V6) && *clid == 0 && config->clid_len == clid_len-1  &&

+	      memcmp(config->clid, clid+1, clid_len-1) == 0 &&

+	      is_config_in_context(context, config))

+	    return config;

+	}

+  

+

+  if (hwaddr)

+    for (config = configs; config; config = config->next)

+      if (config_has_mac(config, hwaddr, hw_len, hw_type) &&

+	  is_config_in_context(context, config))

+	return config;

+  

+  if (hostname && context)

+    for (config = configs; config; config = config->next)

+      if ((config->flags & CONFIG_NAME) && 

+	  hostname_isequal(config->hostname, hostname) &&

+	  is_config_in_context(context, config))

+	return config;

+

+  

+  if (!hwaddr)

+    return NULL;

+

+  /* use match with fewest wildcard octets */

+  for (candidate = NULL, count = 0, config = configs; config; config = config->next)

+    if (is_config_in_context(context, config))

+      for (conf_addr = config->hwaddr; conf_addr; conf_addr = conf_addr->next)

+	if (conf_addr->wildcard_mask != 0 &&

+	    conf_addr->hwaddr_len == hw_len &&	

+	    (conf_addr->hwaddr_type == hw_type || conf_addr->hwaddr_type == 0) &&

+	    (new = memcmp_masked(conf_addr->hwaddr, hwaddr, hw_len, conf_addr->wildcard_mask)) > count)

+	  {

+	      count = new;

+	      candidate = config;

+	  }

+  

+  return candidate;

+}

+

 void dhcp_update_configs(struct dhcp_config *configs)

 {

   /* Some people like to keep all static IP addresses in /etc/hosts.

diff --git a/src/dhcp.c b/src/dhcp.c

index b95a4ba..f69183e 100644

--- a/src/dhcp.c

+++ b/src/dhcp.c

@@ -704,89 +704,6 @@ int address_allocate(struct dhcp_context *context,

   return 0;

 }

-static int is_addr_in_context(struct dhcp_context *context, struct dhcp_config *config)

-{

-  if (!context) /* called via find_config() from lease_update_from_configs() */

-    return 1; 

-  if (!(config->flags & CONFIG_ADDR))

-    return 1;

-  for (; context; context = context->current)

-    if (is_same_net(config->addr, context->start, context->netmask))

-      return 1;

-  

-  return 0;

-}

-

-int config_has_mac(struct dhcp_config *config, unsigned char *hwaddr, int len, int type)

-{

-  struct hwaddr_config *conf_addr;

-  

-  for (conf_addr = config->hwaddr; conf_addr; conf_addr = conf_addr->next)

-    if (conf_addr->wildcard_mask == 0 &&

-	conf_addr->hwaddr_len == len &&

-	(conf_addr->hwaddr_type == type || conf_addr->hwaddr_type == 0) &&

-	memcmp(conf_addr->hwaddr, hwaddr, len) == 0)

-      return 1;

-  

-  return 0;

-}

-

-struct dhcp_config *find_config(struct dhcp_config *configs,

-				struct dhcp_context *context,

-				unsigned char *clid, int clid_len,

-				unsigned char *hwaddr, int hw_len, 

-				int hw_type, char *hostname)

-{

-  int count, new;

-  struct dhcp_config *config, *candidate; 

-  struct hwaddr_config *conf_addr;

-

-  if (clid)

-    for (config = configs; config; config = config->next)

-      if (config->flags & CONFIG_CLID)

-	{

-	  if (config->clid_len == clid_len && 

-	      memcmp(config->clid, clid, clid_len) == 0 &&

-	      is_addr_in_context(context, config))

-	    return config;

-	  

-	  /* dhcpcd prefixes ASCII client IDs by zero which is wrong, but we try and

-	     cope with that here */

-	  if (*clid == 0 && config->clid_len == clid_len-1  &&

-	      memcmp(config->clid, clid+1, clid_len-1) == 0 &&

-	      is_addr_in_context(context, config))

-	    return config;

-	}

-  

-

-  for (config = configs; config; config = config->next)

-    if (config_has_mac(config, hwaddr, hw_len, hw_type) &&

-	is_addr_in_context(context, config))

-      return config;

-  

-  if (hostname && context)

-    for (config = configs; config; config = config->next)

-      if ((config->flags & CONFIG_NAME) && 

-	  hostname_isequal(config->hostname, hostname) &&

-	  is_addr_in_context(context, config))

-	return config;

-

-  /* use match with fewest wildcard octets */

-  for (candidate = NULL, count = 0, config = configs; config; config = config->next)

-    if (is_addr_in_context(context, config))

-      for (conf_addr = config->hwaddr; conf_addr; conf_addr = conf_addr->next)

-	if (conf_addr->wildcard_mask != 0 &&

-	    conf_addr->hwaddr_len == hw_len &&	

-	    (conf_addr->hwaddr_type == hw_type || conf_addr->hwaddr_type == 0) &&

-	    (new = memcmp_masked(conf_addr->hwaddr, hwaddr, hw_len, conf_addr->wildcard_mask)) > count)

-	  {

-	    count = new;

-	    candidate = config;

-	  }

-

-  return candidate;

-}

-

 void dhcp_read_ethers(void)

 {

   FILE *f = fopen(ETHERSFILE, "r");

diff --git a/src/dhcp6-protocol.h b/src/dhcp6-protocol.h

index 50d84a9..8cef0e8 100644

--- a/src/dhcp6-protocol.h

+++ b/src/dhcp6-protocol.h

@@ -58,6 +58,7 @@

 #define OPTION6_REMOTE_ID       37

 #define OPTION6_SUBSCRIBER_ID   38

 #define OPTION6_FQDN            39

+#define OPTION6_CLIENT_MAC      79

 /* replace this with the real number when allocated.

    defining this also enables the relevant code. */ 

diff --git a/src/dhcp6.c b/src/dhcp6.c

index de3187d..5f4d298 100644

--- a/src/dhcp6.c

+++ b/src/dhcp6.c

@@ -18,16 +18,25 @@

 #ifdef HAVE_DHCP6

+#include <netinet/icmp6.h>

+

 struct iface_param {

   struct dhcp_context *current;

   struct in6_addr fallback;

   int ind, addr_match;

 };

+struct mac_param {

+  struct in6_addr *target;

+  unsigned char *mac;

+  unsigned int maclen;

+};

+

 static int complete_context6(struct in6_addr *local,  int prefix,

 			     int scope, int if_index, int flags, 

 			     unsigned int preferred, unsigned int valid, void *vparam);

+static int find_mac(int family, char *addrp, char *mac, size_t maclen, void *parmv);

 static int make_duid1(int index, unsigned int type, char *mac, size_t maclen, void *parm); 

 void dhcp6_init(void)

@@ -156,7 +165,7 @@ void dhcp6_packet(time_t now)

   if (!iface_enumerate(AF_INET6, &parm, complete_context6))

     return;

-  

+

   if (daemon->if_names || daemon->if_addrs)

     {

@@ -171,7 +180,7 @@ void dhcp6_packet(time_t now)

   lease_prune(NULL, now); /* lose any expired leases */

   port = dhcp6_reply(parm.current, if_index, ifr.ifr_name, &parm.fallback, 

-		     sz, IN6_IS_ADDR_MULTICAST(&from.sin6_addr), now);

+		     sz, &from.sin6_addr, now);

   lease_update_file(now);

   lease_update_dns(0);

@@ -189,6 +198,75 @@ void dhcp6_packet(time_t now)

     }

 }

+void get_client_mac(struct in6_addr *client, int iface, unsigned char *mac, unsigned int *maclenp, unsigned int *mactypep)

+{

+  /* Recieving a packet from a host does not populate the neighbour

+     cache, so we send a neighbour discovery request if we can't 

+     find the sender. Repeat a few times in case of packet loss. */

+  

+  struct neigh_packet neigh;

+  struct sockaddr_in6 addr;

+  struct mac_param mac_param;

+  int i;

+

+  neigh.type = ND_NEIGHBOR_SOLICIT;

+  neigh.code = 0;

+  neigh.reserved = 0;

+  neigh.target = *client;

+  // https://tools.ietf.org/html/rfc4443#section-2.3

+  neigh.checksum = 0;

+  

+  memset(&addr, 0, sizeof(addr));

+#ifdef HAVE_SOCKADDR_SA_LEN

+  addr.sin6_len = sizeof(struct sockaddr_in6);

+#endif

+  addr.sin6_family = AF_INET6;

+  addr.sin6_port = htons(IPPROTO_ICMPV6);

+  addr.sin6_addr = *client;

+  addr.sin6_scope_id = iface;

+  

+  mac_param.target = client;

+  mac_param.maclen = 0;

+  mac_param.mac = mac;

+  

+  for (i = 0; i < 5; i++)

+    {

+      struct timespec ts;

+      

+      iface_enumerate(AF_UNSPEC, &mac_param, find_mac);

+      

+      if (mac_param.maclen != 0)

+	break;

+      

+      sendto(daemon->icmp6fd, &neigh, sizeof(neigh), 0, (struct sockaddr *)&addr, sizeof(addr));

+      

+      ts.tv_sec = 0;

+      ts.tv_nsec = 100000000; /* 100ms */

+      nanosleep(&ts, NULL);

+    }

+

+  *maclenp = mac_param.maclen;

+  *mactypep = ARPHRD_ETHER;

+}

+

+static int find_mac(int family, char *addrp, char *mac, size_t maclen, void *parmv)

+{

+  struct mac_param *parm = parmv;

+  

+  if (family == AF_INET6 && IN6_ARE_ADDR_EQUAL(parm->target, addrp))

+    {

+      if (maclen <= DHCP_CHADDR_MAX)

+	{

+	  parm->maclen = maclen;

+	  memcpy(parm->mac, mac, maclen);

+	}

+      

+      return 0; /* found, abort */

+    }

+  

+  return 1;

+}

+

 static int complete_context6(struct in6_addr *local,  int prefix,

 			     int scope, int if_index, int flags, unsigned int preferred, 

 			     unsigned int valid, void *vparam)

@@ -400,48 +478,6 @@ int config_valid(struct dhcp_config *config, struct dhcp_context *context, struc

   return 0;

 }

-static int is_config_in_context6(struct dhcp_context *context, struct dhcp_config *config)

-{

-  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;

-}

-

-

-struct dhcp_config *find_config6(struct dhcp_config *configs,

-				 struct dhcp_context *context,

-				 unsigned char *duid, int duid_len,

-				 char *hostname)

-{

-  struct dhcp_config *config; 

-      

-  if (duid)

-    for (config = configs; config; config = config->next)

-      if (config->flags & CONFIG_CLID)

-	{

-	  if (config->clid_len == duid_len && 

-	      memcmp(config->clid, duid, duid_len) == 0 &&

-	      is_config_in_context6(context, config))

-	    return config;

-	}

-    

-  if (hostname && context)

-    for (config = configs; config; config = config->next)

-      if ((config->flags & CONFIG_NAME) && 

-          hostname_isequal(config->hostname, hostname) &&

-          is_config_in_context6(context, config))

-        return config;

-

-  return NULL;

-}

-

 void make_duid(time_t now)

 {

   if (daemon->duid_config)

diff --git a/src/dnsmasq.c b/src/dnsmasq.c

index b0f984d..3c0d7e7 100644

--- a/src/dnsmasq.c

+++ b/src/dnsmasq.c

@@ -203,7 +203,7 @@ int main (int argc, char **argv)

 	dhcp_init();

 #  ifdef HAVE_DHCP6

-      if (daemon->doing_ra)

+      if (daemon->doing_ra || daemon->doing_dhcp6)

 	ra_init(now);

       if (daemon->doing_dhcp6)

diff --git a/src/dnsmasq.h b/src/dnsmasq.h

index ca000ad..45e3d6d 100644

--- a/src/dnsmasq.h

+++ b/src/dnsmasq.h

@@ -530,13 +530,15 @@ struct dhcp_lease {

 #ifdef HAVE_BROKEN_RTC

   unsigned int length;

 #endif

-  int hwaddr_len, hwaddr_type; /* hw_type used for iaid in v6 */

-  unsigned char hwaddr[DHCP_CHADDR_MAX]; /* also IPv6 address */

+  int hwaddr_len, hwaddr_type;

+  unsigned char hwaddr[DHCP_CHADDR_MAX];

   struct in_addr addr, override, giaddr;

   unsigned char *extradata;

   unsigned int extradata_len, extradata_size;

   int last_interface;

 #ifdef HAVE_DHCP6

+  struct in6_addr addr6;

+  int iaid;

   struct slaac_address {

     struct in6_addr addr, local;

     time_t ping_time;

@@ -724,6 +726,7 @@ struct dhcp_context {

 #define CONTEXT_RA          8192

 #define CONTEXT_CONF_USED  16384

 #define CONTEXT_USED       32768

+#define CONTEXT_V6         65536

 struct ping_result {

   struct in_addr addr;

@@ -1050,12 +1053,6 @@ struct dhcp_context *narrow_context(struct dhcp_context *context,

 int address_allocate(struct dhcp_context *context,

 		     struct in_addr *addrp, unsigned char *hwaddr, int hw_len,

 		     struct dhcp_netid *netids, time_t now);

-int config_has_mac(struct dhcp_config *config, unsigned char *hwaddr, int len, int type);

-struct dhcp_config *find_config(struct dhcp_config *configs,

-				struct dhcp_context *context,

-				unsigned char *clid, int clid_len,

-				unsigned char *hwaddr, int hw_len, 

-				int hw_type, char *hostname);

 void dhcp_read_ethers(void);

 struct dhcp_config *config_find_by_address(struct dhcp_config *configs, struct in_addr addr);

 char *host_from_dns(struct in_addr addr);

@@ -1077,6 +1074,7 @@ struct dhcp_lease *lease6_find_by_addr(struct in6_addr *net, int prefix, u64 add

 u64 lease_find_max_addr6(struct dhcp_context *context);

 void lease_ping_reply(struct in6_addr *sender, unsigned char *packet, char *interface);

 void lease_update_slaac(time_t now);

+void lease_set_iaid(struct dhcp_lease *lease, int iaid);

 #endif

 void lease_set_hwaddr(struct dhcp_lease *lease, unsigned char *hwaddr,

 		      unsigned char *clid, int hw_len, int hw_type, int clid_len, time_t now, int force);

@@ -1188,20 +1186,18 @@ struct dhcp_context *address6_valid(struct dhcp_context *context,

 				    struct in6_addr *taddr,

 				    struct dhcp_netid *netids,

 				    int plain_range);

-struct dhcp_config *find_config6(struct dhcp_config *configs,

-				 struct dhcp_context *context,

-				 unsigned char *duid, int duid_len,

-				 char *hostname);

 struct dhcp_config *config_find_by_address6(struct dhcp_config *configs, struct in6_addr *net, 

 					    int prefix, u64 addr);

 void make_duid(time_t now);

 void dhcp_construct_contexts(time_t now);

+void get_client_mac(struct in6_addr *client, int iface, unsigned char *mac,

+		    unsigned int *maclenp, unsigned int *mactypep);

 #endif

 /* rfc3315.c */

 #ifdef HAVE_DHCP6

 unsigned short dhcp6_reply(struct dhcp_context *context, int interface, char *iface_name,  

-			   struct in6_addr *fallback, size_t sz, int is_multicast, time_t now);

+			   struct in6_addr *fallback, size_t sz, struct in6_addr *client_addr, time_t now);

 #endif

 /* dhcp-common.c */

@@ -1221,6 +1217,12 @@ int lookup_dhcp_opt(int prot, char *name);

 int lookup_dhcp_len(int prot, int val);

 char *option_string(int prot, unsigned int opt, unsigned char *val, 

 		    int opt_len, char *buf, int buf_len);

+struct dhcp_config *find_config(struct dhcp_config *configs,

+				struct dhcp_context *context,

+				unsigned char *clid, int clid_len,

+				unsigned char *hwaddr, int hw_len, 

+				int hw_type, char *hostname);

+int config_has_mac(struct dhcp_config *config, unsigned char *hwaddr, int len, int type);

 #ifdef HAVE_LINUX_NETWORK

 void bindtodevice(int fd);

 #endif

diff --git a/src/helper.c b/src/helper.c

index ab691b7..c6838ba 100644

--- a/src/helper.c

+++ b/src/helper.c

@@ -61,6 +61,10 @@ struct script_data

 #else

   time_t expires;

 #endif

+#ifdef HAVE_DHCP6

+  struct in6_addr addr6;

+  int iaid, vendorclass_count;

+#endif

   unsigned char hwaddr[DHCP_CHADDR_MAX];

   char interface[IF_NAMESIZE];

@@ -215,8 +219,6 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)

 	continue;

-      if (!is6)

-	{

 	  /* stringify MAC into dhcp_buff */

 	  p = daemon->dhcp_buff;

 	  if (data.hwaddr_type != ARPHRD_ETHER || data.hwaddr_len == 0) 

@@ -227,7 +229,6 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)

 	      if (i != data.hwaddr_len - 1)

 		p += sprintf(p, ":");

 	    }

-	}

       /* supplied data may just exceed normal buffer (unlikely) */

       if ((data.hostname_len + data.ed_len + data.clid_len) > MAXDNAME && 

@@ -239,7 +240,6 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)

 	continue;

       /* CLID into packet */

-      if (!is6)

 	for (p = daemon->packet, i = 0; i < data.clid_len; i++)

 	  {

 	    p += sprintf(p, "%.2x", buf[i]);

@@ -247,24 +247,17 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)

 	      p += sprintf(p, ":");

 	  }

 #ifdef HAVE_DHCP6

-      else

+      if (is6)

 	{

 	  /* or IAID and server DUID for IPv6 */

-	  sprintf(daemon->dhcp_buff3, "%s%u", data.flags & LEASE_TA ? "T" : "", data.hwaddr_type);	

-	  for (p = daemon->packet, i = 0; i < daemon->duid_len; i++)

+	  sprintf(daemon->dhcp_buff3, "%s%u", data.flags & LEASE_TA ? "T" : "", data.iaid);	

+	  for (p = daemon->dhcp_packet.iov_base, i = 0; i < daemon->duid_len; i++)

 	    {

 	      p += sprintf(p, "%.2x", daemon->duid[i]);

 	      if (i != daemon->duid_len - 1) 

 		p += sprintf(p, ":");

 	    }

-	  /* duid not MAC for IPv6 */

-	  for (p = daemon->dhcp_buff, i = 0; i < data.clid_len; i++)

-	    {

-	      p += sprintf(p, "%.2x", buf[i]);

-	      if (i != data.clid_len - 1) 

-		p += sprintf(p, ":");

-	    } 

 	}

 #endif

@@ -293,7 +286,7 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)

 	inet_ntop(AF_INET, &data.addr, daemon->addrbuff, ADDRSTRLEN);

 #ifdef HAVE_DHCP6

       else

-	inet_ntop(AF_INET6, &data.hwaddr, daemon->addrbuff, ADDRSTRLEN);

+	inet_ntop(AF_INET6, &data.addr6, daemon->addrbuff, ADDRSTRLEN);

 #endif

       /* file length */

@@ -329,9 +322,9 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)

 	      if (is6)

 		{

-		  lua_pushstring(lua, daemon->dhcp_buff);

-		  lua_setfield(lua, -2, "client_duid");

 		  lua_pushstring(lua, daemon->packet);

+		  lua_setfield(lua, -2, "client_duid");

+		  lua_pushstring(lua, daemon->dhcp_packet.iov_base);

 		  lua_setfield(lua, -2, "server_duid");

 		  lua_pushstring(lua, daemon->dhcp_buff3);

 		  lua_setfield(lua, -2, "iaid");

@@ -375,12 +368,16 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)

 	      if (!is6)

 		buf = grab_extradata_lua(buf, end, "vendor_class");

 #ifdef HAVE_DHCP6

-	      else

-		for (i = 0; i < data.hwaddr_len; i++)

-		  {

-		    sprintf(daemon->dhcp_buff2, "vendor_class%i", i);

-		    buf = grab_extradata_lua(buf, end, daemon->dhcp_buff2);

-		  }

+	      else  if (data.vendorclass_count != 0)

+		{

+		  sprintf(daemon->dhcp_buff2, "vendor_class_id");

+		  buf = grab_extradata_lua(buf, end, daemon->dhcp_buff2);

+		  for (i = 0; i < data.vendorclass_count - 1; i++)

+		    {

+		      sprintf(daemon->dhcp_buff2, "vendor_class%i", i);

+		      buf = grab_extradata_lua(buf, end, daemon->dhcp_buff2);

+		    }

+		}

 #endif

 	      buf = grab_extradata_lua(buf, end, "supplied_hostname");

@@ -423,7 +420,7 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)

 		  lua_setfield(lua, -2, "old_hostname");

 		}

-	      if (!is6)

+	      if (!is6 || data.hwaddr_len != 0)

 		{

 		  lua_pushstring(lua, daemon->dhcp_buff);

 		  lua_setfield(lua, -2, "mac_address");

@@ -476,12 +473,15 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)

       if (data.action != ACTION_TFTP)

 	{

+#ifdef HAVE_DHCP6

 	  if (is6)

 	    {

 	      my_setenv("DNSMASQ_IAID", daemon->dhcp_buff3, &err;;

-	      my_setenv("DNSMASQ_SERVER_DUID", daemon->packet, &err;;

+	      my_setenv("DNSMASQ_SERVER_DUID", daemon->dhcp_packet.iov_base, &err;; 

+	      if (data.hwaddr_len != 0)

+		my_setenv("DNSMASQ_MAC", daemon->dhcp_buff, &err;;

 	    }

-	  

+#endif

 	  if (!is6 && data.clid_len != 0)

 	    my_setenv("DNSMASQ_CLIENT_ID", daemon->packet, &err;;

@@ -507,10 +507,10 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)

 #ifdef HAVE_DHCP6

 	  else

 	    {

-	      if (data.hwaddr_len != 0)

+	      if (data.vendorclass_count != 0)

 		{

 		  buf = grab_extradata(buf, end, "DNSMASQ_VENDOR_CLASS_ID", &err;;

-		  for (i = 0; i < data.hwaddr_len - 1; i++)

+		  for (i = 0; i < data.vendorclass_count - 1; i++)

 		    {

 		      sprintf(daemon->dhcp_buff2, "DNSMASQ_VENDOR_CLASS%i", i);

 		      buf = grab_extradata(buf, end, daemon->dhcp_buff2, &err;;