projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move CABAL branch to its rightful place: the trunk.
[tinc]
/
src
/
net.c
diff --git
a/src/net.c
b/src/net.c
index
e0b5e6f
..
a6d2bb7
100644
(file)
--- a/
src/net.c
+++ b/
src/net.c
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: net.c,v 1.35.4.20
1 2003/11/17 15:30:17
guus Exp $
+ $Id: net.c,v 1.35.4.20
3 2003/12/20 19:47:52
guus Exp $
*/
#include "system.h"
*/
#include "system.h"
@@
-270,7
+270,7
@@
static void check_network_activity(fd_set * f)
if(FD_ISSET(device_fd, f)) {
if(read_packet(&packet))
if(FD_ISSET(device_fd, f)) {
if(read_packet(&packet))
- route
_outgoing(
&packet);
+ route
(myself,
&packet);
}
for(node = connection_tree->head; node; node = node->next) {
}
for(node = connection_tree->head; node; node = node->next) {
@@
-334,7
+334,8
@@
int main_loop(void)
while(running) {
now = time(NULL);
while(running) {
now = time(NULL);
- tv.tv_sec = 1 + (rand() & 7); /* Approx. 5 seconds, randomized to prevent global synchronisation effects */
+ // tv.tv_sec = 1 + (rand() & 7); /* Approx. 5 seconds, randomized to prevent global synchronisation effects */
+ tv.tv_sec = 1;
tv.tv_usec = 0;
maxfd = build_fdset(&fset);
tv.tv_usec = 0;
maxfd = build_fdset(&fset);
@@
-367,7
+368,7
@@
int main_loop(void)
last_ping_check = now;
if(routing_mode == RMODE_SWITCH)
last_ping_check = now;
if(routing_mode == RMODE_SWITCH)
- age_
mac
();
+ age_
subnets
();
age_past_requests();
age_past_requests();