From patchwork Sat Jun 20 07:23:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 1156 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director7.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id KBNJFy5G7l7GVQAAIUCqbw for ; Sat, 20 Jun 2020 13:23:58 -0400 Received: from proxy6.mail.ord1d.rsapps.net ([172.30.191.6]) by director7.mail.ord1d.rsapps.net with LMTP id qEINFy5G7l78TgAAovjBpQ ; Sat, 20 Jun 2020 13:23:58 -0400 Received: from smtp28.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy6.mail.ord1d.rsapps.net with LMTP id qIVwFi5G7l6JTQAAQyIf0w ; Sat, 20 Jun 2020 13:23:58 -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: smtp28.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=greenie.muc.de X-Suspicious-Flag: YES X-Classification-ID: d2aadf48-b31a-11ea-993f-525400ea129b-1-1 Received: from [216.105.38.7] ([216.105.38.7:33244] helo=lists.sourceforge.net) by smtp28.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 3C/71-17598-D264EEE5; Sat, 20 Jun 2020 13:23:58 -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.90_1) (envelope-from ) id 1jmhD2-0007u6-KN; Sat, 20 Jun 2020 17:23:16 +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 1jmhD0-0007ti-FN for openvpn-devel@lists.sourceforge.net; Sat, 20 Jun 2020 17:23:14 +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=rLJiKY4iF0LLfrV4YnGpHfq4diGsqF7rlrKeYOQCNZM=; b=EPQyFprbvPmHr/07bumRTvuD6G a/6vDHyIk+hIsvEzch840opZcFbKmTW2nYL1WmChGmVdFtbDLz44MIV4GMyfUQUJJ6RT+kUfJO5W7 wvd+DSjdzteSSarJD/N18PjiK+okYQWG7tiATMXNBMCm/aS6+2WtCjVlAKidYEIk+aVI=; 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=rLJiKY4iF0LLfrV4YnGpHfq4diGsqF7rlrKeYOQCNZM=; b=h uoH5t3chVWvWvdhwbCxzbwY/JPUZt4aGdl46MMILKxyFqucuMVPwdZ9p0MdPvloat7V1nS+EsOMT9 0HdKtxigpgT94kGpzLw9ojx9Tg4eQJBMcImPoYXUjKS84Yk2+sNRGjiHCNwtx7v4lPt2PUqAGpWcQ tT4pYGkqzL2FXlBU=; Received: from vmail1.greenie.net ([195.30.8.66]) by sfi-mx-3.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1jmhCw-00AC30-Ak for openvpn-devel@lists.sourceforge.net; Sat, 20 Jun 2020 17:23:14 +0000 Received: from gentoo.ov.greenie.net (gentoo.ov.greenie.net [IPv6:2001:608:0:814:0:0:f000:11]) by vmail1.greenie.net (8.15.2/8.12.11) with SMTP id 05KHN3uM032163 for ; Sat, 20 Jun 2020 19:23:03 +0200 (CEST) Received: (nullmailer pid 15056 invoked by uid 1000); Sat, 20 Jun 2020 17:23:03 -0000 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Sat, 20 Jun 2020 19:23:03 +0200 Message-Id: <20200620172303.15010-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (vmail1.greenie.net [IPv6:2001:608:1:995a:20c:29ff:feb8:10eb]); Sat, 20 Jun 2020 19:23:03 +0200 (CEST) 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: muc.de] 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: 1jmhCw-00AC30-Ak Subject: [Openvpn-devel] [PATCH] Change timestamps in file-based logging to ISO 8601 time format. 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 Replace existing ctime() output which is hard to sort and compare with ISO 8601 / RFC 3399 "YYYY-MM-DD hh:mm:dd" format for file-based logging (stderr or --log file). RFC 3399 5.6 permits use of a space for full-date-full-time separation, which is used to enhance readability. Sylog or --machine-readable-timestamps are not affected. Trac: #719 Signed-off-by: Gert Doering ACKed-By: Arne Schwabe --- src/openvpn/otime.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/openvpn/otime.c b/src/openvpn/otime.c index 759a7fb5..28683459 100644 --- a/src/openvpn/otime.c +++ b/src/openvpn/otime.c @@ -127,8 +127,11 @@ time_string(time_t t, int usec, bool show_usec, struct gc_arena *gc) } t = tv.tv_sec; - buf_printf(&out, "%s", ctime(&t)); - buf_rmtail(&out, '\n'); + struct tm * tm = localtime(&t); + + buf_printf(&out, "%04d-%02d-%02d %02d:%02d:%02d", + tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday, + tm->tm_hour, tm->tm_min, tm->tm_sec); if (show_usec && tv.tv_usec) {