X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=inline;f=src%2Fmeshlink.c;h=23fe1dc4198335b5d4fe901482f7ecbf638ae09c;hb=472552e949bea9fedf099491bfaf2925701022da;hp=0195e04571d4df6e4779a0f8e8f8e60e7ce775e4;hpb=132c36964b2538409bbbd0b3d43386d9077a5e07;p=meshlink diff --git a/src/meshlink.c b/src/meshlink.c index 0195e045..23fe1dc4 100644 --- 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 */ @@ -190,9 +190,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 +327,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 +403,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; @@ -715,6 +720,7 @@ static bool meshlink_setup(meshlink_handle_t *mesh) { meshlink_handle_t *meshlink_open(const char *confbase, const char *name) { // Validate arguments provided by the application + bool usingname = false; if(!confbase || !*confbase) { fprintf(stderr, "No confbase given!\n"); @@ -723,17 +729,22 @@ meshlink_handle_t *meshlink_open(const char *confbase, const char *name) { if(!name || !*name) { fprintf(stderr, "No name given!\n"); - return NULL; + //return NULL; } + else { //check name only if there is a name != NULL - if(!check_id(name)) { - fprintf(stderr, "Invalid name given!\n"); - return NULL; + if(!check_id(name)) { + fprintf(stderr, "Invalid name given!\n"); + return NULL; + } else { usingname = true;} } meshlink_handle_t *mesh = xzalloc(sizeof *mesh); mesh->confbase = xstrdup(confbase); - mesh->name = xstrdup(name); + if (usingname) mesh->name = xstrdup(name); + pthread_mutex_init ( &(mesh->outpacketqueue_mutex), NULL); + pthread_mutex_init ( &(mesh->nodes_mutex), NULL); + mesh->threadstarted = false; event_loop_init(&mesh->loop); mesh->loop.data = mesh; @@ -789,6 +800,12 @@ void *meshlink_main_loop(void *arg) { bool meshlink_start(meshlink_handle_t *mesh) { // TODO: open listening sockets first + //Check that a valid name is set + if(!mesh->name ) { + fprintf(stderr, "No name given!\n"); + return false; + } + // Start the main thread if(pthread_create(&mesh->thread, NULL, meshlink_main_loop, mesh) != 0) { @@ -797,6 +814,8 @@ bool meshlink_start(meshlink_handle_t *mesh) { return false; } + mesh->threadstarted=true; + return true; } @@ -823,6 +842,8 @@ void meshlink_close(meshlink_handle_t *mesh) { exit_configuration(&mesh->config); event_loop_exit(&mesh->loop); + free(mesh); + #ifdef HAVE_MINGW WSACleanup(); #endif @@ -842,25 +863,52 @@ void meshlink_set_log_cb(meshlink_handle_t *mesh, meshlink_log_level_t level, me } 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_head(mesh->outpacketqueue,packet_in_queue); + pthread_mutex_unlock(&(mesh->outpacketqueue_mutex)); + + //notify event loop + signal_trigger(&(mesh->loop),&(mesh->datafromapp)); + return true; +} + +void meshlink_send_from_queue(event_loop_t* el,meshlink_handle_t *mesh) { vpn_packet_t packet; meshlink_packethdr_t *hdr = (meshlink_packethdr_t *)packet.data; - if (sizeof(meshlink_packethdr_t) + len > MAXSIZE) { + + outpacketqueue_t* p = list_get_tail(mesh->outpacketqueue); + if (p) + list_delete_tail(mesh->outpacketqueue); + else return ; + + if (sizeof(meshlink_packethdr_t) + p->len > MAXSIZE) { //log something - return false; + return ; } 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; route(mesh, mesh->self, &packet); - return false; + return ; } meshlink_node_t *meshlink_get_node(meshlink_handle_t *mesh, const char *name) { @@ -870,21 +918,37 @@ meshlink_node_t *meshlink_get_node(meshlink_handle_t *mesh, const char *name) { size_t meshlink_get_all_nodes(meshlink_handle_t *mesh, meshlink_node_t **nodes, size_t nmemb) { size_t i = 0; + //lock mesh->nodes + pthread_mutex_lock(&(mesh->nodes_mutex)); + for splay_each(node_t, n, mesh->nodes) { if(i < nmemb) nodes[i] = (meshlink_node_t *)n; i++; } + pthread_mutex_unlock(&(mesh->nodes_mutex)); + 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) { @@ -1041,6 +1105,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); @@ -1088,11 +1154,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); @@ -1124,7 +1194,7 @@ bool meshlink_join(meshlink_handle_t *mesh, const char *invitation) { *port++ = 0; } - if(!*port) + if(!port) port = "655"; if(!b64decode(slash, mesh->hash, 18) || !b64decode(slash + 24, mesh->cookie, 18)) @@ -1137,6 +1207,11 @@ bool meshlink_join(meshlink_handle_t *mesh, const char *invitation) { char *b64key = ecdsa_get_base64_public_key(key); + //Before doing meshlink_join make sure we are not connected to another mesh + if ( mesh->threadstarted ){ + goto invalid; + } + // Connect to the meshlink daemon mentioned in the URL. struct addrinfo *ai = str2addrinfo(address, port, SOCK_STREAM); if(!ai) @@ -1166,6 +1241,8 @@ bool meshlink_join(meshlink_handle_t *mesh, const char *invitation) { return false; } + free(b64key); + char hisname[4096] = ""; int code, hismajor, hisminor = 0; @@ -1227,7 +1304,7 @@ bool meshlink_join(meshlink_handle_t *mesh, const char *invitation) { return true; invalid: - fprintf(stderr, "Invalid invitation URL.\n"); + fprintf(stderr, "Invalid invitation URL or you are already connected to a Mesh ?\n"); return false; }