X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=lib%2Futils.c;h=9552c5c0fda2e1a0654279fc15a40c90f0acc85f;hp=c8de214f1e0e0aa0994878b10155810f71494314;hb=085d33e6265e139bb08cdfda3d7498993190d187;hpb=e9635ae38e0e2e3eb92568a1e234f8348856dd69

diff --git a/lib/utils.c b/lib/utils.c
index c8de214f..9552c5c0 100644
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -1,6 +1,7 @@
 /*
     utils.c -- gathering of some stupid small functions
-    Copyright (C) 1999 Ivo Timmermans <zarq@iname.com>
+    Copyright (C) 1999-2003 Ivo Timmermans <zarq@iname.com>
+                  2000-2003 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
@@ -17,39 +18,69 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include "config.h"
+
 #include <sys/types.h>
 #include <ctype.h>
-
-#include "config.h"
+#include <string.h>
 
 #include <utils.h>
+#include <syslog.h>
+#include <xalloc.h>
 
-volatile int cp_line;
-volatile char *cp_file;
+#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 *charbin2hex = "0123456789ABCDEF";
+char *hexadecimals = "0123456789ABCDEF";
 
 int charhex2bin(char c)
 {
-  if(isdigit(c))
-    return c - '0';
-  else
-    return tolower(c) - 'a' + 10;
+	if(isdigit(c))
+		return c - '0';
+	else
+		return toupper(c) - 'A' + 10;
+}
+
+
+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 hex2bin(char *src, char *dst, size_t length)
+void bin2hex(char *src, char *dst, int length)
 {
-  size_t i;
-  for(i=0; i<length; i++)
-    dst[i] = charhex2bin(src[i*2])<<4 || charhex2bin(src[i*2+1]);
+	int i;
+	for(i = length - 1; i >= 0; i--) {
+		dst[i * 2 + 1] = hexadecimals[(unsigned char) src[i] & 15];
+		dst[i * 2] = hexadecimals[(unsigned char) src[i] >> 4];
+	}
 }
 
-void bin2hex(char *src, char *dst, size_t length)
+#ifdef ENABLE_TRACING
+void cp_trace()
 {
-  size_t i;
-  for(i=length-1; i>=0; i--)
-    {
-      dst[i*2+1] = charbin2hex[src[i] & 15];
-      dst[i*2] = charbin2hex[src[i]>>4];
-    }
+	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]
+		);
 }
+#endif