From patchwork Wed Oct 23 11:39:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 3907 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:6bd6:b0:5b9:581e:f939 with SMTP id c22csp321684max; Wed, 23 Oct 2024 04:39:40 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXs5q7fs7/ipyKX6SVni52kUMnN+RkNRYBgc1Gx7OhtSXfH+eY2pa9QuuqIL0AztxdIFUmlxvjClZI=@openvpn.net X-Google-Smtp-Source: AGHT+IFDg7VGmagGKu7m4sYuFnIu0oaHt0pyhVbSOiZTbbHVGN0wkxfd3Si+ldUxepxqso8jry1x X-Received: by 2002:a05:6808:2022:b0:3e6:402:e1f9 with SMTP id 5614622812f47-3e62451bf60mr1162585b6e.2.1729683580686; Wed, 23 Oct 2024 04:39:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729683580; cv=none; d=google.com; s=arc-20240605; b=IcYAYYH8ss72pshJ78pOfOZgK1lWIvsG8zE+UPl4MAQrcWhekuf8LZrZ4OepOvjIIN yq/o4toEyYJBo+M9UrlhWZb9x1C/rLKfkqHbnx1C6t/Lxs+jQ0RvqwrHxXvTnYiElXbs xG+448AD5Rw3kT/C6rnY8TDe6FuE4GGInfDWjk4fSa9WY+DTpVcYCeZAKeO0kJplAzQk ehaPmFtd8NreYw04yJ8Nj1OH4sUOEkognjapslCeOxrUO9RYLQq3tU7QK6wAFmYfYLBF I1cc0fksvLgXLyly8lhJAGPvncd2T8VAMvZ3fhcBf4zkZMfdT5ARytEq9wzKYl9G3BUT HfgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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; bh=Ike98E6rIEZoc9P/jRmkOD1kX3NSqNFDij3O11GBP48=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=T43PCrnkqoUgNOzSop+XegZZvQMUcH0sf5Oge2ZETPODikH2I1FSpgEhaFBWELMOKL QUywskZIHSD6x0oBiZxK93eGTs+RUVIoFR5kyBKuAIKDXULfZRTlc4Gp809N/AjNF6kk 4okDl2OkWPIrXXZC0RCBTFzxZ1Yi+323/XFhH8Fy62PHwLImJAASa3fsA0pEPCul6i7a QQ9Okb7SAQKuY265EKA2v+sC9Sro/xhFJxydDtCNS5DbPJl6nFsZaKUMxEMzvpUeCKay CzfovpFJS5x0+bVYANFrA7U175EmaHVEXpqIuPy8UV81J+apIu0KDX+glQ+hzkZZnWhx fPqw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=AQ1sGpPg; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=THtro+mV; 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 5614622812f47-3e61035c78dsi4053403b6e.335.2024.10.23.04.39.40 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Oct 2024 04:39:40 -0700 (PDT) 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=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=AQ1sGpPg; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=THtro+mV; 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 [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1t3Zi9-0006mi-Jv; Wed, 23 Oct 2024 11:39:33 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1t3Zi8-0006mc-3r for openvpn-devel@lists.sourceforge.net; Wed, 23 Oct 2024 11:39:32 +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-Subscribe:List-Post:List-Owner:List-Archive; bh=OhmjsrM2esfkaKkPoe2kNyPuG8SImQOCcEVB/s4Ihr4=; b=AQ1sGpPgcWNPDTWWR7RnMFiNdx uFE3dQxD5Rbog/Zor0yz44IY1pr+pTRO4BUFpS8fMNvraFoojl9Wzu8yZWCQzmKVo9ieYh2ZapkKJ cSXcqsSIRflXt+SMdU1B+nLAHHPWBrbXMK+zWKBPVUCNyPoV+b4A/FSi43l/8EyeJawY=; 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-Subscribe: List-Post:List-Owner:List-Archive; bh=OhmjsrM2esfkaKkPoe2kNyPuG8SImQOCcEVB/s4Ihr4=; b=THtro+mVEqTzEJ/xh/8C9+DcIr 7rmfcdQaR+OoPSVuWCBMy3p1l4HUoU/fxJ61bafokZFFXD5nSz4kdTxchg4ZzHOOt2jcB9pCIYt2f op17r3myr2kosOp6RClHBL2Knzl+lLzf37oms6gAja7oTzRE+ugulTZCJW16dQto4ICE=; Received: from dhcp-174.greenie.muc.de ([193.149.48.174] 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.95) id 1t3Zi6-0001m4-OU for openvpn-devel@lists.sourceforge.net; Wed, 23 Oct 2024 11:39:32 +0000 Received: from blue.greenie.muc.de (localhost [127.0.0.1]) by blue.greenie.muc.de (8.17.1.9/8.17.1.9) with ESMTP id 49NBdOcm007430 for ; Wed, 23 Oct 2024 13:39:24 +0200 Received: (from gert@localhost) by blue.greenie.muc.de (8.17.1.9/8.17.1.9/Submit) id 49NBdOqB007429 for openvpn-devel@lists.sourceforge.net; Wed, 23 Oct 2024 13:39:24 +0200 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Wed, 23 Oct 2024 13:39:23 +0200 Message-ID: <20241023113923.7420-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Spam-Report: Spam detection software, running on the system "util-spamd-2.v13.lw.sourceforge.com", 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: Gianmarco De Gregori Commit ("event/multi: add event_arg object to make event handling more generic") accidentally removed a variable declaration and its usage because of a rebase, this fix restore the wiped out unsigned [...] Content analysis details: (-0.0 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record X-Headers-End: 1t3Zi6-0001m4-OU Subject: [Openvpn-devel] [PATCH v1] Fix for msbuild/mingw GHA failures 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: =?utf-8?q?1813704690096270667?= X-GMAIL-MSGID: =?utf-8?q?1813704690096270667?= From: Gianmarco De Gregori Commit ("event/multi: add event_arg object to make event handling more generic") accidentally removed a variable declaration and its usage because of a rebase, this fix restore the wiped out unsigned int *persistent in multi_tcp_wait(). Change-Id: I8526aadb5151ddc997c836d5a691bcdfee700938 Signed-off-by: Gianmarco De Gregori Acked-by: Gert Doering --- 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/+/785 This mail reflects revision 1 of this Change. Acked-by according to Gerrit (reflected above): Gert Doering diff --git a/src/openvpn/mtcp.c b/src/openvpn/mtcp.c index 67e3e8e..6faf45a 100644 --- a/src/openvpn/mtcp.c +++ b/src/openvpn/mtcp.c @@ -254,6 +254,7 @@ struct multi_tcp *mtcp) { int status; + unsigned int *persistent = &mtcp->tun_rwflags; socket_set_listen_persistent(c->c2.link_socket, mtcp->es, &c->c2.link_socket->ev_arg); @@ -271,7 +272,7 @@ persistent = NULL; } #endif - tun_set(c->c1.tuntap, mtcp->es, EVENT_READ, MTCP_TUN, &mtcp->tun_rwflags); + tun_set(c->c1.tuntap, mtcp->es, EVENT_READ, MTCP_TUN, persistent); #if defined(TARGET_LINUX) || defined(TARGET_FREEBSD) dco_event_set(&c->c1.tuntap->dco, mtcp->es, MTCP_DCO); #endif