Add stricter checks for netnames.

[tinc] / src / dropin.h

diff --git a/src/dropin.h b/src/dropin.h
index 7b0050d..938f30d 100644 (file)
--- a/src/dropin.h
+++ b/src/dropin.h
@@ -1,7 +1,7 @@
 /*
     dropin.h -- header file for dropin.c
     Copyright (C) 2000-2005 Ivo Timmermans,
-                  2000-2011 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2016 Guus Sliepen <guus@tinc-vpn.org>
 
     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
@@ -21,17 +21,10 @@
 #ifndef __DROPIN_H__
 #define __DROPIN_H__
 
-#include "fake-getaddrinfo.h"
-#include "fake-getnameinfo.h"
-
 #ifndef HAVE_DAEMON
 extern int daemon(int, int);
 #endif
 
-#ifndef HAVE_GET_CURRENT_DIR_NAME
-extern char *get_current_dir_name(void);
-#endif
-
 #ifndef HAVE_ASPRINTF
 extern int asprintf(char **, const char *, ...);
 extern int vasprintf(char **, const char *, va_list ap);
@@ -41,8 +34,37 @@ extern int vasprintf(char **, const char *, va_list ap);
 extern int gettimeofday(struct timeval *, void *);
 #endif
 
-#ifndef HAVE_USLEEP
-extern void usleep(long long usec);
+#ifndef HAVE_NANOSLEEP
+extern int nanosleep(const struct timespec *req, struct timespec *rem);
+#endif
+
+#ifndef timeradd
+#define timeradd(a, b, r) do {\
+       (r)->tv_sec = (a)->tv_sec + (b)->tv_sec;\
+       (r)->tv_usec = (a)->tv_usec + (b)->tv_usec;\
+       if((r)->tv_usec >= 1000000)\
+               (r)->tv_sec++, (r)->tv_usec -= 1000000;\
+} while (0)
+#endif
+
+#ifndef timersub
+#define timersub(a, b, r) do {\
+       (r)->tv_sec = (a)->tv_sec - (b)->tv_sec;\
+       (r)->tv_usec = (a)->tv_usec - (b)->tv_usec;\
+       if((r)->tv_usec < 0)\
+               (r)->tv_sec--, (r)->tv_usec += 1000000;\
+} while (0)
+#endif
+
+#ifdef HAVE_MINGW
+#define mkdir(a, b) mkdir(a)
+#ifndef SHUT_RDWR
+#define SHUT_RDWR SD_BOTH
+#endif
+#endif
+
+#ifndef EAI_SYSTEM
+#define EAI_SYSTEM 0
 #endif
 
-#endif                                                 /* __DROPIN_H__ */
+#endif /* __DROPIN_H__ */