Message ID | 1a52c029c8ef766594ac07d8a450dd12aff11fee-HTML@gerrit.openvpn.net |
---|---|
State | Not Applicable |
Headers | show
Return-Path: <openvpn-devel-bounces@lists.sourceforge.net> Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:1496:b0:d7:3b0f:3938 with SMTP id b22csp7504821dyh; Mon, 17 Jul 2023 07:18:28 -0700 (PDT) X-Google-Smtp-Source: APBJJlFs6LbgA80fRN77vmV3rbNyvMOHt0ZG5tlbGzdQQEpvZucGpUVzRq5ULvJdpRfFl9MfOs2U X-Received: by 2002:a05:6a00:1406:b0:66a:5466:25b9 with SMTP id l6-20020a056a00140600b0066a546625b9mr15117506pfu.29.1689603507928; Mon, 17 Jul 2023 07:18:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689603507; cv=none; d=google.com; s=arc-20160816; b=fOaLvfA/5Q2ku/zEhik1JptmrQ+YPQBtHv7YvDE9O0rE0vDenKYBBTmrJv6zYr+ZkC ubxLCH2KHSNH3KMWJl98qrQNjIwLqwfBSTKcquJnvg6Y7KqIOwuxJbsXr24XI8mgfzAE lrvWte7/Y0kgr3cn3BjgxXmQAPhnFcO/TmFxYnX8SIo+fU/TG2VnVDwfX3BVn47HmPw3 fhTvoLeWJHaxK7/yPAEzsTAcVmW0whYO9x0GttX1kGPgzWoDlRXIZC9wjJHM4GYm/5q5 /JYLlrDOhFejnaigzj0DDGlaJKTCr6fFKwT7U5oE4yJZAdhcWRVKznl9juAiCqjEOjGu vELQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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:date:from :dkim-signature:dkim-signature:dkim-signature; bh=uNERkb5G+P9MYWybALvWUzvioyvwavKMuFHZTDKR6S8=; fh=9vhRlZcpCP80UjWrCI6q3ngtdEXG/FvhUoPNKY8Aubc=; b=dj7prQmuQqzHQyEFDMARDqRP1N5RyTuFulPEz5UYA21ufK5ntx2Kbe1+qvMfiISBIY LCnyK2QePSrRzoHQa1QvKlYseHMOnyqYW7T8/ZwWboys09sPOzkwWMFglAds2x/TNgjt z8xRKlIIwyYWelICkFNyfXay7nVKvs5IcsPKAP3leNo8E2rXGTAJALekglldCsZw4AM4 eQgZVmQsQTKneapArpmKetMRBtsz8lKLUC55xZP1WbiJL9czxKJ47rcQHTncCFKYmd8Q OrlpQvW4D+CP8C9Ty2LdEQvQD3UQt5+BdniPMuvJPbJtqSmxEFB+vMrTsVY7JRawdvo7 R+bA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=Cf1CNWwa; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=hYhzU2KN; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=X9AP9Jvp; 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 Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id i192-20020a639dc9000000b0055ffed90cf5si1709332pgd.209.2023.07.17.07.18.27 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jul 2023 07:18:27 -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=Cf1CNWwa; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=hYhzU2KN; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=X9AP9Jvp; 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 Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from <openvpn-devel-bounces@lists.sourceforge.net>) id 1qLP2Z-0007bH-Gh; Mon, 17 Jul 2023 14:17:30 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from <gerrit@openvpn.net>) id 1qLP2X-0007b7-Us for openvpn-devel@lists.sourceforge.net; Mon, 17 Jul 2023 14:17:28 +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:Date:From :Sender:To: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=wCU5UOxfX2+8LtgPFiRXlwQTFmPQLd3dTKvUn+d+Sfg=; b=Cf1CNWwankqYEtsmPbnIcNwE2e 7SFnY9pN9yHDULJBXbv+ykN/KxKGacZsA8Tpaxxo0/0s7YNKCMU1zu5U3VHK0DzUZxJjzf+Jiw9om S4uNp1Ilnx4Z7LOeFU+M4EZVhM4tVnOtrWzzufzr1BVVSpiwZc7pWg05V+NEZ4mmk5Pg=; 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:Date:From:Sender:To: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=wCU5UOxfX2+8LtgPFiRXlwQTFmPQLd3dTKvUn+d+Sfg=; b=h YhzU2KN9KRNYfYsV21ga9dkNi6To1QPxAKfuM+c4J7TeRDd1hM8wbOWWxLHUhnyjsnhewl+oRZu63 Kd2r4NKAMot4RhwFVReE5yehTymwo8m6xqoRz5qEMpIyErHj/APhmMWv6DLxo+P/czyVNef9L+s41 o2r9gXeJJirgRbCA=; Received: from mail-wm1-f46.google.com ([209.85.128.46]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1qLP2V-00AfQe-U3 for openvpn-devel@lists.sourceforge.net; Mon, 17 Jul 2023 14:17:28 +0000 Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-3fbd33a57dcso47974805e9.0 for <openvpn-devel@lists.sourceforge.net>; Mon, 17 Jul 2023 07:17:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1689603441; x=1692195441; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:subject :list-unsubscribe:list-id:auto-submitted:cc:date:from:from:to:cc :subject:date:message-id:reply-to; bh=wCU5UOxfX2+8LtgPFiRXlwQTFmPQLd3dTKvUn+d+Sfg=; b=X9AP9Jvp3clNs2U7XQgN7i9E8OWVRGDHP6fU5IbwseG1zv3LD/faQ03ChjqzNCMNNf i5wHleydVVqjeikhFHtWqir9+kzpKEQO07vNfxLpV82bNKbir9DNpggrDVZ1eCzbl1// 2QlSinS6v6h+I5Vw7B7iAtjZ+mtGopMFxme6q6qrhKOfVIYRpjrLW46S9P/Gknk5Th1A ddf3ybUCVbtyP3zxq+fRqPL2T+WHkLLbK3J2Bn/z1OP/jLk/3HO9w1nCHBejIt8NAadM 5l3MLzYMrQp+Yi3Pd9bpBbCVAMg9JiK+yRfSX8qz8NB8VPasVIn0XGnqXanWgVr49keB cykg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689603441; x=1692195441; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:subject :list-unsubscribe:list-id:auto-submitted:cc:date:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=wCU5UOxfX2+8LtgPFiRXlwQTFmPQLd3dTKvUn+d+Sfg=; b=RDMlj/NQh6kS97nedK9PicXDDF+XuAGIHY9HQSixvna8HbbUYJuYlWeVIvqKA3mrTS GH3YIsDJ5bp1f3zMVjnCK4hZUV0fdlvAl1aleiYaPvKXrrMxaUbe+/j1UUS0Lr8fpPe5 Tqhv1d1l+TJvEGLRzimf2I8s07Os87pyHvDWyiWMnmbHFehwzM2XqkqGNTGKxfqBX3P+ Xkqt4LhB76qCn13Bw7W6vaN/QEX0FTFg2fFWDlRg/oc2jFo3rL3zta6KVXFqedUrz6kp uAEICU3bybYD8rIQ50PwZeOKIrFxqqDKtNBzzMwRehfcfjpeMBFlazyQK9iORMnxFt7h oEgg== X-Gm-Message-State: ABy/qLaplRGEf6dJLJ8NgevNc1SLeCvRczoWhvicmAQ2P6pal3C6VPUZ Gfnv6cFYm9ZBAlfhl18sol/6nhiCSkc30mwIjuQ= X-Received: by 2002:a7b:c7ce:0:b0:3fc:a5:2c3a with SMTP id z14-20020a7bc7ce000000b003fc00a52c3amr10581702wmk.41.1689603441508; Mon, 17 Jul 2023 07:17:21 -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 c22-20020a05600c0ad600b003fc01495383sm8089390wmr.6.2023.07.17.07.17.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Jul 2023 07:17:20 -0700 (PDT) From: "stipa (Code Review)" <gerrit@openvpn.net> X-Google-Original-From: "stipa (Code Review)" <gerrit@gerrit.openvpn.in> X-Gerrit-PatchSet: 2 Date: Mon, 17 Jul 2023 14:17:20 +0000 Auto-Submitted: auto-generated X-Gerrit-MessageType: newchange X-Gerrit-Change-Id: I4c089e486728a43bfe42596787c00355838311da X-Gerrit-Change-Number: 201 X-Gerrit-Project: openvpn X-Gerrit-ChangeURL: <http://gerrit.openvpn.net/c/openvpn/+/201?usp=email> X-Gerrit-Commit: a3c9458d233d35d2afdb866aaa602bebaabf2f59 References: <gerrit.1679478040000.I4c089e486728a43bfe42596787c00355838311da@gerrit.openvpn.net> Message-ID: <1a52c029c8ef766594ac07d8a450dd12aff11fee-HTML@gerrit.openvpn.net> MIME-Version: 1.0 User-Agent: Gerrit/3.8.0 X-Spam-Score: 1.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: stipa has uploaded this change for review. ( http://gerrit.openvpn.net/c/openvpn/+/201?usp=email ) Change subject: Fix '--inactive <time> 0' behavior for DCO Content analysis details: (1.0 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.46 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.46 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 1.2 MISSING_HEADERS Missing To: header 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 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_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.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.0 T_KAM_HTML_FONT_INVALID Test for Invalidly Named or Formatted Colors in HTML -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Headers-End: 1qLP2V-00AfQe-U3 Subject: [Openvpn-devel] [XS] Change in openvpn[release/2.6]: Fix '--inactive <time> 0' behavior for DCO X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: <openvpn-devel.lists.sourceforge.net> List-Unsubscribe: <https://lists.sourceforge.net/lists/options/openvpn-devel>, <mailto:openvpn-devel-request@lists.sourceforge.net?subject=unsubscribe> List-Archive: <http://sourceforge.net/mailarchive/forum.php?forum_name=openvpn-devel> List-Post: <mailto:openvpn-devel@lists.sourceforge.net> List-Help: <mailto:openvpn-devel-request@lists.sourceforge.net?subject=help> List-Subscribe: <https://lists.sourceforge.net/lists/listinfo/openvpn-devel>, <mailto:openvpn-devel-request@lists.sourceforge.net?subject=subscribe> Reply-To: lstipakov@gmail.com, arne-openvpn@rfc2549.org, heiko@openvpn.net, openvpn-devel@lists.sourceforge.net, frank@lichtenheld.com, a@unstable.cc Cc: plaisthos <arne-openvpn@rfc2549.org>, d12fk <heiko@openvpn.net>, openvpn-devel <openvpn-devel@lists.sourceforge.net> Content-Type: multipart/mixed; boundary="===============7794869439403494209==" Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1771677685911811986?= X-GMAIL-MSGID: =?utf-8?q?1771677688187039986?= |
Series |
[Openvpn-devel,XS] Change in openvpn[release/2.6]: Fix '--inactive <time> 0' behavior for DCO
|
expand
|
diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c index 28a96f9..b3e0ba5 100644 --- a/src/openvpn/forward.c +++ b/src/openvpn/forward.c @@ -481,7 +481,7 @@ int64_t tot_bytes = c->c2.tun_read_bytes + c->c2.tun_write_bytes; int64_t new_bytes = tot_bytes - c->c2.inactivity_bytes; - if (new_bytes >= c->options.inactivity_minimum_bytes) + if (new_bytes > c->options.inactivity_minimum_bytes) { c->c2.inactivity_bytes = tot_bytes; event_timeout_reset(&c->c2.inactivity_interval);