From patchwork Wed Apr 21 03:43:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 1752 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director14.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id KNYTJVYsgGAsawAAIUCqbw (envelope-from ) for ; Wed, 21 Apr 2021 09:44:54 -0400 Received: from proxy18.mail.ord1d.rsapps.net ([172.30.191.6]) by director14.mail.ord1d.rsapps.net with LMTP id CJfSJFYsgGBaRQAAeJ7fFg (envelope-from ) for ; Wed, 21 Apr 2021 09:44:54 -0400 Received: from smtp30.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy18.mail.ord1d.rsapps.net with LMTPS id +ACmJFYsgGBqSwAATCaURg (envelope-from ) for ; Wed, 21 Apr 2021 09:44:54 -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: smtp30.gate.ord1d.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: c028eaa4-a2a7-11eb-850d-5254001e8e38-1-1 Received: from [216.105.38.7] ([216.105.38.7:48662] helo=lists.sourceforge.net) by smtp30.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id E1/27-06584-55C20806; Wed, 21 Apr 2021 09:44:53 -0400 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.90_1) (envelope-from ) id 1lZD99-0005ow-2Z; Wed, 21 Apr 2021 13:44:03 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZD97-0005oL-Qd for openvpn-devel@lists.sourceforge.net; Wed, 21 Apr 2021 13:44:01 +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: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:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=eP5Bs9FTLUXF37sZOFMT9hMNVAIUt67CxYDcCgz8wJA=; b=Pg/pT4LmJhIogZnzU3ybbk/gAJ 7lKRZEZNSU+g8d3+R4OpTE1oErdLkyddmhAoZf6SQSLkf5Asll0VXrUFSl3vpuu/YP1qAAxwygqL5 +YSbeBmApTujjUic2SjKIZw0AJs+MZ6dNZSxa2J8p0Z4OsWEgLyl8YR10Cly6tGtjzco=; 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: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:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=eP5Bs9FTLUXF37sZOFMT9hMNVAIUt67CxYDcCgz8wJA=; b=hHD/NfgoPVCPDRqC9Lod4OLNbL BjhDPaRDJFOqizbK4zDk58NyHGBxEI5wc1/nTW0E+Jz7QJEIQMT+7V5VZdSRbiwwc5ebETQWoTRBs /AoxAUvhT1+tx1XBrrK1iqVH8TePsYJJ1jNqvVyEXr4KVrtofaf/5BWsh2Ufx9DeOMwY=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.3) id 1lZD90-0004ZI-MO for openvpn-devel@lists.sourceforge.net; Wed, 21 Apr 2021 13:44:01 +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 1lZD8u-0004QO-1m for openvpn-devel@lists.sourceforge.net; Wed, 21 Apr 2021 15:43:48 +0200 Received: (nullmailer pid 1950448 invoked by uid 10006); Wed, 21 Apr 2021 13:43:48 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Wed, 21 Apr 2021 15:43:44 +0200 Message-Id: <20210421134348.1950392-3-arne@rfc2549.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210421134348.1950392-1-arne@rfc2549.org> References: <20210421134348.1950392-1-arne@rfc2549.org> MIME-Version: 1.0 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: 1lZD90-0004ZI-MO Subject: [Openvpn-devel] [PATCH 3/7] Remove always enabled USE_64_BIT_COUNTERS define 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 Also change the types to use C99 uint64_t and its printf u64 define. Signed-off-by: Arne Schwabe Acked-by: Antonio Quartulli --- src/openvpn/common.h | 15 +++------------ src/openvpn/syshead.h | 5 ----- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/src/openvpn/common.h b/src/openvpn/common.h index 623b3e0d7..544fa238e 100644 --- a/src/openvpn/common.h +++ b/src/openvpn/common.h @@ -25,19 +25,10 @@ #define COMMON_H /* - * Statistics counters and associated printf formats. + * Statistics counters and associated printf format. */ -#ifdef USE_64_BIT_COUNTERS -typedef unsigned long long int counter_type; -#ifdef _WIN32 -#define counter_format "%I64u" -#else -#define counter_format "%llu" -#endif -#else /* ifdef USE_64_BIT_COUNTERS */ -typedef unsigned int counter_type; -#define counter_format "%u" -#endif +typedef uint64_t counter_type; +#define counter_format "%" PRIu64 /* * Time intervals diff --git a/src/openvpn/syshead.h b/src/openvpn/syshead.h index cb9bf7dc7..f29c63c73 100644 --- a/src/openvpn/syshead.h +++ b/src/openvpn/syshead.h @@ -458,11 +458,6 @@ socket_defined(const socket_descriptor_t sd) return sd != SOCKET_UNDEFINED; } -/* - * Should statistics counters be 64 bits? - */ -#define USE_64_BIT_COUNTERS - /* * Should we enable the use of execve() for calling subprocesses, * instead of system()?