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 */
#define MSG_NOSIGNAL 0
#endif
+__thread meshlink_errno_t meshlink_errno;
+
//TODO: this can go away completely
const var_t variables[] = {
/* Server configuration */
// 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);
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;
}
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;
free(mesh->self->name);
free(mesh->self->connection->name);
mesh->self->name = xstrdup(name);
- mesh->self->connection->name = xstrdup(name);
+ mesh->self->connection->name = name;
fprintf(stderr, "Configuration stored in: %s\n", mesh->confbase);
[MESHLINK_ENOENT] = "No such node",
};
-const char *meshlink_strerror(meshlink_errno_t errno) {
- return errstr[errno];
+const char *meshlink_strerror(meshlink_errno_t err) {
+ if(err < 0 || err >= sizeof errstr / sizeof *errstr)
+ return "Invalid error code";
+ return errstr[err];
}
static bool ecdsa_keygen(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");
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;
return mesh;
}
-void *meshlink_main_loop(void *arg) {
+static void *meshlink_main_loop(void *arg) {
meshlink_handle_t *mesh = arg;
try_outgoing_connections(mesh);
}
bool meshlink_start(meshlink_handle_t *mesh) {
+ if(!mesh)
+ return false;
+
// 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) {
return false;
}
+ mesh->threadstarted=true;
+
return true;
}
void meshlink_stop(meshlink_handle_t *mesh) {
+ if(!mesh)
+ return;
+
// Shut down the listening sockets to signal the main thread to shut down
for(int i = 0; i < mesh->listen_sockets; i++) {
}
void meshlink_close(meshlink_handle_t *mesh) {
+ if(!mesh || !mesh->confbase)
+ return;
+
// Close and free all resources used.
close_network_connections(mesh);
event_loop_exit(&mesh->loop);
#ifdef HAVE_MINGW
- WSACleanup();
+ if(mesh->confbase)
+ WSACleanup();
#endif
+
+ ecdsa_free(mesh->invitation_key);
+
+ free(mesh->name);
+ free(mesh->confbase);
+
+ memset(mesh, 0, sizeof *mesh);
+
+ free(mesh);
}
void meshlink_set_receive_cb(meshlink_handle_t *mesh, meshlink_receive_cb_t cb) {
+ if(!mesh)
+ return;
mesh->receive_cb = cb;
}
void meshlink_set_node_status_cb(meshlink_handle_t *mesh, meshlink_node_status_cb_t cb) {
+ if(!mesh)
+ return;
mesh->node_status_cb = cb;
}
void meshlink_set_log_cb(meshlink_handle_t *mesh, meshlink_log_level_t level, meshlink_log_cb_t cb) {
+ if(!mesh)
+ return;
mesh->log_cb = cb;
mesh->log_level = level;
}
bool meshlink_send(meshlink_handle_t *mesh, meshlink_node_t *destination, const void *data, unsigned int len) {
+ if(!mesh || !destination)
+ return false;
+ if(!len)
+ return true;
+ if(!data)
+ return false;
/* If there is no outgoing list yet, create one. */
}
meshlink_node_t *meshlink_get_node(meshlink_handle_t *mesh, const char *name) {
+ if(!mesh || !name)
+ return NULL;
return (meshlink_node_t *)lookup_node(mesh, (char *)name); // TODO: make lookup_node() use const
}
-size_t meshlink_get_all_nodes(meshlink_handle_t *mesh, meshlink_node_t **nodes, size_t nmemb) {
+ssize_t meshlink_get_all_nodes(meshlink_handle_t *mesh, meshlink_node_t **nodes, size_t nmemb) {
+ if(!mesh || (nmemb && !nodes))
+ return -1;
+
size_t i = 0;
//lock mesh->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(!mesh || !data || !len || !signature || !siglen)
+ return false;
+ 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(!mesh || !data || !len || !signature)
+ return false;
+ 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) {
}
bool meshlink_add_address(meshlink_handle_t *mesh, const char *address) {
+ if(!mesh || !address)
+ return false;
+
for(const char *p = address; *p; p++) {
if(isalnum(*p) || *p == '-' || *p == '.' || *p == ':')
continue;
}
char *meshlink_invite(meshlink_handle_t *mesh, const char *name) {
+ if(!mesh)
+ return false;
+
// Check validity of the new node's name
if(!check_id(name)) {
fprintf(stderr, "Invalid name for node.\n");
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);
// 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);
char *b64key = ecdsa_get_base64_public_key(key);
//Before doing meshlink_join make sure we are not connected to another mesh
- if ( pthread_kill(mesh->thread,0) == 0){
- printf("HELLO\n");
+ if ( mesh->threadstarted ){
goto invalid;
}
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));
+ freeaddrinfo(ai);
return false;
}
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(mesh->sock);
+ freeaddrinfo(ai);
return false;
}
+ freeaddrinfo(ai);
+
fprintf(stderr, "Connected to %s port %s...\n", address, port);
// Tell him we have an invitation, and give him our throw-away key.
return false;
}
+ free(b64key);
+
char hisname[4096] = "";
int code, hismajor, hisminor = 0;
}
char *meshlink_export(meshlink_handle_t *mesh) {
+ if(!mesh)
+ return NULL;
+
char filename[PATH_MAX];
snprintf(filename, sizeof filename, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, mesh->self->name);
FILE *f = fopen(filename, "r");
}
bool meshlink_import(meshlink_handle_t *mesh, const char *data) {
+ if(!mesh || !data)
+ return false;
+
if(strncmp(data, "Name = ", 7)) {
fprintf(stderr, "Invalid data\n");
return false;
}
void meshlink_blacklist(meshlink_handle_t *mesh, meshlink_node_t *node) {
- node_t *n;
- n = (node_t*)node;
- n->status.blacklisted=true;
+ if(!mesh || !node)
+ return;
+
+ 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;
+ return;
}
static void __attribute__((constructor)) meshlink_init(void) {