Another big & bad commit:

[tinc] / lib / utils.c

diff --git a/lib/utils.c b/lib/utils.c
index e0bfe92..8e460f4 100644 (file)
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -20,31 +20,37 @@
 
 #include <sys/types.h>
 #include <ctype.h>
+#include <string.h>
+#include <stdarg.h>
 
 #include "config.h"
 
 #include <utils.h>
 #include <syslog.h>
+#include <xalloc.h>
 
+#ifdef ENABLE_TRACING
 volatile int (cp_line[]) = {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,12 +58,13 @@ 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],
@@ -70,3 +77,33 @@ char *cp_trace()
            cp_file[cp_index], cp_line[cp_index]
         );
 }
+#endif
+
+#ifndef HAVE_ASPRINTF
+int asprintf(char **buf, const char *fmt, ...)
+{
+  int status;
+  va_list ap;
+  int len;
+  
+  len = 4096;
+  *buf = xmalloc(len);
+
+  va_start(ap, fmt);
+  status = vsnprintf (*buf, len, fmt, ap);
+  va_end (ap);
+
+  if(status >= 0)
+    *buf = xrealloc(*buf, status);
+
+  if(status > len-1)
+    {
+      len = status;
+      va_start(ap, fmt);
+      status = vsnprintf (*buf, len, fmt, ap);
+      va_end (ap);
+    }
+
+  return status;
+}
+#endif