From patchwork Sat Nov 4 22:46:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremie Courreges-Anglas X-Patchwork-Id: 47 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director1.mail.ord1d.rsapps.net ([172.27.255.7]) by backend31.mail.ord1d.rsapps.net (Dovecot) with LMTP id ow3UNxrk/lkHIQAAgoeIoA for ; Sun, 05 Nov 2017 05:12:42 -0500 Received: from proxy11.mail.iad3a.rsapps.net ([172.27.255.7]) by director1.mail.ord1d.rsapps.net (Dovecot) with LMTP id e/84MRrk/lkNSQAANGzteQ ; Sun, 05 Nov 2017 05:12:42 -0500 Received: from smtp40.gate.iad3a ([172.27.255.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy11.mail.iad3a.rsapps.net (Dovecot) with LMTP id jIibFxrk/llaIgAAxCvdqw ; Sun, 05 Nov 2017 05:12:42 -0500 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-MessageSniffer-Scan-Result: 0 X-MessageSniffer-Rules: 0-298-999-1198-w 0-298-999-1562-w 0-298-0-11299-f X-CMAE-Scan-Result: 0 X-CNFS-Analysis: v=2.2 cv=HoE0IAbS c=1 sm=1 tr=0 a=Q8DxjiC8O3VT/NpP1XjEZQ==:117 a=Q8DxjiC8O3VT/NpP1XjEZQ==:17 a=kj9zAlcOel0A:10 a=sC3jslCIGhcA:10 a=WiVod9pSvdkA:10 a=LLj1TIjvAAAA:8 a=9sSjY8p1AAAA:8 a=P_JWiMecAAAA:8 a=FP58Ms26AAAA:8 a=rc3-OqBB21IT3jMjcv4A:9 a=CjuIK1q_8ugA:10 a=-FEs8UIgK8oA:10 a=NWVoK91CQyQA:10 a=6swFX36t3RvqdHmuLAOK:22 a=ub54wNWiXv_DzeFsgEJW:22 a=D0-HAvA3Hk9NMREbgwuX:22 X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.34.181.88] Authentication-Results: smtp40.gate.iad3a.rsapps.net; iprev=pass policy.iprev="216.34.181.88"; 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=wxcvbn.org X-Classification-ID: dc0da7b6-c211-11e7-9cc9-782bcb62aeec-1-1 Received: from [216.34.181.88] ([216.34.181.88:21978] helo=lists.sourceforge.net) by smtp40.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 99/E5-07091-A14EEF95; Sun, 05 Nov 2017 05:12:42 -0500 Received: from localhost ([127.0.0.1] helo=sfs-ml-2.v29.ch3.sourceforge.com) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.89) (envelope-from ) id 1eBHuH-00033B-OR; Sun, 05 Nov 2017 10:11:57 +0000 Received: from sog-mx-1.v43.ch3.sourceforge.com ([172.29.43.191] helo=mx.sourceforge.net) by sfs-ml-2.v29.ch3.sourceforge.com with esmtps (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.89) (envelope-from ) id 1eBHuG-000334-24 for openvpn-devel@lists.sourceforge.net; Sun, 05 Nov 2017 10:11:56 +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; bh=spFHjWUXhcbc/aHzfQiqTCSOzo8tpIR+q0eK/TiGbQg=; b=FuUvwa/699QXti/v1vRS4vZl+3YGoWf4ZisUwq5hOfBus1TsoU4uH7R0AkrL0dWruMPnaBMt7OUMWzNQVkABw0EsDqH/5Sd1MqKayNp97WpkSHJAh8cG+cGRE+kzM8iEBpC38BxfdNcTtssqm1YGp9JObOHQbIAInEH9XBstM9M=; 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; bh=spFHjWUXhcbc/aHzfQiqTCSOzo8tpIR+q0eK/TiGbQg=; b=kNgfQ/yYGgIEcYdvkm04dvc/HNVLuqjDfoslHAENZM0Oz3GxkBV9emSik2UH0elOZKmBVOsNd6Z17kn2lkngb4X75gF4BtbZHOiog2Q9kK4VvZLwM2SzWI1fMvnUZhWG2Cb3gO/PjefxCu804JCcUtUPzJ4jWNpz6IH0o68bXWw=; Received-SPF: pass (sog-mx-1.v43.ch3.sourceforge.com: domain of wxcvbn.org designates 91.216.110.36 as permitted sender) client-ip=91.216.110.36; envelope-from=jca@wxcvbn.org; helo=chomsky.autogeree.net; Received: from chomsky.autogeree.net ([91.216.110.36]) by sog-mx-1.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) id 1eBHuF-0005QF-3g for openvpn-devel@lists.sourceforge.net; Sun, 05 Nov 2017 10:11:55 +0000 Received: from ritchie.wxcvbn.org (localhost [127.0.0.1]) by wxcvbn.org (8.16.0.21/8.15.2) with ESMTP id vA59kmGW019325; Sun, 5 Nov 2017 10:46:48 +0100 (CET) Received: (from jca@localhost) by ritchie.wxcvbn.org (8.16.0.21/8.16.0.21/Submit) id vA59kmxi030535; Sun, 5 Nov 2017 10:46:48 +0100 (CET) From: Jeremie Courreges-Anglas To: openvpn-devel@lists.sourceforge.net Date: Sun, 5 Nov 2017 10:46:41 +0100 Message-Id: <20171105094641.55673-1-jca@wxcvbn.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <87375t6qas.fsf@ritchie.wxcvbn.org> References: <87375t6qas.fsf@ritchie.wxcvbn.org> X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_PASS SPF: sender matches SPF record X-Headers-End: 1eBHuF-0005QF-3g Subject: [Openvpn-devel] [PATCH] Use long long to format time_t-related environment variables 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 Signed-off-by: Jeremie Courreges-Anglas Acked-by: Steffan Karger --- src/openvpn/misc.c | 4 ++-- src/openvpn/misc.h | 2 +- src/openvpn/multi.c | 7 ++----- src/openvpn/options.c | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/openvpn/misc.c b/src/openvpn/misc.c index 8c7f6116..001fe1c4 100644 --- a/src/openvpn/misc.c +++ b/src/openvpn/misc.c @@ -553,10 +553,10 @@ setenv_int(struct env_set *es, const char *name, int value) } void -setenv_unsigned(struct env_set *es, const char *name, unsigned int value) +setenv_long_long(struct env_set *es, const char *name, long long value) { char buf[64]; - openvpn_snprintf(buf, sizeof(buf), "%u", value); + openvpn_snprintf(buf, sizeof(buf), "%lld", value); setenv_str(es, name, buf); } diff --git a/src/openvpn/misc.h b/src/openvpn/misc.h index eb39ce3f..f6c810a2 100644 --- a/src/openvpn/misc.h +++ b/src/openvpn/misc.h @@ -98,7 +98,7 @@ void setenv_counter(struct env_set *es, const char *name, counter_type value); void setenv_int(struct env_set *es, const char *name, int value); -void setenv_unsigned(struct env_set *es, const char *name, unsigned int value); +void setenv_long_long(struct env_set *es, const char *name, long long value); void setenv_str(struct env_set *es, const char *name, const char *value); diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index 4545bce1..82a0b9d9 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -565,10 +565,7 @@ multi_client_disconnect_setenv(struct multi_context *m, setenv_stats(&mi->context); /* setenv connection duration */ - { - const unsigned int duration = (unsigned int) now - mi->created; - setenv_unsigned(mi->context.c2.es, "time_duration", duration); - } + setenv_long_long(mi->context.c2.es, "time_duration", now - mi->created); } static void @@ -1769,7 +1766,7 @@ multi_client_connect_setenv(struct multi_context *m, { const char *created_ascii = time_string(mi->created, 0, false, &gc); setenv_str(mi->context.c2.es, "time_ascii", created_ascii); - setenv_unsigned(mi->context.c2.es, "time_unix", (unsigned int)mi->created); + setenv_long_long(mi->context.c2.es, "time_unix", mi->created); } gc_free(&gc); diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 7aa311aa..641a26e2 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -990,7 +990,7 @@ setenv_settings(struct env_set *es, const struct options *o) setenv_int(es, "verb", o->verbosity); setenv_int(es, "daemon", o->daemon); setenv_int(es, "daemon_log_redirect", o->log); - setenv_unsigned(es, "daemon_start_time", time(NULL)); + setenv_long_long(es, "daemon_start_time", time(NULL)); setenv_int(es, "daemon_pid", platform_getpid()); if (o->connection_list)