X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fdiscovery.c;h=7e3fca5b49b920c8ba2da3bc709edb7ad9bc05e4;hb=733ef19ab996933c361f5b4f65fd768148a2d07b;hp=1f163cf682a41e596a8d7eb8a3a414538f4de0cb;hpb=130b8c0b637619beaf65a9e00618c51f383451e8;p=meshlink

diff --git a/src/discovery.c b/src/discovery.c
index 1f163cf6..7e3fca5b 100644
--- a/src/discovery.c
+++ b/src/discovery.c
@@ -258,53 +258,63 @@ static void discovery_resolve_callback(AvahiSServiceResolver *resolver, AvahiIfI
 
                 if(node_name_li != NULL && node_fp_li != NULL)
                 {
-                    char *node_name = avahi_string_list_get_text(node_name_li) + strlen(MESHLINK_MDNS_NAME_KEY) + 1;
-                    char *node_fp = avahi_string_list_get_text(node_fp_li) + strlen(MESHLINK_MDNS_FINGERPRINT_KEY) + 1;
+                    char *node_name = (char*)avahi_string_list_get_text(node_name_li) + strlen(MESHLINK_MDNS_NAME_KEY);
+                    char *node_fp = (char*)avahi_string_list_get_text(node_fp_li) + strlen(MESHLINK_MDNS_FINGERPRINT_KEY);
 
-                    meshlink_node_t *node = meshlink_get_node(mesh, node_name);
-
-                    if(node != NULL)
+                    if(node_name[0] == '=' && node_fp[0] == '=')
                     {
-                        fprintf(stderr, "Node %s is part of the mesh network.\n", node->name);
+                        node_name += 1;
+                        node_fp += 1;
 
-                        sockaddr_t naddress;
-                        memset(&naddress, 0, sizeof(naddress));
+                        meshlink_node_t *node = meshlink_get_node(mesh, node_name);
 
-                        switch(address->proto)
+                        if(node != NULL)
                         {
-                            case AVAHI_PROTO_INET:
-                                {
-                                    naddress.in.sin_family = AF_INET;
-                                    naddress.in.sin_port = port;
-                                    naddress.in.sin_addr.s_addr = address->data.ipv4.address;
-                                }
-                                break;
-
-                            case AVAHI_PROTO_INET6:
-                                {
-                                    naddress.in6.sin6_family = AF_INET6;
-                                    naddress.in6.sin6_port = port;
-                                    memcpy(naddress.in6.sin6_addr.s6_addr, address->data.ipv6.address, sizeof(naddress.in6.sin6_addr.s6_addr));
-                                }
-                                break;
-
-                            default:
-                                naddress.unknown.family = AF_UNKNOWN;
-                                break;
-                        }
-
-                        if(naddress.unknown.family != AF_UNKNOWN)
-                        {
-                            meshlink_hint_address(mesh, (meshlink_node_t *)node, (struct sockaddr*)&naddress);
+                            fprintf(stderr, "Node %s is part of the mesh network.\n", node->name);
+
+                            sockaddr_t naddress;
+                            memset(&naddress, 0, sizeof(naddress));
+
+                            switch(address->proto)
+                            {
+                                case AVAHI_PROTO_INET:
+                                    {
+                                        naddress.in.sin_family = AF_INET;
+                                        naddress.in.sin_port = port;
+                                        naddress.in.sin_addr.s_addr = address->data.ipv4.address;
+                                    }
+                                    break;
+
+                                case AVAHI_PROTO_INET6:
+                                    {
+                                        naddress.in6.sin6_family = AF_INET6;
+                                        naddress.in6.sin6_port = port;
+                                        memcpy(naddress.in6.sin6_addr.s6_addr, address->data.ipv6.address, sizeof(naddress.in6.sin6_addr.s6_addr));
+                                    }
+                                    break;
+
+                                default:
+                                    naddress.unknown.family = AF_UNKNOWN;
+                                    break;
+                            }
+
+                            if(naddress.unknown.family != AF_UNKNOWN)
+                            {
+                                meshlink_hint_address(mesh, (meshlink_node_t *)node, (struct sockaddr*)&naddress);
+                            }
+                            else
+                            {
+                                fprintf(stderr, "Could not resolve node %s to a known address family type.\n", node->name);
+                            }
                         }
                         else
                         {
-                            fprintf(stderr, "Could not resolve node %s to a known address family type.\n", node->name);
+                            fprintf(stderr, "Node %s is not part of the mesh network.\n", node_name);
                         }
                     }
                     else
                     {
-                        fprintf(stderr, "Node %s is not part of the mesh network.\n", node_name);
+                        fprintf(stderr, "TXT records invalid.\n");
                     }
                 }
                 else
@@ -391,6 +401,8 @@ static void *discovery_loop(void *userdata)
 
 bool discovery_start(meshlink_handle_t *mesh)
 {
+    fprintf(stderr, "discovery_start called\n");
+
     // asserts
     assert(mesh != NULL);
     assert(mesh->avahi_poll == NULL);
@@ -498,30 +510,46 @@ fail:
 
 void discovery_stop(meshlink_handle_t *mesh)
 {
+    fprintf(stderr, "discovery_stop called\n");
+
     // asserts
     assert(mesh != NULL);
-    assert(mesh->avahi_poll != NULL);
-    assert(mesh->avahi_server != NULL);
-    assert(mesh->avahi_browser != NULL);
-    assert(mesh->discovery_threadstarted == true);
-    assert(mesh->avahi_servicetype != NULL);
 
-	// Shut down 
-	avahi_simple_poll_quit(mesh->avahi_poll);
+	// Shut down
+    if(mesh->avahi_poll)
+    {
+        avahi_simple_poll_quit(mesh->avahi_poll);
+    }
 
 	// Wait for the discovery thread to finish
-	pthread_join(mesh->discovery_thread, NULL);
+    if(mesh->discovery_threadstarted == true)
+    {
+        pthread_join(mesh->discovery_thread, NULL);
+        mesh->discovery_threadstarted = false;
+    }
 
 	// Clean up resources
-    avahi_s_service_browser_free(mesh->avahi_browser);
-    mesh->avahi_browser = NULL;
+    if(mesh->avahi_browser != NULL)
+    {
+        avahi_s_service_browser_free(mesh->avahi_browser);
+        mesh->avahi_browser = NULL;
+    }
 
-    avahi_server_free(mesh->avahi_server);
-    mesh->avahi_server = NULL;
+    if(mesh->avahi_server != NULL)
+    {
+        avahi_server_free(mesh->avahi_server);
+        mesh->avahi_server = NULL;
+    }
 
-    avahi_simple_poll_free(mesh->avahi_poll);
-    mesh->avahi_poll = NULL;
+    if(mesh->avahi_poll != NULL)
+    {
+        avahi_simple_poll_free(mesh->avahi_poll);
+        mesh->avahi_poll = NULL;
+    }
 
-    free(mesh->avahi_servicetype);
-    mesh->avahi_servicetype = NULL;
+    if(mesh->avahi_servicetype != NULL)
+    {
+        free(mesh->avahi_servicetype);
+        mesh->avahi_servicetype = NULL;
+    }
 }