X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Futils.h;h=e99ab9ffbb6d5bb4efbf74405dde48d130de0db1;hb=689fd74cf976264f54d9c61f09ef5338fa5c5f23;hp=85d6bf22532757777aca5ca8507c08a52d26f151;hpb=5e00a24e1f13fa70a6945831c409d873b7809d11;p=meshlink

diff --git a/src/utils.h b/src/utils.h
index 85d6bf22..e99ab9ff 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -1,7 +1,9 @@
+#ifndef MESHLINK_UTILS_H
+#define MESHLINK_UTILS_H
+
 /*
     utils.h -- header file for utils.c
-    Copyright (C) 1999-2005 Ivo Timmermans
-                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,18 +20,15 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_UTILS_H__
-#define __TINC_UTILS_H__
-
-extern int hex2bin(const char *src, char *dst, int length);
-extern int bin2hex(const char *src, char *dst, int length);
+int hex2bin(const char *src, void *dst, int length);
+int bin2hex(const void *src, char *dst, int length);
 
-extern int b64encode(const char *src, char *dst, int length);
-extern int b64encode_urlsafe(const char *src, char *dst, int length);
-extern int b64decode(const char *src, char *dst, int length);
+int b64encode(const void *src, char *dst, int length);
+int b64encode_urlsafe(const void *src, char *dst, int length);
+int b64decode(const char *src, void *dst, int length);
 
 #ifdef HAVE_MINGW
-extern const char *winerror(int);
+const char *winerror(int);
 #define strerror(x) ((x)>0?strerror(x):winerror(GetLastError()))
 #define sockerrno WSAGetLastError()
 #define sockstrerror(x) winerror(x)
@@ -46,6 +45,41 @@ extern const char *winerror(int);
 #define sockinuse(x) ((x) == EADDRINUSE)
 #endif
 
-extern unsigned int bitfield_to_int(const void *bitfield, size_t size);
+unsigned int bitfield_to_int(const void *bitfield, size_t size) __attribute__((__warn_unused_result__));
+
+static inline void timespec_add(const struct timespec *a, const struct timespec *b, struct timespec *r) {
+	r->tv_sec = a->tv_sec + b->tv_sec;
+	r->tv_nsec = a->tv_nsec + b->tv_nsec;
+
+	if(r->tv_nsec > 1000000000) {
+		r->tv_sec++, r->tv_nsec -= 1000000000;
+	}
+}
+
+static inline void timespec_sub(const struct timespec *a, const struct timespec *b, struct timespec *r) {
+	r->tv_sec = a->tv_sec - b->tv_sec;
+	r->tv_nsec = a->tv_nsec - b->tv_nsec;
 
-#endif /* __TINC_UTILS_H__ */
+	if(r->tv_nsec < 0) {
+		r->tv_sec--, r->tv_nsec += 1000000000;
+	}
+}
+
+static inline bool timespec_lt(const struct timespec *a, const struct timespec *b) {
+	if(a->tv_sec == b->tv_sec) {
+		return a->tv_nsec < b->tv_nsec;
+	} else {
+		return a->tv_sec < b->tv_sec;
+	}
+}
+
+static inline void timespec_clear(struct timespec *a) {
+	a->tv_sec = 0;
+	a->tv_nsec = 0;
+}
+
+static inline bool timespec_isset(const struct timespec *a) {
+	return a->tv_sec || a->tv_nsec;
+}
+
+#endif