Various fixes needed for Solaris.

[tinc] / lib / utils.c

diff --git a/lib/utils.c b/lib/utils.c
index e0bfe92..fc9141f 100644 (file)
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -1,7 +1,7 @@
 /*
     utils.c -- gathering of some stupid small functions
-    Copyright (C) 1999,2000 Ivo Timmermans <zarq@iname.com>
-                       2000 Guus Sliepen <guus@sliepen.warande.net>
+    Copyright (C) 1999-2001 Ivo Timmermans <zarq@iname.com>
+                  2000,2001 Guus Sliepen <guus@sliepen.warande.net>
 
     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,31 +20,38 @@
 
 #include <sys/types.h>
 #include <ctype.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
 
 #include "config.h"
 
 #include <utils.h>
 #include <syslog.h>
+#include <xalloc.h>
 
-volatile int (cp_line[]) = {0, 0, 0, 0, 0, 0, 0, 0};
-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;
+    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])<<4 || charhex2bin(src[i*2+1]);
+    dst[i] = charhex2bin(src[i*2])*16 + charhex2bin(src[i*2+1]);
 }
 
 void bin2hex(char *src, char *dst, int length)
@@ -52,21 +59,31 @@ void bin2hex(char *src, char *dst, int length)
   int i;
   for(i=length-1; i>=0; i--)
     {
-      dst[i*2+1] = charbin2hex[(unsigned char)src[i] & 15];
-      dst[i*2] = charbin2hex[(unsigned char)src[i]>>4];
+      dst[i*2+1] = hexadecimals[(unsigned char)src[i] & 15];
+      dst[i*2] = hexadecimals[(unsigned char)src[i]>>4];
     }
 }
 
-char *cp_trace()
+#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 ...",
-           cp_file[(cp_index+7)%8], cp_line[(cp_index+7)%8],
-           cp_file[(cp_index+6)%8], cp_line[(cp_index+6)%8],
-           cp_file[(cp_index+5)%8], cp_line[(cp_index+5)%8],
-           cp_file[(cp_index+4)%8], cp_line[(cp_index+4)%8],
-           cp_file[(cp_index+3)%8], cp_line[(cp_index+3)%8],
-           cp_file[(cp_index+2)%8], cp_line[(cp_index+2)%8],
-           cp_file[(cp_index+1)%8], cp_line[(cp_index+1)%8],
+  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