From patchwork Wed Nov 4 17:43:01 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 5600 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:6022:30a9:b0:118:2077:975e with SMTP id f41csp741749laa; Wed, 4 Nov 2026 09:43:42 -0800 (PST) X-Forwarded-Encrypted: i=2; AKwUvBzsF5USMfARGcVjS9Q2/p4BwKO+3MEXP81gX08h1BlEWVT8srHbshHhQE1zyE9zta64zq0tolnCo7M=@openvpn.net X-Received: by 2002:a05:7300:d948:b0:36c:c434:b6b5 with SMTP id 5a478bee46e88-36cc4441afbmr3934510eec.17.1793814221786; Wed, 04 Nov 2026 09:43:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1793814221; cv=none; d=google.com; s=arc-20260327; b=fQwQ75RIMOxkrLuFsuE/cD3Xgmh44ZJGPQjUnGsc9TnI+0gs8BLH9m6dmizKQIzpj2 gyIv5GKS13EIQJM/u90yCo4QP8FUYGoYkHQaqj4aKAEiGMsDkqrHHaW5EMlvTqJS1HTo LNgD2adwbbCOEIdF86jppYXLxZGFyqE7+Ja7HbZCDmnVIfIGwx6LljSLzihb9V+q9uV+ U7dLBheMOmZafq9nWMHz5qhmaHKelWFDb8+zGGnXNVA3LsdjSlZGhydqYop/HZPHNnAA kFOLv8w6ksVrkcZXeXhqtlSKnpwazGDJmWmb/KRM99PWSgewz7oOjNBDSajy9Nm0HPqb EpVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:dkim-signature:dkim-signature; bh=qAX+MiLOjUgvHN8bxnZ9X4pLrJqGSamFFTAqA31E1yc=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=oT1W1oY95QtOAhe0S8aKz51eL7ptJXHGUw4oWb0R1cv9lxVYXnuBgMgDWZfVh74lg1 84arfsW6ap+5sIibV1Obb0FdRq3LhnhsSsJjLsF4yM7O7V9pX41lqK0T4ZSTPVqr495x 32z2mIjtx+ZS2jX1islbi1qLkjlpUK79YWMzPzi020mFQfdQAADVxCTRxjnkw2GKsIlB 8MPiJhrdp3/VO+m6EC4AZD+S4e8iZ+o7mH5+jmWYyM51CMV4DIZ4vDkr+Vh40+aTONzB pqozgcmRIsJDd5WKEmL6KfB53/Nq5BggVk9MZ1NzunWKNHn2zyhyaXxt6tAO4BONsjed AeOA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=cypdpOZQ; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=OEKPiVgf; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=elArV7R3; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=muc.de Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id 5a478bee46e88-36ca38e5539si6803641eec.17.2026.11.04.09.43.40 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Nov 2026 09:43:41 -0800 (PST) Received-SPF: pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) client-ip=216.105.38.7; Authentication-Results: mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=cypdpOZQ; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=OEKPiVgf; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=elArV7R3; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=muc.de DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.sourceforge.net; s=beta; h=Content-Transfer-Encoding:Content-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: Subject:MIME-Version:References:In-Reply-To:Message-ID:Date:To:From:Sender: Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Unsubscribe-Post: List-Owner; bh=qAX+MiLOjUgvHN8bxnZ9X4pLrJqGSamFFTAqA31E1yc=; b=cypdpOZQzkjsPU bteFkz6BBDgzIlkQeAW1s8mWb9E7WbDuTxWDGYE1xDyOKXgPN3mtsuVb58TYHn+mr74j89JYBvNry 48gf3byklSVkpqZ4IZn/fcaPJb7oAMBKasxawt/+r/Xkfp3kVb/9ZI7DdgUjIRQ9ABPeO9v3RcBd+ ihs=; Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.100.1) (envelope-from ) id 1xOf1N-00000000816-0hd7; Wed, 04 Nov 2026 17:43:37 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.100.1) (envelope-from ) id 1xOf15-000000007xE-2Czz for openvpn-devel@lists.sourceforge.net; Wed, 04 Nov 2026 17:43:19 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Unsubscribe-Post:List-Subscribe:List-Post:List-Owner:List-Archive; bh=2LxkfXB+Vbf9IfLu74Invb/S2BShx6HrD1MUdY1Ye9Y=; b=OEKPiVgfunB5YgYpC9pG1v+ZCv EIB+2WYcGNb+LnVXpIju4F55yawDzDnBFrcOL+fORhHGPYLZQMp2IRxieIAqBhLu8rHnUltT/Eyln uNvUgpFgGMP6aXF2BkULAnkYkOPOUMmfZ9dleXQ8wvqIJqE533lQbvYXT2HspU1o+dhw=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID: Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Unsubscribe-Post: List-Subscribe:List-Post:List-Owner:List-Archive; bh=2LxkfXB+Vbf9IfLu74Invb/S2BShx6HrD1MUdY1Ye9Y=; b=elArV7R3QjuhgCX89D9ivZCM9L hhbvTMJeKxAjKXTJwgijbIz5RMHpvCRvrLL27bbLK5KsJH5ry8kXFBMLERrz3E4idB5D2l9ojaMw2 yGZjWPgK1cGOnRDiIrBChxUyRA0HWmilzfPeyE0lGFKzZLN6RiFSe7+ZA7zM372AaSnU=; Received: from [193.149.48.129] (helo=blue.greenie.muc.de) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.100.1) id 1xOf10-000000002tl-0nC9 for openvpn-devel@lists.sourceforge.net; Wed, 04 Nov 2026 17:43:16 +0000 Received: from blue.greenie.muc.de (localhost [127.0.0.1]) by blue.greenie.muc.de (8.18.1/8.18.1) with ESMTP id 6A4Hh7U9015185 for ; Wed, 4 Nov 2026 18:43:07 +0100 Received: (from gert@localhost) by blue.greenie.muc.de (8.18.2/8.18.1/Submit) id 6A4Hh7LY015184 for openvpn-devel@lists.sourceforge.net; Wed, 4 Nov 2026 18:43:07 +0100 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Wed, 4 Nov 2026 18:43:01 +0100 Message-ID: <20261104174306.15159-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.55.0 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "sfi-spamd-2.hosts.colo.sdot.me", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Razvan Cojocaru cbb0440e ("multiproto: move generic event handling code in dedicated files") added multi_io_delete_event() as a copy of multi_tcp_delete_event() but kept the old function and its only caller. Switch m [...] Content analysis details: (1.3 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.3 RDNS_NONE Delivered to internal network by a host with no rDNS X-Headers-End: 1xOf10-000000002tl-0nC9 Subject: [Openvpn-devel] [PATCH v1] multi: use multi_io_delete_event() and drop multi_tcp_delete_event() X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: 1880950541123545121 X-GMAIL-MSGID: 1880950541123545121 From: Razvan Cojocaru cbb0440e ("multiproto: move generic event handling code in dedicated files") added multi_io_delete_event() as a copy of multi_tcp_delete_event() but kept the old function and its only caller. Switch management_delete_event() to the new one and remove the old copy. Change-Id: Iba1db32cd130d092e34a31159f14d3aa37db96f2 Signed-off-by: Razvan Cojocaru Acked-by: Gianmarco De Gregori Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/2133 --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/2133 This mail reflects revision 1 of this Change. Acked-by according to Gerrit (reflected above): Gianmarco De Gregori diff --git a/src/openvpn/mtcp.c b/src/openvpn/mtcp.c index 2d0af06..62d059e 100644 --- a/src/openvpn/mtcp.c +++ b/src/openvpn/mtcp.c @@ -95,15 +95,6 @@ } void -multi_tcp_delete_event(struct multi_io *multi_io, event_t event) -{ - if (multi_io && multi_io->es) - { - event_del(multi_io->es, event); - } -} - -void multi_tcp_dereference_instance(struct multi_io *multi_io, struct multi_instance *mi) { const struct link_socket *sock = mi->context.c2.link_sockets[0]; diff --git a/src/openvpn/mtcp.h b/src/openvpn/mtcp.h index 47c6308..b4ec1f9 100644 --- a/src/openvpn/mtcp.h +++ b/src/openvpn/mtcp.h @@ -43,6 +43,4 @@ struct multi_instance *multi_create_instance_tcp(struct multi_context *m, struct link_socket *sock); -void multi_tcp_delete_event(struct multi_io *multi_io, event_t event); - #endif /* ifndef MTCP_H */ diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index 3f514d6..741b3d1 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -4025,7 +4025,7 @@ struct multi_context *m = (struct multi_context *)arg; if (m->multi_io) { - multi_tcp_delete_event(m->multi_io, event); + multi_io_delete_event(m->multi_io, event); } }