Attachment 629650 Details for Bug 867441 – add --interface to dnsmasq command line

[patch] add --interface to dnsmasq command line

libvirt-interface-fix-2.patch (text/plain), 7.75 KB, created by Gene Czarcinski on 2012-10-18 20:54:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gene Czarcinski

Created: 2012-10-18 20:54:57 UTC

Size: 7.75 KB

patch

obsolete

>diff -urp libvirt-0.10.2-0-orig/src/network/bridge_driver.c libvirt-0.10.2/src/network/bridge_driver.c
>--- libvirt-0.10.2-0-orig/src/network/bridge_driver.c	2012-09-23 21:55:16.000000000 -0400
>+++ libvirt-0.10.2/src/network/bridge_driver.c	2012-10-18 16:28:20.538670209 -0400
>@@ -681,14 +681,22 @@ networkBuildDnsmasqArgv(virNetworkObjPtr
>         }
>     }
> 
>-    /*
>-     * --interface does not actually work with dnsmasq < 2.47,
>-     * due to DAD for ipv6 addresses on the interface.
>+    /* It may have been important not to use --interface at one time,
>+     * but with with dnsmasq => 2.61 there is a problem if
>+     * --interface is not specified because --bind-interfaces
>+     * will have no effect.  Here is what Simon Kelly (dnsmasq
>+     * developer) has to say on the subject:
>+     * "The problem is that, without SO_BINDTODEVICE, there is 
>+     * no guarantee that the kernel will route DHCP (v4 or v6) 
>+     * packets to the correct instance of dnsmasq, 
>+     * when there is more than one."
>      *
>-     * virCommandAddArgList(cmd, "--interface", ipdef->bridge, NULL);
>-     *
>-     * So listen on all defined IPv[46] addresses
>+     * --interface is added but the --listen-address parameters
>+     * are left in.
>      */
>+
>+    virCommandAddArgList(cmd, "--interface", network->def->bridge, NULL);
>+    
>     for (ii = 0;
>          (tmpipdef = virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, ii));
>          ii++) {
>diff -urp libvirt-0.10.2-0-orig/tests/networkxml2argvdata/isolated-network.argv libvirt-0.10.2/tests/networkxml2argvdata/isolated-network.argv
>--- libvirt-0.10.2-0-orig/tests/networkxml2argvdata/isolated-network.argv	2012-09-12 05:15:43.000000000 -0400
>+++ libvirt-0.10.2/tests/networkxml2argvdata/isolated-network.argv	2012-10-18 16:29:41.185206181 -0400
>@@ -1,6 +1,7 @@
> @DNSMASQ@ --strict-order --bind-interfaces \
> --local=// --domain-needed --conf-file= \
> --except-interface lo --dhcp-option=3 --no-resolv \
>+--interface virbr2 \
> --listen-address 192.168.152.1 \
> --dhcp-range 192.168.152.2,192.168.152.254 \
> --dhcp-leasefile=/var/lib/libvirt/dnsmasq/private.leases --dhcp-lease-max=253 \
>diff -urp libvirt-0.10.2-0-orig/tests/networkxml2argvdata/nat-network.argv libvirt-0.10.2/tests/networkxml2argvdata/nat-network.argv
>--- libvirt-0.10.2-0-orig/tests/networkxml2argvdata/nat-network.argv	2012-09-12 05:15:43.000000000 -0400
>+++ libvirt-0.10.2/tests/networkxml2argvdata/nat-network.argv	2012-10-18 16:36:56.363960573 -0400
>@@ -1,6 +1,7 @@
> @DNSMASQ@ --strict-order --bind-interfaces \
> --local=// --domain-needed --conf-file= \
>---except-interface lo --listen-address 192.168.122.1 \
>+--except-interface lo --interface virbr0 \
>+--listen-address 192.168.122.1 \
> --listen-address 192.168.123.1 --listen-address 2001:db8:ac10:fe01::1 \
> --listen-address 2001:db8:ac10:fd01::1 --listen-address 10.24.10.1 \
> --dhcp-range 192.168.122.2,192.168.122.254 \
>diff -urp libvirt-0.10.2-0-orig/tests/networkxml2argvdata/nat-network-dns-hosts.argv libvirt-0.10.2/tests/networkxml2argvdata/nat-network-dns-hosts.argv
>--- libvirt-0.10.2-0-orig/tests/networkxml2argvdata/nat-network-dns-hosts.argv	2012-09-12 05:15:43.000000000 -0400
>+++ libvirt-0.10.2/tests/networkxml2argvdata/nat-network-dns-hosts.argv	2012-10-18 16:33:39.573846829 -0400
>@@ -1,4 +1,5 @@
> @DNSMASQ@ --strict-order --bind-interfaces --domain=example.com \
> --local=/example.com/ --domain-needed \
>---conf-file= --except-interface lo --listen-address 192.168.122.1 \
>+--conf-file= --except-interface lo \
>+--interface virbr0 --listen-address 192.168.122.1 \
> --expand-hosts --addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts\
>diff -urp libvirt-0.10.2-0-orig/tests/networkxml2argvdata/nat-network-dns-srv-record.argv libvirt-0.10.2/tests/networkxml2argvdata/nat-network-dns-srv-record.argv
>--- libvirt-0.10.2-0-orig/tests/networkxml2argvdata/nat-network-dns-srv-record.argv	2012-09-12 05:15:43.000000000 -0400
>+++ libvirt-0.10.2/tests/networkxml2argvdata/nat-network-dns-srv-record.argv	2012-10-18 16:35:21.195632843 -0400
>@@ -4,6 +4,7 @@
> --local=// --domain-needed --conf-file= \
> --except-interface lo \
> --srv-host=name.tcp.test-domain-name,.,1024,10,10 \
>+--interface virbr0 \
> --listen-address 192.168.122.1 \
> --listen-address 192.168.123.1 \
> --listen-address 2001:db8:ac10:fe01::1 \
>diff -urp libvirt-0.10.2-0-orig/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv libvirt-0.10.2/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv
>--- libvirt-0.10.2-0-orig/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv	2012-09-12 05:15:43.000000000 -0400
>+++ libvirt-0.10.2/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv	2012-10-18 16:34:50.185444952 -0400
>@@ -4,6 +4,7 @@
> --local=// --domain-needed --conf-file= \
> --except-interface lo \
> --srv-host=name.tcp.,,,, \
>+--interface virbr0 \
> --listen-address 192.168.122.1 \
> --listen-address 192.168.123.1 \
> --listen-address 2001:db8:ac10:fe01::1 \
>diff -urp libvirt-0.10.2-0-orig/tests/networkxml2argvdata/nat-network-dns-txt-record.argv libvirt-0.10.2/tests/networkxml2argvdata/nat-network-dns-txt-record.argv
>--- libvirt-0.10.2-0-orig/tests/networkxml2argvdata/nat-network-dns-txt-record.argv	2012-09-12 05:15:43.000000000 -0400
>+++ libvirt-0.10.2/tests/networkxml2argvdata/nat-network-dns-txt-record.argv	2012-10-18 16:36:04.798709691 -0400
>@@ -1,6 +1,7 @@
> @DNSMASQ@ --strict-order --bind-interfaces \
> --local=// --domain-needed --conf-file= \
> --except-interface lo '--txt-record=example,example value' \
>+--interface virbr0 \
> --listen-address 192.168.122.1 --listen-address 192.168.123.1 \
> --listen-address 2001:db8:ac10:fe01::1 \
> --listen-address 2001:db8:ac10:fd01::1 --listen-address 10.24.10.1 \
>diff -urp libvirt-0.10.2-0-orig/tests/networkxml2argvdata/netboot-network.argv libvirt-0.10.2/tests/networkxml2argvdata/netboot-network.argv
>--- libvirt-0.10.2-0-orig/tests/networkxml2argvdata/netboot-network.argv	2012-09-12 05:15:43.000000000 -0400
>+++ libvirt-0.10.2/tests/networkxml2argvdata/netboot-network.argv	2012-10-18 16:31:48.484478283 -0400
>@@ -1,6 +1,7 @@
> @DNSMASQ@ --strict-order --bind-interfaces --domain=example.com \
> --local=/example.com/ --domain-needed --conf-file= \
>---except-interface lo --listen-address 192.168.122.1 \
>+--except-interface lo --interface virbr1 \
>+--listen-address 192.168.122.1 \
> --dhcp-range 192.168.122.2,192.168.122.254 \
> --dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases \
> --dhcp-lease-max=253 --dhcp-no-override --expand-hosts --enable-tftp \
>diff -urp libvirt-0.10.2-0-orig/tests/networkxml2argvdata/netboot-proxy-network.argv libvirt-0.10.2/tests/networkxml2argvdata/netboot-proxy-network.argv
>--- libvirt-0.10.2-0-orig/tests/networkxml2argvdata/netboot-proxy-network.argv	2012-09-12 05:15:43.000000000 -0400
>+++ libvirt-0.10.2/tests/networkxml2argvdata/netboot-proxy-network.argv	2012-10-18 16:32:06.133377679 -0400
>@@ -1,6 +1,7 @@
> @DNSMASQ@ --strict-order --bind-interfaces --domain=example.com \
> --local=/example.com/ --domain-needed --conf-file= \
>---except-interface lo --listen-address 192.168.122.1 \
>+--except-interface lo --interface virbr1 \
>+--listen-address 192.168.122.1 \
> --dhcp-range 192.168.122.2,192.168.122.254 \
> --dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases \
> --dhcp-lease-max=253 --dhcp-no-override --expand-hosts \
>diff -urp libvirt-0.10.2-0-orig/tests/networkxml2argvdata/routed-network.argv libvirt-0.10.2/tests/networkxml2argvdata/routed-network.argv
>--- libvirt-0.10.2-0-orig/tests/networkxml2argvdata/routed-network.argv	2012-09-12 05:15:43.000000000 -0400
>+++ libvirt-0.10.2/tests/networkxml2argvdata/routed-network.argv	2012-10-18 16:30:26.521946023 -0400
>@@ -1,3 +1,4 @@
> @DNSMASQ@ --strict-order --bind-interfaces \
> --local=// --domain-needed --conf-file= \
>---except-interface lo --listen-address 192.168.122.1\
>+--except-interface lo --interface virbr1 \
>+--listen-address 192.168.122.1\

Actions: View | Diff

Attachments on bug 867441: 629650