X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-daemon%2Fstatic-services.c;h=4c3491f025fdf7b9436328f632ca48753144e22d;hb=ca3addf6ae9aa830ccb45fe69ab9b9608d42b51c;hp=5eba8b2059a8f2461e13a75be9ba91b8eaa65a9e;hpb=58dbdd3113ff75b7262ac2e7a8474550a2dacfd3;p=catta diff --git a/avahi-daemon/static-services.c b/avahi-daemon/static-services.c index 5eba8b2..4c3491f 100644 --- a/avahi-daemon/static-services.c +++ b/avahi-daemon/static-services.c @@ -1,18 +1,16 @@ -/* $Id$ */ - /*** This file is part of avahi. - + avahi is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. - + avahi is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - + You should have received a copy of the GNU Lesser General Public License along with avahi; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 @@ -30,13 +28,21 @@ #include #include #include +#include +#ifdef USE_EXPAT_H #include +#endif /* USE_EXPAT_H */ + +#ifdef USE_BSDXML_H +#include +#endif /* USE_BSDXML_H */ #include #include #include #include +#include #include #include @@ -48,7 +54,7 @@ typedef struct StaticServiceGroup StaticServiceGroup; struct StaticService { StaticServiceGroup *group; - + char *type; char *domain_name; char *host_name; @@ -56,9 +62,9 @@ struct StaticService { int protocol; AvahiStringList *subtypes; - + AvahiStringList *txt_records; - + AVAHI_LLIST_FIELDS(StaticService, services); }; @@ -109,7 +115,7 @@ static void remove_static_service_group_from_server(StaticServiceGroup *g); static StaticService *static_service_new(StaticServiceGroup *group) { StaticService *s; - + assert(group); s = avahi_new(StaticService, 1); s->group = group; @@ -145,7 +151,7 @@ static StaticServiceGroup *static_service_group_new(char *filename) { static void static_service_free(StaticService *s) { assert(s); - + AVAHI_LLIST_REMOVE(StaticService, services, s->group->services, s); avahi_free(s->type); @@ -154,7 +160,7 @@ static void static_service_free(StaticService *s) { avahi_string_list_free(s->txt_records); avahi_string_list_free(s->subtypes); - + avahi_free(s); } @@ -175,34 +181,34 @@ 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); 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: + + case AVAHI_ENTRY_GROUP_ESTABLISHED: avahi_log_info("Service \"%s\" (%s) successfully established.", g->chosen_name, g->filename); break; - case AVAHI_ENTRY_GROUP_FAILURE: + 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; @@ -221,21 +227,29 @@ static void add_static_service_group_to_server(StaticServiceGroup *g) { if (g->entry_group && !avahi_s_entry_group_is_empty(g->entry_group)) /* This service group is already registered in the server */ return; - - if (!g->chosen_name) { - - if (g->replace_wildcards) - g->chosen_name = replacestr(g->name, "%h", avahi_server_get_host_name(avahi_server)); - else + + if (!g->chosen_name || (g->replace_wildcards && strstr(g->name, "%h"))) { + + avahi_free(g->chosen_name); + + if (g->replace_wildcards) { + char label[AVAHI_LABEL_MAX]; + const char *p; + + p = avahi_server_get_host_name(avahi_server); + avahi_unescape_label(&p, label, sizeof(label)); + + g->chosen_name = replacestr(g->name, "%h", label); + } 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; @@ -243,7 +257,7 @@ static void add_static_service_group_to_server(StaticServiceGroup *g) { avahi_server, g->entry_group, AVAHI_IF_UNSPEC, s->protocol, - 0, + 0, g->chosen_name, s->type, s->domain_name, s->host_name, s->port, s->txt_records) < 0) { @@ -263,7 +277,7 @@ static void add_static_service_group_to_server(StaticServiceGroup *g) { 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))); @@ -302,9 +316,13 @@ 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; - + assert(u); if (u->failed) @@ -320,7 +338,7 @@ static void XMLCALL xml_start(void *data, const char *el, const char *attr[]) { u->current_tag = XML_TAG_NAME; if (attr[0]) { - if (strcmp(attr[0], "replace-wildcards") == 0) + if (strcmp(attr[0], "replace-wildcards") == 0) u->group->replace_wildcards = strcmp(attr[1], "yes") == 0; else goto invalid_attr; @@ -328,7 +346,7 @@ static void XMLCALL xml_start(void *data, const char *el, const char *attr[]) { if (attr[2]) goto invalid_attr; } - + } else if (u->current_tag == XML_TAG_SERVICE_GROUP && strcmp(el, "service") == 0) { u->current_tag = XML_TAG_SERVICE; @@ -338,7 +356,7 @@ static void XMLCALL xml_start(void *data, const char *el, const char *attr[]) { 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) { @@ -372,22 +390,22 @@ static void XMLCALL xml_start(void *data, const char *el, const char *attr[]) { } else if (u->current_tag == XML_TAG_SERVICE && strcmp(el, "domain-name") == 0) { if (attr[0]) goto invalid_attr; - + u->current_tag = XML_TAG_DOMAIN_NAME; } else if (u->current_tag == XML_TAG_SERVICE && strcmp(el, "host-name") == 0) { if (attr[0]) goto invalid_attr; - + u->current_tag = XML_TAG_HOST_NAME; } else if (u->current_tag == XML_TAG_SERVICE && strcmp(el, "port") == 0) { if (attr[0]) goto invalid_attr; - + u->current_tag = XML_TAG_PORT; } else if (u->current_tag == XML_TAG_SERVICE && strcmp(el, "txt-record") == 0) { if (attr[0]) goto invalid_attr; - + u->current_tag = XML_TAG_TXT_RECORD; } else { avahi_log_error("%s: parse failure: didn't expect element <%s>.", u->group->filename, el); @@ -401,14 +419,14 @@ invalid_attr: u->failed = 1; 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); if (u->failed) return; - + switch (u->current_tag) { case XML_TAG_SERVICE_GROUP: @@ -417,7 +435,7 @@ static void XMLCALL xml_end(void *data, const char *el) { u->failed = 1; return; } - + u->current_tag = XML_TAG_INVALID; break; @@ -428,7 +446,7 @@ static void XMLCALL xml_end(void *data, const char *el) { u->failed = 1; return; } - + u->service = NULL; u->current_tag = XML_TAG_SERVICE_GROUP; break; @@ -440,7 +458,7 @@ static void XMLCALL xml_end(void *data, const char *el) { case XML_TAG_PORT: { int p; assert(u->service); - + p = u->buf ? atoi(u->buf) : 0; if (p < 0 || p > 0xFFFF) { @@ -457,7 +475,7 @@ static void XMLCALL xml_end(void *data, const char *el) { case XML_TAG_TXT_RECORD: { assert(u->service); - + u->service->txt_records = avahi_string_list_add(u->service->txt_records, u->buf ? u->buf : ""); u->current_tag = XML_TAG_SERVICE; break; @@ -465,12 +483,12 @@ static void XMLCALL xml_end(void *data, const char *el) { case XML_TAG_SUBTYPE: { assert(u->service); - + u->service->subtypes = avahi_string_list_add(u->service->subtypes, u->buf ? u->buf : ""); u->current_tag = XML_TAG_SERVICE; break; } - + case XML_TAG_TYPE: case XML_TAG_DOMAIN_NAME: case XML_TAG_HOST_NAME: @@ -487,11 +505,11 @@ static void XMLCALL xml_end(void *data, const char *el) { static char *append_cdata(char *t, const char *n, int length) { char *r, *k; - + if (!length) return t; - + k = avahi_strndup(n, length); if (t) { @@ -500,7 +518,7 @@ static char *append_cdata(char *t, const char *n, int length) { avahi_free(t); } else r = k; - + return r; } @@ -515,7 +533,7 @@ static void XMLCALL xml_cdata(void *data, const XML_Char *s, int len) { case XML_TAG_NAME: u->group->name = append_cdata(u->group->name, s, len); break; - + case XML_TAG_TYPE: assert(u->service); u->service->type = append_cdata(u->service->type, s, len); @@ -570,7 +588,7 @@ static int static_service_group_load(StaticServiceGroup *g) { avahi_free(g->chosen_name); g->name = g->chosen_name = NULL; g->replace_wildcards = 0; - + if (!(parser = XML_ParserCreate(NULL))) { avahi_log_error("XML_ParserCreate() failed."); goto finish; @@ -587,7 +605,7 @@ static int static_service_group_load(StaticServiceGroup *g) { } g->mtime = st.st_mtime; - + XML_SetUserData(parser, &u); XML_SetElementHandler(parser, xml_start, xml_end); @@ -609,7 +627,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; } @@ -640,7 +658,7 @@ static void load_file(char *n) { return; avahi_log_info("Loading service file %s.", n); - + g = static_service_group_new(n); if (static_service_group_load(g) < 0) { avahi_log_error("Failed to load service group file %s, ignoring.", g->filename); @@ -648,9 +666,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) { @@ -664,11 +683,11 @@ void static_service_load(void) { avahi_log_info("Service group file %s vanished, removing services.", g->filename); else avahi_log_warn("Failed to stat() file %s, ignoring: %s", g->filename, strerror(errno)); - + static_service_group_free(g); } else if (st.st_mtime != g->mtime) { avahi_log_info("Service group file %s changed, reloading.", g->filename); - + if (static_service_group_load(g) < 0) { avahi_log_warn("Failed to load service group file %s, removing service.", g->filename); static_service_group_free(g); @@ -677,18 +696,35 @@ 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) { +#ifdef GLOB_NOSPACE + case GLOB_NOSPACE: + avahi_log_error("Not enough memory to read service directory "AVAHI_SERVICE_DIR"."); + break; +#endif +#ifdef GLOB_NOMATCH + case GLOB_NOMATCH: + avahi_log_info("No service file found in "AVAHI_SERVICE_DIR"."); + break; +#endif + default: + avahi_log_error("Failed to read "AVAHI_SERVICE_DIR"."); + break; + } + else { for (p = globbuf.gl_pathv; *p; p++) load_file(*p); - + globfree(&globbuf); } } void static_service_free_all(void) { - + while (groups) static_service_group_free(groups); }