Move macOS-specific code into a subdirectory

[tinc] / src / connection.c

diff --git a/src/connection.c b/src/connection.c
index 0c5e7ef..4f8d4fd 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -57,17 +57,72 @@ 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);
@@ -93,7 +148,8 @@ 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);
@@ -112,7 +168,7 @@ bool dump_connections(connection_t *cdump) {
                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);