From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <root@kvmformation1.odiso.net>
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 BABA46087B
for <pve-devel@lists.proxmox.com>; Thu, 26 Nov 2020 15:29:36 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id AF11E11BF6
for <pve-devel@lists.proxmox.com>; Thu, 26 Nov 2020 15:29:36 +0100 (CET)
Received: from kvmformation1.odiso.net (globalOdiso.M6Lille.odiso.net
[89.248.211.242])
by firstgate.proxmox.com (Proxmox) with ESMTP id 4888111BEE
for <pve-devel@lists.proxmox.com>; Thu, 26 Nov 2020 15:29:36 +0100 (CET)
Received: by kvmformation1.odiso.net (Postfix, from userid 0)
id EA744168426; Thu, 26 Nov 2020 15:29:35 +0100 (CET)
From: Alexandre Derumier <aderumier@odiso.com>
To: pve-devel@lists.proxmox.com
Date: Thu, 26 Nov 2020 15:29:35 +0100
Message-Id: <20201126142935.558118-1-aderumier@odiso.com>
X-Mailer: git-send-email 2.20.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 1
AWL -0.230 Adjusted score from AWL reputation of From: address
HEADER_FROM_DIFFERENT_DOMAINS 0.249 From and EnvelopeFrom 2nd level mail
domains are different
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery
methods
KHOP_HELO_FCRDNS 0.4 Relay HELO differs from its IP's reverse DNS
NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_NONE 0.001 SPF: sender does not publish an SPF Record
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [simpleplugin.pm, evpnplugin.pm]
Subject: [pve-devel] [PATCH pve-network] zones: evpn/simple: add missing
mask to gateway address
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
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/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Thu, 26 Nov 2020 14:29:36 -0000
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---
PVE/Network/SDN/Zones/EvpnPlugin.pm | 3 ++-
PVE/Network/SDN/Zones/SimplePlugin.pm | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/PVE/Network/SDN/Zones/EvpnPlugin.pm b/PVE/Network/SDN/Zones/EvpnPlugin.pm
index 14bbf56..d833641 100644
--- a/PVE/Network/SDN/Zones/EvpnPlugin.pm
+++ b/PVE/Network/SDN/Zones/EvpnPlugin.pm
@@ -93,10 +93,11 @@ sub generate_sdn_config {
foreach my $subnetid (sort keys %{$subnets}) {
my $subnet = $subnets->{$subnetid};
my $cidr = $subnet->{cidr};
+ my $mask = $subnet->{mask};
my $gateway = $subnet->{gateway};
if ($gateway) {
- push @iface_config, "address $gateway" if !defined($address->{$gateway});
+ push @iface_config, "address $gateway/$mask" if !defined($address->{$gateway});
$address->{$gateway} = 1;
}
if ($subnet->{snat}) {
diff --git a/PVE/Network/SDN/Zones/SimplePlugin.pm b/PVE/Network/SDN/Zones/SimplePlugin.pm
index ed41e62..94452a0 100644
--- a/PVE/Network/SDN/Zones/SimplePlugin.pm
+++ b/PVE/Network/SDN/Zones/SimplePlugin.pm
@@ -65,7 +65,7 @@ sub generate_sdn_config {
my $gateway = $subnet->{gateway};
if ($gateway) {
- push @iface_config, "address $gateway" if !defined($address->{$gateway});
+ push @iface_config, "address $gateway/$mask" if !defined($address->{$gateway});
$address->{$gateway} = 1;
}
#add route for /32 pointtopoint
--
2.20.1