Bring head revision up to date with cabal (try #3)

lib/Makefile.am

@@ -1,8 +1,9 @@
 ## Process this file with automake to produce Makefile.in
+# $Id: Makefile.am,v 1.3 2000/10/18 20:12:07 zarq Exp $
 
 noinst_LIBRARIES = libvpn.a
 
-INCLUDES = -I. -I$(top_builddir)
+INCLUDES = -I. -I$(top_builddir) -I$(top_srcdir)/intl
 
 libvpn_a_SOURCES = xmalloc.c pidfile.c utils.c getopt.c getopt1.c
 

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,2000 Ivo Timmermans <zarq@iname.com>
+                       2000 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
@@ -17,10 +18,57 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include <sys/types.h>
+#include <ctype.h>
+#include <string.h>
+
 #include "config.h"
 
 #include <utils.h>
+#include <syslog.h>
 
-volatile int cp_line;
-volatile char *cp_file;
+volatile int (cp_line[]) = {0, 0, 0, 0, 0, 0, 0, 0};
+volatile char (*cp_file[]) = {"?", "?", "?", "?", "?", "?", "?", "?"};
+volatile int cp_index = 0;
 
+char *hexadecimals = "0123456789ABCDEF";
+
+int charhex2bin(char c)
+{
+  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 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];
+      dst[i*2] = hexadecimals[(unsigned char)src[i]>>4];
+    }
+}
+
+char *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],
+           cp_file[cp_index], cp_line[cp_index]
+        );
+}

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,2000 Ivo Timmermans <zarq@iname.com>
+                       2000 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,11 +21,27 @@
 #ifndef __TINC_UTILS_H__
 #define __TINC_UTILS_H__
 
+#include <ctype.h>
+
+enum {
+  DEBUG_CONNECTIONS = 0,
+  DEBUG_PROTOCOL,
+  DEBUG_STATUS,
+  DEBUG_ERROR,
+  DEBUG_META
+};
+
 #define min(a,b) (((a)<(b))?(a):(b))
 
-#define cp { cp_line = __LINE__; cp_file = __FILE__; }
+extern volatile int cp_line[];
+extern volatile char *cp_file[];
+extern volatile int cp_index;
 
-extern volatile int cp_line;
-extern volatile char *cp_file;
+#define cp { cp_line[cp_index] = __LINE__; cp_file[cp_index] = __FILE__; cp_index++; cp_index %= 8; }
+#define ecp { fprintf(stderr, "Explicit checkpoint in %s line %d\n", __FILE__, __LINE__); }
+
+extern void hex2bin(char *src, char *dst, int length);
+extern void bin2hex(char *src, char *dst, int length);
+extern char *cp_trace(void);
 
 #endif /* __TINC_UTILS_H__ */

lib/xalloc.h

@@ -1,3 +1,5 @@
+#include <sys/types.h>
+
 #ifndef PARAMS
 # if defined PROTOTYPES || (defined __STDC__ && __STDC__)
 #  define PARAMS(Args) Args

lib/xmalloc.c

@@ -87,8 +87,6 @@ xmalloc (n)
      size_t n;
 {
   void *p;
-  extern char*cp_file;
-  extern int cp_line;
 
   p = malloc (n);
   if (p == 0)