Provide all missing IPv6 definitions in lib/ipv6.h.

[tinc] / lib / utils.h

diff --git a/lib/utils.h b/lib/utils.h
index 9184a33..6f3b18f 100644 (file)
--- a/lib/utils.h
+++ b/lib/utils.h
@@ -1,6 +1,7 @@
 /*
     utils.h -- header file for utils.c
-    Copyright (C) 1999 Ivo Timmermans <zarq@iname.com>
+    Copyright (C) 1999-2001 Ivo Timmermans <zarq@iname.com>
+                  2000,2001 Guus Sliepen <guus@sliepen.eu.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
@@ -20,19 +21,29 @@
 #ifndef __TINC_UTILS_H__
 #define __TINC_UTILS_H__
 
-enum {
-  DEBUG_CONNECTIONS = 0,
-  DEBUG_PROTOCOL,
-  DEBUG_STATUS,
-  DEBUG_error,
-  DEBUG_META
-};
+#include <ctype.h>
+
+#include "fake-getaddrinfo.h"
+#include "fake-getnameinfo.h"
+#include "ipv6.h"
 
 #define min(a,b) (((a)<(b))?(a):(b))
 
-#define cp { cp_line = __LINE__; cp_file = __FILE__; }
+#ifdef ENABLE_TRACING
+extern volatile int cp_line[];
+extern volatile char *cp_file[];
+extern volatile int cp_index;
+extern void cp_trace(void);
+
+#define cp() { cp_line[cp_index] = __LINE__; cp_file[cp_index] = __FILE__; cp_index++; cp_index %= 16; }
+#define ecp() { fprintf(stderr, "Explicit checkpoint in %s line %d\n", __FILE__, __LINE__); }
+#else
+#define cp()
+#define ecp()
+#define cp_trace()
+#endif
 
-extern volatile int cp_line;
-extern volatile char *cp_file;
+extern void hex2bin(char *src, char *dst, int length);
+extern void bin2hex(char *src, char *dst, int length);
 
-#endif /* __TINC_UTILS_H__ */
+#endif                                                 /* __TINC_UTILS_H__ */