External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-03 16:42:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

network: change default of forwardPlainNames to 'yes'

Browse Source 
The previous patch fixed "forwardPlainNames" so that it really is
doing only what is intended, but left the default to be
"forwardPlainNames='no'". Discussion around the initial version of
that patch led to the decision that the default should instead be
"forwardPlainNames='yes'" (i.e. the original behavior before commit
f3886825). This patch makes that change to the default.
This commit is contained in:
Laine Stump 2014-01-31 15:50:16 +02:00
parent f69a6b987d
commit 66f75925eb
18 changed files with 42 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/conf/network_conf.c
View File

@ -1,7 +1,7 @@
/*
* network_conf.c: network XML handling
*
* Copyright (C) 2006-2013 Red Hat, Inc.
* Copyright (C) 2006-2014 Red Hat, Inc.
* Copyright (C) 2006-2008 Daniel P. Berrange
*
* This library is free software; you can redistribute it and/or
@ -66,6 +66,12 @@ VIR_ENUM_IMPL(virNetworkForwardDriverName,
"kvm",
"vfio")
VIR_ENUM_IMPL(virNetworkDNSForwardPlainNames,
VIR_NETWORK_DNS_FORWARD_PLAIN_NAMES_LAST,
"default",
"yes",
"no")
virNetworkObjPtr virNetworkFindByUUID(virNetworkObjListPtr nets,
const unsigned char *uuid)
{
@ -1053,9 +1059,9 @@ virNetworkDNSDefParseXML(const char *networkName,
forwardPlainNames = virXPathString("string(./@forwardPlainNames)", ctxt);
if (forwardPlainNames) {
if (STREQ(forwardPlainNames, "yes")) {
def->forwardPlainNames = true;
} else if (STRNEQ(forwardPlainNames, "no")) {
def->forwardPlainNames
= virNetworkDNSForwardPlainNamesTypeFromString(forwardPlainNames);
if (def->forwardPlainNames <= 0) {
virReportError(VIR_ERR_XML_ERROR,
_("Invalid dns forwardPlainNames setting '%s' "
"in network '%s'"),
@ -2295,19 +2301,26 @@ static int
virNetworkDNSDefFormat(virBufferPtr buf,
const virNetworkDNSDef *def)
{
int result = 0;
size_t i, j;
if (!(def->forwardPlainNames || def->forwarders || def->nhosts ||
def->nsrvs || def->ntxts))
goto out;
return 0;
virBufferAddLit(buf, "<dns");
if (def->forwardPlainNames) {
virBufferAddLit(buf, " forwardPlainNames='yes'");
const char *fwd = virNetworkDNSForwardPlainNamesTypeToString(def->forwardPlainNames);
if (!fwd) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Unknown forwardPlainNames type %d in network"),
def->forwardPlainNames);
return -1;
}
virBufferAsprintf(buf, " forwardPlainNames='%s'", fwd);
if (!(def->forwarders || def->nhosts || def->nsrvs || def->ntxts)) {
virBufferAddLit(buf, "/>\n");
goto out;
return 0;
}
}
@ -2363,8 +2376,7 @@ virNetworkDNSDefFormat(virBufferPtr buf,
}
virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</dns>\n");
out:
return result;
return 0;
}
static int

17
src/conf/network_conf.h
View File

@ -1,7 +1,7 @@
/*
* network_conf.h: network XML handling
*
* Copyright (C) 2006-2013 Red Hat, Inc.
* Copyright (C) 2006-2014 Red Hat, Inc.
* Copyright (C) 2006-2008 Daniel P. Berrange
*
* This library is free software; you can redistribute it and/or
@ -112,10 +112,23 @@ struct _virNetworkDNSHostDef {
char **names;
};
/* If forwardPlainNames is 0 (default), that is equivalent to "yes",
* but won't be encoded in newly formatted XML.
*/
typedef enum {
VIR_NETWORK_DNS_FORWARD_PLAIN_NAMES_DEFAULT = 0, /* silent "yes" */
VIR_NETWORK_DNS_FORWARD_PLAIN_NAMES_YES,
VIR_NETWORK_DNS_FORWARD_PLAIN_NAMES_NO,
VIR_NETWORK_DNS_FORWARD_PLAIN_NAMES_LAST,
} virNetworkDNSForwardPlainNamesType;
VIR_ENUM_DECL(virNetworkDNSForwardPlainNames)
typedef struct _virNetworkDNSDef virNetworkDNSDef;
typedef virNetworkDNSDef *virNetworkDNSDefPtr;
struct _virNetworkDNSDef {
bool forwardPlainNames;
int forwardPlainNames; /* enum virNetworkDNSForwardPlainNamesType */
size_t ntxts;
virNetworkDNSTxtDefPtr txts;
size_t nhosts;

3
src/network/bridge_driver.c
View File

@ -725,7 +725,8 @@ networkDnsmasqConfContents(virNetworkObjPtr network,
network->def->domain);
}
if (!network->def->dns.forwardPlainNames) {
if (network->def->dns.forwardPlainNames
== VIR_NETWORK_DNS_FORWARD_PLAIN_NAMES_NO) {
virBufferAddLit(&configbuf, "domain-needed\n");
/* need to specify local=// whether or not a domain is
* specified, unless the config says we should forward "plain"

2
tests/networkxml2confdata/dhcp6-nat-network.conf
View File

@ -5,8 +5,6 @@
##
## dnsmasq conf file created by libvirt
strict-order
domain-needed
local=//
except-interface=lo
bind-dynamic
interface=virbr0

2
tests/networkxml2confdata/dhcp6-network.conf
View File

@ -7,8 +7,6 @@
strict-order
domain=mynet
expand-hosts
domain-needed
local=//
except-interface=lo
bind-dynamic
interface=virbr0

2
tests/networkxml2confdata/dhcp6host-routed-network.conf
View File

@ -5,8 +5,6 @@
##
## dnsmasq conf file created by libvirt
strict-order
domain-needed
local=//
except-interface=lo
bind-dynamic
interface=virbr1

2
tests/networkxml2confdata/isolated-network.conf
View File

@ -5,8 +5,6 @@
##
## dnsmasq conf file created by libvirt
strict-order
domain-needed
local=//
except-interface=lo
bind-interfaces
listen-address=192.168.152.1

2
tests/networkxml2confdata/nat-network-dns-forwarders.conf
View File

@ -8,8 +8,6 @@ strict-order
no-resolv
server=8.8.8.8
server=8.8.4.4
domain-needed
local=//
except-interface=lo
bind-dynamic
interface=virbr0

2
tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf
View File

@ -5,8 +5,6 @@
##
## dnsmasq conf file created by libvirt
strict-order
domain-needed
local=//
except-interface=lo
bind-interfaces
listen-address=192.168.122.1

2
tests/networkxml2confdata/nat-network-dns-srv-record.conf
View File

@ -5,8 +5,6 @@
##
## dnsmasq conf file created by libvirt
strict-order
domain-needed
local=//
except-interface=lo
bind-dynamic
interface=virbr0

2
tests/networkxml2confdata/nat-network-dns-txt-record.conf
View File

@ -5,8 +5,6 @@
##
## dnsmasq conf file created by libvirt
strict-order
domain-needed
local=//
except-interface=lo
bind-dynamic
interface=virbr0

2
tests/networkxml2confdata/nat-network.conf
View File

@ -5,8 +5,6 @@
##
## dnsmasq conf file created by libvirt
strict-order
domain-needed
local=//
except-interface=lo
bind-dynamic
interface=virbr0

2
tests/networkxml2confdata/netboot-network.conf
View File

@ -7,8 +7,6 @@
strict-order
domain=example.com
expand-hosts
domain-needed
local=//
except-interface=lo
bind-interfaces
listen-address=192.168.122.1

2
tests/networkxml2confdata/netboot-proxy-network.conf
View File

@ -7,8 +7,6 @@
strict-order
domain=example.com
expand-hosts
domain-needed
local=//
except-interface=lo
bind-interfaces
listen-address=192.168.122.1

2
tests/networkxml2confdata/routed-network.conf
View File

@ -5,8 +5,6 @@
##
## dnsmasq conf file created by libvirt
strict-order
domain-needed
local=//
except-interface=lo
bind-dynamic
interface=virbr1

2
tests/networkxml2xmlout/nat-network-dns-hosts.xml
View File

@ -5,7 +5,7 @@
<interface dev='eth0'/>
</forward>
<bridge name='virbr0' stp='on' delay='0'/>
<dns>
<dns forwardPlainNames='no'>
<host ip='192.168.122.1'>
<hostname>host</hostname>
<hostname>gateway</hostname>

2
tests/networkxml2xmlupdateout/nat-network-dns-more-hosts.xml
View File

@ -5,7 +5,7 @@
<interface dev='eth0'/>
</forward>
<bridge name='virbr0' stp='on' delay='0'/>
<dns>
<dns forwardPlainNames='no'>
<host ip='f0:d::f0:d'>
<hostname>pudding</hostname>
</host>

1
tests/networkxml2xmlupdateout/nat-network-no-hosts.xml
View File

@ -5,6 +5,7 @@
<interface dev='eth0'/>
</forward>
<bridge name='virbr0' stp='on' delay='0'/>
<dns forwardPlainNames='no'/>
<ip address='192.168.122.1' netmask='255.255.255.0'>
</ip>
</network>