X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fresolve-service.c;h=b15af4f25232d826241e22b9d0a91d6d68bdbc0c;hb=cc0a4994f07b61952a77549fffa1711014f936be;hp=8fe9fd26a9d1838e203fdfe88453ab9435e4a00a;hpb=9962a048634c590db23a00db1d01daada779844c;p=catta

diff --git a/avahi-core/resolve-service.c b/avahi-core/resolve-service.c
index 8fe9fd2..b15af4f 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;
@@ -107,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;
@@ -121,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);
@@ -192,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;
@@ -208,7 +208,7 @@ AvahiServiceResolver *avahi_service_resolver_new(AvahiServer *server, gint inter
 
     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;
@@ -220,8 +220,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);