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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id B38E298CAE for ; Wed, 15 Nov 2023 22:58:49 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 99EB9C48B for ; Wed, 15 Nov 2023 22:58:49 +0100 (CET) Received: from bastionodiso.odiso.net (bastionodiso.odiso.net [IPv6:2a0a:1580:2000::2d]) (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 ; Wed, 15 Nov 2023 22:58:45 +0100 (CET) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id 621678106; Wed, 15 Nov 2023 22:58:44 +0100 (CET) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 53E2915CFCA; Wed, 15 Nov 2023 22:58:44 +0100 (CET) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Wed, 15 Nov 2023 22:58:43 +0100 Message-Id: <20231115215843.856752-2-aderumier@odiso.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231115215843.856752-1-aderumier@odiso.com> References: <20231115215843.856752-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.131 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy HEADER_FROM_DIFFERENT_DOMAINS 0.25 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 POISEN_SPAM_PILL 0.1 Meta: its spam POISEN_SPAM_PILL_2 0.1 random spam to be learned in bayes POISEN_SPAM_PILL_4 0.1 random spam to be learned in bayes SPF_NONE 0.001 SPF: sender does not publish an SPF Record T_SCC_BODY_TEXT_LINE -0.01 - T_SPF_HELO_TEMPERROR 0.01 SPF: test of HELO record failed (temperror) Subject: [pve-devel] [PATCH dnsmasq 1/1] purge old ip-mac lease on dhcpreply 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: Wed, 15 Nov 2023 21:58:49 -0000 --- src/rfc2131.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/rfc2131.c b/src/rfc2131.c index 17e97b5..2a4ce76 100644 --- a/src/rfc2131.c +++ b/src/rfc2131.c @@ -1095,7 +1095,7 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index, if ((opt = option_find(mess, sz, OPTION_REQUESTED_IP, INADDRSZ))) addr = option_addr(opt); - + if (have_config(config, CONFIG_ADDR)) { inet_ntop(AF_INET, &config->addr, daemon->addrbuff, ADDRSTRLEN); @@ -1104,11 +1104,14 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index, ltmp != lease && !config_has_mac(config, ltmp->hwaddr, ltmp->hwaddr_len, ltmp->hwaddr_type)) { - int len; - unsigned char *mac = extended_hwaddr(ltmp->hwaddr_type, ltmp->hwaddr_len, - ltmp->hwaddr, ltmp->clid_len, ltmp->clid, &len); - my_syslog(MS_DHCP | LOG_WARNING, _("not using configured address %s because it is leased to %s"), - daemon->addrbuff, print_mac(daemon->namebuff, mac, len)); + lease_prune(ltmp, now); + my_syslog(MS_DHCP | LOG_WARNING, _("workaround - pruning old lease")); + + //int len; + //unsigned char *mac = extended_hwaddr(ltmp->hwaddr_type, ltmp->hwaddr_len, + // ltmp->hwaddr, ltmp->clid_len, ltmp->clid, &len); + //my_syslog(MS_DHCP | LOG_WARNING, _("not using configured address %s because it is leased to %s"), + // daemon->addrbuff, print_mac(daemon->namebuff, mac, len)); } else { -- 2.39.2