From patchwork Fri Oct 23 00:34:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 1517 X-Patchwork-Delegate: a@unstable.cc Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director9.mail.ord1d.rsapps.net ([172.27.255.59]) by backend41.mail.ord1d.rsapps.net with LMTP id mPhKHwTAkl8/fQAAqwncew (envelope-from ) for ; Fri, 23 Oct 2020 07:35:32 -0400 Received: from proxy17.mail.iad3a.rsapps.net ([172.27.255.59]) by director9.mail.ord1d.rsapps.net with LMTP id AOQaHwTAkl9MFQAAalYnBA (envelope-from ) for ; Fri, 23 Oct 2020 07:35:32 -0400 Received: from smtp13.gate.iad3a ([172.27.255.59]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy17.mail.iad3a.rsapps.net with LMTPS id uFEFGQTAkl/VIgAAR4KW9A (envelope-from ) for ; Fri, 23 Oct 2020 07:35:32 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp13.gate.iad3a.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dmarc=none (p=nil; dis=none) header.from=rfc2549.org X-Suspicious-Flag: YES X-Classification-ID: db3ec686-1523-11eb-a1b9-5254004b83b1-1-1 Received: from [216.105.38.7] ([216.105.38.7:38364] helo=lists.sourceforge.net) by smtp13.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 34/FD-04452-300C29F5; Fri, 23 Oct 2020 07:35:32 -0400 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.90_1) (envelope-from ) id 1kVvLO-0002HR-OD; Fri, 23 Oct 2020 11:34:50 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVvLL-0002HB-Qh for openvpn-devel@lists.sourceforge.net; Fri, 23 Oct 2020 11:34:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=References:In-Reply-To:Message-Id:Date:Subject:To: From:Sender:Reply-To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding: 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=2XqZfhSD22m4adkwOVrZUkE34JL2QVmbpRFDA7mOrUk=; b=mJprsnWu378s5rPYx/yJWCufhm cTzE/VVl05re4u1rwxSKY+bXEr3fevZBmnC4IImIykb/7KRsxy1DLNZXXazMYnL8hSZ2owqVFqHm9 Zq4USjA7BLvQ1rPVf1B60ETG6wiN+QFf5QimAOUhjYxy/xgmrk073fzvfQDBML5pfJn0=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=References:In-Reply-To:Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc :MIME-Version:Content-Type:Content-Transfer-Encoding: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=2XqZfhSD22m4adkwOVrZUkE34JL2QVmbpRFDA7mOrUk=; b=fSmUBPwR04t/CfZdULT87GqYn1 XmP65/g04+Ng7olnmSJhEFduuoKWsYKHYXubHgr7u+8tMJ/7Me985xVkTEH+EtuEAdo/6cPVrz7MA Vj2bp6l5SFfsDpQ8VITbsbc12Epdt/67VaFKms/d8NJKD5osL90PMrANPKFzvadbUnE4=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-3.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1kVvLG-003oIw-Qi for openvpn-devel@lists.sourceforge.net; Fri, 23 Oct 2020 11:34:47 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.94 (FreeBSD)) (envelope-from ) id 1kVvL5-000J9x-Tn for openvpn-devel@lists.sourceforge.net; Fri, 23 Oct 2020 13:34:31 +0200 Received: (nullmailer pid 26739 invoked by uid 10006); Fri, 23 Oct 2020 11:34:31 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Fri, 23 Oct 2020 13:34:28 +0200 Message-Id: <20201023113431.26691-2-arne@rfc2549.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201023113431.26691-1-arne@rfc2549.org> References: <20201023113431.26691-1-arne@rfc2549.org> X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: rfc2549.org] 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-Headers-End: 1kVvLG-003oIw-Qi Subject: [Openvpn-devel] [PATCH 2/5] xmit_hold is only required for port_share 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: , MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox Make options.c only set xmit_hold when port_share is active to least document this dependency. I have not actually tested if this dependency is actually true (or if port_share could work without xmit_hold). Signed-off-by: Arne Schwabe --- src/openvpn/init.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/openvpn/init.c b/src/openvpn/init.c index 034edba0..fdd9a6cc 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -2908,12 +2908,15 @@ do_init_crypto_tls(struct context *c, const unsigned int flags) to.push_peer_info_detail = 0; } +#ifdef ENABLE_PORT_SHARE /* should we not xmit any packets until we get an initial * response from client? */ - if (to.server && options->ce.proto == PROTO_TCP_SERVER) + if (to.server && options->ce.proto == PROTO_TCP_SERVER + && options->port_share_host) { to.xmit_hold = true; } +#endif to.disable_occ = !options->occ;