[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH 2/3] v8.1 add support for DHCPv6



The DHCPv6 support includes IPV6 dhcp-range and dhcp-host for one
IPv6 subnetwork on one interface.  This support will only work
if dnsmasq version >= 2.64; otherwise an error occurs if
dhcp-range or dhcp-host is specified.

Essentially, this change provides the same DHCP support for IPv6
that has been available for IPv4.

With dnsmasq >= 2.64, support for the RA service is now provided
by dnsmasq (radvd is no longer used/started).

Documentation has been updated to reflect the new support.

The network schema has been updated to reflect the new support.

This patch has been reworked to fit with "v3" of the dnsmasq-capabilities
and bind-dynamic changes.
---
 docs/formatnetwork.html.in                         | 108 +++++-
 docs/schemas/network.rng                           |  12 +-
 src/conf/network_conf.c                            | 100 +++--
 src/network/bridge_driver.c                        | 427 +++++++++++++++------
 src/util/dnsmasq.c                                 |   9 +-
 tests/networkxml2argvdata/dhcp6-nat-network.argv   |  15 +
 tests/networkxml2argvdata/dhcp6-nat-network.xml    |  24 ++
 tests/networkxml2argvdata/dhcp6-network.argv       |  15 +
 tests/networkxml2argvdata/dhcp6-network.xml        |  14 +
 .../dhcp6host-routed-network.argv                  |  13 +
 .../dhcp6host-routed-network.xml                   |  19 +
 tests/networkxml2argvdata/isolated-network.argv    |  16 +-
 .../networkxml2argvdata/nat-network-dns-hosts.argv |  13 +-
 .../nat-network-dns-srv-record-minimal.argv        |   9 +-
 .../nat-network-dns-srv-record.argv                |   9 +-
 .../nat-network-dns-txt-record.argv                |  10 +-
 tests/networkxml2argvdata/nat-network.argv         |  17 +-
 tests/networkxml2argvdata/netboot-network.argv     |  23 +-
 .../networkxml2argvdata/netboot-proxy-network.argv |  19 +-
 tests/networkxml2argvdata/routed-network.argv      |  10 +-
 tests/networkxml2argvtest.c                        |   7 +-
 21 files changed, 674 insertions(+), 215 deletions(-)
 create mode 100644 tests/networkxml2argvdata/dhcp6-nat-network.argv
 create mode 100644 tests/networkxml2argvdata/dhcp6-nat-network.xml
 create mode 100644 tests/networkxml2argvdata/dhcp6-network.argv
 create mode 100644 tests/networkxml2argvdata/dhcp6-network.xml
 create mode 100644 tests/networkxml2argvdata/dhcp6host-routed-network.argv
 create mode 100644 tests/networkxml2argvdata/dhcp6host-routed-network.xml

diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in
index 7b3b25c..50e00f9 100644
--- a/docs/formatnetwork.html.in
+++ b/docs/formatnetwork.html.in
@@ -577,8 +577,10 @@
         dotted-decimal format, or an IPv6 address in standard
         colon-separated hexadecimal format, that will be configured on
         the bridge
-        device associated with the virtual network. To the guests this
-        address will be their default route. For IPv4 addresses, the <code>netmask</code>
+        device associated with the virtual network. To the guests this IPv4
+        address will be their IPv4 default route.  For IPv6, the default route is
+        established via Router Advertisement.
+        For IPv4 addresses, the <code>netmask</code>
         attribute defines the significant bits of the network address,
         again specified in dotted-decimal format.  For IPv6 addresses,
         and as an alternate method for IPv4 addresses, you can specify
@@ -587,10 +589,13 @@
         could also be given as <code>prefix='24'</code>. The <code>family</code>
         attribute is used to specify the type of address - 'ipv4' or 'ipv6'; if no
         <code>family</code> is given, 'ipv4' is assumed. A network can have more than
-        one of each family of address defined, but only a single address can have a
-        <code>dhcp</code> or <code>tftp</code> element. <span class="since">Since 0.3.0;
+        one of each family of address defined, but only a single IPv4 address can have a
+        <code>dhcp</code> or <code>tftp</code> element. <span class="since">Since 0.3.0 </span>
         IPv6, multiple addresses on a single network, <code>family</code>, and
-        <code>prefix</code> since 0.8.7</span>
+        <code>prefix</code>. <span class="since">Since 0.8.7</span>  In addition
+        to the one IPv4 address which has a <code>dhcp</code> definition, one IPv6
+        address can have a <code>dhcp</code> definition.
+        <span class="since"> Since 1.0.1</span>
         <dl>
           <dt><code>tftp</code></dt>
           <dd>Immediately within
@@ -611,27 +616,46 @@
             <code>dhcp</code> element is not supported for IPv6, and
             is only supported on a single IP address per network for IPv4.
             <span class="since">Since 0.3.0</span>
+            The <code>dhcp</code> element is now supported for IPv6.
+            Again, there is a restriction that only one IPv6 address definition
+            is able to have a <code>dhcp</code> element.
+            <span class="since">Since 1.0.1</span>
             <dl>
               <dt><code>range</code></dt>
               <dd>The <code>start</code> and <code>end</code> attributes on the
                 <code>range</code> element specify the boundaries of a pool of
-                IPv4 addresses to be provided to DHCP clients. These two addresses
+                addresses to be provided to DHCP clients. These two addresses
                 must lie within the scope of the network defined on the parent
-                <code>ip</code> element.  <span class="since">Since 0.3.0</span>
+                <code>ip</code> element.  There may be zero or more
+                <code>range</code> elements specified.
+                <span class="since">Since 0.3.0</span>
+                <code>Range</code> can be specified for one IPv4 address,
+                one IPv6 address, or both.   <span class="since">Since 1.0.1</span>
               </dd>
               <dt><code>host</code></dt>
               <dd>Within the <code>dhcp</code> element there may be zero or more
-                <code>host</code> elements; these specify hosts which will be given
+                <code>host</code> elements.  These specify hosts which will be given
                 names and predefined IP addresses by the built-in DHCP server. Any
-                such element must specify the MAC address of the host to be assigned
+                such IPv4 element must specify the MAC address of the host to be assigned
                 a given name (via the <code>mac</code> attribute), the IP to be
                 assigned to that host (via the <code>ip</code> attribute), and the
                 name to be given that host by the DHCP server (via the
                 <code>name</code> attribute).  <span class="since">Since 0.4.5</span>
+                Within the IPv6 <code>dhcp</code> element zero or more
+                <code>host</code> elements are now supported.  The definition for
+                an IPv6 <code>host</code> element differs from that for IPv4:
+                there is no <code>mac</code> attribute since a MAC address has no
+                defined meaning in IPv6.  Instead, the <code>name</code> attribute is
+                used to identify the host to be assigned the IPv6 address.  For DHCPv6,
+                the name is the plain name of the client host sent by the
+                client to the server.  Note that this method of assigning a
+                specific IP address can be used instead of the <code>mac</code>
+                attribute for IPv4.  <span class="since">Since 1.0.1</span>
               </dd>
               <dt><code>bootp</code></dt>
               <dd>The optional <code>bootp</code>
-                element specifies BOOTP options to be provided by the DHCP server.
+                element specifies BOOTP options to be provided by the DHCP
+                server for IPv4 only.
                 Two attributes are supported: <code>file</code> is mandatory and
                 gives the file to be used for the boot image; <code>server</code> is
                 optional and gives the address of the TFTP server from which the boot
@@ -674,6 +698,29 @@
         &lt;ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" /&gt;
       &lt;/network&gt;</pre>
 
+
+    <p>
+      Below is a variation of the above example which adds an IPv6
+      dhcp range definition.
+    </p>
+
+    <pre>
+      &lt;network&gt;
+        &lt;name&gt;default6&lt;/name&gt;
+        &lt;bridge name="virbr0" /&gt;
+        &lt;forward mode="nat"/&gt;
+        &lt;ip address="192.168.122.1" netmask="255.255.255.0"&gt;
+          &lt;dhcp&gt;
+            &lt;range start="192.168.122.2" end="192.168.122.254" /&gt;
+          &lt;/dhcp&gt;
+        &lt;/ip&gt;
+        &lt;ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" &gt;
+          &lt;dhcp&gt;
+            &lt;range start="2001:db8:ca2:2:1::10" end="2001:db8:ca2:2:1::ff" /&gt;
+          &lt;/dhcp&gt;
+        &lt;/ip&gt;
+      &lt;/network&gt;</pre>
+
     <h3><a name="examplesRoute">Routed network config</a></h3>
 
     <p>
