From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 F363E75082 for ; Fri, 4 Jun 2021 13:25:41 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E8AC81C0B6 for ; Fri, 4 Jun 2021 13:25:11 +0200 (CEST) Received: from kvmformation3.odiso.net (globalOdiso.M6Lille.odiso.net [89.248.211.242]) by firstgate.proxmox.com (Proxmox) with ESMTP id 70DA61C089 for ; Fri, 4 Jun 2021 13:25:07 +0200 (CEST) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 1F4BBD568A; Fri, 4 Jun 2021 13:25:01 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Fri, 4 Jun 2021 13:24:59 +0200 Message-Id: <20210604112500.2349926-4-aderumier@odiso.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210604112500.2349926-1-aderumier@odiso.com> References: <20210604112500.2349926-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -0.158 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.398 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. [vnets.pm] Subject: [pve-devel] [pve-network 3/4] vnets: subroutines: return if !$vnetid X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jun 2021 11:25:42 -0000 --- PVE/Network/SDN/Vnets.pm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/PVE/Network/SDN/Vnets.pm b/PVE/Network/SDN/Vnets.pm index 8c9629d..86967a3 100644 --- a/PVE/Network/SDN/Vnets.pm +++ b/PVE/Network/SDN/Vnets.pm @@ -52,6 +52,8 @@ sub complete_sdn_vnet { sub get_vnet { my ($vnetid, $running) = @_; + return if !$vnetid; + my $cfg = {}; if($running) { my $cfg = PVE::Network::SDN::running_config(); @@ -68,6 +70,8 @@ sub get_vnet { sub get_subnets { my ($vnetid) = @_; + return if !$vnetid; + my $subnets = undef; my $subnets_cfg = PVE::Network::SDN::Subnets::config(); foreach my $subnetid (sort keys %{$subnets_cfg->{ids}}) { @@ -130,6 +134,8 @@ sub get_next_free_cidr { sub add_cidr { my ($vnetid, $cidr, $hostname, $mac, $description) = @_; + return if !$vnetid; + my ($zone, $subnetid, $subnet, $ip) = PVE::Network::SDN::Vnets::get_subnet_from_vnet_cidr($vnetid, $cidr); PVE::Network::SDN::Subnets::add_ip($zone, $subnetid, $subnet, $ip, $hostname, $mac, $description); } @@ -137,6 +143,8 @@ sub add_cidr { sub update_cidr { my ($vnetid, $cidr, $hostname, $oldhostname, $mac, $description) = @_; + return if !$vnetid; + my ($zone, $subnetid, $subnet, $ip) = PVE::Network::SDN::Vnets::get_subnet_from_vnet_cidr($vnetid, $cidr); PVE::Network::SDN::Subnets::update_ip($zone, $subnetid, $subnet, $ip, $hostname, $oldhostname, $mac, $description); } @@ -144,6 +152,8 @@ sub update_cidr { sub del_cidr { my ($vnetid, $cidr, $hostname) = @_; + return if !$vnetid; + my ($zone, $subnetid, $subnet, $ip) = PVE::Network::SDN::Vnets::get_subnet_from_vnet_cidr($vnetid, $cidr); PVE::Network::SDN::Subnets::del_ip($zone, $subnetid, $subnet, $ip, $hostname); } -- 2.20.1