From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pve-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
by lore.proxmox.com (Postfix) with ESMTPS id 62AA21FF171
for <inbox@lore.proxmox.com>; Fri, 13 Dec 2024 20:46:38 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id BA31A14826;
Fri, 13 Dec 2024 20:46:38 +0100 (CET)
To: pve-devel@lists.proxmox.com
Date: Fri, 13 Dec 2024 20:45:38 +0100
In-Reply-To: <20241213194539.43105-2-lou.lecrivain@wdz.de>
References: <20241213194539.43105-2-lou.lecrivain@wdz.de>
MIME-Version: 1.0
Message-ID: <mailman.183.1734119197.332.pve-devel@lists.proxmox.com>
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Post: <mailto:pve-devel@lists.proxmox.com>
From: lou lecrivain via pve-devel <pve-devel@lists.proxmox.com>
Precedence: list
Cc: lou lecrivain <lou.lecrivain@wdz.de>
X-Mailman-Version: 2.1.29
X-BeenThere: pve-devel@lists.proxmox.com
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
Subject: [pve-devel] SPAM: [PATCH pve-network v3 2/4] dhcp: always generate
dhcp-range for dnsmasq
Content-Type: multipart/mixed; boundary="===============0701432118783542424=="
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com>
--===============0701432118783542424==
Content-Type: message/rfc822
Content-Disposition: inline
Return-Path: <lou.lecrivain@wdz.de>
X-Original-To: pve-devel@lists.proxmox.com
Delivered-To: pve-devel@lists.proxmox.com
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id EA8A3C2B65
for <pve-devel@lists.proxmox.com>; Fri, 13 Dec 2024 20:46:36 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id D4CEB14737
for <pve-devel@lists.proxmox.com>; Fri, 13 Dec 2024 20:46:36 +0100 (CET)
Received: from smtp-tls.etu.univ-nantes.fr (smtptlsetu1-cha.cpub.univ-nantes.fr [IPv6:2001:660:7220:385:193:52:103:133])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS
for <pve-devel@lists.proxmox.com>; Fri, 13 Dec 2024 20:46:36 +0100 (CET)
Received: from localhost (localhost [127.0.0.1])
by smtp-tls.etu.univ-nantes.fr (Postfix) with ESMTP id 1FE662034E;
Fri, 13 Dec 2024 20:46:29 +0100 (CET)
X-Virus-Scanned: Debian amavisd-new at smtptlsetu1-cha.cpub.univ-nantes.fr
Received: from smtp-tls.etu.univ-nantes.fr ([127.0.0.1])
by localhost (smtptlsetu1-cha.cpub.univ-nantes.fr [127.0.0.1]) (amavisd-new, port 10024)
with LMTP id VW8swxnaKlX8; Fri, 13 Dec 2024 20:46:29 +0100 (CET)
Received: from localhost.localdomain (ip-185-104-138-75.ptr.icomera.net [185.104.138.75])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
(No client certificate requested)
by smtp-tls.etu.univ-nantes.fr (Postfix) with ESMTPSA id 6235020346;
Fri, 13 Dec 2024 20:46:28 +0100 (CET)
From: lou lecrivain <lou.lecrivain@wdz.de>
To: pve-devel@lists.proxmox.com
subject: SPAM: [PATCH pve-network v3 2/4] dhcp: always generate dhcp-range for dnsmasq
Date: Fri, 13 Dec 2024 20:45:38 +0100
Message-ID: <20241213194539.43105-3-lou.lecrivain@wdz.de>
X-Mailer: git-send-email 2.47.0
In-Reply-To: <20241213194539.43105-2-lou.lecrivain@wdz.de>
References: <20241213194539.43105-2-lou.lecrivain@wdz.de>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 4
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
DMARC_REJECT 0.1 DMARC reject policy
KAM_DMARC_REJECT 6 DKIM has Failed or SPF has failed on the message and the domain has a DMARC reject policy
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
T_SPF_PERMERROR 0.01 SPF: test of record failed (permerror)
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [dhcp.pm,dnsmasq.pm]
From: Lou Lecrivain <lou.lecrivain@wdz.de>
(configure_range is now noop)
Signed-off-by: lou lecrivain <lou.lecrivain@wdz.de>
Tested-by: Stefan Hanreich <s.hanreich@proxmox.com>
Reviewed-by: Stefan Hanreich <s.hanreich@proxmox.com>
---
src/PVE/Network/SDN/Dhcp.pm | 1 -
src/PVE/Network/SDN/Dhcp/Dnsmasq.pm | 23 ++++++++++-------------
2 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/src/PVE/Network/SDN/Dhcp.pm b/src/PVE/Network/SDN/Dhcp.pm
index d48de34..8bbc210 100644
--- a/src/PVE/Network/SDN/Dhcp.pm
+++ b/src/PVE/Network/SDN/Dhcp.pm
@@ -100,7 +100,6 @@ sub regenerate_config {
my ($zone, $subnet_network, $subnet_mask) = split(/-/, $subnet_id);
next if $zone ne $zoneid;
- next if !$dhcp_ranges;
eval { $dhcp_plugin->configure_subnet($config, $zoneid, $vnetid, $subnet_config) };
warn "Could not configure subnet $subnet_id: $@\n" if $@;
diff --git a/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm b/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm
index ae52d31..263d24f 100644
--- a/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm
+++ b/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm
@@ -129,6 +129,15 @@ sub configure_subnet {
my $tag = $subnet_config->{id};
+ my ($zone, $network, $mask) = split(/-/, $tag);
+
+ if (Net::IP::ip_is_ipv4($network)) {
+ $mask = (2 ** $mask - 1) << (32 - $mask);
+ $mask = join( '.', unpack( "C4", pack( "N", $mask ) ) );
+ }
+
+ push @{$config}, "dhcp-range=set:$tag,$network,static,$mask,infinite";
+
my $option_string;
if (ip_is_ipv6($subnet_config->{network})) {
$option_string = 'option6';
@@ -139,22 +148,10 @@ sub configure_subnet {
push @{$config}, "dhcp-option=tag:$tag,$option_string:dns-server,$subnet_config->{'dhcp-dns-server'}"
if $subnet_config->{'dhcp-dns-server'};
-
}
sub configure_range {
- my ($class, $config, $dhcpid, $vnetid, $subnet_config, $range_config) = @_;
-
- my $tag = $subnet_config->{id};
-
- my ($zone, $network, $mask) = split(/-/, $tag);
-
- if (Net::IP::ip_is_ipv4($network)) {
- $mask = (2 ** $mask - 1) << (32 - $mask);
- $mask = join( '.', unpack( "C4", pack( "N", $mask ) ) );
- }
-
- push @{$config}, "dhcp-range=set:$tag,$network,static,$mask,infinite";
+ # noop, everything is done within configure_subnet
}
sub configure_vnet {
--
2.47.0
--===============0701432118783542424==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
--===============0701432118783542424==--