11:20 a.m.
Updated based on Laine Stump review and rebased 6 December 2012
Note to Laine: I "ignored" one of your comments involving moving
the order of some dnsmasq parameters in the spirit of "what is done is done."
Changing that would have required more changes to test files as well as
the conf-file patch file.
These two patch files are packaged together because they serially
depend on each other.
The DHCPv6 support checks dnsmasq's version and requires a minimum of 2.64.
Also, using dnsmasq for providing the RA service is checked against the
dnsmasq version and is currently 2.64. There are separate checks for DHCPv6
and Router Advertising support by dnsmasq.
Dnsmasq version 2.64 final is not released and staged for both Fedora 18 and
Fedora 17.
As with IPv4, IPv6 DHCP is only one subnetwork on an interface. Additionally,
if other IPv6 addresses are defined, a warning message is issued since
the Router Advertisement service will support only state-full (DHCP) or
state-less (SLAAC) addressing on a network interface (not both). Thus, the
additional subnetworks will need to be manually configured to properly function.
If dnsmasq provides the RA service, it also points to itself as a RDNSS
(Recursive DNS Server) as part of the information is supplies.
If IPv6 DHCP is not being run, then SLAAC addressing is supported for
any IPv6 addresses specified.
Gene Czarcinski (2):
v8.3 add support for DHCPv6
v8.0: put dnsmasq parameters into conf-file
docs/formatnetwork.html.in | 108 +++-
docs/schemas/network.rng | 12 +-
src/conf/network_conf.c | 96 ++--
src/network/bridge_driver.c | 556 ++++++++++++++-------
src/network/bridge_driver.h | 13 +-
src/util/dnsmasq.c | 29 +-
src/util/dnsmasq.h | 17 +-
tests/networkxml2argvdata/dhcp6-nat-network.conf | 19 +
tests/networkxml2argvdata/dhcp6-nat-network.xml | 24 +
tests/networkxml2argvdata/dhcp6-network.conf | 19 +
tests/networkxml2argvdata/dhcp6-network.xml | 14 +
.../dhcp6host-routed-network.conf | 17 +
.../dhcp6host-routed-network.xml | 19 +
tests/networkxml2argvdata/isolated-network.argv | 10 -
tests/networkxml2argvdata/isolated-network.conf | 20 +
.../networkxml2argvdata/nat-network-dns-hosts.argv | 5 -
.../networkxml2argvdata/nat-network-dns-hosts.conf | 14 +
.../nat-network-dns-srv-record-minimal.argv | 16 -
.../nat-network-dns-srv-record-minimal.conf | 23 +
.../nat-network-dns-srv-record.argv | 11 -
.../nat-network-dns-srv-record.conf | 18 +
.../nat-network-dns-txt-record.argv | 9 -
.../nat-network-dns-txt-record.conf | 18 +
tests/networkxml2argvdata/nat-network.argv | 8 -
tests/networkxml2argvdata/nat-network.conf | 19 +
tests/networkxml2argvdata/netboot-network.argv | 10 -
tests/networkxml2argvdata/netboot-network.conf | 23 +
.../networkxml2argvdata/netboot-proxy-network.argv | 10 -
.../networkxml2argvdata/netboot-proxy-network.conf | 21 +
tests/networkxml2argvdata/routed-network.argv | 4 -
tests/networkxml2argvdata/routed-network.conf | 12 +
tests/networkxml2argvtest.c | 49 +-
32 files changed, 865 insertions(+), 378 deletions(-)
create mode 100644 tests/networkxml2argvdata/dhcp6-nat-network.conf
create mode 100644 tests/networkxml2argvdata/dhcp6-nat-network.xml
create mode 100644 tests/networkxml2argvdata/dhcp6-network.conf
create mode 100644 tests/networkxml2argvdata/dhcp6-network.xml
create mode 100644 tests/networkxml2argvdata/dhcp6host-routed-network.conf
create mode 100644 tests/networkxml2argvdata/dhcp6host-routed-network.xml
delete mode 100644 tests/networkxml2argvdata/isolated-network.argv
create mode 100644 tests/networkxml2argvdata/isolated-network.conf
delete mode 100644 tests/networkxml2argvdata/nat-network-dns-hosts.argv
create mode 100644 tests/networkxml2argvdata/nat-network-dns-hosts.conf
delete mode 100644 tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv
create mode 100644 tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.conf
delete mode 100644 tests/networkxml2argvdata/nat-network-dns-srv-record.argv
create mode 100644 tests/networkxml2argvdata/nat-network-dns-srv-record.conf
delete mode 100644 tests/networkxml2argvdata/nat-network-dns-txt-record.argv
create mode 100644 tests/networkxml2argvdata/nat-network-dns-txt-record.conf
delete mode 100644 tests/networkxml2argvdata/nat-network.argv
create mode 100644 tests/networkxml2argvdata/nat-network.conf
delete mode 100644 tests/networkxml2argvdata/netboot-network.argv
create mode 100644 tests/networkxml2argvdata/netboot-network.conf
delete mode 100644 tests/networkxml2argvdata/netboot-proxy-network.argv
create mode 100644 tests/networkxml2argvdata/netboot-proxy-network.conf
delete mode 100644 tests/networkxml2argvdata/routed-network.argv
create mode 100644 tests/networkxml2argvdata/routed-network.conf
--
1.7.11.7