X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-daemon%2Fstatic-services.c;h=e402a9853de94b07c70118e340b5d25554718282;hb=298a8cdb7b369d80a1d8bad2bd315d2a38c5a38f;hp=f659371a8d31b6ba8bbf2f926e359b9aedd569a4;hpb=a52bd64a8db2c07bb2309cf2d8b888cc1a47ec56;p=catta

diff --git a/avahi-daemon/static-services.c b/avahi-daemon/static-services.c
index f659371..e402a98 100644
--- a/avahi-daemon/static-services.c
+++ b/avahi-daemon/static-services.c
@@ -35,6 +35,8 @@
 
 #include <avahi-common/llist.h>
 #include <avahi-common/malloc.h>
+#include <avahi-common/alternative.h>
+#include <avahi-common/error.h>
 #include <avahi-core/log.h>
 
 #include "main.h"
@@ -111,7 +113,7 @@ static StaticService *static_service_new(StaticServiceGroup *group) {
 
     s->type = s->host_name = s->domain_name = NULL;
     s->port = 0;
-    s->protocol = AF_UNSPEC;
+    s->protocol = AVAHI_PROTO_UNSPEC;
 
     s->txt_records = NULL;
 
@@ -199,14 +201,15 @@ static void add_static_service_group_to_server(StaticServiceGroup *g) {
         /* This service group is already registered in the server */
         return;
     
-    if (g->chosen_name)
-        avahi_free(g->chosen_name);
-    
-    if (g->replace_wildcards)
-        g->chosen_name = replacestr(g->name, "%h", avahi_server_get_host_name(avahi_server));
-    else
-        g->chosen_name = avahi_strdup(g->name);
+    if (!g->chosen_name) {
+        
+        if (g->replace_wildcards)
+            g->chosen_name = replacestr(g->name, "%h", avahi_server_get_host_name(avahi_server));
+        else
+            g->chosen_name = avahi_strdup(g->name);
 
+    }
+        
     if (!g->entry_group)
         g->entry_group = avahi_s_entry_group_new(avahi_server, entry_group_callback, g);
 
@@ -395,12 +398,12 @@ static void XMLCALL xml_end(void *data, const char *el) {
             int protocol;
             assert(u->service);
 
-            if (strcasecmp (u->buf, "ipv4") == 0) {
-                protocol = AF_INET;
-            } else if (strcasecmp (u->buf, "ipv6") == 0) {
-                protocol = AF_INET6;
-            } else if (strcasecmp (u->buf, "any") == 0) {
-                protocol = AF_UNSPEC;
+            if (u->buf && strcasecmp (u->buf, "ipv4") == 0) {
+                protocol = AVAHI_PROTO_INET;
+            } else if (u->buf && strcasecmp (u->buf, "ipv6") == 0) {
+                protocol = AVAHI_PROTO_INET6;
+            } else if (u->buf && strcasecmp (u->buf, "any") == 0) {
+                protocol = AVAHI_PROTO_UNSPEC;
             } else {
                 avahi_log_error("%s: parse failure: invalid protocol specification \"%s\".", u->group->filename, u->buf);
                 u->failed = 1;
@@ -408,6 +411,7 @@ static void XMLCALL xml_end(void *data, const char *el) {
             }
 
             u->service->protocol = protocol;
+	    u->current_tag = XML_TAG_SERVICE;
             break;
         }