X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink.c;h=6e2ca709b28679163d550d6890459904ed41d4a4;hb=2e606e5823d06aece9a0d4719e07ce3b28ebeadc;hp=33af6c36272a4c05aac9c1f1cfab87c0f5f5ccf4;hpb=cf5a9d0ff6ef59cd130a865ce1be44b4e8b8471a;p=meshlink diff --git a/src/meshlink.c b/src/meshlink.c index 33af6c36..6e2ca709 100644 --- a/src/meshlink.c +++ b/src/meshlink.c @@ -47,6 +47,8 @@ typedef struct { #define MSG_NOSIGNAL 0 #endif +static pthread_mutex_t global_mutex; + __thread meshlink_errno_t meshlink_errno; //TODO: this can go away completely @@ -350,12 +352,7 @@ static bool try_bind(int port) { } static int check_port(meshlink_handle_t *mesh) { - if(try_bind(655)) - return 655; - - fprintf(stderr, "Warning: could not bind to port 655.\n"); - - for(int i = 0; i < 100; i++) { + for(int i = 0; i < 1000; i++) { int port = 0x1000 + (rand() & 0x7fff); if(try_bind(port)) { char filename[PATH_MAX]; @@ -368,7 +365,6 @@ static int check_port(meshlink_handle_t *mesh) { fprintf(f, "Port = %d\n", port); fclose(f); - fprintf(stderr, "MeshLink will instead listen on port %d.\n", port); return port; } } @@ -744,6 +740,11 @@ static bool meshlink_setup(meshlink_handle_t *mesh) { } meshlink_handle_t *meshlink_open(const char *confbase, const char *name, const char* appname) { + return meshlink_open_with_size(confbase, name, appname, sizeof(meshlink_handle_t)); +} + +meshlink_handle_t *meshlink_open_with_size(const char *confbase, const char *name, const char* appname, size_t size) { + // Validate arguments provided by the application bool usingname = false; @@ -772,11 +773,10 @@ meshlink_handle_t *meshlink_open(const char *confbase, const char *name, const c } else { usingname = true;} } - meshlink_handle_t *mesh = xzalloc(sizeof *mesh); + meshlink_handle_t *mesh = xzalloc(size); mesh->confbase = xstrdup(confbase); mesh->appname = xstrdup(appname); 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); @@ -837,12 +837,17 @@ static void *meshlink_main_loop(void *arg) { try_outgoing_connections(mesh); + fprintf(stderr, "Starting main_loop...\n"); main_loop(mesh); + fprintf(stderr, "main_loop returned.\n"); return NULL; } bool meshlink_start(meshlink_handle_t *mesh) { + + fprintf(stderr, "meshlink_start called\n"); + if(!mesh) { meshlink_errno = MESHLINK_EINVAL; return false; @@ -868,14 +873,15 @@ bool meshlink_start(meshlink_handle_t *mesh) { mesh->threadstarted=true; - // Start discovery - if(!discovery_start(mesh)) - return false; + discovery_start(mesh); return true; } void meshlink_stop(meshlink_handle_t *mesh) { + + fprintf(stderr, "meshlink_stop called\n"); + if(!mesh) { meshlink_errno = MESHLINK_EINVAL; return; @@ -884,16 +890,25 @@ void meshlink_stop(meshlink_handle_t *mesh) { // Stop discovery discovery_stop(mesh); - // Shut down the listening sockets to signal the main thread to shut down + // Shut down a listening socket 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); - } + listen_socket_t *s = &mesh->listen_socket[0]; + shutdown(s->tcp.fd, SHUT_RDWR); // Wait for the main thread to finish pthread_join(mesh->thread, NULL); + mesh->threadstarted = false; + + // Fix the socket + + closesocket(s->tcp.fd); + io_del(&mesh->loop, &s->tcp); + s->tcp.fd = setup_listen_socket(&s->sa); + if(s->tcp.fd < 0) + logger(DEBUG_ALWAYS, LOG_ERR, "Could not repair listenen socket!"); + else + io_add(&mesh->loop, &s->tcp, handle_new_meta_connection, s, s->tcp.fd, IO_READ); } void meshlink_close(meshlink_handle_t *mesh) { @@ -968,19 +983,15 @@ bool meshlink_send(meshlink_handle_t *mesh, meshlink_node_t *destination, const return false; } - /* 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)); + if(!meshlink_queue_push(&mesh->outpacketqueue, packet_in_queue)) { + free(packet_in_queue); + return false; + } //notify event loop signal_trigger(&(mesh->loop),&(mesh->datafromapp)); @@ -991,10 +1002,9 @@ 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; - outpacketqueue_t* p = list_get_tail(mesh->outpacketqueue); - if (p) - list_delete_tail(mesh->outpacketqueue); - else return ; + outpacketqueue_t* p = meshlink_queue_pop(&mesh->outpacketqueue); + if(!p) + return; if (sizeof(meshlink_packethdr_t) + p->len > MAXSIZE) { //log something @@ -1403,7 +1413,7 @@ bool meshlink_join(meshlink_handle_t *mesh, const char *invitation) { } if(!port) - port = "655"; + goto invalid; if(!b64decode(slash, mesh->hash, 18) || !b64decode(slash + 24, mesh->cookie, 18)) goto invalid; @@ -1667,40 +1677,21 @@ void meshlink_whitelist(meshlink_handle_t *mesh, meshlink_node_t *node) { /* Hint that a hostname may be found at an address * See header file for detailed comment. */ -extern void meshlink_hint_address(meshlink_handle_t *mesh, meshlink_node_t *node, struct sockaddr *addr) { +extern void meshlink_hint_address(meshlink_handle_t *mesh, meshlink_node_t *node, const struct sockaddr *addr) { if(!mesh || !node || !addr) return; - char *addr_str = malloc(MAX_ADDRESS_LENGTH*sizeof(char)); - memset(addr_str, 0, MAX_ADDRESS_LENGTH*sizeof(char)); + char *host = NULL, *port = NULL, *str = NULL; + sockaddr2str((const sockaddr_t *)addr, &host, &port); - char *port_str = malloc(MAX_PORT_LENGTH*sizeof(char)); - memset(port_str, 0, MAX_PORT_LENGTH*sizeof(char)); - - // extra byte for a space, and one to make sure string is null-terminated - int full_addr_len = MAX_ADDRESS_LENGTH + MAX_PORT_LENGTH + 2; - - char *full_addr_str = malloc(full_addr_len*sizeof(char)); - memset(full_addr_str, 0, full_addr_len*sizeof(char)); - - // get address and port number - if(!get_ip_str(addr, addr_str, MAX_ADDRESS_LENGTH)) - goto fail; - if(!get_port_str(addr, port_str, MAX_ADDRESS_LENGTH)) - goto fail; - - // append_config_file expects an address, a space, and then a port number - strcat(full_addr_str, addr_str); - strcat(full_addr_str, " "); - strcat(full_addr_str, port_str); - - append_config_file(mesh, node->name, "Address", full_addr_str); + if(host && port) { + xasprintf(&str, "%s %s", host, port); + append_config_file(mesh, node->name, "Address", str); + } -fail: -done: - free(addr_str); - free(port_str); - free(full_addr_str); + free(str); + free(host); + free(port); // @TODO do we want to fire off a connection attempt right away? }