Merge branch 'roles' into everbase

diff --git a/src/discovery.c b/src/discovery.c
index 3c26705efeeeadbe2394a4859a7ccd0480d7c808..cf1dd5e214fb19c34271fa9af540b4edb9331ebf 100644 (file)
--- a/src/discovery.c
+++ b/src/discovery.c
@@ -536,6 +536,13 @@ void discovery_stop(meshlink_handle_t *mesh)
         mesh->avahi_browser = NULL;
     }
 
+    if(mesh->avahi_group)
+    {
+        avahi_s_entry_group_reset(mesh->avahi_group);
+        avahi_s_entry_group_free(mesh->avahi_group);
+        mesh->avahi_group = NULL;
+    }
+
     if(mesh->avahi_server != NULL)
     {
         avahi_server_free(mesh->avahi_server);

diff --git a/src/protocol_edge.c b/src/protocol_edge.c
index 1baa038754c7ebdade678dad92c15a5501b1dbd1..5ab15863c5e2c0d7f9f2751fad2327cef4c11787 100644 (file)
--- a/src/protocol_edge.c
+++ b/src/protocol_edge.c
@@ -87,17 +87,19 @@ 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);
        }
 
+       from->dclass = from_dclass;
+
        if(!to) {
                to = new_node();
                to->name = xstrdup(to_name);
-               to->dclass = to_dclass;
                node_add(mesh, to);
        }
 
+       to->dclass = to_dclass;
+
        /* Convert addresses */
 
        address = str2sockaddr(to_address, to_port);