X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fresolve-service.c;h=2ad38f89ea26114ae9154d03200784fb8fc7a17c;hb=88a99a094e561b6c87404f4999e61e7b9ed754f6;hp=e854cca8f5fdc6fc0bb797bbf08c071ed5380fff;hpb=5d67f2aefcdb84d2938fdc522d1f906ca6616e3d;p=catta

diff --git a/avahi-core/resolve-service.c b/avahi-core/resolve-service.c
index e854cca..2ad38f8 100644
--- a/avahi-core/resolve-service.c
+++ b/avahi-core/resolve-service.c
@@ -33,10 +33,10 @@ struct AvahiServiceResolver {
     gchar *service_name;
     gchar *service_type;
     gchar *domain_name;
-    guchar address_protocol;
+    AvahiProtocol address_protocol;
 
-    gint interface;
-    guchar protocol;
+    AvahiIfIndex interface;
+    AvahiProtocol protocol;
 
     AvahiRecordBrowser *record_browser_srv;
     AvahiRecordBrowser *record_browser_txt;
@@ -75,9 +75,11 @@ static void finish(AvahiServiceResolver *r, AvahiResolverEvent event) {
         avahi_record_browser_free(r->record_browser_txt);
         r->record_browser_txt = NULL;
     }
-    
-    avahi_time_event_queue_remove(r->server->time_event_queue, r->time_event);
-    r->time_event = NULL;
+
+    if (r->time_event) {
+        avahi_time_event_queue_remove(r->server->time_event_queue, r->time_event);
+        r->time_event = NULL;
+    }
 
     if (event == AVAHI_RESOLVER_TIMEOUT)
         r->callback(r, r->interface, r->protocol, event, r->service_name, r->service_type, r->domain_name, NULL, NULL, 0, NULL, r->userdata);
@@ -92,12 +94,12 @@ static void finish(AvahiServiceResolver *r, AvahiResolverEvent event) {
         
         switch (r->address_record->key->type) {
             case AVAHI_DNS_TYPE_A:
-                a.family = AF_INET;
+                a.family = AVAHI_PROTO_INET;
                 a.data.ipv4 = r->address_record->data.a.address;
                 break;
                 
             case AVAHI_DNS_TYPE_AAAA:
-                a.family = AF_INET6;
+                a.family = AVAHI_PROTO_INET6;
                 a.data.ipv6 = r->address_record->data.aaaa.address;
                 break;
                 
@@ -105,8 +107,8 @@ static void finish(AvahiServiceResolver *r, AvahiResolverEvent event) {
                 g_assert(FALSE);
         }
 
-        snprintf(sn, sizeof(sn), r->service_name);
-        snprintf(st, sizeof(st), r->service_type);
+        g_snprintf(sn, sizeof(sn), r->service_name);
+        g_snprintf(st, sizeof(st), r->service_type);
 
         if ((i = strlen(sn)) > 0 && sn[i-1] == '.')
             sn[i-1] = 0;
@@ -119,7 +121,7 @@ static void finish(AvahiServiceResolver *r, AvahiResolverEvent event) {
     }
 }
 
-static void record_browser_callback(AvahiRecordBrowser*rr, gint interface, guchar protocol, AvahiBrowserEvent event, AvahiRecord *record, gpointer userdata) {
+static void record_browser_callback(AvahiRecordBrowser*rr, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, AvahiRecord *record, gpointer userdata) {
     AvahiServiceResolver *r = userdata;
 
     g_assert(rr);
@@ -132,13 +134,13 @@ static void record_browser_callback(AvahiRecordBrowser*rr, gint interface, gucha
     if (r->interface > 0 && interface != r->interface)
         return;
 
-    if (r->protocol != AF_UNSPEC && protocol != r->protocol)
+    if (r->protocol != AVAHI_PROTO_UNSPEC && protocol != r->protocol)
         return;
     
     if (r->interface <= 0)
         r->interface = interface;
 
-    if (r->protocol == AF_UNSPEC)
+    if (r->protocol == AVAHI_PROTO_UNSPEC)
         r->protocol = protocol;
     
     switch (record->key->type) {
@@ -148,13 +150,13 @@ static void record_browser_callback(AvahiRecordBrowser*rr, gint interface, gucha
 
                 g_assert(!r->record_browser_a && !r->record_browser_aaaa);
                 
-                if (r->address_protocol == AF_INET || r->address_protocol == AF_UNSPEC) {
+                if (r->address_protocol == AVAHI_PROTO_INET || r->address_protocol == AVAHI_PROTO_UNSPEC) {
                     AvahiKey *k = avahi_key_new(r->srv_record->data.srv.name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_A);
                     r->record_browser_a = avahi_record_browser_new(r->server, r->interface, r->protocol, k, record_browser_callback, r);
                     avahi_key_unref(k);
                 } 
                 
-                if (r->address_protocol == AF_INET6 || r->address_protocol == AF_UNSPEC) {
+                if (r->address_protocol == AVAHI_PROTO_INET6 || r->address_protocol == AVAHI_PROTO_UNSPEC) {
                     AvahiKey *k = avahi_key_new(r->srv_record->data.srv.name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_AAAA);
                     r->record_browser_aaaa = avahi_record_browser_new(r->server, r->interface, r->protocol, k, record_browser_callback, r);
                     avahi_key_unref(k);
@@ -190,7 +192,7 @@ static void time_event_callback(AvahiTimeEvent *e, void *userdata) {
     finish(r, AVAHI_RESOLVER_TIMEOUT);
 }
 
-AvahiServiceResolver *avahi_service_resolver_new(AvahiServer *server, gint interface, guchar protocol, const gchar *name, const gchar *type, const gchar *domain, guchar aprotocol, AvahiServiceResolverCallback callback, gpointer userdata) {
+AvahiServiceResolver *avahi_service_resolver_new(AvahiServer *server, AvahiIfIndex interface, AvahiProtocol protocol, const gchar *name, const gchar *type, const gchar *domain, AvahiProtocol aprotocol, AvahiServiceResolverCallback callback, gpointer userdata) {
     AvahiServiceResolver *r;
     AvahiKey *k;
     GTimeVal tv;
@@ -202,11 +204,26 @@ AvahiServiceResolver *avahi_service_resolver_new(AvahiServer *server, gint inter
     g_assert(type);
     g_assert(callback);
 
-    g_assert(aprotocol == AF_UNSPEC || aprotocol == AF_INET || aprotocol == AF_INET6);
+    g_assert(aprotocol == AVAHI_PROTO_UNSPEC || aprotocol == AVAHI_PROTO_INET || aprotocol == AVAHI_PROTO_INET6);
+
+    if (!avahi_valid_service_name(name)) {
+        avahi_server_set_errno(server, AVAHI_ERR_INVALID_SERVICE_NAME);
+        return NULL;
+    }
+
+    if (!avahi_valid_service_type(type)) {
+        avahi_server_set_errno(server, AVAHI_ERR_INVALID_SERVICE_TYPE);
+        return NULL;
+    }
 
+    if (!avahi_valid_domain_name(domain)) {
+        avahi_server_set_errno(server, AVAHI_ERR_INVALID_DOMAIN_NAME);
+        return NULL;
+    }
+    
     r = g_new(AvahiServiceResolver, 1);
     r->server = server;
-    r->service_name = avahi_normalize_name(name);
+    r->service_name = g_strdup(name);
     r->service_type = avahi_normalize_name(type);
     r->domain_name = avahi_normalize_name(domain);
     r->callback = callback;
@@ -218,8 +235,8 @@ AvahiServiceResolver *avahi_service_resolver_new(AvahiServer *server, gint inter
     
     n = t;
     l = sizeof(t);
-    avahi_escape_label((guint8*) name, strlen(name), &n, &l);
-    snprintf(n, l, ".%s%s", r->service_type, r->domain_name);
+    avahi_escape_label((const guint8*) name, strlen(name), &n, &l);
+    g_snprintf(n, l, ".%s.%s", r->service_type, r->domain_name);
 
     avahi_elapse_time(&tv, 1000, 0);
     r->time_event = avahi_time_event_queue_add(server->time_event_queue, &tv, time_event_callback, r);
@@ -232,10 +249,20 @@ AvahiServiceResolver *avahi_service_resolver_new(AvahiServer *server, gint inter
     r->record_browser_srv = avahi_record_browser_new(server, interface, protocol, k, record_browser_callback, r);
     avahi_key_unref(k);
 
+    if (!r->record_browser_srv) {
+        avahi_service_resolver_free(r);
+        return NULL;
+    }
+    
     k = avahi_key_new(t, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_TXT);
     r->record_browser_txt = avahi_record_browser_new(server, interface, protocol, k, record_browser_callback, r);
     avahi_key_unref(k);
-    
+
+    if (!r->record_browser_txt) {
+        avahi_service_resolver_free(r);
+        return NULL;
+    }
+
     return r;
 }
 
@@ -244,6 +271,9 @@ void avahi_service_resolver_free(AvahiServiceResolver *r) {
 
     AVAHI_LLIST_REMOVE(AvahiServiceResolver, resolver, r->server->service_resolvers, r);
 
+    if (r->time_event)
+        avahi_time_event_queue_remove(r->server->time_event_queue, r->time_event);
+    
     if (r->record_browser_srv)
         avahi_record_browser_free(r->record_browser_srv);
     if (r->record_browser_txt)