On 06/24/2011 06:04 AM, Michal Novotny wrote:
This commit introduces the<dns> element and<txt> record
for the virtual DNS
network. The DNS TXT record can be defined using following syntax in the
network XML file:
<dns>
<txt name="example" value="example value" />
</dns>
Also, the Relax-NG scheme has been altered to allow the texts without spaces
only for the name element and some nitpicks about memory free'ing have been
fixed by Laine so therefore I'm adding Laine to the SOB clause ;-)
ACK. I pushed it with one small change to the doc (described below)
Signed-off-by: Michal Novotny<minovotn(a)redhat.com>
Signed-off-by: Laine Stump<lstump(a)redhat.com>
---
docs/formatnetwork.html.in | 20 ++++-
docs/schemas/network.rng | 20 ++++
src/conf/network_conf.c | 112 ++++++++++++++++++++
src/conf/network_conf.h | 16 +++
src/network/bridge_driver.c | 18 +++
.../nat-network-dns-txt-record.xml | 24 ++++
.../nat-network-dns-txt-record.xml | 24 ++++
tests/networkxml2xmltest.c | 1 +
8 files changed, 234 insertions(+), 1 deletions(-)
create mode 100644 tests/networkxml2xmlin/nat-network-dns-txt-record.xml
create mode 100644 tests/networkxml2xmlout/nat-network-dns-txt-record.xml
diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in
index 589aaff..62e1e08 100644
--- a/docs/formatnetwork.html.in
+++ b/docs/formatnetwork.html.in
@@ -114,6 +114,9 @@
<pre>
...
<mac address='00:16:3E:5D:C7:9E'/>
+<dns>
+<txt name="example" value="example value" />
+</dns>
<ip address="192.168.122.1"
netmask="255.255.255.0">
<dhcp>
<range start="192.168.122.100"
end="192.168.122.254" />
@@ -166,7 +169,22 @@
supported for IPv6 addresses, can only be specified on a single IPv4 address
per network.
<span class="since">Since 0.7.1</span>
-</dd><dt><code>dhcp</code></dt><dd>Also within
the<code>ip</code> element there is an
+
+</dd><dt><code>dns</code></dt><dd>
+ The dns element of a network contains configuration information for the
+ virtual network's DNS server.<span class="since">Since
0.9.3</span>
+ Currently supported elements are:
+</dd>
+<dt><code>txt</code></dt>
+<dd>A<code>dns</code> element can have 0 or
more<code>txt</code> elements.
+ Each txt element defines a DNS TXT record and has two attributes, both
+ required: a name that can be queried via dns, and a value that will be
+ returned when that name is queried. names cannot contain embedded spaces
+ or commas. value is a single string that can contain multiple values
+ separated by commas.<span class="since">Since 0.9.3</span>
+</dd>
I added a <dl> </dl> to the above paragraph, so it would be obvious that
txt is a subelement of <dns>