projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove vendored LZ4
[tinc]
/
src
/
connection.c
diff --git
a/src/connection.c
b/src/connection.c
index
5fcecbd
..
0de5109
100644
(file)
--- a/
src/connection.c
+++ b/
src/connection.c
@@
-25,26
+25,32
@@
#include "cipher.h"
#include "conf.h"
#include "control_common.h"
#include "cipher.h"
#include "conf.h"
#include "control_common.h"
-#include "list.h"
#include "logger.h"
#include "logger.h"
+#include "net.h"
#include "rsa.h"
#include "rsa.h"
-#include "subnet.h"
#include "utils.h"
#include "xalloc.h"
#include "utils.h"
#include "xalloc.h"
-list_t *connection_list;
+list_t connection_list = {
+ .head = NULL,
+ .tail = NULL,
+ .count = 0,
+ .delete = (list_action_t) free_connection,
+};
+
connection_t *everyone;
void init_connections(void) {
connection_t *everyone;
void init_connections(void) {
- connection_list = list_alloc((list_action_t) free_connection);
everyone = new_connection();
everyone->name = xstrdup("everyone");
everyone->hostname = xstrdup("BROADCAST");
}
void exit_connections(void) {
everyone = new_connection();
everyone->name = xstrdup("everyone");
everyone->hostname = xstrdup("BROADCAST");
}
void exit_connections(void) {
- list_delete_list(connection_list);
+ list_empty_list(&connection_list);
+
free_connection(everyone);
free_connection(everyone);
+ everyone = NULL;
}
connection_t *new_connection(void) {
}
connection_t *new_connection(void) {
@@
-52,14
+58,15
@@
connection_t *new_connection(void) {
}
void free_connection(connection_t *c) {
}
void free_connection(connection_t *c) {
- if(!c)
+ if(!c)
{
return;
return;
+ }
#ifndef DISABLE_LEGACY
#ifndef DISABLE_LEGACY
- cipher_close(c->incipher);
- digest_close(c->indigest);
- cipher_close(c->outcipher);
- digest_close(c->outdigest);
+ cipher_close(
&
c->incipher);
+ digest_close(
&
c->indigest);
+ cipher_close(
&
c->outcipher);
+ digest_close(
&
c->outdigest);
rsa_free(c->rsa);
#endif
rsa_free(c->rsa);
#endif
@@
-67,38
+74,45
@@
void free_connection(connection_t *c) {
ecdsa_free(c->ecdsa);
free(c->hischallenge);
ecdsa_free(c->ecdsa);
free(c->hischallenge);
+ free(c->mychallenge);
buffer_clear(&c->inbuf);
buffer_clear(&c->outbuf);
io_del(&c->io);
buffer_clear(&c->inbuf);
buffer_clear(&c->outbuf);
io_del(&c->io);
- if(c->socket > 0)
- closesocket(c->socket);
+ if(c->socket > 0) {
+ if(c->status.tarpit) {
+ tarpit(c->socket);
+ } else {
+ closesocket(c->socket);
+ }
+ }
free(c->name);
free(c->hostname);
free(c->name);
free(c->hostname);
- if(c->config_tree)
+ if(c->config_tree)
{
exit_configuration(&c->config_tree);
exit_configuration(&c->config_tree);
+ }
free(c);
}
void connection_add(connection_t *c) {
free(c);
}
void connection_add(connection_t *c) {
- list_insert_tail(connection_list, c);
+ list_insert_tail(
&
connection_list, c);
}
void connection_del(connection_t *c) {
}
void connection_del(connection_t *c) {
- list_delete(connection_list, c);
+ list_delete(
&
connection_list, c);
}
bool dump_connections(connection_t *cdump) {
}
bool dump_connections(connection_t *cdump) {
- for list_each(connection_t, c, connection_list) {
+ for list_each(connection_t, c,
&
connection_list) {
send_request(cdump, "%d %d %s %s %x %d %x",
send_request(cdump, "%d %d %s %s %x %d %x",
-
CONTROL, REQ_DUMP_CONNECTIONS,
-
c->name, c->hostname, c->options, c->socket,
-
bitfield_to_int(&c->status, sizeof(c->status))
);
+ CONTROL, REQ_DUMP_CONNECTIONS,
+ c->name, c->hostname, c->options, c->socket,
+
c->status.value
);
}
return send_request(cdump, "%d %d", CONTROL, REQ_DUMP_CONNECTIONS);
}
return send_request(cdump, "%d %d", CONTROL, REQ_DUMP_CONNECTIONS);