X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-daemon%2Fstatic-services.c;h=cba22c635cccf8068c820ee42a6522ad5de1700b;hb=ecdb90c3de218098b6166718eb2872e0badb9c3c;hp=d4198c44ca9fdccd5357112cde8eb7b2c7590d91;hpb=c08b2340a6a4a2f176672d692a41a75153c35f0e;p=catta diff --git a/avahi-daemon/static-services.c b/avahi-daemon/static-services.c index d4198c4..cba22c6 100644 --- a/avahi-daemon/static-services.c +++ b/avahi-daemon/static-services.c @@ -35,7 +35,10 @@ #include #include +#include +#include #include +#include #include "main.h" #include "static-services.h" @@ -52,6 +55,8 @@ struct StaticService { uint16_t port; int protocol; + AvahiStringList *subtypes; + AvahiStringList *txt_records; AVAHI_LLIST_FIELDS(StaticService, services); @@ -114,6 +119,7 @@ static StaticService *static_service_new(StaticServiceGroup *group) { s->protocol = AVAHI_PROTO_UNSPEC; s->txt_records = NULL; + s->subtypes = NULL; AVAHI_LLIST_PREPEND(StaticService, services, group->services, s); @@ -147,6 +153,7 @@ static void static_service_free(StaticService *s) { avahi_free(s->domain_name); avahi_string_list_free(s->txt_records); + avahi_string_list_free(s->subtypes); avahi_free(s); } @@ -168,26 +175,42 @@ static void static_service_group_free(StaticServiceGroup *g) { avahi_free(g); } -static void entry_group_callback(AvahiServer *s, AvahiSEntryGroup *eg, AvahiEntryGroupState state, void* userdata) { +static void entry_group_callback(AvahiServer *s, AVAHI_GCC_UNUSED AvahiSEntryGroup *eg, AvahiEntryGroupState state, void* userdata) { StaticServiceGroup *g = userdata; assert(s); assert(g); - - if (state == AVAHI_ENTRY_GROUP_COLLISION) { - char *n; - - remove_static_service_group_from_server(g); - n = avahi_alternative_service_name(g->chosen_name); - avahi_free(g->chosen_name); - g->chosen_name = n; + switch (state) { + + case AVAHI_ENTRY_GROUP_COLLISION: { + char *n; + + remove_static_service_group_from_server(g); + + n = avahi_alternative_service_name(g->chosen_name); + avahi_free(g->chosen_name); + g->chosen_name = n; + + avahi_log_notice("Service name conflict for \"%s\" (%s), retrying with \"%s\".", g->name, g->filename, g->chosen_name); + + add_static_service_group_to_server(g); + break; + } + + case AVAHI_ENTRY_GROUP_ESTABLISHED: + avahi_log_info("Service \"%s\" (%s) successfully established.", g->chosen_name, g->filename); + break; - avahi_log_notice("Service name conflict for \"%s\" (%s), retrying with \"%s\".", g->name, g->filename, g->chosen_name); + case AVAHI_ENTRY_GROUP_FAILURE: + avahi_log_warn("Failed to publish service \"%s\" (%s): %s", g->chosen_name, g->filename, avahi_strerror(avahi_server_errno(s))); + remove_static_service_group_from_server(g); + break; - add_static_service_group_to_server(g); - } else if (state == AVAHI_ENTRY_GROUP_ESTABLISHED) - avahi_log_info("Service \"%s\" (%s) successfully established.", g->chosen_name, g->filename); + case AVAHI_ENTRY_GROUP_UNCOMMITED: + case AVAHI_ENTRY_GROUP_REGISTERING: + ; + } } static void add_static_service_group_to_server(StaticServiceGroup *g) { @@ -199,27 +222,30 @@ 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); assert(avahi_s_entry_group_is_empty(g->entry_group)); for (s = g->services; s; s = s->services_next) { + AvahiStringList *i; if (avahi_server_add_service_strlst( avahi_server, g->entry_group, - -1, s->protocol, - g->chosen_name, s->type, - s->domain_name, s->host_name, s->port, + AVAHI_IF_UNSPEC, s->protocol, + 0, + g->chosen_name, s->type, s->domain_name, + s->host_name, s->port, s->txt_records) < 0) { avahi_log_error("Failed to add service '%s' of type '%s', ignoring service group (%s): %s", g->chosen_name, s->type, g->filename, @@ -227,6 +253,22 @@ static void add_static_service_group_to_server(StaticServiceGroup *g) { remove_static_service_group_from_server(g); return; } + + for (i = s->subtypes; i; i = i->next) { + + if (avahi_server_add_service_subtype( + avahi_server, + g->entry_group, + AVAHI_IF_UNSPEC, s->protocol, + 0, + g->chosen_name, s->type, s->domain_name, + (char*) i->text) < 0) { + + avahi_log_error("Failed to add subtype '%s' for service '%s' of type '%s', ignoring subtype (%s): %s", + i->text, g->chosen_name, s->type, g->filename, + avahi_strerror(avahi_server_errno(avahi_server))); + } + } } avahi_s_entry_group_commit(g->entry_group); @@ -245,10 +287,10 @@ typedef enum { XML_TAG_NAME, XML_TAG_SERVICE, XML_TAG_TYPE, + XML_TAG_SUBTYPE, XML_TAG_DOMAIN_NAME, XML_TAG_HOST_NAME, XML_TAG_PORT, - XML_TAG_PROTOCOL, XML_TAG_TXT_RECORD } xml_tag_name; @@ -260,6 +302,10 @@ struct xml_userdata { char *buf; }; +#ifndef XMLCALL +#define XMLCALL +#endif + static void XMLCALL xml_start(void *data, const char *el, const char *attr[]) { struct xml_userdata *u = data; @@ -282,24 +328,51 @@ static void XMLCALL xml_start(void *data, const char *el, const char *attr[]) { u->group->replace_wildcards = strcmp(attr[1], "yes") == 0; else goto invalid_attr; - } - if (attr[2]) - goto invalid_attr; + if (attr[2]) + goto invalid_attr; + } } else if (u->current_tag == XML_TAG_SERVICE_GROUP && strcmp(el, "service") == 0) { - if (attr[0]) - goto invalid_attr; + u->current_tag = XML_TAG_SERVICE; assert(!u->service); u->service = static_service_new(u->group); - u->current_tag = XML_TAG_SERVICE; + if (attr[0]) { + if (strcmp(attr[0], "protocol") == 0) { + AvahiProtocol protocol; + + if (strcmp(attr[1], "ipv4") == 0) { + protocol = AVAHI_PROTO_INET; + } else if (strcmp(attr[1], "ipv6") == 0) { + protocol = AVAHI_PROTO_INET6; + } else if (strcmp(attr[1], "any") == 0) { + protocol = AVAHI_PROTO_UNSPEC; + } else { + avahi_log_error("%s: parse failure: invalid protocol specification \"%s\".", u->group->filename, attr[1]); + u->failed = 1; + return; + } + + u->service->protocol = protocol; + } else + goto invalid_attr; + + if (attr[2]) + goto invalid_attr; + } + } else if (u->current_tag == XML_TAG_SERVICE && strcmp(el, "type") == 0) { if (attr[0]) goto invalid_attr; u->current_tag = XML_TAG_TYPE; + } else if (u->current_tag == XML_TAG_SERVICE && strcmp(el, "subtype") == 0) { + if (attr[0]) + goto invalid_attr; + + u->current_tag = XML_TAG_SUBTYPE; } else if (u->current_tag == XML_TAG_SERVICE && strcmp(el, "domain-name") == 0) { if (attr[0]) goto invalid_attr; @@ -315,11 +388,6 @@ static void XMLCALL xml_start(void *data, const char *el, const char *attr[]) { goto invalid_attr; u->current_tag = XML_TAG_PORT; - } else if (u->current_tag == XML_TAG_SERVICE && strcmp(el, "protocol") == 0) { - if (attr[0]) - goto invalid_attr; - - u->current_tag = XML_TAG_PROTOCOL; } else if (u->current_tag == XML_TAG_SERVICE && strcmp(el, "txt-record") == 0) { if (attr[0]) goto invalid_attr; @@ -338,7 +406,7 @@ invalid_attr: return; } -static void XMLCALL xml_end(void *data, const char *el) { +static void XMLCALL xml_end(void *data, AVAHI_GCC_UNUSED const char *el) { struct xml_userdata *u = data; assert(u); @@ -391,31 +459,18 @@ static void XMLCALL xml_end(void *data, const char *el) { break; } - case XML_TAG_PROTOCOL: { - int protocol; + case XML_TAG_TXT_RECORD: { assert(u->service); - - 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; - return; - } - - u->service->protocol = protocol; - u->current_tag = XML_TAG_SERVICE; + + u->service->txt_records = avahi_string_list_add(u->service->txt_records, u->buf ? u->buf : ""); + u->current_tag = XML_TAG_SERVICE; break; } - case XML_TAG_TXT_RECORD: { + case XML_TAG_SUBTYPE: { assert(u->service); - u->service->txt_records = avahi_string_list_add(u->service->txt_records, u->buf ? u->buf : ""); + u->service->subtypes = avahi_string_list_add(u->service->subtypes, u->buf ? u->buf : ""); u->current_tag = XML_TAG_SERVICE; break; } @@ -481,8 +536,8 @@ static void XMLCALL xml_cdata(void *data, const XML_Char *s, int len) { break; case XML_TAG_PORT: - case XML_TAG_PROTOCOL: case XML_TAG_TXT_RECORD: + case XML_TAG_SUBTYPE: assert(u->service); u->buf = append_cdata(u->buf, s, len); break; @@ -558,7 +613,7 @@ static int static_service_group_load(StaticServiceGroup *g) { } if (!XML_ParseBuffer(parser, n, n == 0)) { - avahi_log_error("XML_ParseBuffer() failed at line %d: %s.\n", XML_GetCurrentLineNumber(parser), XML_ErrorString(XML_GetErrorCode(parser))); + avahi_log_error("XML_ParseBuffer() failed at line %d: %s.\n", (int) XML_GetCurrentLineNumber(parser), XML_ErrorString(XML_GetErrorCode(parser))); goto finish; } @@ -588,7 +643,7 @@ static void load_file(char *n) { if (strcmp(g->filename, n) == 0) return; - avahi_log_info("Loading service file %s", n); + avahi_log_info("Loading service file %s.", n); g = static_service_group_new(n); if (static_service_group_load(g) < 0) { @@ -597,9 +652,10 @@ static void load_file(char *n) { } } -void static_service_load(void) { +void static_service_load(int in_chroot) { StaticServiceGroup *g, *n; glob_t globbuf; + int globret; char **p; for (g = groups; g; g = n) { @@ -626,8 +682,20 @@ void static_service_load(void) { } memset(&globbuf, 0, sizeof(globbuf)); - if (glob(AVAHI_SERVICE_DIR "/*.service", GLOB_ERR, NULL, &globbuf) != 0) - avahi_log_error("Failed to read service directory."); + if ((globret = glob(in_chroot ? "/services/*.service" : AVAHI_SERVICE_DIR "/*.service", GLOB_ERR, NULL, &globbuf)) != 0) + switch (globret) { + case GLOB_NOSPACE: + avahi_log_error("Not enough memory to read service directory."); + break; + + case GLOB_ABORTED: + avahi_log_error("Failed to read %s.", AVAHI_SERVICE_DIR); + break; + + case GLOB_NOMATCH: + avahi_log_info("No service found in %s.", AVAHI_SERVICE_DIR); + break; + } else { for (p = globbuf.gl_pathv; *p; p++) load_file(*p);