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;
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;
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) {
return false;
}
+ mesh->threadstarted=true;
+
return true;
}
exit_configuration(&mesh->config);
event_loop_exit(&mesh->loop);
+ free(mesh);
+
#ifdef HAVE_MINGW
WSACleanup();
#endif
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) {
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 ( mesh->threadstarted ){
+ goto invalid;
+ }
+
// Connect to the meshlink daemon mentioned in the URL.
struct addrinfo *ai = str2addrinfo(address, port, SOCK_STREAM);
if(!ai)
return false;
}
+ free(b64key);
+
char hisname[4096] = "";
int code, hismajor, hisminor = 0;
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;
}
projects / meshlink / blobdiff