X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=lib%2Futils.c;h=6ea904a59d15a63803faee04c448e8e43665b4ad;hp=3b1abc374bb8ef7bb4fe9ed8fc75019e99dd7037;hb=6d08eb1614b59d5f86a43edda9db06fca72b76cd;hpb=9f38e394636a177c00a4545de2a99c661de36386;ds=sidebyside

diff --git a/lib/utils.c b/lib/utils.c
index 3b1abc37..6ea904a5 100644
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -1,7 +1,7 @@
 /*
     utils.c -- gathering of some stupid small functions
-    Copyright (C) 1999-2001 Ivo Timmermans <zarq@iname.com>
-                  2000,2001 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 1999-2005 Ivo Timmermans
+                  2000-2009 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
@@ -13,31 +13,19 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include <sys/types.h>
-#include <ctype.h>
-#include <string.h>
+#include "system.h"
 
-#include "config.h"
+#include "../src/logger.h"
+#include "utils.h"
 
-#include <utils.h>
-#include <syslog.h>
-#include <xalloc.h>
+static const char hexadecimals[] = "0123456789ABCDEF";
 
-#ifdef ENABLE_TRACING
-volatile int (cp_line[]) = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-volatile char (*cp_file[]) = {"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?"};
-volatile int cp_index = 0;
-#endif
-
-char *hexadecimals = "0123456789ABCDEF";
-
-int charhex2bin(char c)
-{
+static int charhex2bin(char c) {
 	if(isdigit(c))
 		return c - '0';
 	else
@@ -45,15 +33,13 @@ int charhex2bin(char c)
 }
 
 
-void hex2bin(char *src, char *dst, int length)
-{
+void hex2bin(char *src, char *dst, int length) {
 	int i;
 	for(i = 0; i < length; i++)
 		dst[i] = charhex2bin(src[i * 2]) * 16 + charhex2bin(src[i * 2 + 1]);
 }
 
-void bin2hex(char *src, char *dst, int length)
-{
+void bin2hex(char *src, char *dst, int length) {
 	int i;
 	for(i = length - 1; i >= 0; i--) {
 		dst[i * 2 + 1] = hexadecimals[(unsigned char) src[i] & 15];
@@ -61,26 +47,30 @@ void bin2hex(char *src, char *dst, int length)
 	}
 }
 
-#ifdef ENABLE_TRACING
-void cp_trace()
-{
-	syslog(LOG_DEBUG, "Checkpoint trace: %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d...",
-		   cp_file[(cp_index + 15) % 16], cp_line[(cp_index + 15) % 16],
-		   cp_file[(cp_index + 14) % 16], cp_line[(cp_index + 14) % 16],
-		   cp_file[(cp_index + 13) % 16], cp_line[(cp_index + 13) % 16],
-		   cp_file[(cp_index + 12) % 16], cp_line[(cp_index + 12) % 16],
-		   cp_file[(cp_index + 11) % 16], cp_line[(cp_index + 11) % 16],
-		   cp_file[(cp_index + 10) % 16], cp_line[(cp_index + 10) % 16],
-		   cp_file[(cp_index + 9) % 16], cp_line[(cp_index + 9) % 16],
-		   cp_file[(cp_index + 8) % 16], cp_line[(cp_index + 8) % 16],
-		   cp_file[(cp_index + 7) % 16], cp_line[(cp_index + 7) % 16],
-		   cp_file[(cp_index + 6) % 16], cp_line[(cp_index + 6) % 16],
-		   cp_file[(cp_index + 5) % 16], cp_line[(cp_index + 5) % 16],
-		   cp_file[(cp_index + 4) % 16], cp_line[(cp_index + 4) % 16],
-		   cp_file[(cp_index + 3) % 16], cp_line[(cp_index + 3) % 16],
-		   cp_file[(cp_index + 2) % 16], cp_line[(cp_index + 2) % 16],
-		   cp_file[(cp_index + 1) % 16], cp_line[(cp_index + 1) % 16],
-		   cp_file[cp_index], cp_line[cp_index]
-		);
+#if defined(HAVE_MINGW) || defined(HAVE_CYGWIN)
+#ifdef HAVE_CYGWIN
+#include <w32api/windows.h>
+#endif
+
+const char *winerror(int err) {
+	static char buf[1024], *newline;
+
+	if (!FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+	        NULL, err, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), buf, sizeof(buf), NULL)) {
+		strncpy(buf, "(unable to format errormessage)", sizeof(buf));
+	};
+
+	if((newline = strchr(buf, '\r')))
+		*newline = '\0';
+
+	return buf;
 }
 #endif
+
+unsigned int bitfield_to_int(const void *bitfield, size_t size) {
+	unsigned int value = 0;
+	if(size > sizeof value)
+		size = sizeof value;
+	memcpy(&value, bitfield, size);
+	return value;
+}