projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update THANKS and copyright information.
[tinc]
/
src
/
net.c
diff --git
a/src/net.c
b/src/net.c
index
08e3cad
..
e6a1166
100644
(file)
--- a/
src/net.c
+++ b/
src/net.c
@@
-1,7
+1,7
@@
/*
net.c -- most of the network code
Copyright (C) 1998-2005 Ivo Timmermans,
/*
net.c -- most of the network code
Copyright (C) 1998-2005 Ivo Timmermans,
- 2000-201
0
Guus Sliepen <guus@tinc-vpn.org>
+ 2000-201
1
Guus Sliepen <guus@tinc-vpn.org>
2006 Scott Lamb <slamb@slamb.org>
This program is free software; you can redistribute it and/or modify
2006 Scott Lamb <slamb@slamb.org>
This program is free software; you can redistribute it and/or modify
@@
-427,7
+427,7
@@
int main_loop(void) {
keyexpires = now + keylifetime;
}
keyexpires = now + keylifetime;
}
- if(contradicting_del_edge
&& contradicting_add_edge
) {
+ if(contradicting_del_edge
> 10 && contradicting_add_edge > 10
) {
logger(LOG_WARNING, "Possible node with same Name as us!");
if(rand() % 3 == 0) {
logger(LOG_WARNING, "Possible node with same Name as us!");
if(rand() % 3 == 0) {