#include "xalloc.h"
#include "ed25519/sha512.h"
+#ifndef MSG_NOSIGNAL
+#define MSG_NOSIGNAL 0
+#endif
//TODO: this can go away completely
const var_t variables[] = {
}
}
- //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);
+ if(!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:
f = fopen(filename, "a");
if(f) {
fprintf(f, "\nAddress = %s\n", hostname);
return NULL;
return val;
}
-static FILE *fopenmask(const char *filename, const char *mode, mode_t perms) {
- mode_t mask = umask(0);
- perms &= ~mask;
- umask(~perms);
- FILE *f = fopen(filename, mode);
-#ifdef HAVE_FCHMOD
- if((perms & 0444) && f)
- fchmod(fileno(f), perms);
-#endif
- umask(mask);
- return f;
-}
static bool try_bind(int port) {
struct addrinfo *ai = NULL;
FILE *fh = fopen(filename, "w");
if(!fh) {
fprintf(stderr, "Could not create file %s: %s\n", filename, strerror(errno));
+ fclose(f);
return false;
}
fclose(f);
}
- // Generate our key and send a copy to the server
- ecdsa_t *key = ecdsa_generate();
- if(!key)
- return false;
-
- char *b64key = ecdsa_get_base64_public_key(key);
+ char *b64key = ecdsa_get_base64_public_key(mesh->self->connection->ecdsa);
if(!b64key)
return false;
- snprintf(filename, sizeof filename, "%s" SLASH "ecdsa_key.priv", mesh->confbase);
- f = fopenmask(filename, "w", 0600);
-
- if(!ecdsa_write_pem_private_key(key, f)) {
- fprintf(stderr, "Error writing private key!\n");
- ecdsa_free(key);
- fclose(f);
- return false;
- }
-
- fclose(f);
-
fprintf(fh, "ECDSAPublicKey = %s\n", b64key);
+ fprintf(fh, "Port = %s\n", mesh->myport);
+
+ fclose(fh);
sptps_send_record(&(mesh->sptps), 1, b64key, strlen(b64key));
free(b64key);
- ecdsa_free(key);
-
- check_port(mesh);
+ free(mesh->self->name);
+ free(mesh->self->connection->name);
+ mesh->self->name = xstrdup(name);
+ mesh->self->connection->name = xstrdup(name);
fprintf(stderr, "Configuration stored in: %s\n", mesh->confbase);
+ load_all_nodes(mesh);
+
return true;
}
-static bool invitation_send(void *handle, uint8_t type, const char *data, size_t len) {
+static bool invitation_send(void *handle, uint8_t type, const void *data, size_t len) {
meshlink_handle_t* mesh = handle;
while(len) {
int result = send(mesh->sock, data, len, 0);
return true;
}
-static bool invitation_receive(void *handle, uint8_t type, const char *msg, uint16_t len) {
+static bool invitation_receive(void *handle, uint8_t type, const void *msg, uint16_t len) {
meshlink_handle_t* mesh = handle;
switch(type) {
case SPTPS_HANDSHAKE:
meshlink_handle_t *mesh = xzalloc(sizeof *mesh);
mesh->confbase = xstrdup(confbase);
mesh->name = xstrdup(name);
+ pthread_mutex_init ( &(mesh->outpacketqueue_mutex), NULL);
event_loop_init(&mesh->loop);
mesh->loop.data = mesh;
if(!read_server_config(mesh))
return meshlink_close(mesh), NULL;
+#ifdef HAVE_MINGW
+ struct WSAData wsa_state;
+ WSAStartup(MAKEWORD(2, 2), &wsa_state);
+#endif
+
// Setup up everything
// TODO: we should not open listening sockets yet
}
void meshlink_stop(meshlink_handle_t *mesh) {
- // TODO: close the listening sockets to signal the main thread to shut down
+ // Shut down the listening sockets to signal the main thread to shut down
+
+ for(int i = 0; i < mesh->listen_sockets; i++) {
+ shutdown(mesh->listen_socket[i].tcp.fd, SHUT_RDWR);
+ shutdown(mesh->listen_socket[i].udp.fd, SHUT_RDWR);
+ }
// Wait for the main thread to finish
exit_configuration(&mesh->config);
event_loop_exit(&mesh->loop);
+
+#ifdef HAVE_MINGW
+ WSACleanup();
+#endif
}
void meshlink_set_receive_cb(meshlink_handle_t *mesh, meshlink_receive_cb_t cb) {
}
bool meshlink_send(meshlink_handle_t *mesh, meshlink_node_t *destination, const void *data, unsigned int len) {
+
+ /* If there is no outgoing list yet, create one. */
+
+ if(!mesh->outpacketqueue)
+ mesh->outpacketqueue = list_alloc(NULL);
+
+ //add packet to the queue
+ outpacketqueue_t *packet_in_queue = xzalloc(sizeof *packet_in_queue);
+ packet_in_queue->destination=destination;
+ packet_in_queue->data=data;
+ packet_in_queue->len=len;
+ pthread_mutex_lock(&(mesh->outpacketqueue_mutex));
+ list_insert_tail(mesh->outpacketqueue,packet_in_queue);
+ pthread_mutex_unlock(&(mesh->outpacketqueue_mutex));
+
+ //notify event loop
+
+}
+
+bool meshlink_send_from_queue (meshlink_handle_t *mesh,outpacketqueue_t* p) {
vpn_packet_t packet;
meshlink_packethdr_t *hdr = (meshlink_packethdr_t *)packet.data;
- if (sizeof(meshlink_packethdr_t) + len > MAXSIZE) {
+ if (sizeof(meshlink_packethdr_t) + p->len > MAXSIZE) {
//log something
return false;
}
packet.probe = false;
memset(hdr, 0, sizeof *hdr);
- memcpy(hdr->destination, destination->name, sizeof hdr->destination);
+ memcpy(hdr->destination, p->destination->name, sizeof hdr->destination);
memcpy(hdr->source, mesh->self->name, sizeof hdr->source);
- packet.len = sizeof *hdr + len;
- memcpy(packet.data + sizeof *hdr, data, len);
+ packet.len = sizeof *hdr + p->len;
+ memcpy(packet.data + sizeof *hdr, p->data, p->len);
mesh->self->in_packets++;
mesh->self->in_bytes += packet.len;
}
size_t meshlink_get_all_nodes(meshlink_handle_t *mesh, meshlink_node_t **nodes, size_t nmemb) {
- return 0;
+ size_t i = 0;
+
+ for splay_each(node_t, n, mesh->nodes) {
+ if(i < nmemb)
+ nodes[i] = (meshlink_node_t *)n;
+ i++;
+ }
+
+ return i;
}
char *meshlink_sign(meshlink_handle_t *mesh, const char *data, size_t len) {
snprintf(filename, sizeof filename, "%s" SLASH "invitations", mesh->confbase);
if(mkdir(filename, 0700) && errno != EEXIST) {
fprintf(stderr, "Could not create directory %s: %s\n", filename, strerror(errno));
- return NULL;
+ return false;
}
// 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 NULL;
+ return false;
}
errno = 0;
if(!f) {
if(errno != ENOENT) {
fprintf(stderr, "Could not read %s: %s\n", filename, strerror(errno));
- return NULL;
+ return false;
}
mesh->invitation_key = ecdsa_generate();
if(!mesh->invitation_key) {
fprintf(stderr, "Could not generate a new key!\n");
- return NULL;
+ return false;
}
f = fopen(filename, "w");
if(!f) {
fprintf(stderr, "Could not write %s: %s\n", filename, strerror(errno));
- return NULL;
+ return false;
}
chmod(filename, 0600);
ecdsa_write_pem_private_key(mesh->invitation_key, f);
return mesh->invitation_key;
}
+bool meshlink_add_address(meshlink_handle_t *mesh, const char *address) {
+ for(const char *p = address; *p; p++) {
+ if(isalnum(*p) || *p == '-' || *p == '.' || *p == ':')
+ continue;
+ fprintf(stderr, "Invalid character in address: %s\n", address);
+ return false;
+ }
+
+ return append_config_file(mesh, mesh->self->name, "Address", address);
+}
+
char *meshlink_invite(meshlink_handle_t *mesh, const char *name) {
// Check validity of the new node's name
if(!check_id(name)) {
return NULL;
}
+ // Get the local address
+ char *address = get_my_hostname(mesh);
+ if(!address) {
+ fprintf(stderr, "No Address known for ourselves!\n");
+ return NULL;
+ }
+
if(!refresh_invitation_key(mesh))
return NULL;
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)
*port++ = 0;
}
- if(!mesh->myport || !*port)
+ if(!*port)
port = "655";
if(!b64decode(slash, mesh->hash, 18) || !b64decode(slash + 24, mesh->cookie, 18))
}
void meshlink_blacklist(meshlink_handle_t *mesh, meshlink_node_t *node) {
+ node_t *n;
+ n = (node_t*)node;
+ n->status.blacklisted=true;
+ fprintf(stderr, "Blacklisted %s.\n",node->name);
+
+ //Make blacklisting persistent in the config file
+ append_config_file(mesh, n->name, "blacklisted", "yes");
+ return;
+
}
static void __attribute__((constructor)) meshlink_init(void) {