From patchwork Mon Dec 19 15:04:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Selva Nair X-Patchwork-Id: 2928 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:c95:b0:82:e4b3:40a0 with SMTP id p21csp3077540dyk; Mon, 19 Dec 2022 07:06:02 -0800 (PST) X-Google-Smtp-Source: AA0mqf5MMzdrd0qzgKyAVEKYUFgswtyLROO2umlkcPjGQXtsnboBytSi09YJ6lzqD5+i86cskzb2 X-Received: by 2002:a05:6a20:d805:b0:a2:43b7:98a6 with SMTP id iv5-20020a056a20d80500b000a243b798a6mr48755182pzb.10.1671462362529; Mon, 19 Dec 2022 07:06:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671462362; cv=none; d=google.com; s=arc-20160816; b=F2YiZFtIUeLS6Te0feUq/qCJYeX2kI1b3645l/yiGKTo0HMfVSeaX6iyA9mdSaRH+J lgy7hEyZ/mFfEpo9BBim+nYCEguTztnmlLE3chzyUUSj0/ppp4t3A//DxRFQCfSjPHIi V4aQfSP3ha2/2kj/rkxWHX5fJLITK6rP/k73YpUW5HMiIb875VMKZPY0GrBQqmM8HqPS buxo5wFdYQyy/J6ddlDwGGHxy8NiHVnJL05hX+nV7OfK5zCWoS9teysJ7EzttM6R6oTl d/ISAn2QkXiZeHUVpDtZFZxJn2WSQ06I5IBCpWJpJuk/oinAw/ewLVd4N9zE7S+B8Rb2 xKbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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=eK01u3aArA4PaseuHHbrQa+l4j/uO/gaEh2Vb4teg40=; b=mxJzo5U6IQX/dAjEJiTxVd4DHh9WZ7XiHeiSXXO95i2VgpBveguKMKMJY/45+BvjeF g5aUambJ18u+g3WkKq/4pSEqksmocdUVqjg3vj6s3x9rnZrIMujrczwHBJQZt/yDLcPr WM2RFE4oeq+kGs00mMJfo71KzWrJi39Xu9s/xnIbzWrrp+5YE/LF0UYHzJan+k1HWVgA BZsSrNpJ8mcfyPf6a9frVC/caPs11q4N1t06/7IpbIG6zX8Angi6DZLeU2s9Dx7xXxiM iqBT/HZxA7Ppvee07ADsf1lr4wNDjUgIK9q4DobY/tVI+LZdW43eqAbttZXIyVljrVfp 0u2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=OFcY3yKz; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=HXnbFEUm; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=DJd1z3oX; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id x77-20020a633150000000b0047908ce91c8si11203910pgx.799.2022.12.19.07.06.02 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Dec 2022 07:06:02 -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=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=OFcY3yKz; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=HXnbFEUm; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=DJd1z3oX; 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=QUARANTINE dis=NONE) header.from=gmail.com 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 1p7HhX-0003W0-RZ; Mon, 19 Dec 2022 15:05:11 +0000 Received: from [172.30.20.202] (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 1p7HhU-0003Vt-1A for openvpn-devel@lists.sourceforge.net; Mon, 19 Dec 2022 15:05:08 +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:Cc:To:From:Sender:Reply-To: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=OsTA/6KhpELWwlCaULPHQZu6zPkYLPH6gYmuzA5jbNc=; b=OFcY3yKz6h9Gl1EAQZuu9iknFZ +pfNrI3YjySNT9huczQ1Pm17OQ3fsHTG/hCPjWGJl82pzSTQp4tq2bx5g2ZfW88hY1lwEzxHBerHp CJabevBxE/GO7+Ll45UM9nEGwwVBkW0jbVG6/0aWXCuteUAgF7Z8MuXIChhsVWivOBeE=; 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:Cc:To:From:Sender:Reply-To: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=OsTA/6KhpELWwlCaULPHQZu6zPkYLPH6gYmuzA5jbNc=; b=HXnbFEUmfsl31nHzFRdH3BZdSt IeMP4w1Wzaj6rDOWTTPmyler3IVchCcm2YdaBwMY4aiWGev3G+a4D6kv6hQHTRw2P04haTl+0hS5p WmIoeF4kE2RsF+aF6nA3k75mA9K7zg7fJopU/bYoV9JnJ5MD4S+NgnWGoI97W8t1A0X4=; Received: from mail-il1-f173.google.com ([209.85.166.173]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1p7HhT-004roF-85 for openvpn-devel@lists.sourceforge.net; Mon, 19 Dec 2022 15:05:07 +0000 Received: by mail-il1-f173.google.com with SMTP id o13so4846270ilc.7 for ; Mon, 19 Dec 2022 07:05:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OsTA/6KhpELWwlCaULPHQZu6zPkYLPH6gYmuzA5jbNc=; b=DJd1z3oXrBraREp/ndQTXX5t0z/czXl5mSYa2yMYaXKhz1ZcluTBjAZ+4RCkqgmk4H KFec0nHxSB4dLfZx/3UB0pTIPTeqV2PXYG4x9r1X9i6WAhwrYXhD28ElT1LzM7Ce2BtO sDFltJMPKLr7762HCb7ZsD/G0kEOyCAE1KTQ1bWUELu3qEboTDxKgcAsrl4k/LSfTSGs P+znaLjt2SYLg+4reLzEoEyUYey1NCxh9qjktb9fqdg1XfvHvs/1z/nQ/ZFVymA6surd 8xFBzwomlNeRmU4jBwgcV0G1+15D1rcroUghTngrezAhTyaC0FHFdA/iKhXpvQZ48GfG jhWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OsTA/6KhpELWwlCaULPHQZu6zPkYLPH6gYmuzA5jbNc=; b=P+SlrndoHxCpH77UA6uCxZ9Lgzi1wNwOv4W/M/r4aOylgbHWW+1etcanvzE2Rq0rPO +BIZLQVOe8G6ojnvuMGY1QBRJd41CBekSQ8ypwa8+91eQfmg+1Qw4hnQrPAetINB31mo 09ZdQCAgf+iiOQpz/gCryZtl+CriMBsYiSBLcT4Jc13M9d/F+b3+wv3BO+bes+8C/Vx3 rLsZuiyI6BwQ0LN7Q10R+1Y3Nc6FyahIaISl3pvPuMmGNCmOnFYnd21ZschICtHwIHmw LObPymYkb3ExBtKrz0bJqNtxBUXKYB3IFJc/ZyNQYlp0cEf6lWdBm6dCcw9hEpEHx+1h 3Egg== X-Gm-Message-State: ANoB5pnU3WQSS8pXhu3m6/u2Ii/aPW9JpDU7ZKkQ2IxryADgUspvy0ww LLyloYwgkLMn8ABZYCltHU1x/xxI75mzyw== X-Received: by 2002:a92:d74c:0:b0:302:d868:8ded with SMTP id e12-20020a92d74c000000b00302d8688dedmr4136278ilq.0.1671462301330; Mon, 19 Dec 2022 07:05:01 -0800 (PST) Received: from uranus.sansel.ca (bras-vprn-tnhlon4053w-lp130-01-70-51-222-66.dsl.bell.ca. [70.51.222.66]) by smtp.gmail.com with ESMTPSA id b14-20020a92db0e000000b002fc323a2902sm3356531iln.62.2022.12.19.07.05.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Dec 2022 07:05:01 -0800 (PST) From: selva.nair@gmail.com To: openvpn-devel@lists.sourceforge.net Date: Mon, 19 Dec 2022 10:04:35 -0500 Message-Id: <20221219150435.1222451-1-selva.nair@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221218195810.1216368-1-selva.nair@gmail.com> References: <20221218195810.1216368-1-selva.nair@gmail.com> MIME-Version: 1.0 X-Spam-Score: -0.2 (/) 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: Selva Nair Current value of restart pause is 5 seconds which feels unduly long. Reduce it to 1 second. User can still customize the delay using the first parameter for "--connect-retry". Content analysis details: (-0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [selva.nair[at]gmail.com] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.166.173 listed in wl.mailspike.net] -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.166.173 listed in list.dnswl.org] X-Headers-End: 1p7HhT-004roF-85 Subject: [Openvpn-devel] [PATCH v2] Reduce default restart pause to 1 second 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?1752583170162880463?= X-GMAIL-MSGID: =?utf-8?q?1752655318142797871?= From: Selva Nair Current value of restart pause is 5 seconds which feels unduly long. Reduce it to 1 second. User can still customize the delay using the first parameter for "--connect-retry". Also improve the description of "--connect-retry" in the man page. v2 changes: - fix incomplete man page edit as pointed out by Arne Schwabe - fix man page (rst) changes as suggested by Frank Lichtenheld Signed-off-by: Selva Nair Acked-By: Frank Lichtenheld --- I've changed the rst edits following how other similar options are described -- though I do not like referring to 'arg' as 'n' first and then "explaining" it in valid-syntaxes... Will be happy to revise if there is a better way. reST is not for me: feels like I'm forced to write a paper in Word instead of LaTeX. doc/man-sections/client-options.rst | 17 ++++++++++++----- src/openvpn/options.c | 2 +- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/doc/man-sections/client-options.rst b/doc/man-sections/client-options.rst index 07651479..974cc992 100644 --- a/doc/man-sections/client-options.rst +++ b/doc/man-sections/client-options.rst @@ -138,12 +138,19 @@ configuration. Set ``--verb 6`` for debugging info showing the transformation of src/dest addresses in packets. ---connect-retry n - Wait ``n`` seconds between connection attempts (default :code:`5`). +--connect-retry args + Wait ``n`` seconds between connection attempts (default :code:`1`). Repeated reconnection attempts are slowed down after 5 retries per - remote by doubling the wait time after each unsuccessful attempt. An - optional argument ``max`` specifies the maximum value of wait time in - seconds at which it gets capped (default :code:`300`). + remote by doubling the wait time after each unsuccessful attempt. + + Valid syntaxes: + :: + + connect retry n + connect retry n max + + If the optional argument ``max`` is specified, the maximum wait time in + seconds gets capped at that value (default :code:`300`). --connect-retry-max n ``n`` specifies the number of times each ``--remote`` or diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 4383c953..4442697f 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -815,7 +815,7 @@ init_options(struct options *o, const bool init_gc) o->ce.proto = PROTO_UDP; o->ce.af = AF_UNSPEC; o->ce.bind_ipv6_only = false; - o->ce.connect_retry_seconds = 5; + o->ce.connect_retry_seconds = 1; o->ce.connect_retry_seconds_max = 300; o->ce.connect_timeout = 120; o->connect_retry_max = 0;