Start of implementation of meshlink_open().

diff --git a/src/meshlink.c b/src/meshlink.c
index aaf6657b4dc31c76282b7668a05649b00d1c24ee..d9da584aadf9b75c6c254eac73317c5cf475225f 100644 (file)
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -20,6 +20,8 @@
 #include "system.h"
 
 #include "meshlink_internal.h"
+#include "protocol.h"
+#include "xalloc.h"
 
 static const char *errstr[] = {
        [MESHLINK_OK] = "No error",
@@ -31,8 +33,85 @@ const char *meshlink_strerror(meshlink_errno_t errno) {
        return errstr[errno];
 }
 
+static meshlink_handle_t *meshlink_setup(meshlink_handle_t *mesh) {
+       return mesh;
+}
+
 meshlink_handle_t *meshlink_open(const char *confbase, const char *name) {
-       return NULL;
+       if(!confbase || !*confbase) {
+               fprintf(stderr, "No confbase given!\n");
+               return NULL;
+       }
+
+       if(!name || !*name) {
+               fprintf(stderr, "No name given!\n");
+               return NULL;
+       }
+
+       if(!check_id(name)) {
+               fprintf(stderr, "Invalid name given!\n");
+               return NULL;
+       }
+
+       meshlink_handle_t *mesh = xzalloc(sizeof *mesh);
+       mesh->confbase = xstrdup(confbase);
+       mesh->name = xstrdup(name);
+
+       char filename[PATH_MAX];
+       snprintf(filename, sizeof filename, "%s" SLASH "meshlink.conf", confbase);
+
+       FILE *f = fopen(filename, "r");
+
+       if(!f && errno == ENOENT)
+               return meshlink_setup(mesh);
+
+       if(!f) {
+               fprintf(stderr, "Could not open %s: %s\n", filename, strerror(errno));
+               return meshlink_close(mesh), NULL;
+       }
+
+       char buf[1024] = "";
+       if(!fgets(buf, sizeof buf, f)) {
+               fprintf(stderr, "Could not read line from %s: %s\n", filename, strerror(errno));
+               fclose(f);
+               return meshlink_close(mesh), NULL;
+       }
+
+       fclose(f);
+
+       size_t len = strlen(buf);
+       if(len && buf[len - 1] == '\n')
+               buf[--len] = 0;
+       if(len && buf[len - 1] == '\r')
+               buf[--len] = 0;
+
+       if(strncmp(buf, "Name = ", 7) || !check_id(buf + 7)) {
+               fprintf(stderr, "Could not read Name from %s\n", filename);
+               return meshlink_close(mesh), NULL;
+       }
+
+       if(strcmp(buf + 7, name)) {
+               fprintf(stderr, "Name in %s is %s, not the same as %s\n", filename, buf + 7, name);
+               free(mesh->name);
+               mesh->name = xstrdup(buf + 7);
+       }
+
+       snprintf(filename, sizeof filename, "%s" SLASH "ed25519_key.priv", mesh->confbase);
+       f = fopen(filename, "r");
+       if(!f) {
+               fprintf(stderr, "Could not open %s: %s\n", filename, strerror(errno));
+               return meshlink_close(mesh), NULL;
+       }
+
+       mesh->self->ecdsa = ecdsa_read_pem_private_key(f);
+       fclose(f);
+
+       if(!mesh->self->ecdsa) {
+               fprintf(stderr, "Could not read keypair!\n");
+               return meshlink_close(mesh), NULL;
+       }
+
+       return mesh;
 }
 
 bool meshlink_start(meshlink_handle_t *mesh) {

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index fcef8e8413fbfa07f2abf5bd2f385163a23b8544..fa1017d065538efe9634d26426aeb8e95609c6b7 100644 (file)
--- a/src/meshlink_internal.h
+++ b/src/meshlink_internal.h
@@ -23,10 +23,6 @@
 #include "system.h"
 
 #include "meshlink.h"
-#include "list.h"
-#include "splay_tree.h"
-
-#define MAXSOCKETS 16
 
 /// A handle for an instance of MeshLink.
 struct meshlink_handle {
@@ -41,7 +37,7 @@ struct meshlink_handle {
        pthread_t thread;
        struct list_t *sockets;
 
-       struct node_t *myself;
+       struct node_t *self;
 
        struct splay_tree_t *config;
        struct splay_tree_t *edges;