#include "xalloc.h"
#include "ed25519/sha512.h"
-static char meshlink_conf[PATH_MAX];
-static char hosts_dir[PATH_MAX];
-
-static int sock;
-static sptps_t sptps;
-static char cookie[18], hash[18];
-static char *data = NULL;
-static size_t thedatalen = 0;
-static bool success = false;
-static char line[4096];
-static char buffer[4096];
-static size_t blen = 0;
+//TODO: this can go away completely
const var_t variables[] = {
/* Server configuration */
{"AddressFamily", VAR_SERVER},
{NULL, 0}
};
+static char *get_my_name(meshlink_handle_t* mesh) {
+ FILE *f = fopen(mesh->meshlink_conf, "r");
+ if(!f) {
+ return NULL;
+ }
+
+ char buf[4096];
+ char *value;
+ while(fgets(buf, sizeof buf, f)) {
+ int len = strcspn(buf, "\t =");
+ value = buf + len;
+ value += strspn(value, "\t ");
+ if(*value == '=') {
+ value++;
+ value += strspn(value, "\t ");
+ }
+ if(!rstrip(value))
+ continue;
+ buf[len] = 0;
+ if(strcasecmp(buf, "Name"))
+ continue;
+ if(*value) {
+ fclose(f);
+ return strdup(value);
+ }
+ }
+
+ fclose(f);
+ return NULL;
+}
+static bool fcopy(FILE *out, const char *filename) {
+ FILE *in = fopen(filename, "r");
+ if(!in) {
+ fprintf(stderr, "Could not open %s: %s\n", filename, strerror(errno));
+ return false;
+ }
+
+ char buf[1024];
+ size_t len;
+ while((len = fread(buf, 1, sizeof buf, in)))
+ fwrite(buf, len, 1, out);
+ fclose(in);
+ return true;
+}
+static void scan_for_hostname(const char *filename, char **hostname, char **port) {
+ char line[4096];
+ if(!filename || (*hostname && *port))
+ return;
+
+ FILE *f = fopen(filename, "r");
+ if(!f)
+ return;
+
+ while(fgets(line, sizeof line, f)) {
+ if(!rstrip(line))
+ continue;
+ char *p = line, *q;
+ p += strcspn(p, "\t =");
+ if(!*p)
+ continue;
+ q = p + strspn(p, "\t ");
+ if(*q == '=')
+ q += 1 + strspn(q + 1, "\t ");
+ *p = 0;
+ p = q + strcspn(q, "\t ");
+ if(*p)
+ *p++ = 0;
+ p += strspn(p, "\t ");
+ p[strcspn(p, "\t ")] = 0;
+
+ if(!*port && !strcasecmp(line, "Port")) {
+ *port = xstrdup(q);
+ } else if(!*hostname && !strcasecmp(line, "Address")) {
+ *hostname = xstrdup(q);
+ if(*p) {
+ free(*port);
+ *port = xstrdup(p);
+ }
+ }
+
+ if(*hostname && *port)
+ break;
+ }
+
+ fclose(f);
+}
+static char *get_my_hostname(meshlink_handle_t* mesh) {
+ char *hostname = NULL;
+ char *port = NULL;
+ char *hostport = NULL;
+ char *name = get_my_name(mesh);
+ char filename[PATH_MAX];
+ char line[4096];
+
+ // Use first Address statement in own host config file
+ if(check_id(name)) {
+ snprintf(filename,PATH_MAX, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
+ scan_for_hostname(filename, &hostname, &port);
+ scan_for_hostname(mesh->meshlink_conf, &hostname, &port);
+ }
+
+ if(hostname)
+ goto done;
+
+ // 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 *aip = ai;
+ static const char request[] = "GET http://tinc-vpn.org/host.cgi HTTP/1.0\r\n\r\n";
+
+ while(aip) {
+ int s = socket(aip->ai_family, aip->ai_socktype, aip->ai_protocol);
+ if(s >= 0) {
+ if(connect(s, aip->ai_addr, aip->ai_addrlen)) {
+ closesocket(s);
+ s = -1;
+ }
+ }
+ if(s >= 0) {
+ send(s, request, sizeof request - 1, 0);
+ int len = recv(s, line, sizeof line - 1, MSG_WAITALL);
+ if(len > 0) {
+ line[len] = 0;
+ if(line[len - 1] == '\n')
+ line[--len] = 0;
+ char *p = strrchr(line, '\n');
+ if(p && p[1])
+ hostname = xstrdup(p + 1);
+ }
+ closesocket(s);
+ if(hostname)
+ break;
+ }
+ aip = aip->ai_next;
+ continue;
+ }
+
+ if(ai)
+ freeaddrinfo(ai);
+
+ // Check that the hostname is reasonable
+ if(hostname) {
+ for(char *p = hostname; *p; p++) {
+ if(isalnum(*p) || *p == '-' || *p == '.' || *p == ':')
+ continue;
+ // If not, forget it.
+ free(hostname);
+ hostname = NULL;
+ break;
+ }
+ }
+
+ //if(!tty) {
+ // if(!hostname) {
+ // fprintf(stderr, "Could not determine the external address or hostname. Please set Address manually.\n");
+ // return NULL;
+ // }
+ // goto save;
+ //}
+
+again:
+ fprintf(stderr, "Please enter your host's external address or hostname");
+ if(hostname)
+ fprintf(stderr, " [%s]", hostname);
+ fprintf(stderr, ": ");
+
+ if(!fgets(line, sizeof line, stdin)) {
+ fprintf(stderr, "Error while reading stdin: %s\n", strerror(errno));
+ free(hostname);
+ return NULL;
+ }
+
+ if(!rstrip(line)) {
+ if(hostname)
+ goto save;
+ else
+ goto again;
+ }
+
+ for(char *p = line; *p; p++) {
+ if(isalnum(*p) || *p == '-' || *p == '.')
+ continue;
+ fprintf(stderr, "Invalid address or hostname.\n");
+ goto again;
+ }
+
+ free(hostname);
+ hostname = xstrdup(line);
+
+save:
+ if(filename) {
+ FILE *f = fopen(filename, "a");
+ if(f) {
+ fprintf(f, "\nAddress = %s\n", hostname);
+ fclose(f);
+ } else {
+ fprintf(stderr, "Could not append Address to %s: %s\n", filename, strerror(errno));
+ }
+ }
+
+done:
+ if(port) {
+ if(strchr(hostname, ':'))
+ xasprintf(&hostport, "[%s]:%s", hostname, port);
+ else
+ xasprintf(&hostport, "%s:%s", hostname, port);
+ } else {
+ if(strchr(hostname, ':'))
+ xasprintf(&hostport, "[%s]", hostname);
+ else
+ hostport = xstrdup(hostname);
+ }
+
+ free(hostname);
+ free(port);
+ return hostport;
+}
+
static char *get_line(const char **data) {
if(!data || !*data)
return NULL;
}
static bool finalize_join(meshlink_handle_t *mesh) {
- char *name = xstrdup(get_value(data, "Name"));
+ char *name = xstrdup(get_value(mesh->data, "Name"));
if(!name) {
fprintf(stderr, "No Name found in invitation!\n");
return false;
return false;
}
- if(mkdir(hosts_dir, 0777) && errno != EEXIST) {
- fprintf(stderr, "Could not create directory %s: %s\n", hosts_dir, strerror(errno));
+ if(mkdir(mesh->hosts_dir, 0777) && errno != EEXIST) {
+ fprintf(stderr, "Could not create directory %s: %s\n", mesh->hosts_dir, strerror(errno));
return false;
}
- FILE *f = fopen(meshlink_conf, "w");
+ FILE *f = fopen(mesh->meshlink_conf, "w");
if(!f) {
- fprintf(stderr, "Could not create file %s: %s\n", meshlink_conf, strerror(errno));
+ fprintf(stderr, "Could not create file %s: %s\n", mesh->meshlink_conf, strerror(errno));
return false;
}
fprintf(f, "Name = %s\n", name);
char filename[PATH_MAX];
- snprintf(filename,PATH_MAX, "%s" SLASH "%s", hosts_dir, name);
+ snprintf(filename,PATH_MAX, "%s" SLASH "%s", mesh->hosts_dir, name);
FILE *fh = fopen(filename, "w");
if(!fh) {
fprintf(stderr, "Could not create file %s: %s\n", filename, strerror(errno));
// Filter first chunk on approved keywords, split between tinc.conf and hosts/Name
// Other chunks go unfiltered to their respective host config files
- const char *p = data;
+ const char *p = mesh->data;
char *l, *value;
while((l = get_line(&p))) {
else if(!strcasecmp(l, "NetName"))
continue;
- // Check the list of known variables
+ // Check the list of known variables //TODO: most variables will not be available in meshlink, only name and key will be absolutely necessary
bool found = false;
int i;
for(i = 0; variables[i].name; i++) {
return false;
}
- snprintf(filename,PATH_MAX, "%s" SLASH "%s", hosts_dir, value);
+ snprintf(filename,PATH_MAX, "%s" SLASH "%s", mesh->hosts_dir, value);
f = fopen(filename, "w");
if(!f) {
fprintf(fh, "ECDSAPublicKey = %s\n", b64key);
- sptps_send_record(&sptps, 1, b64key, strlen(b64key));
+ sptps_send_record(&(mesh->sptps), 1, b64key, strlen(b64key));
free(b64key);
ecdsa_free(key);
}
static bool invitation_send(void *handle, uint8_t type, const char *data, size_t len) {
+ meshlink_handle_t* mesh = handle;
while(len) {
- int result = send(sock, data, len, 0);
+ int result = send(mesh->sock, data, len, 0);
if(result == -1 && errno == EINTR)
continue;
else if(result <= 0)
}
static bool invitation_receive(void *handle, uint8_t type, const char *msg, uint16_t len) {
+ meshlink_handle_t* mesh = handle;
switch(type) {
case SPTPS_HANDSHAKE:
- return sptps_send_record(&sptps, 0, cookie, sizeof cookie);
+ return sptps_send_record(&(mesh->sptps), 0, mesh->cookie, sizeof mesh->cookie);
case 0:
- data = xrealloc(data, thedatalen + len + 1);
- memcpy(data + thedatalen, msg, len);
- thedatalen += len;
- data[thedatalen] = 0;
+ mesh->data = xrealloc(mesh->data, mesh->thedatalen + len + 1);
+ memcpy(mesh->data + mesh->thedatalen, msg, len);
+ mesh->thedatalen += len;
+ mesh->data[mesh->thedatalen] = 0;
break;
case 1:
- return finalize_join(NULL);//TODO: wrong, we have to pass the mesh handler here, but how ?
+ return finalize_join(mesh);
case 2:
fprintf(stderr, "Invitation succesfully accepted.\n");
- shutdown(sock, SHUT_RDWR);
- success = true;
+ shutdown(mesh->sock, SHUT_RDWR);
+ mesh->success = true;
break;
default:
return true;
}
-static bool recvline(int fd, char *line, size_t len) {
+static bool recvline(meshlink_handle_t* mesh, size_t len) {
char *newline = NULL;
- if(!fd)
+ if(!mesh->sock)
abort();
- while(!(newline = memchr(buffer, '\n', blen))) {
- int result = recv(fd, buffer + blen, sizeof buffer - blen, 0);
+ while(!(newline = memchr(mesh->buffer, '\n', mesh->blen))) {
+ int result = recv(mesh->sock, mesh->buffer + mesh->blen, sizeof mesh->buffer - mesh->blen, 0);
if(result == -1 && errno == EINTR)
continue;
else if(result <= 0)
return false;
- blen += result;
+ mesh->blen += result;
}
- if(newline - buffer >= len)
+ if(newline - mesh->buffer >= len)
return false;
- len = newline - buffer;
+ len = newline - mesh->buffer;
- memcpy(line, buffer, len);
- line[len] = 0;
- memmove(buffer, newline + 1, blen - len - 1);
- blen -= len + 1;
+ memcpy(mesh->line, mesh->buffer, len);
+ mesh->line[len] = 0;
+ memmove(mesh->buffer, newline + 1, mesh->blen - len - 1);
+ mesh->blen -= len + 1;
return true;
}
return false;
}
- snprintf(hosts_dir, sizeof hosts_dir, "%s" SLASH "hosts", mesh->confbase);
+ snprintf(mesh->hosts_dir, sizeof mesh->hosts_dir, "%s" SLASH "hosts", mesh->confbase);
- if(mkdir(hosts_dir, 0777) && errno != EEXIST) {
- fprintf(stderr, "Could not create directory %s: %s\n", hosts_dir, strerror(errno));
+ if(mkdir(mesh->hosts_dir, 0777) && errno != EEXIST) {
+ fprintf(stderr, "Could not create directory %s: %s\n", mesh->hosts_dir, strerror(errno));
return false;
}
- snprintf(meshlink_conf, sizeof meshlink_conf, "%s" SLASH "meshlink.conf", mesh->confbase);
+ snprintf(mesh->meshlink_conf, sizeof mesh->meshlink_conf, "%s" SLASH "meshlink.conf", mesh->confbase);
- if(!access(meshlink_conf, F_OK)) {
- fprintf(stderr, "Configuration file %s already exists!\n", meshlink_conf);
+ if(!access(mesh->meshlink_conf, F_OK)) {
+ fprintf(stderr, "Configuration file %s already exists!\n", mesh->meshlink_conf);
return false;
}
- FILE *f = fopen(meshlink_conf, "w");
+ FILE *f = fopen(mesh->meshlink_conf, "w");
if(!f) {
- fprintf(stderr, "Could not create file %s: %s\n", meshlink_conf, strerror(errno));
+ fprintf(stderr, "Could not create file %s: %s\n", mesh->meshlink_conf, strerror(errno));
return 1;
}
}
char *meshlink_invite(meshlink_handle_t *mesh, const char *name) {
- return NULL;
+ // Check validity of the new node's name
+ if(!check_id(name)) {
+ fprintf(stderr, "Invalid name for node.\n");
+ return 1;
+ }
+
+ char *myname = get_my_name(mesh);
+ if(!myname)
+ return 1;
+
+ // Ensure no host configuration file with that name exists
+ char filename [PATH_MAX];
+ snprintf(filename,PATH_MAX, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
+ if(!access(filename, F_OK)) {
+ fprintf(stderr, "A host config file for %s already exists!\n", name);
+ return 1;
+ }
+
+ // If a daemon is running, ensure no other nodes know about this name
+
+ //TODO: original tinc code connects to tincd cli and makes this check. How we want to implement this here ?
+ //bool found = false;
+ //if(connect_tincd(false)) {
+ // sendline(fd, "%d %d", CONTROL, REQ_DUMP_NODES);
+
+ // while(recvline(fd, line, sizeof line)) {
+ // char node[4096];
+ // int code, req;
+ // if(sscanf(line, "%d %d %s", &code, &req, node) != 3)
+ // break;
+ // if(!strcmp(node, name))
+ // found = true;
+ // }
+
+ // if(found) {
+ // fprintf(stderr, "A node with name %s is already known!\n", name);
+ // return 1;
+ // }
+ //}
+
+ char hash[64];
+
+ snprintf(filename,PATH_MAX, "%s" SLASH "invitations", mesh->confbase);
+ if(mkdir(filename, 0700) && errno != EEXIST) {
+ fprintf(stderr, "Could not create directory %s: %s\n", filename, strerror(errno));
+ return 1;
+ }
+
+ // Count the number of valid invitations, clean up old ones
+ DIR *dir = opendir(filename);
+ if(!dir) {
+ fprintf(stderr, "Could not read directory %s: %s\n", filename, strerror(errno));
+ return 1;
+ }
+
+ errno = 0;
+ int count = 0;
+ struct dirent *ent;
+ time_t deadline = time(NULL) - 604800; // 1 week in the past
+
+ while((ent = readdir(dir))) {
+ if(strlen(ent->d_name) != 24)
+ continue;
+ char invname[PATH_MAX];
+ struct stat st;
+ snprintf(invname,PATH_MAX, "%s" SLASH "%s", filename, ent->d_name);
+ if(!stat(invname, &st)) {
+ if(deadline < st.st_mtime)
+ count++;
+ else
+ unlink(invname);
+ } else {
+ fprintf(stderr, "Could not stat %s: %s\n", invname, strerror(errno));
+ errno = 0;
+ }
+ }
+
+ if(errno) {
+ fprintf(stderr, "Error while reading directory %s: %s\n", filename, strerror(errno));
+ closedir(dir);
+ return 1;
+ }
+
+ closedir(dir);
+
+ ecdsa_t *key;
+ snprintf(filename,PATH_MAX, "%s" SLASH "invitations" SLASH "ecdsa_key.priv", mesh->confbase);
+
+ // Remove the key if there are no outstanding invitations.
+ if(!count)
+ unlink(filename);
+
+ // Create a new key if necessary.
+ FILE *f = fopen(filename, "r");
+ if(!f) {
+ if(errno != ENOENT) {
+ fprintf(stderr, "Could not read %s: %s\n", filename, strerror(errno));
+ return 1;
+ }
+
+ key = ecdsa_generate();
+ if(!key) {
+ return 1;
+ }
+ f = fopen(filename, "w");
+ if(!f) {
+ fprintf(stderr, "Could not write %s: %s\n", filename, strerror(errno));
+ return 1;
+ }
+ chmod(filename, 0600);
+ ecdsa_write_pem_private_key(key, f);
+ fclose(f);
+ //TODO: handle this in meshlink
+ //if(connect_tincd(false))
+ // sendline(fd, "%d %d", CONTROL, REQ_RELOAD);
+ } else {
+ key = ecdsa_read_pem_private_key(f);
+ fclose(f);
+ if(!key)
+ fprintf(stderr, "Could not read private key from %s\n", filename);
+ }
+
+ if(!key)
+ return 1;
+
+ // Create a hash of the key.
+ char *fingerprint = ecdsa_get_base64_public_key(key);
+ sha512(fingerprint, strlen(fingerprint), hash);
+ b64encode_urlsafe(hash, hash, 18);
+
+ // Create a random cookie for this invitation.
+ char cookie[25];
+ randomize(cookie, 18);
+
+ // Create a filename that doesn't reveal the cookie itself
+ char buf[18 + strlen(fingerprint)];
+ char cookiehash[64];
+ memcpy(buf, cookie, 18);
+ memcpy(buf + 18, fingerprint, sizeof buf - 18);
+ sha512(buf, sizeof buf, cookiehash);
+ b64encode_urlsafe(cookiehash, cookiehash, 18);
+
+ b64encode_urlsafe(cookie, cookie, 18);
+
+ // Create a file containing the details of the invitation.
+ snprintf(filename,PATH_MAX, "%s" SLASH "invitations" SLASH "%s", mesh->confbase, cookiehash);
+ int ifd = open(filename, O_RDWR | O_CREAT | O_EXCL, 0600);
+ if(!ifd) {
+ fprintf(stderr, "Could not create invitation file %s: %s\n", filename, strerror(errno));
+ return 1;
+ }
+ f = fdopen(ifd, "w");
+ if(!f)
+ abort();
+
+ // Get the local address
+ char *address = get_my_hostname(mesh);
+
+ // Fill in the details.
+ fprintf(f, "Name = %s\n", name);
+ //if(netname)
+ // fprintf(f, "NetName = %s\n", netname);
+ fprintf(f, "ConnectTo = %s\n", myname);
+
+ // Copy Broadcast and Mode
+ FILE *tc = fopen(mesh->meshlink_conf, "r");
+ if(tc) {
+ char buf[1024];
+ while(fgets(buf, sizeof buf, tc)) {
+ if((!strncasecmp(buf, "Mode", 4) && strchr(" \t=", buf[4]))
+ || (!strncasecmp(buf, "Broadcast", 9) && strchr(" \t=", buf[9]))) {
+ fputs(buf, f);
+ // Make sure there is a newline character.
+ if(!strchr(buf, '\n'))
+ fputc('\n', f);
+ }
+ }
+ fclose(tc);
+ }
+
+ fprintf(f, "#---------------------------------------------------------------#\n");
+ fprintf(f, "Name = %s\n", myname);
+
+ char filename2[PATH_MAX];
+ snprintf(filename2,PATH_MAX, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, myname);
+ fcopy(f, filename2);
+ fclose(f);
+
+ // Create an URL from the local address, key hash and cookie
+ char *url;
+ xasprintf(&url, "%s/%s%s", address, hash, cookie);
+
+ return 0;
}
bool meshlink_join(meshlink_handle_t *mesh, const char *invitation) {
if(!mesh->myport || !*port)
port = "655";
- if(!b64decode(slash, hash, 18) || !b64decode(slash + 24, cookie, 18))
+ if(!b64decode(slash, mesh->hash, 18) || !b64decode(slash + 24, mesh->cookie, 18))
goto invalid;
// Generate a throw-away key for the invitation.
if(!ai)
return 1;
- sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
- if(sock <= 0) {
+ mesh->sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+ if(mesh->sock <= 0) {
fprintf(stderr, "Could not open socket: %s\n", strerror(errno));
return 1;
}
- if(connect(sock, ai->ai_addr, ai->ai_addrlen)) {
+ if(connect(mesh->sock, ai->ai_addr, ai->ai_addrlen)) {
fprintf(stderr, "Could not connect to %s port %s: %s\n", address, port, strerror(errno));
- closesocket(sock);
+ closesocket(mesh->sock);
return 1;
}
if(len <= 0 || len >= sizeof invitation)
abort();
- if(!sendline(sock, "0 ?%s %d.%d", b64key, PROT_MAJOR, 1)) {
+ if(!sendline(mesh->sock, "0 ?%s %d.%d", b64key, PROT_MAJOR, 1)) {
fprintf(stderr, "Error sending request to %s port %s: %s\n", address, port, strerror(errno));
- closesocket(sock);
+ closesocket(mesh->sock);
return 1;
}
char hisname[4096] = "";
int code, hismajor, hisminor = 0;
- if(!recvline(sock, line, sizeof line) || sscanf(line, "%d %s %d.%d", &code, hisname, &hismajor, &hisminor) < 3 || code != 0 || hismajor != PROT_MAJOR || !check_id(hisname) || !recvline(sock, line, sizeof line) || !rstrip(line) || sscanf(line, "%d ", &code) != 1 || code != ACK || strlen(line) < 3) {
+ if(!recvline(mesh, sizeof mesh->line) || sscanf(mesh->line, "%d %s %d.%d", &code, hisname, &hismajor, &hisminor) < 3 || code != 0 || hismajor != PROT_MAJOR || !check_id(hisname) || !recvline(mesh, sizeof mesh->line) || !rstrip(mesh->line) || sscanf(mesh->line, "%d ", &code) != 1 || code != ACK || strlen(mesh->line) < 3) {
fprintf(stderr, "Cannot read greeting from peer\n");
- closesocket(sock);
+ closesocket(mesh->sock);
return 1;
}
// Check if the hash of the key he gave us matches the hash in the URL.
- char *fingerprint = line + 2;
+ char *fingerprint = mesh->line + 2;
char hishash[64];
if(!sha512(fingerprint, strlen(fingerprint), hishash)) {
- fprintf(stderr, "Could not create hash\n%s\n", line + 2);
+ fprintf(stderr, "Could not create hash\n%s\n", mesh->line + 2);
return 1;
}
- if(memcmp(hishash, hash, 18)) {
- fprintf(stderr, "Peer has an invalid key!\n%s\n", line + 2);
+ if(memcmp(hishash, mesh->hash, 18)) {
+ fprintf(stderr, "Peer has an invalid key!\n%s\n", mesh->line + 2);
return 1;
}
return 1;
// Start an SPTPS session
- if(!sptps_start(&sptps, NULL, true, false, key, hiskey, "meshlink invitation", 15, invitation_send, invitation_receive))
+ if(!sptps_start(&mesh->sptps, mesh, true, false, key, hiskey, "meshlink invitation", 15, invitation_send, invitation_receive))
return 1;
// Feed rest of input buffer to SPTPS
- if(!sptps_receive_data(&sptps, buffer, blen))
+ if(!sptps_receive_data(&mesh->sptps, mesh->buffer, mesh->blen))
return 1;
- while((len = recv(sock, line, sizeof line, 0))) {
+ while((len = recv(mesh->sock, mesh->line, sizeof mesh->line, 0))) {
if(len < 0) {
if(errno == EINTR)
continue;
return 1;
}
- if(!sptps_receive_data(&sptps, line, len))
+ if(!sptps_receive_data(&mesh->sptps, mesh->line, len))
return 1;
}
- sptps_stop(&sptps);
+ sptps_stop(&mesh->sptps);
ecdsa_free(hiskey);
ecdsa_free(key);
- closesocket(sock);
+ closesocket(mesh->sock);
- if(!success) {
+ if(!mesh->success) {
fprintf(stderr, "Connection closed by peer, invitation cancelled.\n");
return false;
}
projects / meshlink / blobdiff