Use libevent for meta socket input/output buffering.

[tinc] / src / protocol_auth.c

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index 0efeceb..31dae67 100644 (file)
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -27,7 +27,7 @@
 #include <openssl/err.h>
 #include <openssl/evp.h>
 
-#include "avl_tree.h"
+#include "splay_tree.h"
 #include "conf.h"
 #include "connection.h"
 #include "edge.h"
@@ -40,21 +40,19 @@
 #include "utils.h"
 #include "xalloc.h"
 
-bool send_id(connection_t *c)
-{
+bool send_id(connection_t *c) {
        cp();
 
        return send_request(c, "%d %s %d", ID, myself->connection->name,
                                                myself->connection->protocol_version);
 }
 
-bool id_h(connection_t *c)
-{
+bool id_h(connection_t *c, char *request) {
        char name[MAX_STRING_SIZE];
 
        cp();
 
-       if(sscanf(c->buffer, "%*d " MAX_STRING " %d", name, &c->protocol_version) != 2) {
+       if(sscanf(request, "%*d " MAX_STRING " %d", name, &c->protocol_version) != 2) {
                logger(LOG_ERR, _("Got bad %s from %s (%s)"), "ID", c->name,
                           c->hostname);
                return false;
@@ -116,8 +114,7 @@ bool id_h(connection_t *c)
        return send_metakey(c);
 }
 
-bool send_metakey(connection_t *c)
-{
+bool send_metakey(connection_t *c) {
        char *buffer;
        int len;
        bool x;
@@ -202,15 +199,14 @@ bool send_metakey(connection_t *c)
        return x;
 }
 
-bool metakey_h(connection_t *c)
-{
+bool metakey_h(connection_t *c, char *request) {
        char buffer[MAX_STRING_SIZE];
        int cipher, digest, maclength, compression;
        int len;
 
        cp();
 
-       if(sscanf(c->buffer, "%*d %d %d %d %d " MAX_STRING, &cipher, &digest, &maclength, &compression, buffer) != 5) {
+       if(sscanf(request, "%*d %d %d %d %d " MAX_STRING, &cipher, &digest, &maclength, &compression, buffer) != 5) {
                logger(LOG_ERR, _("Got bad %s from %s (%s)"), "METAKEY", c->name,
                           c->hostname);
                return false;
@@ -302,8 +298,7 @@ bool metakey_h(connection_t *c)
        return send_challenge(c);
 }
 
-bool send_challenge(connection_t *c)
-{
+bool send_challenge(connection_t *c) {
        char *buffer;
        int len;
 
@@ -334,14 +329,13 @@ bool send_challenge(connection_t *c)
        return send_request(c, "%d %s", CHALLENGE, buffer);
 }
 
-bool challenge_h(connection_t *c)
-{
+bool challenge_h(connection_t *c, char *request) {
        char buffer[MAX_STRING_SIZE];
        int len;
 
        cp();
 
-       if(sscanf(c->buffer, "%*d " MAX_STRING, buffer) != 1) {
+       if(sscanf(request, "%*d " MAX_STRING, buffer) != 1) {
                logger(LOG_ERR, _("Got bad %s from %s (%s)"), "CHALLENGE", c->name,
                           c->hostname);
                return false;
@@ -373,8 +367,7 @@ bool challenge_h(connection_t *c)
        return send_chal_reply(c);
 }
 
-bool send_chal_reply(connection_t *c)
-{
+bool send_chal_reply(connection_t *c) {
        char hash[EVP_MAX_MD_SIZE * 2 + 1];
        EVP_MD_CTX ctx;
 
@@ -400,15 +393,14 @@ bool send_chal_reply(connection_t *c)
        return send_request(c, "%d %s", CHAL_REPLY, hash);
 }
 
-bool chal_reply_h(connection_t *c)
-{
+bool chal_reply_h(connection_t *c, char *request) {
        char hishash[MAX_STRING_SIZE];
        char myhash[EVP_MAX_MD_SIZE];
        EVP_MD_CTX ctx;
 
        cp();
 
-       if(sscanf(c->buffer, "%*d " MAX_STRING, hishash) != 1) {
+       if(sscanf(request, "%*d " MAX_STRING, hishash) != 1) {
                logger(LOG_ERR, _("Got bad %s from %s (%s)"), "CHAL_REPLY", c->name,
                           c->hostname);
                return false;
@@ -460,8 +452,7 @@ bool chal_reply_h(connection_t *c)
        return send_ack(c);
 }
 
-bool send_ack(connection_t *c)
-{
+bool send_ack(connection_t *c) {
        /* ACK message contains rest of the information the other end needs
           to create node_t and edge_t structures. */
 
@@ -491,9 +482,8 @@ bool send_ack(connection_t *c)
        return send_request(c, "%d %s %d %lx", ACK, myport, c->estimated_weight, c->options);
 }
 
-static void send_everything(connection_t *c)
-{
-       avl_node_t *node, *node2;
+static void send_everything(connection_t *c) {
+       splay_node_t *node, *node2;
        node_t *n;
        subnet_t *s;
        edge_t *e;
@@ -524,8 +514,7 @@ static void send_everything(connection_t *c)
        }
 }
 
-bool ack_h(connection_t *c)
-{
+bool ack_h(connection_t *c, char *request) {
        char hisport[MAX_STRING_SIZE];
        char *hisaddress, *dummy;
        int weight, mtu;
@@ -534,7 +523,7 @@ bool ack_h(connection_t *c)
 
        cp();
 
-       if(sscanf(c->buffer, "%*d " MAX_STRING " %d %lx", hisport, &weight, &options) != 3) {
+       if(sscanf(request, "%*d " MAX_STRING " %d %lx", hisport, &weight, &options) != 3) {
                logger(LOG_ERR, _("Got bad %s from %s (%s)"), "ACK", c->name,
                           c->hostname);
                return false;
@@ -551,8 +540,17 @@ bool ack_h(connection_t *c)
        } else {
                if(n->connection) {
                        /* Oh dear, we already have a connection to this node. */
-                       ifdebug(CONNECTIONS) logger(LOG_DEBUG, _("Established a second connection with %s (%s), closing old connection"),
-                                          n->name, n->hostname);
+                       ifdebug(CONNECTIONS) logger(LOG_DEBUG, _("Established a second connection with %s (%s), closing old connection"), n->connection->name, n->connection->hostname);
+
+                       if(n->connection->outgoing) {
+                               if(c->outgoing)
+                                       logger(LOG_WARNING, _("Two outgoing connections to the same node!"));
+                               else
+                                       c->outgoing = n->connection->outgoing;
+
+                               n->connection->outgoing = NULL;
+                       }
+
                        terminate_connection(n->connection, false);
                        /* Run graph algorithm to purge key and make sure up/down scripts are rerun with new IP addresses and stuff */
                        graph();