From patchwork Wed Oct 23 11:05:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "its_Giaan (Code Review)" X-Patchwork-Id: 3906 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:6bd6:b0:5b9:581e:f939 with SMTP id c22csp303032max; Wed, 23 Oct 2024 04:05:37 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXWnF3jOSE1LpPpNYFfLsQrYGm2BaOkjhY7+2Zry5KxwFrG/8bUCotu1HwVFZNL7qtyHFNYGHXj7PA=@openvpn.net X-Google-Smtp-Source: AGHT+IGIJblbp8UgmZ9TyzhtrVsQ9mJfuwfyjpLGJdmUjr1lyZuOTV9Z5VGhhaNZP3/5lirAttps X-Received: by 2002:a05:6808:f16:b0:3e6:542:916c with SMTP id 5614622812f47-3e624522d97mr1992316b6e.12.1729681536818; Wed, 23 Oct 2024 04:05:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729681536; cv=none; d=google.com; s=arc-20240605; b=id8665hckvaJqQHHYup/bhffK/RO+0JvS+j4BLN9kYPubmDBGMbaFz+3T6wrvffHIq ZVP2b4q0tnnmj9ICXrA4aAIr87QQBGWd7gh7G4oaYoOuiqQDzPqY8uLg1IxBujWzRK2h 5efep5EYdlC4cmSZ6NaV8WS8jGulLpEeGrjvPyzQOGJI+WS1fKqGlplwxqAGGh+GPgli 9Vs5XedIiwpPwkCyosfYEQuoUd9Y3+Ieoce+AvAThztHtdx+vFpOWVVv13+y2aiRAWv6 TxL4sLP62XHQJvVMPYK1/MdU7qzwZcBAFYRfFLb9M7VNucI1PsxSvLnJ/0tPhyZJU9Sa +pEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=errors-to:cc:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:user-agent :mime-version:message-id:references:auto-submitted:to:date:from :dkim-signature:dkim-signature:dkim-signature; bh=tl+ydoPPWBTyKgFStzaDABLTzk3Z45HiOYE+hxl1tgo=; fh=U7wEyxtwz2o5+UdevFSA47vNeG9knhWH0KV//QhD5a0=; b=gBBBz9U5MaQmSHBsplOVQjWBT/ybuvjOvhth0GCLrNWuC4tU7GT1buKWYkhBL+ZWNU mT/zk4RdWR4BC310S0BNGlw2REGnz/VhpZuHcBGPf1FTCQ6LxCf0SPWZTg2GMpXCmA/t FMY0wT3COM9Vd2GUtbPEI1HhWhiafWIa9EMAihwXSKL2vQdf4Z29eHYrjna2UgR8D+0G PGCRvCwkzpLoBeNDgDFz0uJNxyx0J4UrONi+wz0WzRx/WgsIqXbc9HOX6S6rL//VZ7lf 5btzUAQbb77VB9VRaaBAw/yJZZudht82WNOC39rUpOA9y6BT0iVmr869/MzLclD5xZTN EG9w==; 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=ldGd8z5C; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b="ga/cwoI5"; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=L8BDFOUt; 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=openvpn.net; dara=fail header.i=@openvpn.net Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id 5614622812f47-3e61033efebsi3921417b6e.252.2024.10.23.04.05.36 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Oct 2024 04:05:36 -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=ldGd8z5C; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b="ga/cwoI5"; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=L8BDFOUt; 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=openvpn.net; dara=fail header.i=@openvpn.net Received: from [127.0.0.1] (helo=sfs-ml-3.v29.lw.sourceforge.com) by sfs-ml-3.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1t3ZBA-0000qy-ND; Wed, 23 Oct 2024 11:05:28 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-3.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1t3ZB9-0000qq-Mu for openvpn-devel@lists.sourceforge.net; Wed, 23 Oct 2024 11:05:27 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Type:Content-Transfer-Encoding:MIME-Version :Message-ID:Reply-To:References:Subject:List-Unsubscribe:List-Id:Cc:To:Date: From:Sender:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:List-Help: List-Subscribe:List-Post:List-Owner:List-Archive; bh=0KlkHhXTUkxD8Bc9zH4aRDJlMI0v4ClAa5qFCiZJAYM=; b=ldGd8z5CgAdK9/x/Vjcy5cG3l1 gLsKUyuuzzmH92qVjDPAAa6jd0R+NPl352TJeVk/o4vqcPWuT5WN+gDRc7KFxLHydlZXYum5b3qyj e4MXl04dQhQkNS5JjolVJO8RpwIBipvOglxBVzstFN0frXKiyeVOtjxtY0blSA484Ipk=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Type:Content-Transfer-Encoding:MIME-Version:Message-ID:Reply-To: References:Subject:List-Unsubscribe:List-Id:Cc:To:Date:From:Sender:Content-ID :Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To: Resent-Cc:Resent-Message-ID:In-Reply-To:List-Help:List-Subscribe:List-Post: List-Owner:List-Archive; bh=0KlkHhXTUkxD8Bc9zH4aRDJlMI0v4ClAa5qFCiZJAYM=; b=g a/cwoI5jF2YIltqhSQ35H5HtItGIewy1mSurR/wCUEWtiJ/MqvYCOwgGaWoMRnLCqPAyty9jSZXMI RGKuZeC7TRAtsOzUwwViD51UT/rnZ0SAKBZUPhS5/1+U0CllYM+iUMrHXoSwvRINBLg3lNtA7olr8 7luWH519lu2hzZH4=; Received: from mail-wm1-f45.google.com ([209.85.128.45]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1t3ZB7-0006Tm-CW for openvpn-devel@lists.sourceforge.net; Wed, 23 Oct 2024 11:05:27 +0000 Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-4315df7b43fso67534445e9.0 for ; Wed, 23 Oct 2024 04:05:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1729681514; x=1730286314; darn=lists.sourceforge.net; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:subject :list-unsubscribe:list-id:auto-submitted:cc:to:date:from:from:to:cc :subject:date:message-id:reply-to; bh=0KlkHhXTUkxD8Bc9zH4aRDJlMI0v4ClAa5qFCiZJAYM=; b=L8BDFOUtRlt7X9U4rmdvUy+/id7hnlN6UXHLG9cu4tkZpr5gDV8lTl+bX/KBGBgGg/ sbo/66l5KPb34EKvoe21Jhj+4X4NrMFQHXSYjH+epcWlxMixWC2WNHPtqKBTqGGfV9oj CdPaX2dy5jbAVkuISonUWFXPBtmNpZHfrIktOCjPLSSp0/5mqQc+5RM++x6XiFuAL/1m MWxaoktBCZ7cBGFY0VqFAhghfruAOiKWvGhUjysjvapR2oOOdbqtisDbhXi5joGl3Vme sUI5D4ligXvcshS5Vp3VInVSPcX16qUKvKCgu9V5Da+EPuEAOy28A7hlrBgH6YS8vtFW m4Qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729681514; x=1730286314; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:subject :list-unsubscribe:list-id:auto-submitted:cc:to:date:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=0KlkHhXTUkxD8Bc9zH4aRDJlMI0v4ClAa5qFCiZJAYM=; b=PdlG1slqBPtWCQA1bjDvFdt0OFtc/WGTTxeIx1CyKdmru+k3K8Kqafv7S0Ts9OKl5g GdQqjftQ1Xfpy4iZiHtd+TIG+m0j8P+Uw8QyUXyGBT3LkbH2yd5mY5tpME3h3Y9U0cnB Iz6piusF6zpvsOsdauDpfm1MlmL4ktgvo07CICZGQnTNT/sGhJeV6O3iyTjidcHFbg+2 PhHzIynU4GRsuc/3N/doDIlZ2A2p7oFKt5VIRC7EdK7WHO7FB1UupIrbnXJL9FVTHK8Y +r0bzv28XX2GBIBAKSpxiI+sRSP8AwRnteJdnbNafYoHWQXUC54UcDWaaIIK0sBmOEYI 6C6w== X-Gm-Message-State: AOJu0YzuqCFcr9gtiHTuuiLTSeXk5xxHVRtkc95R5aFD44IgT+QTVt3E X0DsNed/4LOxJAVSI68L0d7IyHgaLndyYsXJ6IVOc5sh5ABnXlhG0LG3/OrBC1YGQPdlW7QfKOo E X-Received: by 2002:a5d:56d2:0:b0:37c:d162:8297 with SMTP id ffacd0b85a97d-37efcf8ec62mr1357549f8f.47.1729681513759; Wed, 23 Oct 2024 04:05:13 -0700 (PDT) Received: from gerrit.openvpn.in (ec2-18-159-0-78.eu-central-1.compute.amazonaws.com. [18.159.0.78]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37ee0a37df9sm8652317f8f.19.2024.10.23.04.05.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2024 04:05:13 -0700 (PDT) From: "its_Giaan (Code Review)" X-Google-Original-From: "its_Giaan (Code Review)" X-Gerrit-PatchSet: 1 Date: Wed, 23 Oct 2024 11:05:12 +0000 To: plaisthos , flichtenheld Auto-Submitted: auto-generated X-Gerrit-MessageType: newchange X-Gerrit-Change-Id: I8526aadb5151ddc997c836d5a691bcdfee700938 X-Gerrit-Change-Number: 785 X-Gerrit-Project: openvpn X-Gerrit-ChangeURL: X-Gerrit-Commit: 4a0f196bb5fa62c45bf369b5602aa5dfe7095567 References: Message-ID: <63d4a5e2c940a336b4ad361084ae02a7c6b6552f-HTML@gerrit.openvpn.net> MIME-Version: 1.0 User-Agent: Gerrit/3.8.2 X-Spam-Score: -1.9 (-) X-Spam-Report: Spam detection software, running on the system "util-spamd-1.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: Attention is currently required from: flichtenheld, plaisthos. Hello plaisthos, flichtenheld, I'd like you to do a code review. Please visit Content analysis details: (-1.9 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.128.45 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -1.7 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.45 listed in wl.mailspike.net] 0.0 WEIRD_PORT URI: Uses non-standard port number for HTTP 0.0 HTML_MESSAGE BODY: HTML included in message -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.0 T_KAM_HTML_FONT_INVALID Test for Invalidly Named or Formatted Colors in HTML X-Headers-End: 1t3ZB7-0006Tm-CW Subject: [Openvpn-devel] [XS] Change in openvpn[master]: 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: , Reply-To: gianmarco@mandelbit.com, arne-openvpn@rfc2549.org, openvpn-devel@lists.sourceforge.net, frank@lichtenheld.com Cc: openvpn-devel Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1813702547175876165?= X-GMAIL-MSGID: =?utf-8?q?1813702547175876165?= X-getmail-filter-classifier: gerrit message type newchange Attention is currently required from: flichtenheld, plaisthos. Hello plaisthos, flichtenheld, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/785?usp=email to review the following change. Change subject: Fix for msbuild/mingw GHA failures ...................................................................... Fix for msbuild/mingw GHA failures 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 --- M src/openvpn/mtcp.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/85/785/1 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