X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconnection.c;h=1c638a4d0bac178f6443b59c7aed333a380097ec;hb=refs%2Fheads%2F1.1;hp=9b752fadaa3d1b292e36702c933ffbcf08897bf5;hpb=80e15d8b96e5313b33c91003b1f75d7f6db9924e;p=tinc diff --git a/src/connection.c b/src/connection.c index 9b752fad..4f8d4fd7 100644 --- a/src/connection.c +++ b/src/connection.c @@ -1,6 +1,6 @@ /* connection.c -- connection list management - Copyright (C) 2000-2012 Guus Sliepen , + Copyright (C) 2000-2013 Guus Sliepen , 2000-2005 Ivo Timmermans 2008 Max Rijevski @@ -21,116 +21,155 @@ #include "system.h" -#include "avl_tree.h" +#include "list.h" +#include "cipher.h" #include "conf.h" +#include "control_common.h" #include "logger.h" -#include "subnet.h" +#include "net.h" +#include "rsa.h" #include "utils.h" #include "xalloc.h" -avl_tree_t *connection_tree; /* Meta connections */ -connection_t *everyone; +list_t connection_list = { + .head = NULL, + .tail = NULL, + .count = 0, + .delete = (list_action_t) free_connection, +}; -static int connection_compare(const connection_t *a, const connection_t *b) { - return a < b ? -1 : a == b ? 0 : 1; -} +connection_t *everyone; void init_connections(void) { - connection_tree = avl_alloc_tree((avl_compare_t) connection_compare, (avl_action_t) free_connection); everyone = new_connection(); everyone->name = xstrdup("everyone"); everyone->hostname = xstrdup("BROADCAST"); } void exit_connections(void) { - avl_delete_tree(connection_tree); + list_empty_list(&connection_list); + free_connection(everyone); + everyone = NULL; } connection_t *new_connection(void) { - connection_t *c; - - c = xmalloc_and_zero(sizeof(connection_t)); + return xzalloc(sizeof(connection_t)); +} - if(!c) - return NULL; +#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; + } - gettimeofday(&c->start, NULL); + if(!digest_open_by_nid(&c->digest, digest, DIGEST_ALGO_SIZE)) { + cipher_close(&c->cipher); + return false; + } - return c; + c->budget = cipher_budget(&c->cipher); + return true; } -void free_connection_partially(connection_t *c) { - free(c->inkey); - free(c->outkey); - free(c->mychallenge); - free(c->hischallenge); - free(c->outbuf); - - c->inkey = NULL; - c->outkey = NULL; - c->mychallenge = NULL; - c->hischallenge = NULL; - c->outbuf = NULL; - - c->buflen = 0; - c->reqlen = 0; - c->tcplen = 0; - c->allow_request = 0; - c->outbuflen = 0; - c->outbufsize = 0; - c->outbufstart = 0; - - if(c->inctx) { - EVP_CIPHER_CTX_cleanup(c->inctx); - free(c->inctx); - c->inctx = NULL; +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; } - if(c->outctx) { - EVP_CIPHER_CTX_cleanup(c->outctx); - free(c->outctx); - c->outctx = NULL; + 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; +} - if(c->rsa_key) { - RSA_free(c->rsa_key); - c->rsa_key = NULL; +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) { - free_connection_partially(c); + if(!c) { + return; + } + +#ifndef DISABLE_LEGACY + free_legacy_ctx(c->legacy); +#endif + + sptps_stop(&c->sptps); + ecdsa_free(c->ecdsa); + + free(c->hischallenge); + free(c->mychallenge); + + buffer_clear(&c->inbuf); + buffer_clear(&c->outbuf); + + io_del(&c->io); + + if(c->socket > 0) { + if(c->status.tarpit) { + tarpit(c->socket); + } else { + closesocket(c->socket); + } + } free(c->name); free(c->hostname); - if(c->config_tree) - exit_configuration(&c->config_tree); + if(c->config_tree) { + exit_configuration(c->config_tree); + c->config_tree = NULL; + } free(c); } void connection_add(connection_t *c) { - avl_insert(connection_tree, c); + list_insert_tail(&connection_list, c); } void connection_del(connection_t *c) { - avl_delete(connection_tree, c); + list_delete(&connection_list, c); } -void dump_connections(void) { - avl_node_t *node; - connection_t *c; - - logger(LOG_DEBUG, "Connections:"); - - for(node = connection_tree->head; node; node = node->next) { - c = node->data; - logger(LOG_DEBUG, " %s at %s options %x socket %d status %04x outbuf %d/%d/%d", - c->name, c->hostname, c->options, c->socket, bitfield_to_int(&c->status, sizeof c->status), - c->outbufsize, c->outbufstart, c->outbuflen); +bool dump_connections(connection_t *cdump) { + 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, + c->status.value); } - logger(LOG_DEBUG, "End of connections."); + return send_request(cdump, "%d %d", CONTROL, REQ_DUMP_CONNECTIONS); }