From patchwork Sat Aug 13 11:11:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 2675 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director14.mail.ord1d.rsapps.net ([172.27.255.53]) by backend30.mail.ord1d.rsapps.net with LMTP id QB4yELQT+GIFJQAAIUCqbw (envelope-from ) for ; Sat, 13 Aug 2022 17:12:20 -0400 Received: from proxy4.mail.iad3a.rsapps.net ([172.27.255.53]) by director14.mail.ord1d.rsapps.net with LMTP id QLDwD7QT+GIAawAAeJ7fFg (envelope-from ) for ; Sat, 13 Aug 2022 17:12:20 -0400 Received: from smtp1.gate.iad3a ([172.27.255.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy4.mail.iad3a.rsapps.net with LMTPS id gP8SCbQT+GIXbwAA8Zvu4w (envelope-from ) for ; Sat, 13 Aug 2022 17:12:20 -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: smtp1.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: 9d6d1f48-1b4c-11ed-97b4-52540091dea5-1-1 Received: from [216.105.38.7] ([216.105.38.7:48734] helo=lists.sourceforge.net) by smtp1.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 12/94-30080-3B318F26; Sat, 13 Aug 2022 17:12:19 -0400 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 1oMyPk-00069u-IC; Sat, 13 Aug 2022 21:11:24 +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 1oMyPi-00069o-U7 for openvpn-devel@lists.sourceforge.net; Sat, 13 Aug 2022 21:11:22 +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:Message-Id: Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=t6NSZqsn9xQKjG+pQBrUGBkPhJt7ZGpyodzbB3XL9wA=; b=Lg99sMPiGbZ9a7YRMZK7vog+vx q4Xdy2omI+SQ2StTU2fbHTzoHuYuyLKFEmVEAlIknKvFjDAc9X2fkUZt0V/t5hLvRwJ5Kkp+3yOaj NqsC7z2VLJJn3ukOVVMwlBqc79LznS6mjWZDLjp58ckq6C7jdYMF9h6K7nfPPJjKK8ro=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:To:From: Sender:Reply-To:Cc:Content-Type:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=t6NSZqsn9xQKjG+pQBrUGBkPhJt7ZGpyodzbB3XL9wA=; b=m y974I/UhKZFzzrEwc7axBAraufNkHiiTeHiolLn2TfKCi38YxETNNOizvYME95eiFvm6+n0o8sNdn aS87PK6DkkH9KjTf3WKK8pW1ia9TSQQBOHkbb6ruu7VG1pZq+Lnek+cdrQfvPEByI4ZzyOTJFUNm2 d0UOWVJNSrV+C49U=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1oMyPe-0005wz-Mk for openvpn-devel@lists.sourceforge.net; Sat, 13 Aug 2022 21:11:22 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.95 (FreeBSD)) (envelope-from ) id 1oMyPQ-000M6k-5t for openvpn-devel@lists.sourceforge.net; Sat, 13 Aug 2022 23:11:04 +0200 Received: (nullmailer pid 411602 invoked by uid 10006); Sat, 13 Aug 2022 21:11:04 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Sat, 13 Aug 2022 23:11:04 +0200 Message-Id: <20220813211104.411554-1-arne@rfc2549.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 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: This is allows querying the DCO status without doing an error-prone parsing of the startup log. Also remove comment that serves no purpose anymore. Signed-off-by: Arne Schwabe --- src/openvpn/multi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Content analysis details: (0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Headers-End: 1oMyPe-0005wz-Mk Subject: [Openvpn-devel] [PATCH] Allow querying DCO status via management status 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 This is allows querying the DCO status without doing an error-prone parsing of the startup log. Also remove comment that serves no purpose anymore. Signed-off-by: Arne Schwabe Acked-by: Lev Stipakov --- src/openvpn/multi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index 53ee3e1a1..95414429f 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -837,7 +837,7 @@ multi_print_status(struct multi_context *m, struct status_output *so, const int status_reset(so); - if (version == 1) /* WAS: m->status_file_version */ + if (version == 1) { /* * Status file version 1 @@ -984,6 +984,7 @@ multi_print_status(struct multi_context *m, struct status_output *so, const int sep, sep, mbuf_maximum_queued(m->mbuf)); } + status_printf(so, "GLOBAL_STATS%cdco_enabled%c%d", sep, sep, dco_enabled(&m->top.options)); status_printf(so, "END"); } else