Make meshlink_main_loop static, it's not part of the API.

[meshlink] / src / meshlink.c

diff --git a/src/meshlink.c b/src/meshlink.c
index e5982721d533aadd2cafb8e775f6dcb7b1555916..0f6e5f8c875a60b3eb0c5cd60ee3e49315f73286 100644 (file)
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -16,7 +16,7 @@
     with this program; if not, write to the Free Software Foundation, Inc.,
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-#define VAR_SERVER 1    /* Should be in tinc.conf */
+#define VAR_SERVER 1    /* Should be in meshlink.conf */
 #define VAR_HOST 2      /* Can be in host config file */
 #define VAR_MULTIPLE 4  /* Multiple statements allowed */
 #define VAR_OBSOLETE 8  /* Should not be used anymore */
@@ -44,6 +44,8 @@ typedef struct {
 #define MSG_NOSIGNAL 0
 #endif
 
+__thread meshlink_errno_t meshlink_errno;
+
 //TODO: this can go away completely
 const var_t variables[] = {
        /* Server configuration */
@@ -190,9 +192,9 @@ static char *get_my_hostname(meshlink_handle_t* mesh) {
 
        // If that doesn't work, guess externally visible hostname
        fprintf(stderr, "Trying to discover externally visible hostname...\n");
-       struct addrinfo *ai = str2addrinfo("tinc-vpn.org", "80", SOCK_STREAM);
+       struct addrinfo *ai = str2addrinfo("meshlink.io", "80", SOCK_STREAM);
        struct addrinfo *aip = ai;
-       static const char request[] = "GET http://tinc-vpn.org/host.cgi HTTP/1.0\r\n\r\n";
+       static const char request[] = "GET http://www.meshlink.io/host.cgi HTTP/1.0\r\n\r\n";
 
        while(aip) {
                int s = socket(aip->ai_family, aip->ai_socktype, aip->ai_protocol);
@@ -327,15 +329,20 @@ static bool try_bind(int port) {
 
        while(ai) {
                int fd = socket(ai->ai_family, SOCK_STREAM, IPPROTO_TCP);
-               if(!fd)
+               if(!fd) {
+                       freeaddrinfo(ai);
                        return false;
+               }
                int result = bind(fd, ai->ai_addr, ai->ai_addrlen);
                closesocket(fd);
-               if(result)
+               if(result) {
+                       freeaddrinfo(ai);
                        return false;
+               }
                ai = ai->ai_next;
        }
 
+       freeaddrinfo(ai);
        return true;
 }
 
@@ -398,7 +405,7 @@ static bool finalize_join(meshlink_handle_t *mesh) {
                return false;
        }
 
-       // Filter first chunk on approved keywords, split between tinc.conf and hosts/Name
+       // Filter first chunk on approved keywords, split between meshlink.conf and hosts/Name
        // Other chunks go unfiltered to their respective host config files
        const char *p = mesh->data;
        char *l, *value;
@@ -782,7 +789,7 @@ meshlink_handle_t *meshlink_open(const char *confbase, const char *name) {
        return mesh;
 }
 
-void *meshlink_main_loop(void *arg) {
+static void *meshlink_main_loop(void *arg) {
        meshlink_handle_t *mesh = arg;
 
        try_outgoing_connections(mesh);
@@ -927,12 +934,23 @@ size_t meshlink_get_all_nodes(meshlink_handle_t *mesh, meshlink_node_t **nodes,
        return i;
 }
 
-char *meshlink_sign(meshlink_handle_t *mesh, const char *data, size_t len) {
-       return NULL;
+bool meshlink_sign(meshlink_handle_t *mesh, const void *data, size_t len, void *signature, size_t *siglen) {
+       if(*siglen < MESHLINK_SIGLEN)
+               return false;
+       if(!ecdsa_sign(mesh->self->connection->ecdsa, data, len, signature))
+               return false;
+       *siglen = MESHLINK_SIGLEN;
+       return true;
 }
 
-bool meshlink_verify(meshlink_handle_t *mesh, meshlink_node_t *source, const char *data, size_t len, const char *signature) {
-       return false;
+bool meshlink_verify(meshlink_handle_t *mesh, meshlink_node_t *source, const void *data, size_t len, const void *signature, size_t siglen) {
+       if(siglen != MESHLINK_SIGLEN)
+               return false;
+       struct node_t *n = (struct node_t *)source;
+       node_read_ecdsa_public_key(mesh, n);
+       if(!n->ecdsa)
+               return false;
+       return ecdsa_verify(((struct node_t *)source)->ecdsa, data, len, signature);
 }
 
 static bool refresh_invitation_key(meshlink_handle_t *mesh) {
@@ -1089,6 +1107,8 @@ char *meshlink_invite(meshlink_handle_t *mesh, const char *name) {
 
        b64encode_urlsafe(cookie, cookie, 18);
 
+       free(fingerprint);
+
        // Create a file containing the details of the invitation.
        snprintf(filename, sizeof filename, "%s" SLASH "invitations" SLASH "%s", mesh->confbase, cookiehash);
        int ifd = open(filename, O_RDWR | O_CREAT | O_EXCL, 0600);
@@ -1136,11 +1156,15 @@ char *meshlink_invite(meshlink_handle_t *mesh, const char *name) {
        // Create an URL from the local address, key hash and cookie
        char *url;
        xasprintf(&url, "%s/%s%s", address, hash, cookie);
+       free(address);
 
        return url;
 }
 
 bool meshlink_join(meshlink_handle_t *mesh, const char *invitation) {
+       if(!mesh || !invitation)
+               return false;
+
        //TODO: think of a better name for this variable, or of a different way to tokenize the invitation URL.
        char copy[strlen(invitation) + 1];
        strcpy(copy, invitation);
@@ -1219,6 +1243,8 @@ bool meshlink_join(meshlink_handle_t *mesh, const char *invitation) {
                return false;
        }
 
+       free(b64key);
+
        char hisname[4096] = "";
        int code, hismajor, hisminor = 0;