projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert bitfields to integers in a safe way.
[tinc]
/
src
/
net.c
diff --git
a/src/net.c
b/src/net.c
index
1682705
..
3cf1773
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-200
7
Guus Sliepen <guus@tinc-vpn.org>
+ 2000-200
9
Guus Sliepen <guus@tinc-vpn.org>
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
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
@@
-251,7
+251,7
@@
static void check_dead_connections(void)
} else {
if(c->status.remove) {
logger(LOG_WARNING, _("Old connection_t for %s (%s) status %04x still lingering, deleting..."),
} else {
if(c->status.remove) {
logger(LOG_WARNING, _("Old connection_t for %s (%s) status %04x still lingering, deleting..."),
- c->name, c->hostname,
c->status.value
);
+ c->name, c->hostname,
bitfield_to_int(&c->status, sizeof c->status)
);
connection_del(c);
continue;
}
connection_del(c);
continue;
}
@@
-295,8
+295,10
@@
static void check_network_activity(fd_set * readset, fd_set * writeset)
/* check input from kernel */
if(FD_ISSET(device_fd, readset)) {
/* check input from kernel */
if(FD_ISSET(device_fd, readset)) {
- if(read_packet(&packet))
+ if(read_packet(&packet)) {
+ packet.priority = 0;
route(myself, &packet);
route(myself, &packet);
+ }
}
/* check meta connections */
}
/* check meta connections */
@@
-364,6
+366,7
@@
int main_loop(void)
last_graph_dump = now;
srand(now);
last_graph_dump = now;
srand(now);
+ srand48(now);
running = true;
running = true;
@@
-411,28
+414,35
@@
int main_loop(void)
/* Should we regenerate our key? */
if(keyexpires < now) {
/* Should we regenerate our key? */
if(keyexpires < now) {
- ifdebug(STATUS) logger(LOG_INFO, _("Regenerating symmetric key"));
+ avl_node_t *node;
+ node_t *n;
+
+ ifdebug(STATUS) logger(LOG_INFO, _("Expiring symmetric keys"));
+
+ for(node = node_tree->head; node; node = node->next) {
+ n = node->data;
+ if(n->inkey) {
+ free(n->inkey);
+ n->inkey = NULL;
+ }
+ }
- RAND_pseudo_bytes((unsigned char *)myself->key, myself->keylength);
- if(myself->cipher)
- EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, (unsigned char *)myself->key, (unsigned char *)myself->key + myself->cipher->key_len);
send_key_changed(broadcast, myself);
keyexpires = now + keylifetime;
}
}
send_key_changed(broadcast, myself);
keyexpires = now + keylifetime;
}
}
+ if(sigalrm) {
+ logger(LOG_INFO, _("Flushing event queue"));
+ expire_events();
+ sigalrm = false;
+ }
while((event = get_expired_event())) {
event->handler(event->data);
free_event(event);
}
while((event = get_expired_event())) {
event->handler(event->data);
free_event(event);
}
- if(sigalrm) {
- logger(LOG_INFO, _("Flushing event queue"));
- flush_events();
- sigalrm = false;
- }
-
if(sighup) {
connection_t *c;
avl_node_t *node;
if(sighup) {
connection_t *c;
avl_node_t *node;
@@
-456,15
+466,7
@@
int main_loop(void)
for(node = connection_tree->head; node; node = node->next) {
c = node->data;
for(node = connection_tree->head; node; node = node->next) {
c = node->data;
- if(c->outgoing) {
- free(c->outgoing->name);
- if(c->outgoing->ai)
- freeaddrinfo(c->outgoing->ai);
- free(c->outgoing);
- c->outgoing = NULL;
- }
-
- asprintf(&fname, "%s/hosts/%s", confbase, c->name);
+ xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
if(stat(fname, &s) || s.st_mtime > last_config_check)
terminate_connection(c, c->status.active);
free(fname);
if(stat(fname, &s) || s.st_mtime > last_config_check)
terminate_connection(c, c->status.active);
free(fname);