From patchwork Thu Feb 20 16:00:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Selva Nair X-Patchwork-Id: 1016 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director11.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id gNfuHTVIT16jRAAAIUCqbw for ; Thu, 20 Feb 2020 22:02:13 -0500 Received: from proxy5.mail.ord1d.rsapps.net ([172.30.191.6]) by director11.mail.ord1d.rsapps.net with LMTP id 2P/XHTVIT14PTgAAvGGmqA ; Thu, 20 Feb 2020 22:02:13 -0500 Received: from smtp11.gate.ord1c ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy5.mail.ord1d.rsapps.net with LMTP id wF66HDVIT153KQAA8Zzt7w ; Thu, 20 Feb 2020 22:02:13 -0500 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: smtp11.gate.ord1c.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; dkim=fail (signature verification failed) header.d=gmail.com; dmarc=fail (p=none; dis=none) header.from=gmail.com X-Suspicious-Flag: YES X-Classification-ID: 8eaca9ca-5456-11ea-acc8-bc305beffa54-1-1 Received: from [216.105.38.7] ([216.105.38.7:47310] helo=lists.sourceforge.net) by smtp11.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 62/EF-21255-5384F4E5; Thu, 20 Feb 2020 22:02:13 -0500 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.90_1) (envelope-from ) id 1j4yYj-0007NM-DC; Fri, 21 Feb 2020 03:00:57 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1j4yYh-0007NC-2c for openvpn-devel@lists.sourceforge.net; Fri, 21 Feb 2020 03:00:55 +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:Cc: To:From:Sender:Reply-To: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=UKryJDG2g8ob4IJW0NjRUYrf18R070lNqGYEDMpsQcs=; b=FOrOUQqPJc3VLJECRl6vQlgOom DPbYV5zuVf5KtGLyuzviDXDwmw1gett8TeyCeWz+0IZ3jC6FiGowPRkuYryOxFp2ea45HZdZJH0f2 c3cPah5OpDBf00lfXFkZF/B2Kz7ZUvsfw+r2JaHgSTCuMK+/l+Oqw7u2gLpoBuRW1aEo=; 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:Cc:To:From:Sender:Reply-To :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=UKryJDG2g8ob4IJW0NjRUYrf18R070lNqGYEDMpsQcs=; b=IMFhgRkApoTwllsHvzHRD/7zYc /EJTjQ3G6Le4oosn5b5d1Xe6wgkrwGvKXPIpihAyNaCb0BR99v/DvpUSV9pMPMHiffkUCm5WbtglM pHhctX4gUXz5td4wxsZYBt7hWSUkAJaFl9CC+1geRK0cZLrRRD7zySqQz4yvI1aZH8WM=; Received: from mail-qk1-f193.google.com ([209.85.222.193]) by sfi-mx-3.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.2) id 1j4yYf-0033BE-M2 for openvpn-devel@lists.sourceforge.net; Fri, 21 Feb 2020 03:00:55 +0000 Received: by mail-qk1-f193.google.com with SMTP id u124so559182qkh.13 for ; Thu, 20 Feb 2020 19:00:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=UKryJDG2g8ob4IJW0NjRUYrf18R070lNqGYEDMpsQcs=; b=ZKig2oKLGyWz6k3+I3MuBIVEUaP2z59P+JkWC1Db5edNBWwrGP/N/xxlUNTx5R8HZE wQShSwirpvbmOypSUIEJzoUpfrpVJLdhRq07/6IcZuVaCKs+7wnjLyV4+F7dXvv7WQ1P dik2TRJQk/WdLPSsXsR4MVfvnqVDj8Z2GeO6sAN+tIKoO+2cNQ9C9nemTCX20l5RASVA P9mYoIjHReUQygeN94Ge5j9V/NALkcS5dhG5igHQ/NsKo71b0BxmlU9SEAhEmqMnMje3 mrD6PlYXpYNySpYYPpxDdR3wvQIFPzE/trIMJlOUSfPzJ7cY0aogyU67sqln3Lg3NmqT ZZDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=UKryJDG2g8ob4IJW0NjRUYrf18R070lNqGYEDMpsQcs=; b=F8gNgDVugPBzWArifh5LVp6GE208XNMUh+JbmmjMXC+AIHkj9IPLqL5+BsmDfJEzLQ RmuASTIHe78YOZvoujU+SVZyQ6MwBffh0ws3dTiYilM2ut/ZpATqw0AX89n/HFIIEDVS GX1sqaT6wtjmTkpHIDOaU21S0juRrRgZYEwFx4Zb/KwkaFwBLqQh9tpo25/hxkOIj+PH ujlI7SMvI9mpcUeCLcwogO6gR/D9yFSwDXCrnYVXwABn36Or8RNTEvs0AH5AEbRBoG/v Tk8jAoR+9MeDZmRprCooDvsucrFqFAK1dkqQOcabUmZxalTGf9cV/m05txsBJsHgswzZ Jb9g== X-Gm-Message-State: APjAAAXz6oi7pp+F7YT80IGmowhlYeDI917TsW4X48//htUpbx14/XiE VOHug2rmKtFFSbSxodxU2IAl4j05nVw= X-Google-Smtp-Source: APXvYqwR8lYU1yPq3rdYuD8hQgQAdiptOsVCED9imVr7R6Fkh71C6pnwPbPPbBjG/4LU/wr49riGbg== X-Received: by 2002:a37:6808:: with SMTP id d8mr29630665qkc.468.1582254047393; Thu, 20 Feb 2020 19:00:47 -0800 (PST) Received: from saturn.home.sansel.ca (CPE40167ea0e1c2-CM788df74daaa0.cpe.net.cable.rogers.com. [99.228.216.21]) by smtp.gmail.com with ESMTPSA id p19sm842999qte.81.2020.02.20.19.00.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 20 Feb 2020 19:00:46 -0800 (PST) From: selva.nair@gmail.com To: openvpn-devel@lists.sourceforge.net Date: Thu, 20 Feb 2020 22:00:28 -0500 Message-Id: <1582254028-7763-1-git-send-email-selva.nair@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1521522224-18829-1-git-send-email-selva.nair@gmail.com> References: <1521522224-18829-1-git-send-email-selva.nair@gmail.com> X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 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.222.193 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.222.193 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -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_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.0 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1j4yYf-0033BE-M2 Subject: [Openvpn-devel] [PATCH v2] Persist management-query-remote and proxy prompts 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 From: Selva Nair Currently this prompt is only output once, not re-written to the management interface when the management client connects. It is thus not seen by a client that connects after the prompt is output or one that disconnects and reconnects. This leads to a deadlock: the daemon waiting for the "remote" command from the client, the latter not aware of it. Resolve by adding the ">REMOTE" and ">PROXY" prompt to man.persist.special_state_msg as done for other persisted prompts such as ">PASSWORD" Signed-off-by: Selva Nair Acked-by: Gert Doering --- v2: bump and rebase to master src/openvpn/init.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/openvpn/init.c b/src/openvpn/init.c index 1cfffbb..b4781a2 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -271,6 +271,7 @@ ce_management_query_proxy(struct context *c) buf_printf(&out, ">PROXY:%u,%s,%s", (l ? l->current : 0) + 1, (proto_is_udp(ce->proto) ? "UDP" : "TCP"), np(ce->remote)); management_notify_generic(management, BSTR(&out)); + management->persist.special_state_msg = BSTR(&out); } ce->flags |= CE_MAN_QUERY_PROXY; while (ce->flags & CE_MAN_QUERY_PROXY) @@ -282,6 +283,7 @@ ce_management_query_proxy(struct context *c) break; } } + management->persist.special_state_msg = NULL; gc_free(&gc); } @@ -351,6 +353,7 @@ ce_management_query_remote(struct context *c) buf_printf(&out, ">REMOTE:%s,%s,%s", np(ce->remote), ce->remote_port, proto2ascii(ce->proto, ce->af, false)); management_notify_generic(management, BSTR(&out)); + management->persist.special_state_msg = BSTR(&out); ce->flags &= ~(CE_MAN_QUERY_REMOTE_MASK << CE_MAN_QUERY_REMOTE_SHIFT); ce->flags |= (CE_MAN_QUERY_REMOTE_QUERY << CE_MAN_QUERY_REMOTE_SHIFT); @@ -364,6 +367,7 @@ ce_management_query_remote(struct context *c) break; } } + management->persist.special_state_msg = NULL; } gc_free(&gc);