Fri Aug 28 17:17:53 2020 UTC ()

Show the time of the latest handshake properly formatted.


(tih)

diff -r1.4 -r1.5 src/usr.sbin/wgconfig/wgconfig.c

--- src/usr.sbin/wgconfig/wgconfig.c 2020/08/21 17:51:31	1.4
+++ src/usr.sbin/wgconfig/wgconfig.c 2020/08/28 17:17:53	1.5

 @@ -1,14 +1,14 @@
-/*	$NetBSD: wgconfig.c,v 1.4 2020/08/21 17:51:31 martin Exp $	*/
+/*	$NetBSD: wgconfig.c,v 1.5 2020/08/28 17:17:53 tih Exp $	*/
 /*
  * Copyright (C) Ryota Ozaki <ozaki.ryota@gmail.com>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -20,27 +20,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: wgconfig.c,v 1.4 2020/08/21 17:51:31 martin Exp $");
+__RCSID("$NetBSD: wgconfig.c,v 1.5 2020/08/28 17:17:53 tih Exp $");
 #include <sys/ioctl.h>
 #include <net/if.h>
 #include <net/if_wg.h>
 #include <arpa/inet.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <err.h>
 #include <unistd.h>
 @@ -231,54 +231,58 @@ ioctl_get(const char *interface)
 	if (prop_dict == NULL)
 		errx(EXIT_FAILURE, "prop_dictionary_internalize failed");
 	free(buf);
 	close(sock);
 	return prop_dict;
+}
 static void
 show_peer(prop_dictionary_t peer, const char *prefix, bool show_psk)
+{
 	prop_object_t prop_obj;
-	uint64_t sec;
+	time_t sec;
 	prop_obj = prop_dictionary_get(peer, "public_key");
 	if (prop_obj == NULL) {
 		warnx("peer without public-key");
 		return;
+	}
 	printf("%spublic-key: %s\n", prefix, format_key(prop_obj));
 	prop_obj = prop_dictionary_get(peer, "endpoint");
 	if (prop_obj == NULL)
 		printf("%sendpoint: (none)\n", prefix);
 	else
 		printf("%sendpoint: %s\n", prefix, format_endpoint(prop_obj));
 	if (show_psk) {
 		prop_obj = prop_dictionary_get(peer, "preshared_key");
 		printf("%spreshared-key: %s\n", prefix, format_key(prop_obj));
 	} else {
 		printf("%spreshared-key: (hidden)\n", prefix);
+	}
 	handle_allowed_ips(peer, prefix);
-	if (prop_dictionary_get_uint64(peer, "last_handshake_time_sec", &sec))
+	if (prop_dictionary_get_int64(peer, "last_handshake_time_sec", &sec)) {
-		printf("%slatest-handshake: %"PRIu64"\n", prefix, sec);
+		if (sec > 0)
-	else
+			printf("%slatest-handshake: %s", prefix, ctime(&sec));
 		else
 			printf("%slatest-handshake: (never)\n", prefix);
 	} else {
 		printf("%slatest-handshake: (none)\n", prefix);
+	}
+}
 static int
 cmd_show_all(const char *interface, int argc, char *argv[])
+{
 	prop_dictionary_t prop_dict;
 	prop_object_t prop_obj;
 	uint16_t port;
 	prop_array_t peers;
 	prop_dict = ioctl_get(interface);
 	printf("interface: %s\n", interface);