X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconnection.c;h=4f8d4fd782bb8ed77c9b83257ec607a317955aae;hb=28be4baae016a5a771d0d9ec6e97ef38a4fc9e46;hp=1c638a4d0bac178f6443b59c7aed333a380097ec;hpb=46f3eba7755089ff68fdc137b0754cae2fa523eb;p=tinc

diff --git a/src/connection.c b/src/connection.c
index 1c638a4d..4f8d4fd7 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -25,44 +25,104 @@
 #include "cipher.h"
 #include "conf.h"
 #include "control_common.h"
-#include "list.h"
 #include "logger.h"
 #include "net.h"
 #include "rsa.h"
-#include "subnet.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_list = list_alloc((list_action_t) free_connection);
 	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);
+	everyone = NULL;
 }
 
 connection_t *new_connection(void) {
 	return xzalloc(sizeof(connection_t));
 }
 
+#ifndef DISABLE_LEGACY
+bool init_crypto_by_nid(legacy_crypto_t *c, nid_t cipher, nid_t digest) {
+	if(!cipher_open_by_nid(&c->cipher, cipher)) {
+		return false;
+	}
+
+	if(!digest_open_by_nid(&c->digest, digest, DIGEST_ALGO_SIZE)) {
+		cipher_close(&c->cipher);
+		return false;
+	}
+
+	c->budget = cipher_budget(&c->cipher);
+	return true;
+}
+
+bool init_crypto_by_name(legacy_crypto_t *c, const char *cipher, const char *digest) {
+	if(!cipher_open_by_name(&c->cipher, cipher)) {
+		return false;
+	}
+
+	if(!digest_open_by_name(&c->digest, digest, DIGEST_ALGO_SIZE)) {
+		cipher_close(&c->cipher);
+		return false;
+	}
+
+	c->budget = cipher_budget(&c->cipher);
+	return true;
+}
+
+bool decrease_budget(legacy_crypto_t *c, size_t bytes) {
+	if(bytes > c->budget) {
+		return false;
+	} else {
+		c->budget -= bytes;
+		return true;
+	}
+}
+
+static void close_legacy_crypto(legacy_crypto_t *c) {
+	cipher_close(&c->cipher);
+	digest_close(&c->digest);
+}
+
+legacy_ctx_t *new_legacy_ctx(rsa_t *rsa) {
+	legacy_ctx_t *ctx = xzalloc(sizeof(legacy_ctx_t));
+	ctx->rsa = rsa;
+	return ctx;
+}
+
+void free_legacy_ctx(legacy_ctx_t *ctx) {
+	if(ctx) {
+		close_legacy_crypto(&ctx->in);
+		close_legacy_crypto(&ctx->out);
+		rsa_free(ctx->rsa);
+		free(ctx);
+	}
+}
+#endif
+
 void free_connection(connection_t *c) {
 	if(!c) {
 		return;
 	}
 
 #ifndef DISABLE_LEGACY
-	cipher_close(c->incipher);
-	digest_close(c->indigest);
-	cipher_close(c->outcipher);
-	digest_close(c->outdigest);
-	rsa_free(c->rsa);
+	free_legacy_ctx(c->legacy);
 #endif
 
 	sptps_stop(&c->sptps);
@@ -88,26 +148,27 @@ void free_connection(connection_t *c) {
 	free(c->hostname);
 
 	if(c->config_tree) {
-		exit_configuration(&c->config_tree);
+		exit_configuration(c->config_tree);
+		c->config_tree = NULL;
 	}
 
 	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) {
-	list_delete(connection_list, c);
+	list_delete(&connection_list, c);
 }
 
 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",
 		             CONTROL, REQ_DUMP_CONNECTIONS,
 		             c->name, c->hostname, c->options, c->socket,
-		             bitfield_to_int(&c->status, sizeof(c->status)));
+		             c->status.value);
 	}
 
 	return send_request(cdump, "%d %d", CONTROL, REQ_DUMP_CONNECTIONS);