X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Favahi-test.c;h=8b2376fb2fc8bc58332bb19c2009b134f50fdbdc;hb=9c0f9c65093cfa53d45f9b68782321eb8063a032;hp=0490c84972256e88466ddbfb9d964581499f2b05;hpb=1ffedb586bd2fb6daa3970304fac7c5b415cd38f;p=catta diff --git a/avahi-core/avahi-test.c b/avahi-core/avahi-test.c index 0490c84..8b2376f 100644 --- a/avahi-core/avahi-test.c +++ b/avahi-core/avahi-test.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 @@ -23,20 +21,25 @@ #include #endif -#include -#include -#include #include #include #include +#include +#include +#include +#include + #include #include #include +#include + #include #include #include #include +#include static AvahiSEntryGroup *group = NULL; static AvahiServer *server = NULL; @@ -44,19 +47,19 @@ static char *service_name = NULL; static const AvahiPoll *poll_api; -static void quit_timeout_callback(AvahiTimeout *timeout, void* userdata) { +static void quit_timeout_callback(AVAHI_GCC_UNUSED AvahiTimeout *timeout, void* userdata) { AvahiSimplePoll *simple_poll = userdata; avahi_simple_poll_quit(simple_poll); } -static void dump_line(const char *text, void* userdata) { +static void dump_line(const char *text, AVAHI_GCC_UNUSED void* userdata) { printf("%s\n", text); } static void dump_timeout_callback(AvahiTimeout *timeout, void* userdata) { struct timeval tv; - + AvahiServer *avahi = userdata; avahi_server_dump(avahi, dump_line, NULL); @@ -71,7 +74,6 @@ static const char *browser_event_to_string(AvahiBrowserEvent event) { case AVAHI_BROWSER_CACHE_EXHAUSTED : return "CACHE_EXHAUSTED"; case AVAHI_BROWSER_ALL_FOR_NOW : return "ALL_FOR_NOW"; case AVAHI_BROWSER_FAILURE : return "FAILURE"; - case AVAHI_BROWSER_NOT_FOUND : return "NOT_FOUND"; } abort(); @@ -80,8 +82,6 @@ static const char *browser_event_to_string(AvahiBrowserEvent event) { static const char *resolver_event_to_string(AvahiResolverEvent event) { switch (event) { case AVAHI_RESOLVER_FOUND: return "FOUND"; - case AVAHI_RESOLVER_TIMEOUT: return "TIMEOUT"; - case AVAHI_RESOLVER_NOT_FOUND: return "NOT_FOUND"; case AVAHI_RESOLVER_FAILURE: return "FAILURE"; } abort(); @@ -93,10 +93,10 @@ static void record_browser_callback( AvahiProtocol protocol, AvahiBrowserEvent event, AvahiRecord *record, - AvahiLookupResultFlags flags, - void* userdata) { + AVAHI_GCC_UNUSED AvahiLookupResultFlags flags, + AVAHI_GCC_UNUSED void* userdata) { char *t; - + assert(r); if (record) { @@ -110,8 +110,8 @@ static void record_browser_callback( static void remove_entries(void); static void create_entries(int new_name); -static void entry_group_callback(AvahiServer *s, AvahiSEntryGroup *g, AvahiEntryGroupState state, void* userdata) { - avahi_log_debug("entry group state: %i", state); +static void entry_group_callback(AVAHI_GCC_UNUSED AvahiServer *s, AVAHI_GCC_UNUSED AvahiSEntryGroup *g, AvahiEntryGroupState state, AVAHI_GCC_UNUSED void* userdata) { + avahi_log_debug("entry group state: %i", state); if (state == AVAHI_ENTRY_GROUP_COLLISION) { remove_entries(); @@ -122,10 +122,11 @@ static void entry_group_callback(AvahiServer *s, AvahiSEntryGroup *g, AvahiEntry } } -static void server_callback(AvahiServer *s, AvahiServerState state, void* userdata) { +static void server_callback(AvahiServer *s, AvahiServerState state, AVAHI_GCC_UNUSED void* userdata) { + + server = s; + avahi_log_debug("server state: %i", state); - avahi_log_debug("server state: %i", state); - if (state == AVAHI_SERVER_RUNNING) { avahi_log_debug("Server startup complete. Host name is <%s>. Service cookie is %u", avahi_server_get_host_name_fqdn(s), avahi_server_get_local_service_cookie(s)); create_entries(0); @@ -148,14 +149,15 @@ static void remove_entries(void) { static void create_entries(int new_name) { AvahiAddress a; + AvahiRecord *r; remove_entries(); - if (!group) + if (!group) group = avahi_s_entry_group_new(server, entry_group_callback, NULL); assert(avahi_s_entry_group_is_empty(group)); - + if (!service_name) service_name = avahi_strdup("Test Service"); else if (new_name) { @@ -163,27 +165,37 @@ static void create_entries(int new_name) { avahi_free(service_name); service_name = n; } - - if (avahi_server_add_service(server, group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, service_name, "_http._tcp", NULL, NULL, 80, "foo", NULL) < 0) { + + if (avahi_server_add_service(server, group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, service_name, "_http._tcp", NULL, NULL, 80, "foo", NULL) < 0) { avahi_log_error("Failed to add HTTP service"); goto fail; } - if (avahi_server_add_service(server, group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, service_name, "_ftp._tcp", NULL, NULL, 21, "foo", NULL) < 0) { + if (avahi_server_add_service(server, group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, service_name, "_ftp._tcp", NULL, NULL, 21, "foo", NULL) < 0) { avahi_log_error("Failed to add FTP service"); goto fail; } - if (avahi_server_add_service(server, group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, service_name, "_webdav._tcp", NULL, NULL, 80, "foo", NULL) < 0) { + if (avahi_server_add_service(server, group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0,service_name, "_webdav._tcp", NULL, NULL, 80, "foo", NULL) < 0) { avahi_log_error("Failed to add WEBDAV service"); goto fail; } - if (avahi_server_add_dns_server_address(server, group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, NULL, AVAHI_DNS_SERVER_RESOLVE, avahi_address_parse("192.168.50.1", AVAHI_PROTO_UNSPEC, &a), 53) < 0) { + if (avahi_server_add_dns_server_address(server, group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, NULL, AVAHI_DNS_SERVER_RESOLVE, avahi_address_parse("192.168.50.1", AVAHI_PROTO_UNSPEC, &a), 53) < 0) { avahi_log_error("Failed to add new DNS Server address"); goto fail; } + r = avahi_record_new_full("cname.local", AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_CNAME, AVAHI_DEFAULT_TTL); + r->data.cname.name = avahi_strdup("cocaine.local"); + + if (avahi_server_add(server, group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, r) < 0) { + avahi_record_unref(r); + avahi_log_error("Failed to add CNAME record"); + goto fail; + } + avahi_record_unref(r); + avahi_s_entry_group_commit(group); return; @@ -195,15 +207,15 @@ fail: } static void hnr_callback( - AvahiSHostNameResolver *r, + AVAHI_GCC_UNUSED AvahiSHostNameResolver *r, AvahiIfIndex iface, AvahiProtocol protocol, AvahiResolverEvent event, const char *hostname, const AvahiAddress *a, - AvahiLookupResultFlags flags, - void* userdata) { - char t[64]; + AVAHI_GCC_UNUSED AvahiLookupResultFlags flags, + AVAHI_GCC_UNUSED void* userdata) { + char t[AVAHI_ADDRESS_STR_MAX]; if (a) avahi_address_snprint(t, sizeof(t), a); @@ -212,15 +224,15 @@ static void hnr_callback( } static void ar_callback( - AvahiSAddressResolver *r, + AVAHI_GCC_UNUSED AvahiSAddressResolver *r, AvahiIfIndex iface, AvahiProtocol protocol, AvahiResolverEvent event, const AvahiAddress *a, const char *hostname, - AvahiLookupResultFlags flags, - void* userdata) { - char t[64]; + AVAHI_GCC_UNUSED AvahiLookupResultFlags flags, + AVAHI_GCC_UNUSED void* userdata) { + char t[AVAHI_ADDRESS_STR_MAX]; avahi_address_snprint(t, sizeof(t), a); @@ -228,45 +240,45 @@ static void ar_callback( } static void db_callback( - AvahiSDomainBrowser *b, + AVAHI_GCC_UNUSED AvahiSDomainBrowser *b, AvahiIfIndex iface, AvahiProtocol protocol, AvahiBrowserEvent event, const char *domain, - AvahiLookupResultFlags flags, - void* userdata) { + AVAHI_GCC_UNUSED AvahiLookupResultFlags flags, + AVAHI_GCC_UNUSED void* userdata) { - avahi_log_debug("DB: (%i.%i) <%s> [%s]", iface, protocol, domain, browser_event_to_string(event)); + avahi_log_debug("DB: (%i.%i) <%s> [%s]", iface, protocol, domain ? domain : "NULL", browser_event_to_string(event)); } static void stb_callback( - AvahiSServiceTypeBrowser *b, + AVAHI_GCC_UNUSED AvahiSServiceTypeBrowser *b, AvahiIfIndex iface, AvahiProtocol protocol, AvahiBrowserEvent event, const char *service_type, const char *domain, - AvahiLookupResultFlags flags, - void* userdata) { + AVAHI_GCC_UNUSED AvahiLookupResultFlags flags, + AVAHI_GCC_UNUSED void* userdata) { - avahi_log_debug("STB: (%i.%i) %s in <%s> [%s]", iface, protocol, service_type, domain, browser_event_to_string(event)); + avahi_log_debug("STB: (%i.%i) %s in <%s> [%s]", iface, protocol, service_type ? service_type : "NULL", domain ? domain : "NULL", browser_event_to_string(event)); } static void sb_callback( - AvahiSServiceBrowser *b, + AVAHI_GCC_UNUSED AvahiSServiceBrowser *b, AvahiIfIndex iface, AvahiProtocol protocol, AvahiBrowserEvent event, const char *name, const char *service_type, const char *domain, - AvahiLookupResultFlags flags, - void* userdata) { - avahi_log_debug("SB: (%i.%i) <%s> as %s in <%s> [%s]", iface, protocol, name, service_type, domain, browser_event_to_string(event)); + AVAHI_GCC_UNUSED AvahiLookupResultFlags flags, + AVAHI_GCC_UNUSED void* userdata) { + avahi_log_debug("SB: (%i.%i) <%s> as %s in <%s> [%s]", iface, protocol, name ? name : "NULL", service_type ? service_type : "NULL", domain ? domain : "NULL", browser_event_to_string(event)); } static void sr_callback( - AvahiSServiceResolver *r, + AVAHI_GCC_UNUSED AvahiSServiceResolver *r, AvahiIfIndex iface, AvahiProtocol protocol, AvahiResolverEvent event, @@ -277,14 +289,14 @@ static void sr_callback( const AvahiAddress *a, uint16_t port, AvahiStringList *txt, - AvahiLookupResultFlags flags, - void* userdata) { + AVAHI_GCC_UNUSED AvahiLookupResultFlags flags, + AVAHI_GCC_UNUSED void* userdata) { if (event != AVAHI_RESOLVER_FOUND) avahi_log_debug("SR: (%i.%i) <%s> as %s in <%s> [%s]", iface, protocol, name, service_type, domain_name, resolver_event_to_string(event)); else { - char t[64], *s; - + char t[AVAHI_ADDRESS_STR_MAX], *s; + avahi_address_snprint(t, sizeof(t), a); s = avahi_string_list_to_string(txt); @@ -294,25 +306,25 @@ static void sr_callback( } static void dsb_callback( - AvahiSDNSServerBrowser *b, + AVAHI_GCC_UNUSED AvahiSDNSServerBrowser *b, AvahiIfIndex iface, AvahiProtocol protocol, AvahiBrowserEvent event, const char*hostname, const AvahiAddress *a, uint16_t port, - AvahiLookupResultFlags flags, - void* userdata) { - - char t[64] = "n/a"; - + AVAHI_GCC_UNUSED AvahiLookupResultFlags flags, + AVAHI_GCC_UNUSED void* userdata) { + + char t[AVAHI_ADDRESS_STR_MAX] = "n/a"; + if (a) avahi_address_snprint(t, sizeof(t), a); - avahi_log_debug("DSB: (%i.%i): %s/%s:%i [%s]", iface, protocol, hostname, t, port, browser_event_to_string(event)); + avahi_log_debug("DSB: (%i.%i): %s/%s:%i [%s]", iface, protocol, hostname ? hostname : "NULL", t, port, browser_event_to_string(event)); } -int main(int argc, char *argv[]) { +int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { AvahiSRecordBrowser *r; AvahiSHostNameResolver *hnr; AvahiSAddressResolver *ar; @@ -330,7 +342,7 @@ int main(int argc, char *argv[]) { simple_poll = avahi_simple_poll_new(); poll_api = avahi_simple_poll_get(simple_poll); - + avahi_server_config_init(&config); avahi_address_parse("192.168.50.1", AVAHI_PROTO_UNSPEC, &config.wide_area_servers[0]); @@ -339,12 +351,12 @@ int main(int argc, char *argv[]) { server = avahi_server_new(poll_api, &config, server_callback, NULL, &error); avahi_server_config_free(&config); - + k = avahi_key_new("_http._tcp.0pointer.de", AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_PTR); r = avahi_s_record_browser_new(server, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, k, 0, record_browser_callback, NULL); avahi_key_unref(k); - hnr = avahi_s_host_name_resolver_new(server, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, "cocaine.local", AVAHI_PROTO_UNSPEC, 0, hnr_callback, NULL); + hnr = avahi_s_host_name_resolver_new(server, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, "cname.local", AVAHI_PROTO_UNSPEC, 0, hnr_callback, NULL); ar = avahi_s_address_resolver_new(server, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, avahi_address_parse("192.168.50.1", AVAHI_PROTO_INET, &a), 0, ar_callback, NULL); @@ -364,20 +376,19 @@ int main(int argc, char *argv[]) { avahi_elapse_time(&tv, 1000*60, 0); poll_api->timeout_new(poll_api, &tv, quit_timeout_callback, simple_poll); - for (;;) - if (avahi_simple_poll_iterate(simple_poll, -1) != 0) - break; + avahi_simple_poll_loop(simple_poll); avahi_s_record_browser_free(r); avahi_s_host_name_resolver_free(hnr); avahi_s_address_resolver_free(ar); + avahi_s_domain_browser_free(db); avahi_s_service_type_browser_free(stb); avahi_s_service_browser_free(sb); avahi_s_service_resolver_free(sr); avahi_s_dns_server_browser_free(dsb); if (group) - avahi_s_entry_group_free(group); + avahi_s_entry_group_free(group); if (server) avahi_server_free(server); @@ -386,6 +397,6 @@ int main(int argc, char *argv[]) { avahi_simple_poll_free(simple_poll); avahi_free(service_name); - + return 0; }