projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported gnutls based branch.
[tinc]
/
src
/
net.c
diff --git
a/src/net.c
b/src/net.c
index
7bf3989
..
24f520c
100644
(file)
--- a/
src/net.c
+++ b/
src/net.c
@@
-17,12
+17,12
@@
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
0 2003/08/28 21:05:10
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"
-#include <
openssl/rand
.h>
+#include <
gcrypt
.h>
#include "utils.h"
#include "avl_tree.h"
#include "utils.h"
#include "avl_tree.h"
@@
-72,14
+72,16
@@
static void purge(void)
for(snode = n->subnet_tree->head; snode; snode = snext) {
snext = snode->next;
s = snode->data;
for(snode = n->subnet_tree->head; snode; snode = snext) {
snext = snode->next;
s = snode->data;
- send_del_subnet(broadcast, s);
+ if(!tunnelserver)
+ send_del_subnet(broadcast, s);
subnet_del(n, s);
}
for(enode = n->edge_tree->head; enode; enode = enext) {
enext = enode->next;
e = enode->data;
subnet_del(n, s);
}
for(enode = n->edge_tree->head; enode; enode = enext) {
enext = enode->next;
e = enode->data;
- send_del_edge(broadcast, e);
+ if(!tunnelserver)
+ send_del_edge(broadcast, e);
edge_del(e);
}
}
edge_del(e);
}
}
@@
-178,7
+180,7
@@
void terminate_connection(connection_t *c, bool report)
closesocket(c->socket);
if(c->edge) {
closesocket(c->socket);
if(c->edge) {
- if(report)
+ if(report
&& !tunnelserver
)
send_del_edge(broadcast, c->edge);
edge_del(c->edge);
send_del_edge(broadcast, c->edge);
edge_del(c->edge);
@@
-193,7
+195,8
@@
void terminate_connection(connection_t *c, bool report)
edge_t *e;
e = lookup_edge(c->node, myself);
if(e) {
edge_t *e;
e = lookup_edge(c->node, myself);
if(e) {
- send_del_edge(broadcast, e);
+ if(!tunnelserver)
+ send_del_edge(broadcast, e);
edge_del(e);
}
}
edge_del(e);
}
}
@@
-267,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) {
@@
-331,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);
@@
-364,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();
@@
-373,9
+377,9
@@
int main_loop(void)
if(keyexpires < now) {
ifdebug(STATUS) logger(LOG_INFO, _("Regenerating symmetric key"));
if(keyexpires < now) {
ifdebug(STATUS) logger(LOG_INFO, _("Regenerating symmetric key"));
-
RAND_pseudo_bytes(myself->key, myself->keylength
);
+
gcry_randomize(myself->cipherkey, myself->cipherkeylen, GCRY_STRONG_RANDOM
);
if(myself->cipher)
if(myself->cipher)
-
EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, myself->key, myself->key + myself->cipher->key_
len);
+
gcry_cipher_setkey(myself->cipher_ctx, myself->cipherkey, myself->cipherkey
len);
send_key_changed(broadcast, myself);
keyexpires = now + keylifetime;
}
send_key_changed(broadcast, myself);
keyexpires = now + keylifetime;
}