Merge branch 'dhcpv6'

diff --cc src/dnsmasq.h
Simple merge

diff --cc src/option.c
Simple merge

diff --cc src/rfc2131.c
index 673ca3618cc202323ba84546378b700162863887,3123dc52e85917a18c904407ccb8fe5d035b25e6..247d698bb0f327fdf1e822d6c802bbe847b5f4c3
--- 1/src/rfc2131.c
--- 2/src/rfc2131.c
+++ b/src/rfc2131.c
@@@ -870,10 -863,10 +865,10 @@@ size_t dhcp_reply(struct dhcp_context *
                  option_put(mess, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, htonl(context->local.s_addr));
                  pxe_misc(mess, end, uuid);
                  prune_vendor_opts(tagif_netid);
 -                do_encap_opts(pxe_opts(pxearch, tagif_netid, context->local), OPTION_VENDOR_CLASS_OPT, DHOPT_VENDOR_MATCH, mess, end, 0);
 +                do_encap_opts(pxe_opts(pxearch, tagif_netid, context->local, now), OPTION_VENDOR_CLASS_OPT, DHOPT_VENDOR_MATCH, mess, end, 0);
                  
                  log_packet("PXE", NULL, emac, emac_len, iface_name, ignore ? "proxy-ignored" : "proxy", mess->xid);
-                 log_tags(tagif_netid, mess);
+                 log_tags(tagif_netid, ntohl(mess->xid));
                  return ignore ? 0 : dhcp_packet_size(mess, agent_id, real_end);         
                }
            }