projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Fixed ans_key_h
[tinc]
/
lib
/
utils.c
diff --git
a/lib/utils.c
b/lib/utils.c
index
e0bfe92
..
795ece9
100644
(file)
--- a/
lib/utils.c
+++ b/
lib/utils.c
@@
-20,6
+20,7
@@
#include <sys/types.h>
#include <ctype.h>
#include <sys/types.h>
#include <ctype.h>
+#include <string.h>
#include "config.h"
#include "config.h"
@@
-30,21
+31,22
@@
volatile int (cp_line[]) = {0, 0, 0, 0, 0, 0, 0, 0};
volatile char (*cp_file[]) = {"?", "?", "?", "?", "?", "?", "?", "?"};
volatile int cp_index = 0;
volatile char (*cp_file[]) = {"?", "?", "?", "?", "?", "?", "?", "?"};
volatile int cp_index = 0;
-char *
charbin2hex
= "0123456789ABCDEF";
+char *
hexadecimals
= "0123456789ABCDEF";
int charhex2bin(char c)
{
if(isdigit(c))
return c - '0';
else
int charhex2bin(char c)
{
if(isdigit(c))
return c - '0';
else
- return to
lower(c) - 'a
' + 10;
+ return to
upper(c) - 'A
' + 10;
}
}
+
void hex2bin(char *src, char *dst, int length)
{
int i;
for(i=0; i<length; i++)
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)
}
void bin2hex(char *src, char *dst, int length)
@@
-52,12
+54,12
@@
void bin2hex(char *src, char *dst, int length)
int i;
for(i=length-1; i>=0; i--)
{
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()
+
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],
{
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],