add now()

3 files changed, 11 insertions, 4 deletions

diff --git a/common.c b/common.c
index 933d106..d6f1a19 100644
--- a/common.c
+++ b/common.c
@@ -324,3 +324,12 @@ size_t printf_to_buf(char *buf, size_t bufsize, size_t offset, char *fmt, ...)
 		fatal("Outbuffer too small");
 	return n;
 }
+
+uint32_t now()
+{
+	struct timespec tp;
+	if (clock_gettime(CLOCK_REALTIME, &tp))
+		fatal("clock_gettime(CLOCK_REALTIME)");
+	return tp.tv_sec;
+}
+
diff --git a/common.h b/common.h
index a4d1ce3..c28b2c1 100644
--- a/common.h
+++ b/common.h
@@ -84,4 +84,5 @@ bool handle_request(int fd, struct wg_dynamic_request *req,
 		    bool (*error)(int, int));
 size_t send_message(int fd, unsigned char *buf, size_t *len);
 size_t printf_to_buf(char *buf, size_t bufsize, size_t len, char *fmt, ...);
+uint32_t now();
 #endif
diff --git a/wg-dynamic-server.c b/wg-dynamic-server.c
index c477411..8660ba2 100644
--- a/wg-dynamic-server.c
+++ b/wg-dynamic-server.c
@@ -308,7 +308,6 @@ static void close_connection(int *fd, struct wg_dynamic_request *req)
 static int allocate_from_pool(struct wg_dynamic_request *const req,
 			      struct wg_dynamic_lease *lease)
 {
-	struct timespec tp;
 	struct wg_dynamic_attr *attr;
 
 	/* NOTE: "allocating" whatever client asks for */
@@ -318,9 +317,7 @@ static int allocate_from_pool(struct wg_dynamic_request *const req,
 	 * to the wg interface, and kept up to date as the routing
 	 * table changes */
 
-	if (clock_gettime(CLOCK_REALTIME, &tp))
-		fatal("clock_gettime(CLOCK_REALTIME)");
-	lease->starttime = tp.tv_sec;
+	lease->starttime = now();
 	lease->leasetime = WG_DYNAMIC_LEASETIME;
 
 	attr = req->first;