@@ -698,6 +745,29 @@
         &lt;ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" /&gt;
       &lt;/network&gt;</pre>
 
+    <p>
+      Below is another IPv6 varition.  Instead of a dhcp range being
+      specified, this example has a couple of IPv6 host definitions.
+    </p>
+
+    <pre>
+      &lt;network&gt;
+        &lt;name&gt;local6&lt;/name&gt;
+        &lt;bridge name="virbr1" /&gt;
+        &lt;forward mode="route" dev="eth1"/&gt;
+        &lt;ip address="192.168.122.1" netmask="255.255.255.0"&gt;
+          &lt;dhcp&gt;
+            &lt;range start="192.168.122.2" end="192.168.122.254" /&gt;
+          &lt;/dhcp&gt;
+        &lt;/ip&gt;
+        &lt;ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" &gt;
+          &lt;dhcp&gt;
+            &lt;host name="paul"   ip="2001:db8:ca2:2:3::1" /&gt;
+            &lt;host name="bob"    ip="2001:db8:ca2:2:3::2" /&gt;
+          &lt;/dhcp&gt;
+        &lt;/ip&gt;
+      &lt;/network&gt;</pre>
+
     <h3><a name="examplesPrivate">Isolated network config</a></h3>
 
     <p>
@@ -720,6 +790,24 @@
         &lt;ip family="ipv6" address="2001:db8:ca2:3::1" prefix="64" /&gt;
       &lt;/network&gt;</pre>
 
+    <h3><a name="examplesPrivate6">Isolated IPv6 network config</a></h3>
+
+    <p>
+      This variation of an isolated network defines only IPv6.
+    </p>
+
+    <pre>
+      &lt;network&gt;
+        &lt;name&gt;sixnet&lt;/name&gt;
+        &lt;bridge name="virbr6" /&gt;
+        &lt;ip family="ipv6" address="2001:db8:ca2:6::1" prefix="64" &gt;
+          &lt;dhcp&gt;
+            &lt;host name="peter"   ip="2001:db8:ca2:6:6::1" /&gt;
+            &lt;host name="dariusz" ip="2001:db8:ca2:6:6::2" /&gt;
+          &lt;/dhcp&gt;
+        &lt;/ip&gt;
+      &lt;/network&gt;</pre>
+
     <h3><a name="examplesBridge">Using an existing host bridge</a></h3>
 
     <p>
diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng
index 4abfd91..c354284 100644
--- a/docs/schemas/network.rng
+++ b/docs/schemas/network.rng
@@ -208,7 +208,7 @@
               </zeroOrMore>
               <zeroOrMore>
                 <element name="host">
-                  <attribute name="ip"><ref name="ipv4Addr"/></attribute>
+                  <attribute name="ip"><ref name="ipAddr"/></attribute>
                   <oneOrMore>
                     <element name="hostname"><ref name="dnsName"/></element>
                   </oneOrMore>
@@ -262,15 +262,17 @@
               <element name="dhcp">
                 <zeroOrMore>
                   <element name="range">
-                    <attribute name="start"><ref name="ipv4Addr"/></attribute>
-                    <attribute name="end"><ref name="ipv4Addr"/></attribute>
+                    <attribute name="start"><ref name="ipAddr"/></attribute>
+                    <attribute name="end"><ref name="ipAddr"/></attribute>
                   </element>
                 </zeroOrMore>
                 <zeroOrMore>
                   <element name="host">
-                    <attribute name="mac"><ref name="uniMacAddr"/></attribute>
+                    <optional>
+                      <attribute name="mac"><ref name="uniMacAddr"/></attribute>
+                    </optional>
                     <attribute name="name"><text/></attribute>
-                    <attribute name="ip"><ref name="ipv4Addr"/></attribute>
+                    <attribute name="ip"><ref name="ipAddr"/></attribute>
                   </element>
                 </zeroOrMore>
                 <optional>
diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index 6ce2e63..d43e2ae 100644
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -633,6 +633,7 @@ cleanup:
 
 static int
 virNetworkDHCPHostDefParse(const char *networkName,
+                           virNetworkIpDefPtr def,
                            xmlNodePtr node,
                            virNetworkDHCPHostDefPtr host,
                            bool partialOkay)
