projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix the "network" command in tinc shell.
[tinc]
/
src
/
connection.c
diff --git
a/src/connection.c
b/src/connection.c
index
3591f13
..
0e61132
100644
(file)
--- a/
src/connection.c
+++ b/
src/connection.c
@@
-1,6
+1,6
@@
/*
connection.c -- connection list management
/*
connection.c -- connection list management
- Copyright (C) 2000-201
2
Guus Sliepen <guus@tinc-vpn.org>,
+ Copyright (C) 2000-201
3
Guus Sliepen <guus@tinc-vpn.org>,
2000-2005 Ivo Timmermans
2008 Max Rijevski <maksuf@gmail.com>
2000-2005 Ivo Timmermans
2008 Max Rijevski <maksuf@gmail.com>
@@
-27,11
+27,12
@@
#include "control_common.h"
#include "list.h"
#include "logger.h"
#include "control_common.h"
#include "list.h"
#include "logger.h"
+#include "rsa.h"
#include "subnet.h"
#include "utils.h"
#include "xalloc.h"
#include "subnet.h"
#include "utils.h"
#include "xalloc.h"
-list_t *connection_list;
/* Meta connections */
+list_t *connection_list;
connection_t *everyone;
void init_connections(void) {
connection_t *everyone;
void init_connections(void) {
@@
-47,32
+48,30
@@
void exit_connections(void) {
}
connection_t *new_connection(void) {
}
connection_t *new_connection(void) {
- return x
malloc_and_zero
(sizeof(connection_t));
+ return x
zalloc
(sizeof(connection_t));
}
void free_connection(connection_t *c) {
if(!c)
return;
}
void free_connection(connection_t *c) {
if(!c)
return;
- cipher_close(&c->incipher);
- digest_close(&c->indigest);
- cipher_close(&c->outcipher);
- digest_close(&c->outdigest);
+#ifndef DISABLE_LEGACY
+ cipher_close(c->incipher);
+ digest_close(c->indigest);
+ cipher_close(c->outcipher);
+ digest_close(c->outdigest);
+ rsa_free(c->rsa);
+#endif
sptps_stop(&c->sptps);
sptps_stop(&c->sptps);
- ecdsa_free(&c->ecdsa);
- rsa_free(&c->rsa);
+ ecdsa_free(c->ecdsa);
free(c->hischallenge);
buffer_clear(&c->inbuf);
buffer_clear(&c->outbuf);
free(c->hischallenge);
buffer_clear(&c->inbuf);
buffer_clear(&c->outbuf);
-
- if(event_initialized(&c->inevent))
- event_del(&c->inevent);
- if(event_initialized(&c->outevent))
- event_del(&c->outevent);
+ io_del(&c->io);
if(c->socket > 0)
closesocket(c->socket);
if(c->socket > 0)
closesocket(c->socket);
@@
-91,18
+90,11
@@
void connection_add(connection_t *c) {
}
void connection_del(connection_t *c) {
}
void connection_del(connection_t *c) {
- for(list_node_t *node = connection_list->head; node; node = node->next) {
- if(node->data == c) {
- list_delete_node(connection_list, node);
- return;
- }
- }
+ list_delete(connection_list, c);
}
bool dump_connections(connection_t *cdump) {
}
bool dump_connections(connection_t *cdump) {
- for(list_node_t *node = connection_list->head, *next; node; node = next) {
- next = node->next;
- connection_t *c = node->data;
+ for list_each(connection_t, c, connection_list) {
send_request(cdump, "%d %d %s %s %x %d %x",
CONTROL, REQ_DUMP_CONNECTIONS,
c->name, c->hostname, c->options, c->socket,
send_request(cdump, "%d %d %s %s %x %d %x",
CONTROL, REQ_DUMP_CONNECTIONS,
c->name, c->hostname, c->options, c->socket,