Remove files not used by MeshLink.

[meshlink] / src / protocol_auth.c

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index d69c8ab722913732c2521ec94356df5ec9e35106..551bff60a70c02c07746eab5107c2a8484c0420f 100644 (file)
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -1,7 +1,7 @@
 /*
     protocol_auth.c -- handle the meta-protocol, authentication
     Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2014 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -39,6 +39,7 @@
 #include "prf.h"
 #include "protocol.h"
 #include "rsa.h"
+#include "script.h"
 #include "sptps.h"
 #include "utils.h"
 #include "xalloc.h"
@@ -174,6 +175,22 @@ static bool finalize_invitation(connection_t *c, const char *data, uint16_t len)
        fclose(f);
 
        logger(DEBUG_CONNECTIONS, LOG_INFO, "Key succesfully received from %s (%s)", c->name, c->hostname);
+
+       // Call invitation-accepted script
+       char *envp[7] = {NULL};
+       char *address, *port;
+
+       xasprintf(&envp[0], "NETNAME=%s", netname ? : "");
+        xasprintf(&envp[3], "NODE=%s", c->name);
+       sockaddr2str(&c->address, &address, &port);
+       xasprintf(&envp[4], "REMOTEADDRESS=%s", address);
+       xasprintf(&envp[5], "NAME=%s", myself->name);
+
+       execute_script("invitation-accepted", envp);
+
+       for(int i = 0; envp[i] && i < 7; i++)
+               free(envp[i]);
+
        sptps_send_record(&c->sptps, 2, data, 0);
        return true;
 }
@@ -652,7 +669,8 @@ bool send_ack(connection_t *c) {
        if(choice)
                c->options |= OPTION_CLAMP_MSS;
 
-       get_config_int(lookup_config(c->config_tree, "Weight"), &c->estimated_weight);
+       if(!get_config_int(lookup_config(c->config_tree, "Weight"), &c->estimated_weight))
+               get_config_int(lookup_config(config_tree, "Weight"), &c->estimated_weight);
 
        return send_request(c, "%d %s %d %x", ACK, myport, c->estimated_weight, (c->options & 0xffffff) | (experimental ? (PROT_MINOR << 24) : 0));
 }