- The daemon actually runs now (somewhat)
- Added support for tun/tap driver (autodetect!) - More sophisticated checkpoint functionality - Updated dutch translation
This commit is contained in:
parent
97ce045189
commit
85adeef212
16 changed files with 1259 additions and 1173 deletions
35
lib/utils.c
35
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
|
||||
|
@ -23,9 +24,11 @@
|
|||
#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 *charbin2hex = "0123456789ABCDEF";
|
||||
|
||||
|
@ -37,19 +40,33 @@ int charhex2bin(char c)
|
|||
return tolower(c) - 'a' + 10;
|
||||
}
|
||||
|
||||
void hex2bin(char *src, char *dst, size_t length)
|
||||
void hex2bin(char *src, char *dst, int length)
|
||||
{
|
||||
size_t i;
|
||||
int i;
|
||||
for(i=0; i<length; i++)
|
||||
dst[i] = charhex2bin(src[i*2])<<4 || charhex2bin(src[i*2+1]);
|
||||
}
|
||||
|
||||
void bin2hex(char *src, char *dst, size_t length)
|
||||
void bin2hex(char *src, char *dst, int length)
|
||||
{
|
||||
size_t i;
|
||||
int i;
|
||||
for(i=length-1; i>=0; i--)
|
||||
{
|
||||
dst[i*2+1] = charbin2hex[src[i] & 15];
|
||||
dst[i*2] = charbin2hex[src[i]>>4];
|
||||
dst[i*2+1] = charbin2hex[(unsigned char)src[i] & 15];
|
||||
dst[i*2] = charbin2hex[(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]
|
||||
);
|
||||
}
|
||||
|
|
18
lib/utils.h
18
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
|
||||
|
@ -26,18 +27,21 @@ enum {
|
|||
DEBUG_CONNECTIONS = 0,
|
||||
DEBUG_PROTOCOL,
|
||||
DEBUG_STATUS,
|
||||
DEBUG_error,
|
||||
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, size_t length);
|
||||
extern void bin2hex(char *src, char *dst, size_t length);
|
||||
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__ */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue