From: Gabriel Goller <g.goller@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH pve-network v3 21/28] sdn: dhcp: fix DNS server option for IPv4 subnets without gateway
Date: Thu, 19 Nov 2026 20:41:07 +0100 [thread overview]
Message-ID: <20261119194116.575520-22-g.goller@proxmox.com> (raw)
In-Reply-To: <20261119194116.575520-1-g.goller@proxmox.com>
The option prefix was only set for IPv4 subnets with a gateway, so setting
dhcp-dns-server on a subnet without one wrote an invalid line
'dhcp-option=tag:<tag>,:dns-server,<ip>' to the dnsmasq config.
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
src/PVE/Network/SDN/Dhcp/Dnsmasq.pm | 11 +++-----
src/PVE/Network/SDN/SubnetPlugin.pm | 8 +++++-
src/test/run_test_vnets_blackbox.pl | 42 +++++++++++++++++++++++++++++
3 files changed, 53 insertions(+), 8 deletions(-)
diff --git a/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm b/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm
index 9bf37307952f..a34883a97cf6 100644
--- a/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm
+++ b/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm
@@ -161,13 +161,10 @@ sub configure_subnet {
push @{$config}, "dhcp-range=set:$tag,$network,static,$mask,infinite";
- my $option_string;
- if (ip_is_ipv6($subnet_config->{network})) {
- $option_string = 'option6';
- } elsif ($subnet_config->{gateway}) {
- $option_string = 'option';
- push @{$config}, "dhcp-option=tag:$tag,$option_string:router,$subnet_config->{gateway}";
- }
+ my $option_string = $is_ipv4 ? 'option' : 'option6';
+
+ push @{$config}, "dhcp-option=tag:$tag,$option_string:router,$subnet_config->{gateway}"
+ if $is_ipv4 && $subnet_config->{gateway};
push @{$config},
"dhcp-option=tag:$tag,$option_string:dns-server,$subnet_config->{'dhcp-dns-server'}"
diff --git a/src/PVE/Network/SDN/SubnetPlugin.pm b/src/PVE/Network/SDN/SubnetPlugin.pm
index 326c80ee3e90..8d4ad10b531f 100644
--- a/src/PVE/Network/SDN/SubnetPlugin.pm
+++ b/src/PVE/Network/SDN/SubnetPlugin.pm
@@ -180,7 +180,7 @@ sub properties {
'dhcp-dns-server' => {
type => 'string',
format => 'ip',
- description => 'IP address for the DNS server',
+ description => 'DNS server IP address. Must use the same address family as the subnet.',
optional => 1,
},
};
@@ -229,6 +229,12 @@ sub on_update_hook {
raise_param_exc({ gateway => "$gateway is not in subnet $cidr" })
if $gateway && !$subnet_matcher->($gateway) && !$pointopoint;
+ if (my $dns_server = $subnet->{'dhcp-dns-server'}) {
+ my ($network) = split('/', $cidr, 2);
+ raise_param_exc({ 'dhcp-dns-server' => 'Must use the same address family as the subnet' })
+ if Net::IP::ip_get_version($dns_server) != Net::IP::ip_get_version($network);
+ }
+
validate_dhcp_ranges($subnet);
if ($ipam) {
diff --git a/src/test/run_test_vnets_blackbox.pl b/src/test/run_test_vnets_blackbox.pl
index 067f4c1b9962..9b8091370267 100755
--- a/src/test/run_test_vnets_blackbox.pl
+++ b/src/test/run_test_vnets_blackbox.pl
@@ -1039,4 +1039,46 @@ sub test_update_vnet_without_zone {
}
run_test(\&test_update_vnet_without_zone);
+sub test_dhcp_dns_server_family {
+ my $zoneid = 'TESTZONE';
+ my $vnetid = 'testvnet';
+
+ create_zone({ type => 'simple', zone => $zoneid });
+ create_vnet({ type => 'vnet', zone => $zoneid, vnet => $vnetid });
+
+ for my $case (
+ ['192.0.2.0/24', '198.51.100.53', '2001:db8::53', '192.0.2.128/25'],
+ ['2001:db8::/64', '2001:db8:1::53', '198.51.100.53', '2001:db8:2::/64'],
+ ) {
+ my ($subnet, $dns, $wrong_dns, $other_subnet) = @$case;
+ my $id = "$zoneid-" . ($subnet =~ s!/!-!r);
+
+ create_subnet({
+ type => 'subnet', vnet => $vnetid, subnet => $subnet, 'dhcp-dns-server' => $dns,
+ });
+ my $config = PVE::API2::Network::SDN::Subnets->read({ subnet => $id, vnet => $vnetid });
+ is($config->{'dhcp-dns-server'}, $dns, "$subnet accepts a DNS server of its own family");
+
+ my $updated = eval {
+ PVE::API2::Network::SDN::Subnets->update({
+ subnet => $id, vnet => $vnetid, 'dhcp-dns-server' => $wrong_dns,
+ });
+ 1;
+ };
+ ok(!$updated, "$subnet rejects a DNS server of the other family on update");
+
+ my $created = eval {
+ create_subnet({
+ type => 'subnet',
+ vnet => $vnetid,
+ subnet => $other_subnet,
+ 'dhcp-dns-server' => $wrong_dns,
+ });
+ 1;
+ };
+ ok(!$created, "$other_subnet rejects a DNS server of the other family on create");
+ }
+}
+run_test(\&test_dhcp_dns_server_family);
+
done_testing();
--
2.47.3
next prev parent reply other threads:[~2026-11-19 19:43 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-19 19:40 [PATCH common/manager/network/proxmox{-ve-rs,-perl-rs,-widget-toolkit} v3 00/28] SDN VRF support Gabriel Goller
2026-11-19 19:40 ` [PATCH pve-common v3 01/28] interfaces: preserve VRF membership across address family changes Gabriel Goller
2026-11-19 19:40 ` [PATCH proxmox-ve-rs v3 02/28] frr: add VRF-aware OSPF rendering Gabriel Goller
2026-11-19 19:40 ` [PATCH proxmox-ve-rs v3 03/28] sdn: add zone references to OSPF and BGP fabrics Gabriel Goller
2026-11-19 19:40 ` [PATCH proxmox-ve-rs v3 04/28] sdn: generate fabric routing configuration in zone VRFs Gabriel Goller
2026-11-19 19:40 ` [PATCH proxmox-ve-rs v3 05/28] sdn: fix VRF route-map scoping and zone ID validation Gabriel Goller
2026-11-19 19:40 ` [PATCH proxmox-ve-rs v3 06/28] tests: fabrics: add tests for fabrics in VRFs Gabriel Goller
2026-11-19 19:40 ` [PATCH proxmox-ve-rs v3 07/28] sdn: allow static routes in simple zone VRFs Gabriel Goller
2026-11-19 19:40 ` [PATCH proxmox-perl-rs v3 08/28] pve-rs: fabrics: assign network interfaces to configured VRFs Gabriel Goller
2026-11-19 19:40 ` [PATCH proxmox-perl-rs v3 09/28] pve-rs: fabrics: make per-fabric status queries VRF-aware Gabriel Goller
2026-11-19 19:40 ` [PATCH proxmox-perl-rs v3 10/28] pve-rs: fabrics: include VRF routes in aggregate status Gabriel Goller
2026-11-19 19:40 ` [PATCH proxmox-perl-rs v3 11/28] pve-rs: fabrics: expose host interface membership Gabriel Goller
2026-11-19 19:40 ` [PATCH proxmox-perl-rs v3 12/28] sdn: expose static routes for simple zone uplinks Gabriel Goller
2026-11-19 19:40 ` [PATCH pve-network v3 13/28] sdn: evpn: add unreachable IPv6 default route to zone VRFs Gabriel Goller
2026-11-19 19:41 ` [PATCH pve-network v3 14/28] sdn: add optional VRFs for simple zones Gabriel Goller
2026-11-19 19:41 ` [PATCH pve-network v3 15/28] sdn: allow fabrics to use simple zone VRFs Gabriel Goller
2026-11-19 19:41 ` [PATCH pve-network v3 16/28] sdn: require underlay fabrics to use the default VRF Gabriel Goller
2026-11-19 19:41 ` [PATCH pve-network v3 17/28] sdn: move full range CIDR formats into a separate module Gabriel Goller
2026-11-19 19:41 ` [PATCH pve-network v3 18/28] sdn: simple: support static routes in zone routing tables Gabriel Goller
2026-11-19 19:41 ` [PATCH pve-network v3 19/28] sdn: dhcp: only configure DHCP for zones on the local node Gabriel Goller
2026-11-19 19:41 ` [PATCH pve-network v3 20/28] sdn: dhcp: run dnsmasq in the zone VRF Gabriel Goller
2026-11-19 19:41 ` Gabriel Goller [this message]
2026-11-19 19:41 ` [PATCH pve-network v3 22/28] sdn: evpn: no exit node null routes for simple zone VRFs Gabriel Goller
2026-11-19 19:41 ` [PATCH proxmox-widget-toolkit v3 23/28] ui: network: allow selecting a VRF for host interfaces Gabriel Goller
2026-11-19 19:41 ` [PATCH pve-manager v3 24/28] ui: sdn: add VRF zone selection for fabrics Gabriel Goller
2026-11-19 19:41 ` [PATCH pve-manager v3 25/28] network: allow setting the VRF of host interfaces Gabriel Goller
2026-11-19 19:41 ` [PATCH pve-manager v3 26/28] ui: sdn: allow static routes for Simple zone VRFs Gabriel Goller
2026-11-19 19:41 ` [PATCH pve-manager v3 27/28] network: generate SDN DHCP config after ifreload Gabriel Goller
2026-11-19 19:41 ` [PATCH pve-manager v3 28/28] ui: sdn: subnet: allow setting the DHCP DNS server Gabriel Goller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261119194116.575520-22-g.goller@proxmox.com \
--to=g.goller@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox