dclass support within the edge protocol

diff --git a/src/discovery.c b/src/discovery.c
index e196825ac5d378f94359897d384a3f20a0282962..dd35bebdf6a73332e6d5f2e05a7dd219f30b99f0 100644 (file)
--- a/src/discovery.c
+++ b/src/discovery.c
@@ -2,6 +2,7 @@
 #include "meshlink_internal.h"
 #include "discovery.h"
 #include "sockaddr.h"
+#include "logger.h"
 
 #include <pthread.h>
 

diff --git a/src/meshlink.c b/src/meshlink.c
index 0ecab432912b4dc9c384700aea5043ac9160169c..65a82c97f192f65b48fdd6a125c5d7d7c36c42b7 100644 (file)
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -1726,7 +1726,17 @@ static void __attribute__((destructor)) meshlink_exit(void) {
 
 int weight_from_dclass(dclass_t dclass)
 {
-       if(dclass == PORTABLE)
+       switch(dclass)
+       {
+       case BACKBONE:
+               return 1;
+
+       case STATIONARY:
                return 3;
-       return 1;
+
+       case PORTABLE:
+               return 6;
+       }
+
+       return 9;
 }

diff --git a/src/meshlink.h b/src/meshlink.h
index 30c118e7dfa8890a5d6290afa4538e6ab36aebd2..24651836f43424b66cff98d58e58bb44b4a0c385 100644 (file)
--- a/src/meshlink.h
+++ b/src/meshlink.h
@@ -67,8 +67,9 @@ typedef enum {
 
 // Device class
 typedef enum {
-       STATIONARY = 1,
-       PORTABLE = 2
+       BACKBONE = 1,
+       STATIONARY = 2,
+       PORTABLE = 3
 } dclass_t;
 
 /// A variable holding the last encountered error from MeshLink.

diff --git a/src/net_setup.c b/src/net_setup.c
index 190eafa3b53303402b764ef75143c9a0b80c53c4..a7ffa828e8c7bded66ad0556f70a3ffb999aade7 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -276,6 +276,7 @@ bool setup_myself(meshlink_handle_t *mesh) {
        mesh->self = new_node();
        mesh->self->connection = new_connection();
        mesh->self->name = name;
+       mesh->self->dclass = mesh->dclass;
        mesh->self->connection->name = xstrdup(name);
        read_host_config(mesh, mesh->config, name);
 

diff --git a/src/node.h b/src/node.h
index e9bc0538b847ad7550da763050349111af26ec5f..2ece66c5ad542d53d7a382cccf627987a802f38c 100644 (file)
--- a/src/node.h
+++ b/src/node.h
@@ -41,6 +41,7 @@ typedef struct node_status_t {
 typedef struct node_t {
        char *name;                             /* name of this node */
        uint32_t options;                       /* options turned on for this node */
+       dclass_t dclass;
 
        struct meshlink_handle *mesh;           /* The mesh this node belongs to */
 

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index b05b04b1c1317bfe20c1e47b87aef6682b59ecde..349d903282005e2a9f467208c304fd4d5da47f4a 100644 (file)
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -411,6 +411,7 @@ bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
                }
        }
 
+       n->dclass = dclass;
        n->connection = c;
        c->node = n;
        if(!(c->options & options & OPTION_PMTU_DISCOVERY)) {

diff --git a/src/protocol_edge.c b/src/protocol_edge.c
index 5c47f5837a544a1cc833905ef0f85e97a9083b07..0626cda94d66280309725766174a6cc6a6b701e9 100644 (file)
--- a/src/protocol_edge.c
+++ b/src/protocol_edge.c
@@ -39,8 +39,8 @@ bool send_add_edge(meshlink_handle_t *mesh, connection_t *c, const edge_t *e) {
 
        sockaddr2str(&e->address, &address, &port);
 
-       x = send_request(mesh, c, "%d %x %s %s %s %s %x %d", ADD_EDGE, rand(),
-                                        e->from->name, e->to->name, address, port,
+       x = send_request(mesh, c, "%d %x %s %d %s %s %s %d %x %d", ADD_EDGE, rand(),
+                                        e->from->name, e->from->dclass, e->to->name, address, port, e->to->dclass,
                                         e->options, e->weight);
        free(address);
        free(port);
@@ -52,15 +52,17 @@ bool add_edge_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
        edge_t *e;
        node_t *from, *to;
        char from_name[MAX_STRING_SIZE];
+       int from_dclass;
        char to_name[MAX_STRING_SIZE];
        char to_address[MAX_STRING_SIZE];
        char to_port[MAX_STRING_SIZE];
+       int to_dclass;
        sockaddr_t address;
        uint32_t options;
        int weight;
 
-       if(sscanf(request, "%*d %*x "MAX_STRING" "MAX_STRING" "MAX_STRING" "MAX_STRING" %x %d",
-                         from_name, to_name, to_address, to_port, &options, &weight) != 6) {
+       if(sscanf(request, "%*d %*x "MAX_STRING" %d "MAX_STRING" "MAX_STRING" "MAX_STRING" %d %x %d",
+                         from_name, &from_dclass, to_name, to_address, to_port, &to_dclass, &options, &weight) != 6) {
                logger(mesh, MESHLINK_ERROR, "Got bad %s from %s (%s)", "ADD_EDGE", c->name,
                           c->hostname);
                return false;
@@ -85,16 +87,17 @@ bool add_edge_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
        if(!from) {
                from = new_node();
                from->name = xstrdup(from_name);
+               from->dclass = from_dclass;
                node_add(mesh, from);
        }
 
        if(!to) {
                to = new_node();
                to->name = xstrdup(to_name);
+               to->dclass = to_dclass;
                node_add(mesh, to);
        }
 
-
        /* Convert addresses */
 
        address = str2sockaddr(to_address, to_port);