@@ -644,6 +645,13 @@ virNetworkDHCPHostDefParse(const char *networkName,
 
     mac = virXMLPropString(node, "mac");
     if (mac != NULL) {
+        if (VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_INET6)) {
+            virReportError(VIR_ERR_XML_ERROR,
+                           _("Invalid to specify MAC address '%s' "
+                             "in IPv6 network '%s'"),
+                           mac, networkName);
+            goto cleanup;
+        }
         if (virMacAddrParse(mac, &addr) < 0) {
             virReportError(VIR_ERR_XML_ERROR,
                            _("Cannot parse MAC address '%s' in network '%s'"),
@@ -686,10 +694,19 @@ virNetworkDHCPHostDefParse(const char *networkName,
                            networkName);
         }
     } else {
+        if (VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_INET6)) {
+            if (!name) {
+                virReportError(VIR_ERR_XML_ERROR,
+                           _("Static host definition in IPv6 network '%s' "
+                             "must have name attribute"),
+                           networkName);
+                goto cleanup;
+            }
+        }
         /* normal usage - you need at least one MAC address or one host name */
-        if (!(mac || name)) {
+        else if (!(mac || name)) {
             virReportError(VIR_ERR_XML_ERROR,
-                           _("Static host definition in network '%s' "
+                           _("Static host definition in IPv4 network '%s' "
                              "must have mac or name attribute"),
                            networkName);
             goto cleanup;
@@ -748,36 +765,39 @@ virNetworkDHCPDefParse(const char *networkName,
                 virReportOOMError();
                 return -1;
             }
-            if (virNetworkDHCPHostDefParse(networkName, cur,
+            if (virNetworkDHCPHostDefParse(networkName, def, cur,
                                            &def->hosts[def->nhosts],
                                            false) < 0) {
                 return -1;
             }
             def->nhosts++;
 
-        } else if (cur->type == XML_ELEMENT_NODE &&
-            xmlStrEqual(cur->name, BAD_CAST "bootp")) {
-            char *file;
-            char *server;
-            virSocketAddr inaddr;
-            memset(&inaddr, 0, sizeof(inaddr));
-
-            if (!(file = virXMLPropString(cur, "file"))) {
-                cur = cur->next;
-                continue;
-            }
-            server = virXMLPropString(cur, "server");
+        } else if (VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_INET)) {
+            /* the following only applies to IPv4 */
+            if (cur->type == XML_ELEMENT_NODE &&
+                xmlStrEqual(cur->name, BAD_CAST "bootp")) {
+                char *file;
+                char *server;
+                virSocketAddr inaddr;
+                memset(&inaddr, 0, sizeof(inaddr));
+
+                if (!(file = virXMLPropString(cur, "file"))) {
+                    cur = cur->next;
+                    continue;
+                }
+                server = virXMLPropString(cur, "server");
+
+                if (server &&
+                    virSocketAddrParse(&inaddr, server, AF_UNSPEC) < 0) {
+                    VIR_FREE(file);
+                    VIR_FREE(server);
+                    return -1;
+                }
 
-            if (server &&
-                virSocketAddrParse(&inaddr, server, AF_UNSPEC) < 0) {
-                VIR_FREE(file);
+                def->bootfile = file;
+                def->bootserver = inaddr;
                 VIR_FREE(server);
-                return -1;
             }
-
-            def->bootfile = file;
-            def->bootserver = inaddr;
-            VIR_FREE(server);
         }
 
         cur = cur->next;
@@ -1139,6 +1159,20 @@ virNetworkIPParseXML(const char *networkName,
         }
     }
 
+    if (VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_INET6)) {
+        /* parse IPv6-related info */
+        cur = node->children;
+        while (cur != NULL) {
+            if (cur->type == XML_ELEMENT_NODE &&
+                xmlStrEqual(cur->name, BAD_CAST "dhcp")) {
+                result = virNetworkDHCPDefParse(networkName, def, cur);
+                if (result)
+                    goto error;
+            }
+            cur = cur->next;
+        }
+    }
+
     result = 0;
 
 error:
@@ -2353,11 +2387,9 @@ virNetworkIpDefByIndex(virNetworkDefPtr def, int parentIndex)
     /* first find which ip element's dhcp host list to work on */
     if (parentIndex >= 0) {
         ipdef = virNetworkDefGetIpByIndex(def, AF_UNSPEC, parentIndex);
-        if (!(ipdef &&
-              VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET))) {
+        if (!(ipdef)) {
             virReportError(VIR_ERR_OPERATION_INVALID,
                            _("couldn't update dhcp host entry - "
-                             "no <ip family='ipv4'> "
                              "element found at index %d in network '%s'"),
                            parentIndex, def->name);
         }
@@ -2370,17 +2402,17 @@ virNetworkIpDefByIndex(virNetworkDefPtr def, int parentIndex)
     for (ii = 0;
          (ipdef = virNetworkDefGetIpByIndex(def, AF_UNSPEC, ii));
          ii++) {
-        if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET) &&
-            (ipdef->nranges || ipdef->nhosts)) {
+        if (ipdef->nranges || ipdef->nhosts)
             break;
-        }
     }
-    if (!ipdef)
+    if (!ipdef) {
         ipdef = virNetworkDefGetIpByIndex(def, AF_INET, 0);
+        if (!ipdef)
+            ipdef = virNetworkDefGetIpByIndex(def, AF_INET6, 0);
+    }
     if (!ipdef) {
         virReportError(VIR_ERR_OPERATION_INVALID,
                        _("couldn't update dhcp host entry - "
-                         "no <ip family='ipv4'> "
                          "element found in network '%s'"), def->name);
     }
     return ipdef;
@@ -2410,7 +2442,7 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDefPtr def,
     /* parse the xml into a virNetworkDHCPHostDef */
     if (command == VIR_NETWORK_UPDATE_COMMAND_MODIFY) {
 
-        if (virNetworkDHCPHostDefParse(def->name, ctxt->node, &host, false) < 0)
+        if (virNetworkDHCPHostDefParse(def->name, ipdef, ctxt->node, &host, false) < 0)
             goto cleanup;
 
         /* search for the entry with this (mac|name),
@@ -2443,7 +2475,7 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDefPtr def,
     } else if ((command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST) ||
                (command == VIR_NETWORK_UPDATE_COMMAND_ADD_LAST)) {
 
-        if (virNetworkDHCPHostDefParse(def->name, ctxt->node, &host, true) < 0)
+        if (virNetworkDHCPHostDefParse(def->name, ipdef, ctxt->node, &host, true) < 0)
             goto cleanup;
 
         /* log error if an entry with same name/address/ip already exists */
@@ -2489,7 +2521,7 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDefPtr def,
 
     } else if (command == VIR_NETWORK_UPDATE_COMMAND_DELETE) {
 
-        if (virNetworkDHCPHostDefParse(def->name, ctxt->node, &host, false) < 0)
+        if (virNetworkDHCPHostDefParse(def->name, ipdef, ctxt->node, &host, false) < 0)
             goto cleanup;
 
         /* find matching entry - all specified attributes must match */
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index c306d46..b793d78 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -75,6 +75,11 @@
 
 #define VIR_FROM_THIS VIR_FROM_NETWORK
 
+#define CHECK_VERSION_DHCP(CAPS)                 \
+                (dnsmasqCapsGetVersion(CAPS) >= 2064000)
+#define CHECK_VERSION_RA(CAPS)                   \
+                (dnsmasqCapsGetVersion(CAPS) >= 2064000)
+
 /* Main driver state */
 struct network_driver {
     virMutex lock;
@@ -588,20 +593,32 @@ cleanup:
     return ret;
 }
 
+    /* the following does not build a file, it builds a list
+     * which is later saved into a file
+     */
+
 static int
-networkBuildDnsmasqHostsfile(dnsmasqContext *dctx,
-                             virNetworkIpDefPtr ipdef,
-                             virNetworkDNSDefPtr dnsdef)
+networkBuildDnsmasqDhcpHostsList(dnsmasqContext *dctx,
+                                 virNetworkIpDefPtr ipdef)
 {
-    unsigned int i, j;
+    unsigned int i;
 
     for (i = 0; i < ipdef->nhosts; i++) {
         virNetworkDHCPHostDefPtr host = &(ipdef->hosts[i]);
-        if ((host->mac) && VIR_SOCKET_ADDR_VALID(&host->ip))
+        if (VIR_SOCKET_ADDR_VALID(&host->ip))
             if (dnsmasqAddDhcpHost(dctx, host->mac, &host->ip, host->name) < 0)
                 return -1;
     }
 
+    return 0;
+}
+
+static int
+networkBuildDnsmasqHostsList(dnsmasqContext *dctx,
+                             virNetworkDNSDefPtr dnsdef)
+{
+    unsigned int i, j;
+
     if (dnsdef) {
         for (i = 0; i < dnsdef->nhosts; i++) {
             virNetworkDNSHostsDefPtr host = &(dnsdef->hosts[i]);
@@ -619,7 +636,6 @@ networkBuildDnsmasqHostsfile(dnsmasqContext *dctx,
 
 static int
 networkBuildDnsmasqArgv(virNetworkObjPtr network,
-                        virNetworkIpDefPtr ipdef,
                         const char *pidfile,
                         virCommandPtr cmd,
                         dnsmasqContext *dctx,
@@ -632,7 +648,8 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network,
     char *recordPort = NULL;
     char *recordWeight = NULL;
     char *recordPriority = NULL;
-    virNetworkIpDefPtr tmpipdef;
+    virNetworkIpDefPtr tmpipdef, ipdef, ipv4def, ipv6def;
+    bool dhcp4flag, dhcp6flag, ipv6SLAAC;
 
     /*
      * NB, be careful about syntax for dnsmasq options in long format.
@@ -657,14 +674,17 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network,
      * Needed to ensure dnsmasq uses same algorithm for processing
      * multiple namedriver entries in /etc/resolv.conf as GLibC.
      */
-    virCommandAddArg(cmd, "--strict-order");
+    virCommandAddArgList(cmd, "--strict-order",
+                              "--domain-needed",
+                              NULL);
 
-    if (network->def->domain)
+    if (network->def->domain) {
         virCommandAddArgPair(cmd, "--domain", network->def->domain);
+        virCommandAddArg(cmd, "--expand-hosts");
+    }
     /* need to specify local even if no domain specified */
     virCommandAddArgFormat(cmd, "--local=/%s/",
                            network->def->domain ? network->def->domain : "");
-    virCommandAddArg(cmd, "--domain-needed");
 
     if (pidfile)
         virCommandAddArgPair(cmd, "--pid-file", pidfile);
@@ -687,7 +707,7 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network,
     } else {
         virCommandAddArgList(cmd,
                              "--bind-interfaces",
-                             "--except-interface", "lo",
+                             "--except-interface=lo",
                              NULL);
         /*
          * --interface does not actually work with dnsmasq < 2.47,
@@ -791,14 +811,75 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network,
         }
     }
 
-    if (ipdef) {
+    /* Find the first dhcp for both IPv4 and IPv6 */
+    for (ii = 0, ipv4def = NULL, ipv6def = NULL,
+                 dhcp4flag = false, dhcp6flag = false, ipv6SLAAC = false;
+         (ipdef = virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, ii));
+         ii++) {
+        if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) {
+            if (ipdef->nranges || ipdef->nhosts) {
+                if (ipv4def) {
+                    virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                        _("For IPv4, multiple DHCP definitions cannot "
+                          "be specified."));
+                    goto cleanup;
+                } else {
+                    ipv4def = ipdef;
+                    dhcp4flag = true;
+                }
+            }
+        }
+        if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET6)) {
+            if (ipdef->nranges || ipdef->nhosts) {
+                if (!CHECK_VERSION_DHCP(caps)) {
+                    unsigned long version = dnsmasqCapsGetVersion(caps);
+                    virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                            _("The version of dnsmasq on this host (%d.%d) doesn't "
+                              "adequately support dhcp range or dhcp host "
+                              "specification.  Version 2.64 or later is required."),
+                            (int)version / 1000000, (int)(version % 1000000) / 1000);
+                    goto cleanup;
+                }
+                if (ipv6def) {
+                    virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                        _("For IPv6, multiple DHCP definitions cannot "
+                          "be specified."));
+                    goto cleanup;
+                } else {
+                    ipv6def = ipdef;
+                    dhcp6flag = true;
+                }
+            } else {
+                ipv6SLAAC = true;
+            }
+        }
+    }
+
+    if (dhcp6flag && ipv6SLAAC) {
+        VIR_WARN("For IPv6, when DHCP is specified for one address, then "
+                 "state-full Router Advertising will occur.  The additional "
+                  "IPv6 addresses specified require manually configured guest "
+                  "network to work properly since both state-full (DHCP) "
+                  "and state-less (SLAAC) addressing are not supported "
+                  "on the same network interface.");
+    }
+
+    if (ipv4def)
+        ipdef = ipv4def;
+    else
+        ipdef = ipv6def;
+
+    while (ipdef) {
         for (r = 0 ; r < ipdef->nranges ; r++) {
             char *saddr = virSocketAddrFormat(&ipdef->ranges[r].start);
-            if (!saddr)
+            if (!saddr) {
+                virReportOOMError();
                 goto cleanup;
+            }
             char *eaddr = virSocketAddrFormat(&ipdef->ranges[r].end);
             if (!eaddr) {
                 VIR_FREE(saddr);
+                virReportOOMError();
                 goto cleanup;
             }
             virCommandAddArg(cmd, "--dhcp-range");
@@ -812,72 +893,110 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network,
         /*
          * For static-only DHCP, i.e. with no range but at least one host element,
          * we have to add a special --dhcp-range option to enable the service in
-         * dnsmasq.
+         * dnsmasq. [this is for dhcp-hosts= support]
          */
         if (!ipdef->nranges && ipdef->nhosts) {
             char *bridgeaddr = virSocketAddrFormat(&ipdef->address);
-            if (!bridgeaddr)
+            if (!bridgeaddr) {
+                virReportOOMError();
                 goto cleanup;
+            }
             virCommandAddArg(cmd, "--dhcp-range");
             virCommandAddArgFormat(cmd, "%s,static", bridgeaddr);
             VIR_FREE(bridgeaddr);
         }
 
-        if (ipdef->nranges > 0) {
-            char *leasefile = networkDnsmasqLeaseFileName(network->def->name);
-            if (!leasefile)
-                goto cleanup;
-            virCommandAddArgFormat(cmd, "--dhcp-leasefile=%s", leasefile);
-            VIR_FREE(leasefile);
-            virCommandAddArgFormat(cmd, "--dhcp-lease-max=%d", nbleases);
-        }
-
-        if (ipdef->nranges || ipdef->nhosts)
-            virCommandAddArg(cmd, "--dhcp-no-override");
+        if (networkBuildDnsmasqDhcpHostsList(dctx, ipdef) < 0)
+            goto cleanup;
 
-        /* add domain to any non-qualified hostnames in /etc/hosts or addn-hosts */
-        if (network->def->domain)
-           virCommandAddArg(cmd, "--expand-hosts");
+        /* Note: the following is IPv4 only */
+        if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) {
+            if (ipdef->nranges || ipdef->nhosts)
+                virCommandAddArg(cmd, "--dhcp-no-override");
 
-        if (networkBuildDnsmasqHostsfile(dctx, ipdef, network->def->dns) < 0)
-            goto cleanup;
+            if (ipdef->tftproot) {
+                virCommandAddArgList(cmd, "--enable-tftp",
+                                     "--tftp-root", ipdef->tftproot,
+                                     NULL);
+            }
 
-        /* Even if there are currently no static hosts, if we're
-         * listening for DHCP, we should write a 0-length hosts
-         * file to allow for runtime additions.
-         */
-        if (ipdef->nranges || ipdef->nhosts)
-            virCommandAddArgPair(cmd, "--dhcp-hostsfile",
-                                 dctx->hostsfile->path);
+            if (ipdef->bootfile) {
+                virCommandAddArg(cmd, "--dhcp-boot");
+                if (VIR_SOCKET_ADDR_VALID(&ipdef->bootserver)) {
+                    char *bootserver = virSocketAddrFormat(&ipdef->bootserver);
 
-        /* Likewise, always create this file and put it on the commandline, to allow for
-         * for runtime additions.
-         */
-        virCommandAddArgPair(cmd, "--addn-hosts",
-                             dctx->addnhostsfile->path);
+                    if (!bootserver) {
+                        virReportOOMError();
+                        goto cleanup;
+                    }
+                    virCommandAddArgFormat(cmd, "%s%s%s",
+                                       ipdef->bootfile, ",,", bootserver);
+                    VIR_FREE(bootserver);
+                } else {
+                    virCommandAddArg(cmd, ipdef->bootfile);
+                }
+            }
+        }
+        if (ipdef == ipv6def)
+            ipdef = NULL;
+        else
+            ipdef = ipv6def;
+    }
 
-        if (ipdef->tftproot) {
-            virCommandAddArgList(cmd, "--enable-tftp",
-                                 "--tftp-root", ipdef->tftproot,
-                                 NULL);
+    if (nbleases > 0) {
+        char *leasefile = networkDnsmasqLeaseFileName(network->def->name);
+        if (!leasefile) {
+            virReportOOMError();
+            goto cleanup;
         }
-        if (ipdef->bootfile) {
-            virCommandAddArg(cmd, "--dhcp-boot");
-            if (VIR_SOCKET_ADDR_VALID(&ipdef->bootserver)) {
-                char *bootserver = virSocketAddrFormat(&ipdef->bootserver);
+        virCommandAddArgFormat(cmd, "--dhcp-leasefile=%s", leasefile);
+        VIR_FREE(leasefile);
+        virCommandAddArgFormat(cmd, "--dhcp-lease-max=%d", nbleases);
+    }
 
-                if (!bootserver)
-                    goto cleanup;
-                virCommandAddArgFormat(cmd, "%s%s%s",
-                                       ipdef->bootfile, ",,", bootserver);
-                VIR_FREE(bootserver);
-            } else {
-                virCommandAddArg(cmd, ipdef->bootfile);
+    /* this is done once per interface */
+    if (networkBuildDnsmasqHostsList(dctx, network->def->dns) < 0)
+       goto cleanup;
+
+    /* Even if there are currently no static hosts, if we're
+     * listening for DHCP, we should write a 0-length hosts
+     * file to allow for runtime additions.
+     */
+    if (dhcp4flag || dhcp6flag)
+        virCommandAddArgPair(cmd, "--dhcp-hostsfile",
+                             dctx->hostsfile->path);
+
+    /* Likewise, always create this file and put it on the commandline, to allow for
+     * for runtime additions.
+     */
+    virCommandAddArgPair(cmd, "--addn-hosts",
+                         dctx->addnhostsfile->path);
+
+    /* Are we doing RA instead of radvd? */
+    if (CHECK_VERSION_RA(caps)) {
+        if (dhcp6flag)
+            virCommandAddArg(cmd, "--enable-ra");
+        else {
+            for (ii = 0;
+                (ipdef = virNetworkDefGetIpByIndex(network->def, AF_INET6, ii));
+                ii++) {
+                if (!(ipdef->nranges || ipdef->nhosts)) {
+                    char *bridgeaddr = virSocketAddrFormat(&ipdef->address);
+                    if (bridgeaddr) {
+                        virCommandAddArgFormat(cmd,
+                            "--dhcp-range=%s,ra-only", bridgeaddr);
+                    } else {
+                        virReportOOMError();
+                        goto cleanup;
+                    }
+                    VIR_FREE(bridgeaddr);
+                }
             }
         }
     }
 
     ret = 0;
+
 cleanup:
     VIR_FREE(record);
     VIR_FREE(recordPort);
@@ -893,32 +1012,20 @@ networkBuildDhcpDaemonCommandLine(virNetworkObjPtr network, virCommandPtr *cmdou
 {
     virCommandPtr cmd = NULL;
     int ret = -1, ii;
-    virNetworkIpDefPtr ipdef;
 
     network->dnsmasqPid = -1;
 
-    /* Look for first IPv4 address that has dhcp defined. */
-    /* We support dhcp config on 1 IPv4 interface only. */
-    for (ii = 0;
-         (ipdef = virNetworkDefGetIpByIndex(network->def, AF_INET, ii));
-         ii++) {
-        if (ipdef->nranges || ipdef->nhosts)
-            break;
-    }
-    /* If no IPv4 addresses had dhcp info, pick the first (if there were any). */
-    if (!ipdef)
-        ipdef = virNetworkDefGetIpByIndex(network->def, AF_INET, 0);
-
     /* If there are no IP addresses at all (v4 or v6), return now, since
      * there won't be any address for dnsmasq to listen on anyway.
      * If there are any addresses, even if no dhcp ranges or static entries,
      * we should continue and run dnsmasq, just for the DNS capabilities.
+     * This should not happen.  This code may not be needed.
      */
     if (!virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, 0))
         return 0;
 
     cmd = virCommandNew(dnsmasqCapsGetBinaryPath(caps));
-    if (networkBuildDnsmasqArgv(network, ipdef, pidfile, cmd, dctx, caps) < 0) {
+    if (networkBuildDnsmasqArgv(network, pidfile, cmd, dctx, caps) < 0) {
         goto cleanup;
     }
 
@@ -939,11 +1046,9 @@ networkStartDhcpDaemon(struct network_driver *driver,
     char *pidfile = NULL;
     int ret = -1;
     dnsmasqContext *dctx = NULL;
-    virNetworkIpDefPtr ipdef;
-    int i;
 
     if (!virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, 0)) {
-        /* no IPv6 addresses, so we don't need to run radvd */
+        /* no IP addresses, so we don't need to run */
         ret = 0;
         goto cleanup;
     }
@@ -983,18 +1088,6 @@ networkStartDhcpDaemon(struct network_driver *driver,
     if (ret < 0)
         goto cleanup;
 
-    /* populate dnsmasq hosts file */
-    for (i = 0; (ipdef = virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, i)); i++) {
-        if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET) &&
-            (ipdef->nranges || ipdef->nhosts)) {
-            if (networkBuildDnsmasqHostsfile(dctx, ipdef,
-                                             network->def->dns) < 0)
-                goto cleanup;
-
-            break;
-        }
-    }
-
     ret = dnsmasqSave(dctx);
     if (ret < 0)
         goto cleanup;
@@ -1027,7 +1120,8 @@ cleanup:
 
 /* networkRefreshDhcpDaemon:
  *  Update dnsmasq config files, then send a SIGHUP so that it rereads
- *  them.
+ *  them.   This only works for the dhcp-hostsfile and the
+ *  addn-hosts file.
  *
  *  Returns 0 on success, -1 on failure.
  */
@@ -1036,34 +1130,57 @@ networkRefreshDhcpDaemon(struct network_driver *driver,
                          virNetworkObjPtr network)
 {
     int ret = -1, ii;
-    virNetworkIpDefPtr ipdef;
+    virNetworkIpDefPtr ipdef, ipv4def, ipv6def;
     dnsmasqContext *dctx = NULL;
 
+    /* if no IP addresses specified, nothing to do */
+    if (virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, 0))
+        return 0;
+
     /* if there's no running dnsmasq, just start it */
     if (network->dnsmasqPid <= 0 || (kill(network->dnsmasqPid, 0) < 0))
         return networkStartDhcpDaemon(driver, network);
 
-    /* Look for first IPv4 address that has dhcp defined. */
-    /* We support dhcp config on 1 IPv4 interface only. */
+    VIR_INFO("REFRESH: DhcpDaemon: for %s", network->def->bridge);
+    if (!(dctx = dnsmasqContextNew(network->def->name, DNSMASQ_STATE_DIR)))
+        goto cleanup;
+
+    /* Look for first IPv4 address that has dhcp defined.
+     * We only support dhcp-host config on one IPv4 subnetwork
+     * and on one IPv6 subnetwork.
+     */
+    ipv4def = NULL;
     for (ii = 0;
          (ipdef = virNetworkDefGetIpByIndex(network->def, AF_INET, ii));
          ii++) {
-        if (ipdef->nranges || ipdef->nhosts)
-            break;
+        if (ipdef->nranges || ipdef->nhosts) {
+            if (!ipv4def)
+                ipv4def = ipdef;
+        }
     }
     /* If no IPv4 addresses had dhcp info, pick the first (if there were any). */
     if (!ipdef)
         ipdef = virNetworkDefGetIpByIndex(network->def, AF_INET, 0);
 
-    if (!ipdef) {
-        /* no <ip> elements, so nothing to do */
-        return 0;
+    ipv6def = NULL;
+    for (ii = 0;
+         (ipdef = virNetworkDefGetIpByIndex(network->def, AF_INET6, ii));
+         ii++) {
+        if (ipdef->nranges || ipdef->nhosts) {
+            if (!ipv6def)
+                ipv6def = ipdef;
+        }
     }
 
-    if (!(dctx = dnsmasqContextNew(network->def->name, DNSMASQ_STATE_DIR)))
-        goto cleanup;
+    if (ipv4def)
+        if (networkBuildDnsmasqDhcpHostsList(dctx, ipv4def) < 0)
+           goto cleanup;
 
-    if (networkBuildDnsmasqHostsfile(dctx, ipdef, network->def->dns) < 0)
+    if (ipv6def)
+        if (networkBuildDnsmasqDhcpHostsList(dctx, ipv6def) < 0)
+           goto cleanup;
+
+    if (networkBuildDnsmasqHostsList(dctx, network->def->dns) < 0)
        goto cleanup;
 
     if ((ret = dnsmasqSave(dctx)) < 0)
@@ -1096,27 +1213,51 @@ networkRestartDhcpDaemon(struct network_driver *driver,
     return networkStartDhcpDaemon(driver, network);
 }
 
+static char radvd1[] = "  AdvOtherConfigFlag off;\n\n";
+static char radvd2[] = "    AdvAutonomous off;\n";
+static char radvd3[] = "    AdvOnLink on;\n"
+                       "    AdvAutonomous on;\n"
+                       "    AdvRouterAddr off;\n";
+
 static int
 networkRadvdConfContents(virNetworkObjPtr network, char **configstr)
 {
     virBuffer configbuf = VIR_BUFFER_INITIALIZER;
     int ret = -1, ii;
     virNetworkIpDefPtr ipdef;
-    bool v6present = false;
+    bool v6present = false, dhcp6 = false;
 
     *configstr = NULL;
 
+    /* Check if DHCPv6 is needed */
+    for (ii = 0;
+         (ipdef = virNetworkDefGetIpByIndex(network->def, AF_INET6, ii));
+         ii++) {
+        v6present = true;
+        if (ipdef->nranges || ipdef->nhosts) {
+            dhcp6 = true;
+            break;
+        }
+    }
+
+    /* If there are no IPv6 addresses, then we are done */
+    if (!v6present) {
+        ret = 0;
+        goto cleanup;
+    }
+
     /* create radvd config file appropriate for this network;
      * IgnoreIfMissing allows radvd to start even when the bridge is down
      */
     virBufferAsprintf(&configbuf, "interface %s\n"
                       "{\n"
                       "  AdvSendAdvert on;\n"
-                      "  AdvManagedFlag off;\n"
-                      "  AdvOtherConfigFlag off;\n"
                       "  IgnoreIfMissing on;\n"
-                      "\n",
-                      network->def->bridge);
+                      "  AdvManagedFlag %s;\n"
+                      "%s",
+                      network->def->bridge,
+                      dhcp6 ? "on" : "off",
+                      dhcp6 ? "\n" : radvd1);
 
     /* add a section for each IPv6 address in the config */
     for (ii = 0;
@@ -1125,7 +1266,6 @@ networkRadvdConfContents(virNetworkObjPtr network, char **configstr)
         int prefix;
         char *netaddr;
 
-        v6present = true;
         prefix = virNetworkIpDefPrefix(ipdef);
         if (prefix < 0) {
             virReportError(VIR_ERR_INTERNAL_ERROR,
@@ -1137,12 +1277,9 @@ networkRadvdConfContents(virNetworkObjPtr network, char **configstr)
             goto cleanup;
         virBufferAsprintf(&configbuf,
                           "  prefix %s/%d\n"
-                          "  {\n"
-                          "    AdvOnLink on;\n"
-                          "    AdvAutonomous on;\n"
-                          "    AdvRouterAddr off;\n"
-                          "  };\n",
-                          netaddr, prefix);
+                          "  {\n%s  };\n",
+                          netaddr, prefix,
+                          dhcp6 ? radvd2 : radvd3);
         VIR_FREE(netaddr);
     }
 
@@ -1208,7 +1345,8 @@ cleanup:
 }
 
 static int
-networkStartRadvd(virNetworkObjPtr network)
+networkStartRadvd(struct network_driver *driver ATTRIBUTE_UNUSED,
+                        virNetworkObjPtr network)
 {
     char *pidfile = NULL;
     char *radvdpidbase = NULL;
@@ -1216,6 +1354,12 @@ networkStartRadvd(virNetworkObjPtr network)
     virCommandPtr cmd = NULL;
     int ret = -1;
 
+    /* Is dnsmasq handling RA? */
+    if (CHECK_VERSION_RA(driver->dnsmasqCaps)) {
+        ret = 0;
+        goto cleanup;
+    }
+
     network->radvdPid = -1;
 
     if (!virNetworkDefGetIpByIndex(network->def, AF_INET6, 0)) {
@@ -1294,9 +1438,13 @@ static int
 networkRefreshRadvd(struct network_driver *driver ATTRIBUTE_UNUSED,
                     virNetworkObjPtr network)
 {
+    /* Is dnsmasq handling RA? */
+    if (CHECK_VERSION_RA(driver->dnsmasqCaps))
+        return 0;
+
     /* if there's no running radvd, just start it */
     if (network->radvdPid <= 0 || (kill(network->radvdPid, 0) < 0))
-        return networkStartRadvd(network);
+        return networkStartRadvd(driver, network);
 
     if (!virNetworkDefGetIpByIndex(network->def, AF_INET6, 0)) {
         /* no IPv6 addresses, so we don't need to run radvd */
@@ -1674,9 +1822,19 @@ networkAddGeneralIp6tablesRules(struct network_driver *driver,
         goto err5;
     }
 
+    if (iptablesAddUdpInput(driver->iptables, AF_INET6,
+                            network->def->bridge, 547) < 0) {
+        virReportError(VIR_ERR_SYSTEM_ERROR,
+                       _("failed to add ip6tables rule to allow DHCP6 requests from '%s'"),
+                       network->def->bridge);
+        goto err6;
+    }
+
     return 0;
 
     /* unwind in reverse order from the point of failure */
+err6:
+    iptablesRemoveUdpInput(driver->iptables, AF_INET6, network->def->bridge, 53);
 err5:
     iptablesRemoveTcpInput(driver->iptables, AF_INET6, network->def->bridge, 53);
 err4:
@@ -1694,6 +1852,7 @@ networkRemoveGeneralIp6tablesRules(struct network_driver *driver,
                                   virNetworkObjPtr network)
 {
     if (virNetworkDefGetIpByIndex(network->def, AF_INET6, 0)) {
+        iptablesRemoveUdpInput(driver->iptables, AF_INET6, network->def->bridge, 547);
         iptablesRemoveUdpInput(driver->iptables, AF_INET6, network->def->bridge, 53);
         iptablesRemoveTcpInput(driver->iptables, AF_INET6, network->def->bridge, 53);
     }
@@ -2283,7 +2442,7 @@ networkStartNetworkVirtual(struct network_driver *driver,
         goto err3;
 
     /* start radvd if there are any ipv6 addresses */
-    if (v6present && networkStartRadvd(network) < 0)
+    if (v6present && networkStartRadvd(driver, network) < 0)
         goto err4;
 
     /* DAD has happened (dnsmasq waits for it), dnsmasq is now bound to the
@@ -2744,8 +2903,7 @@ networkValidate(struct network_driver *driver,
     bool vlanUsed, vlanAllowed, badVlanUse = false;
     virPortGroupDefPtr defaultPortGroup = NULL;
     virNetworkIpDefPtr ipdef;
-    bool ipv4def = false;
-    int i;
+    bool ipv4def = false, ipv6def = false;
 
     /* check for duplicate networks */
     if (virNetworkObjIsDuplicate(&driver->networks, def, check_active) < 0)
@@ -2764,17 +2922,36 @@ networkValidate(struct network_driver *driver,
         virNetworkSetBridgeMacAddr(def);
     }
 
-    /* We only support dhcp on one IPv4 address per defined network */
-    for (i = 0; (ipdef = virNetworkDefGetIpByIndex(def, AF_INET, i)); i++) {
-        if (ipdef->nranges || ipdef->nhosts) {
-            if (ipv4def) {
-                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                               _("Multiple dhcp sections found. "
+    /* We only support dhcp on one IPv4 address and
+     * on one IPv6 address per defined network
+     */
+    for (ii = 0;
+         (ipdef = virNetworkDefGetIpByIndex(def, AF_UNSPEC, ii));
+         ii++) {
+        if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) {
+            if (ipdef->nranges || ipdef->nhosts) {
+                if (ipv4def) {
+                    virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                               _("Multiple IPv4 dhcp sections found -- "
                                  "dhcp is supported only for a "
                                  "single IPv4 address on each network"));
-                return -1;
-            } else {
-                ipv4def = true;
+                    return -1;
+                } else {
+                    ipv4def = true;
+                }
+            }
+        }
+        if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET6)) {
+            if (ipdef->nranges || ipdef->nhosts) {
+                if (ipv6def) {
+                    virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                               _("Multiple IPv6 dhcp sections found -- "
+                                 "dhcp is supported only for a "
+                                 "single IPv6 address on each network"));
+                    return -1;
+                } else {
+                    ipv6def = true;
+                }
             }
         }
     }
diff --git a/src/util/dnsmasq.c b/src/util/dnsmasq.c
index 501ee68..86650ea 100644
--- a/src/util/dnsmasq.c
+++ b/src/util/dnsmasq.c
@@ -306,7 +306,14 @@ hostsfileAdd(dnsmasqHostsfile *hostsfile,
     if (!(ipstr = virSocketAddrFormat(ip)))
         return -1;
 
-    if (name) {
+    /* the first test determins if it is a dhcpv6 host */
+    if (mac==NULL) {
+        if (virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, "%s,[%s]",
+                        name, ipstr) < 0) {
+            goto alloc_error;
+        }
+    }
+    else if (name) {
         if (virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, "%s,%s,%s",
                         mac, ipstr, name) < 0) {
             goto alloc_error;
diff --git a/tests/networkxml2argvdata/dhcp6-nat-network.argv b/tests/networkxml2argvdata/dhcp6-nat-network.argv
new file mode 100644
index 0000000..df8c507
--- /dev/null
+++ b/tests/networkxml2argvdata/dhcp6-nat-network.argv
@@ -0,0 +1,15 @@
+ DNSMASQ@ \
+--strict-order \
+--domain-needed \
+--local=// \
+--conf-file= \
+--bind-dynamic \
+--interface virbr0 \
+--dhcp-range 192.168.122.2,192.168.122.254 \
+--dhcp-no-override \
+--dhcp-range 2001:db8:ac10:fd01::1:10,2001:db8:ac10:fd01::1:ff \
+--dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases \
+--dhcp-lease-max=493 \
+--dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile \
+--addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts \
+--enable-ra\
diff --git a/tests/networkxml2argvdata/dhcp6-nat-network.xml b/tests/networkxml2argvdata/dhcp6-nat-network.xml
new file mode 100644
index 0000000..72103f7
--- /dev/null
+++ b/tests/networkxml2argvdata/dhcp6-nat-network.xml
@@ -0,0 +1,24 @@
+<network>
+  <name>default</name>
+  <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid>
+  <forward dev='eth1' mode='nat'/>
+  <bridge name='virbr0' stp='on' delay='0' />
+  <ip address='192.168.122.1' netmask='255.255.255.0'>
+    <dhcp>
+      <range start='192.168.122.2' end='192.168.122.254' />
+      <host mac='00:16:3e:77:e2:ed' name='a.example.com' ip='192.168.122.10' />
+      <host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11' />
+    </dhcp>
+  </ip>
+  <ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'>
+  </ip>
+  <ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'>
+    <dhcp>
+      <range start='2001:db8:ac10:fd01::1:10' end='2001:db8:ac10:fd01::1:ff' />
+      <host name='ralph' ip='2001:db8:ac10:fd01::1:20' />
+      <host name='paul' ip='2001:db8:ac10:fd01::1:21' />
+    </dhcp>
+  </ip>
+  <ip family='ipv4' address='10.24.10.1'>
+  </ip>
+</network>
diff --git a/tests/networkxml2argvdata/dhcp6-network.argv b/tests/networkxml2argvdata/dhcp6-network.argv
new file mode 100644
index 0000000..059c418
--- /dev/null
+++ b/tests/networkxml2argvdata/dhcp6-network.argv
@@ -0,0 +1,15 @@
+ DNSMASQ@ \
+--strict-order \
+--domain-needed \
+--domain=mynet \
+--expand-hosts \
+--local=/mynet/ \
+--conf-file= \
+--bind-dynamic \
+--interface virbr0 \
+--dhcp-range 2001:db8:ac10:fd01::1:10,2001:db8:ac10:fd01::1:ff \
+--dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases \
+--dhcp-lease-max=240 \
+--dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile \
+--addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts \
+--enable-ra\
diff --git a/tests/networkxml2argvdata/dhcp6-network.xml b/tests/networkxml2argvdata/dhcp6-network.xml
new file mode 100644
index 0000000..311013a
--- /dev/null
+++ b/tests/networkxml2argvdata/dhcp6-network.xml
@@ -0,0 +1,14 @@
+<network>
+  <name>default</name>
+  <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid>
+  <forward dev='eth1' mode='nat'/>
+  <bridge name='virbr0' stp='on' delay='0' />
+  <domain name='mynet'/>
+  <ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'>
+    <dhcp>
+      <range start='2001:db8:ac10:fd01::1:10' end='2001:db8:ac10:fd01::1:ff' />
+      <host name='ralph' ip='2001:db8:ac10:fd01::1:20' />
+      <host name='paul' ip='2001:db8:ac10:fd01::1:21' />
+    </dhcp>
+  </ip>
+</network>
diff --git a/tests/networkxml2argvdata/dhcp6host-routed-network.argv b/tests/networkxml2argvdata/dhcp6host-routed-network.argv
new file mode 100644
index 0000000..8f6d7d3
--- /dev/null
+++ b/tests/networkxml2argvdata/dhcp6host-routed-network.argv
@@ -0,0 +1,13 @@
+ DNSMASQ@ \
+--strict-order \
+--domain-needed \
+--local=// \
+--conf-file= \
+--bind-dynamic \
+--interface virbr1 \
+--dhcp-range 192.168.122.1,static \
+--dhcp-no-override \
+--dhcp-range 2001:db8:ac10:fd01::1,static \
+--dhcp-hostsfile=/var/lib/libvirt/dnsmasq/local.hostsfile \
+--addn-hosts=/var/lib/libvirt/dnsmasq/local.addnhosts \
+--enable-ra\
diff --git a/tests/networkxml2argvdata/dhcp6host-routed-network.xml b/tests/networkxml2argvdata/dhcp6host-routed-network.xml
new file mode 100644
index 0000000..38d9ebf
--- /dev/null
+++ b/tests/networkxml2argvdata/dhcp6host-routed-network.xml
@@ -0,0 +1,19 @@
+<network>
+  <name>local</name>
+  <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid>
+  <forward dev='eth1' mode='route'/>
+  <bridge name='virbr1' stp='on' delay='0' />
+  <mac address='12:34:56:78:9A:BC'/>
+  <ip address='192.168.122.1' netmask='255.255.255.0'>
+    <dhcp>
+      <host mac='00:16:3e:77:e2:ed' name='a.example.com' ip='192.168.122.10' />
+      <host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11' />
+    </dhcp>
+  </ip>
+  <ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'>
+    <dhcp>
+      <host name='ralph' ip='2001:db8:ac10:fd01::1:20' />
+      <host name='paul' ip='2001:db8:ac10:fd01::1:21' />
+    </dhcp>
+  </ip>
+</network>
diff --git a/tests/networkxml2argvdata/isolated-network.argv b/tests/networkxml2argvdata/isolated-network.argv
index 3d8601e..b0783bd 100644
--- a/tests/networkxml2argvdata/isolated-network.argv
+++ b/tests/networkxml2argvdata/isolated-network.argv
@@ -1,10 +1,16 @@
- DNSMASQ@ --strict-order \
---local=// --domain-needed --conf-file= \
---bind-interfaces --except-interface lo \
+ DNSMASQ@ \
+--strict-order \
+--domain-needed \
+--local=// \
+--conf-file= \
+--bind-interfaces \
+--except-interface=lo \
 --listen-address 192.168.152.1 \
---dhcp-option=3 --no-resolv \
+--dhcp-option=3 \
+--no-resolv \
 --dhcp-range 192.168.152.2,192.168.152.254 \
---dhcp-leasefile=/var/lib/libvirt/dnsmasq/private.leases --dhcp-lease-max=253 \
 --dhcp-no-override \
+--dhcp-leasefile=/var/lib/libvirt/dnsmasq/private.leases \
+--dhcp-lease-max=253 \
 --dhcp-hostsfile=/var/lib/libvirt/dnsmasq/private.hostsfile \
 --addn-hosts=/var/lib/libvirt/dnsmasq/private.addnhosts\
diff --git a/tests/networkxml2argvdata/nat-network-dns-hosts.argv b/tests/networkxml2argvdata/nat-network-dns-hosts.argv
index e5143ac..fee137f 100644
--- a/tests/networkxml2argvdata/nat-network-dns-hosts.argv
+++ b/tests/networkxml2argvdata/nat-network-dns-hosts.argv
@@ -1,5 +1,10 @@
- DNSMASQ@ --strict-order --domain=example.com \
---local=/example.com/ --domain-needed \
+ DNSMASQ@ \
+--strict-order \
+--domain-needed \
+--domain=example.com \
+--expand-hosts \
+--local=/example.com/ \
 --conf-file= \
---bind-dynamic --interface virbr0 \
---expand-hosts --addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts\
+--bind-dynamic \
+--interface virbr0 \
+--addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts\
diff --git a/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv b/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv
index 031da3f..1de6637 100644
--- a/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv
+++ b/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv
@@ -1,7 +1,10 @@
 @DNSMASQ@ \
 --strict-order \
---local=// --domain-needed --conf-file= \
---bind-interfaces --except-interface lo \
+--domain-needed \
+--local=// \
+--conf-file= \
+--bind-interfaces \
+--except-interface=lo \
 --listen-address 192.168.122.1 \
 --listen-address 192.168.123.1 \
 --listen-address fc00:db8:ac10:fe01::1 \
@@ -9,8 +12,8 @@
 --listen-address 10.24.10.1 \
 --srv-host=name.tcp.,,,, \
 --dhcp-range 192.168.122.2,192.168.122.254 \
+--dhcp-no-override \
 --dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases \
 --dhcp-lease-max=253 \
---dhcp-no-override \
 --dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile \
 --addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts\
diff --git a/tests/networkxml2argvdata/nat-network-dns-srv-record.argv b/tests/networkxml2argvdata/nat-network-dns-srv-record.argv
index beff591..e7ecaa5 100644
--- a/tests/networkxml2argvdata/nat-network-dns-srv-record.argv
+++ b/tests/networkxml2argvdata/nat-network-dns-srv-record.argv
@@ -1,11 +1,14 @@
 @DNSMASQ@ \
 --strict-order \
---local=// --domain-needed --conf-file= \
---bind-dynamic --interface virbr0 \
+--domain-needed \
+--local=// \
+--conf-file= \
+--bind-dynamic \
+--interface virbr0 \
 --srv-host=name.tcp.test-domain-name,.,1024,10,10 \
 --dhcp-range 192.168.122.2,192.168.122.254 \
+--dhcp-no-override \
 --dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases \
 --dhcp-lease-max=253 \
---dhcp-no-override \
 --dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile \
 --addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts\
diff --git a/tests/networkxml2argvdata/nat-network-dns-txt-record.argv b/tests/networkxml2argvdata/nat-network-dns-txt-record.argv
index fc164f6..8ea0004 100644
--- a/tests/networkxml2argvdata/nat-network-dns-txt-record.argv
+++ b/tests/networkxml2argvdata/nat-network-dns-txt-record.argv
@@ -1,9 +1,13 @@
- DNSMASQ@ --strict-order \
---local=// --domain-needed --conf-file= \
+ DNSMASQ@ \
+--strict-order \
+--domain-needed \
+--local=// \
+--conf-file= \
 --bind-dynamic --interface virbr0 \
 '--txt-record=example,example value' \
 --dhcp-range 192.168.122.2,192.168.122.254 \
+--dhcp-no-override \
 --dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases \
---dhcp-lease-max=253 --dhcp-no-override \
+--dhcp-lease-max=253 \
 --dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile \
 --addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts\
diff --git a/tests/networkxml2argvdata/nat-network.argv b/tests/networkxml2argvdata/nat-network.argv
index 6303f76..578a5ff 100644
--- a/tests/networkxml2argvdata/nat-network.argv
+++ b/tests/networkxml2argvdata/nat-network.argv
@@ -1,8 +1,15 @@
- DNSMASQ@ --strict-order \
---local=// --domain-needed --conf-file= \
---bind-dynamic --interface virbr0 \
+ DNSMASQ@ \
+--strict-order \
+--domain-needed \
+--local=// \
+--conf-file= \
+--bind-dynamic \
+--interface virbr0 \
 --dhcp-range 192.168.122.2,192.168.122.254 \
+--dhcp-no-override \
 --dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases \
---dhcp-lease-max=253 --dhcp-no-override \
+--dhcp-lease-max=253 \
 --dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile \
---addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts\
+--addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts \
+--dhcp-range=2001:db8:ac10:fe01::1,ra-only \
+--dhcp-range=2001:db8:ac10:fd01::1,ra-only\
diff --git a/tests/networkxml2argvdata/netboot-network.argv b/tests/networkxml2argvdata/netboot-network.argv
index 9699e5c..c5b75a3 100644
--- a/tests/networkxml2argvdata/netboot-network.argv
+++ b/tests/networkxml2argvdata/netboot-network.argv
@@ -1,10 +1,19 @@
- DNSMASQ@ --strict-order --domain=example.com \
---local=/example.com/ --domain-needed --conf-file= \
---bind-interfaces --except-interface lo --listen-address 192.168.122.1 \
+ DNSMASQ@ \
+--strict-order \
+--domain-needed \
+--domain=example.com \
+--expand-hosts \
+--local=/example.com/ \
+--conf-file= \
+--bind-interfaces \
+--except-interface=lo \
+--listen-address 192.168.122.1 \
 --dhcp-range 192.168.122.2,192.168.122.254 \
+--dhcp-no-override \
+--enable-tftp \
+--tftp-root /var/lib/tftproot \
+--dhcp-boot pxeboot.img \
 --dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases \
---dhcp-lease-max=253 --dhcp-no-override --expand-hosts \
+--dhcp-lease-max=253 \
 --dhcp-hostsfile=/var/lib/libvirt/dnsmasq/netboot.hostsfile \
---addn-hosts=/var/lib/libvirt/dnsmasq/netboot.addnhosts \
---enable-tftp \
---tftp-root /var/lib/tftproot --dhcp-boot pxeboot.img\
+--addn-hosts=/var/lib/libvirt/dnsmasq/netboot.addnhosts\
diff --git a/tests/networkxml2argvdata/netboot-proxy-network.argv b/tests/networkxml2argvdata/netboot-proxy-network.argv
index 9ac3018..16e1c85 100644
--- a/tests/networkxml2argvdata/netboot-proxy-network.argv
+++ b/tests/networkxml2argvdata/netboot-proxy-network.argv
@@ -1,10 +1,17 @@
- DNSMASQ@ --strict-order --domain=example.com \
---local=/example.com/ --domain-needed --conf-file= \
---bind-interfaces --except-interface lo \
+ DNSMASQ@ \
+--strict-order \
+--domain-needed \
+--domain=example.com \
+--expand-hosts \
+--local=/example.com/ \
+--conf-file= \
+--bind-interfaces \
+--except-interface=lo \
 --listen-address 192.168.122.1 \
 --dhcp-range 192.168.122.2,192.168.122.254 \
+--dhcp-no-override \
+--dhcp-boot pxeboot.img,,10.20.30.40 \
 --dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases \
---dhcp-lease-max=253 --dhcp-no-override --expand-hosts \
+--dhcp-lease-max=253 \
 --dhcp-hostsfile=/var/lib/libvirt/dnsmasq/netboot.hostsfile \
---addn-hosts=/var/lib/libvirt/dnsmasq/netboot.addnhosts \
---dhcp-boot pxeboot.img,,10.20.30.40\
+--addn-hosts=/var/lib/libvirt/dnsmasq/netboot.addnhosts\
diff --git a/tests/networkxml2argvdata/routed-network.argv b/tests/networkxml2argvdata/routed-network.argv
index 700c904..b3fbf49 100644
--- a/tests/networkxml2argvdata/routed-network.argv
+++ b/tests/networkxml2argvdata/routed-network.argv
@@ -1,4 +1,8 @@
- DNSMASQ@ --strict-order \
---local=// --domain-needed --conf-file= \
---bind-dynamic --interface virbr1 \
+ DNSMASQ@ \
+--strict-order \
+--domain-needed \
+--local=// \
+--conf-file= \
+--bind-dynamic \
+--interface virbr1 \
 --addn-hosts=/var/lib/libvirt/dnsmasq/local.addnhosts\
diff --git a/tests/networkxml2argvtest.c b/tests/networkxml2argvtest.c
index 69cbd1c..a020db9 100644
--- a/tests/networkxml2argvtest.c
+++ b/tests/networkxml2argvtest.c
@@ -152,6 +152,8 @@ mymain(void)
         = dnsmasqCapsNewFromBuffer("Dnsmasq version 2.48", DNSMASQ);
     dnsmasqCapsPtr full
         = dnsmasqCapsNewFromBuffer("Dnsmasq version 2.63\n--bind-dynamic", DNSMASQ);
+    dnsmasqCapsPtr dhcpv6
+        = dnsmasqCapsNewFromBuffer("Dnsmasq version 2.64\n--bind-dynamic", DNSMASQ);
 
     networkDnsmasqLeaseFileName = testDnsmasqLeaseFileName;
 
@@ -172,10 +174,13 @@ mymain(void)
     DO_TEST("netboot-proxy-network", restricted);
     DO_TEST("nat-network-dns-srv-record-minimal", restricted);
     DO_TEST("routed-network", full);
-    DO_TEST("nat-network", full);
+    DO_TEST("nat-network", dhcpv6);
     DO_TEST("nat-network-dns-txt-record", full);
     DO_TEST("nat-network-dns-srv-record", full);
     DO_TEST("nat-network-dns-hosts", full);
+    DO_TEST("dhcp6-network", dhcpv6);
+    DO_TEST("dhcp6-nat-network", dhcpv6);
+    DO_TEST("dhcp6host-routed-network", dhcpv6);
 
     return ret==0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
-- 
1.7.11.7


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]