From patchwork Tue Dec 27 14:02:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 2948 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:c95:b0:82:e4b3:40a0 with SMTP id p21csp2650241dyk; Tue, 27 Dec 2022 06:03:33 -0800 (PST) X-Google-Smtp-Source: AMrXdXsiVHDUJ7gYs83ItSN/Sgra0PxZhE+JGbWhxDLwCkx+D3fIk53YwQz46+HWn9CVyAZZoQFb X-Received: by 2002:a05:6808:1807:b0:35e:da33:21f with SMTP id bh7-20020a056808180700b0035eda33021fmr12894729oib.15.1672149813455; Tue, 27 Dec 2022 06:03:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672149813; cv=none; d=google.com; s=arc-20160816; b=ckMoFRrU4nHupqlArJqb5PNvIOWWoMh/xuuYuTyGNzI+ZDXwcR6bd0H5fnJ4i4lpek 22/qvhU6X9hrOvB4wO1xsVWS4uO9de5Z4MilpkWiMoGiNhFB6qK5rwmJaYK9yCF9LDg+ djgsaf02lMv8fhBGYkTtuUm1NB02vVWasxGvOl3VzE8ggoe8NNF0m0DNUmLz9Rc/HJIx mPEF11lvqVhtHEGzz8W20LPQlmP1ebQCvgGjvCM0/LwSWC9TA/ZvBRsLUo9CjwAb1mjS ZagC3PxPCiaRW97sZf6658GmCJL8VkfFkRn4LeahkGqgbEXlVrrf/61hxhgHUcvZI1dK 2AIg== 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:message-id:date:to:from:dkim-signature:dkim-signature; bh=1LyjkD2bdu6adeJZhAhxcNfOMuru641ZQMXhvLHYm8k=; b=oANjKAJojLHMY0At3BFtmOgYAqHd8mMVMYwDVjmf6PHlizFoNyMg9F3aWF/x5nxTPY DZen5d5sFp7cl9Yu4iuwQfw781GF7BFsXcV+NcYv1YNbHNQ7t893k4C1IU4zL2nSzTe8 MiFVF2edVovGZgZ1mEZqg+fK/ymrjuIrRhDqWdK66aPpH5z/4tS2Jjw8G/if6VszlxC4 pwYGyCdQNaqG/RiYqCW16LfKk1QU1xUMYoobDWS1x8XXkWLzjx2gAQXBNFdp2lfvPa0d MmlA1t5ORze6JvPLM2w6SKLj1JIuaWd8LKS8nAr4DfPvGxcCPeF/KLPXJuxpUfaZPAwZ d3hw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=Z0A3xl6P; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=UXGc17n9; 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 Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id j15-20020a056808034f00b0035bbf2e5931si10007876oie.287.2022.12.27.06.03.33 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Dec 2022 06:03:33 -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=Z0A3xl6P; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=UXGc17n9; 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 Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1pAAXm-0003NL-Hk; Tue, 27 Dec 2022 14:03:02 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pAAXh-00032T-ID for openvpn-devel@lists.sourceforge.net; Tue, 27 Dec 2022 14:02:57 +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=tIAHvbNusgg8d25zvOuHrFUx5HPPP9q+C8xX//l5Z1Q=; b=Z0A3xl6P5H46pdFKpQJpvGG82w YAfPjFHiaebaSHc/Mew/JvfU0JKzvK86Wupf80DGyuHsiOkJZMyVrXibFPxdakI660wqCKfWdjT7q SVQb+Wcm2sXLze7znRbrhdPNhDXQOqtRAaBT2KfbUrL61OtHTsvFTCylMPLQFUCJ6VH4=; 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=tIAHvbNusgg8d25zvOuHrFUx5HPPP9q+C8xX//l5Z1Q=; b=U XGc17n9nJ8md4SWtmHlr5sy3j4dZqgS543fPiguEI3zAh1WeTqxAEVQ7Mx9Qtc8RuRH50C2NN01IU GU5zzXFyxoxs0Pxhmd2Gf3vnHUNviEwJ+jTORXfR011pc17Tor1hOyAW2/muEebcVNAuuvp0gBFKF c9xdSZMQlfG9DiR0=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1pAAXg-00E5SC-Jf for openvpn-devel@lists.sourceforge.net; Tue, 27 Dec 2022 14:02:57 +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 1pAAXZ-0004uG-6B for openvpn-devel@lists.sourceforge.net; Tue, 27 Dec 2022 15:02:49 +0100 Received: (nullmailer pid 3524989 invoked by uid 10006); Tue, 27 Dec 2022 14:02:49 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Tue, 27 Dec 2022 15:02:44 +0100 Message-Id: <20221227140249.3524943-1-arne@rfc2549.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Score: 0.3 (/) X-Spam-Report: Spam detection software, running on the system "util-spamd-1.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: Signed-off-by: Arne Schwabe --- src/openvpn/manage.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/openvpn/manage.c b/src/openvpn/manage.c index be9a38952..7e326702f 100644 --- a/src/openvpn/manage.c +++ b/src/openvpn/manage.c @@ -865, 8 +865, 6 @@ man_remote_entry_count(struct manag [...] Content analysis details: (0.3 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 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 X-Headers-End: 1pAAXg-00E5SC-Jf Subject: [Openvpn-devel] [PATCH 1/2] Replace custom min macro and use more C99 style in man_remote_entry_get 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?1753376162883493548?= X-GMAIL-MSGID: =?utf-8?q?1753376162883493548?= Signed-off-by: Arne Schwabe Acked-by: Gert Doering --- src/openvpn/manage.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/openvpn/manage.c b/src/openvpn/manage.c index be9a38952..7e326702f 100644 --- a/src/openvpn/manage.c +++ b/src/openvpn/manage.c @@ -865,8 +865,6 @@ man_remote_entry_count(struct management *man) } } -#define min(a, b) ((a) < (b) ? (a) : (b)) - static void man_remote_entry_get(struct management *man, const char *p1, const char *p2) { @@ -875,12 +873,10 @@ man_remote_entry_get(struct management *man, const char *p1, const char *p2) if (man->persist.callback.remote_entry_get && man->persist.callback.remote_entry_count) { - bool res; - unsigned int from, to; unsigned int count = (*man->persist.callback.remote_entry_count)(man->persist.callback.arg); - from = (unsigned int) atoi(p1); - to = p2 ? (unsigned int) atoi(p2) : from + 1; + unsigned int from = (unsigned int) atoi(p1); + unsigned int to = p2 ? (unsigned int) atoi(p2) : from + 1; if (!strcmp(p1, "all")) { @@ -888,10 +884,10 @@ man_remote_entry_get(struct management *man, const char *p1, const char *p2) to = count; } - for (unsigned int i = from; i < min(to, count); i++) + for (unsigned int i = from; i < min_uint(to, count); i++) { char *remote = NULL; - res = (*man->persist.callback.remote_entry_get)(man->persist.callback.arg, i, &remote); + bool res = (*man->persist.callback.remote_entry_get)(man->persist.callback.arg, i, &remote); if (res && remote) { msg(M_CLIENT, "%u,%s", i, remote);