From 66c497f4637276f390f1a7afaf7fe07616da9f1a Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sat, 20 Aug 2005 22:57:33 +0000 Subject: * Disable debug output of avahi-client * implement service resolving API in avahi-client * fix some memory corruption bugs in dbus-watch-glue * add avahi-client examples git-svn-id: file:///home/lennart/svn/public/avahi/trunk@363 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- examples/Makefile.am | 26 +++-- examples/browse-services.c | 166 ------------------------------- examples/client-browse-services.c | 164 +++++++++++++++++++++++++++++++ examples/client-publish-service.c | 178 +++++++++++++++++++++++++++++++++ examples/core-browse-services.c | 166 +++++++++++++++++++++++++++++++ examples/core-publish-service.c | 200 ++++++++++++++++++++++++++++++++++++++ examples/publish-service.c | 200 -------------------------------------- 7 files changed, 726 insertions(+), 374 deletions(-) delete mode 100644 examples/browse-services.c create mode 100644 examples/client-browse-services.c create mode 100644 examples/client-publish-service.c create mode 100644 examples/core-browse-services.c create mode 100644 examples/core-publish-service.c delete mode 100644 examples/publish-service.c (limited to 'examples') diff --git a/examples/Makefile.am b/examples/Makefile.am index d819103..da233b9 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -20,13 +20,23 @@ AM_CFLAGS=-I$(top_srcdir) noinst_PROGRAMS = \ - publish-service \ - browse-services + core-publish-service \ + core-browse-services \ + client-publish-service \ + client-browse-services -publish_service_SOURCES = publish-service.c -publish_service_CFLAGS = $(AM_CFLAGS) -publish_service_LDADD = $(AM_LDADD) ../avahi-core/libavahi-core.la ../avahi-common/libavahi-common.la +core_publish_service_SOURCES = core-publish-service.c +core_publish_service_CFLAGS = $(AM_CFLAGS) +core_publish_service_LDADD = $(AM_LDADD) ../avahi-core/libavahi-core.la ../avahi-common/libavahi-common.la -browse_services_SOURCES = browse-services.c -browse_services_CFLAGS = $(AM_CFLAGS) -browse_services_LDADD = $(AM_LDADD) ../avahi-core/libavahi-core.la ../avahi-common/libavahi-common.la +core_browse_services_SOURCES = core-browse-services.c +core_browse_services_CFLAGS = $(AM_CFLAGS) +core_browse_services_LDADD = $(AM_LDADD) ../avahi-core/libavahi-core.la ../avahi-common/libavahi-common.la + +client_publish_service_SOURCES = client-publish-service.c +client_publish_service_CFLAGS = $(AM_CFLAGS) +client_publish_service_LDADD = $(AM_LDADD) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la + +client_browse_services_SOURCES = client-browse-services.c +client_browse_services_CFLAGS = $(AM_CFLAGS) +client_browse_services_LDADD = $(AM_LDADD) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la diff --git a/examples/browse-services.c b/examples/browse-services.c deleted file mode 100644 index 7227bd7..0000000 --- a/examples/browse-services.c +++ /dev/null @@ -1,166 +0,0 @@ -/* $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 - USA. -***/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include -#include -#include - -#include -#include -#include - -static AvahiSimplePoll *simple_poll = NULL; - -static void resolve_callback( - AvahiSServiceResolver *r, - AvahiIfIndex interface, - AvahiProtocol protocol, - AvahiResolverEvent event, - const char *name, - const char *type, - const char *domain, - const char *host_name, - const AvahiAddress *address, - uint16_t port, - AvahiStringList *txt, - void* userdata) { - - assert(r); - - /* Called whenever a service has been resolved successfully or timed out */ - - if (event == AVAHI_RESOLVER_TIMEOUT) - fprintf(stderr, "Failed to resolve service '%s' of type '%s' in domain '%s'.\n", name, type, domain); - else { - char a[128], *t; - - assert(event == AVAHI_RESOLVER_FOUND); - - fprintf(stderr, "Service '%s' of type '%s' in domain '%s':\n", name, type, domain); - - avahi_address_snprint(a, sizeof(a), address); - t = avahi_string_list_to_string(txt); - fprintf(stderr, "\t%s:%u (%s) TXT=%s\n", host_name, port, a, t); - avahi_free(t); - } - - avahi_s_service_resolver_free(r); -} - -static void browse_callback( - AvahiSServiceBrowser *b, - AvahiIfIndex interface, - AvahiProtocol protocol, - AvahiBrowserEvent event, - const char *name, - const char *type, - const char *domain, - void* userdata) { - - AvahiServer *s = userdata; - assert(b); - - /* Called whenever a new services becomes available on the LAN or is removed from the LAN */ - - fprintf(stderr, "%s: service '%s' of type '%s' in domain '%s'\n", - event == AVAHI_BROWSER_NEW ? "NEW" : "REMOVED", - name, - type, - domain); - - /* If it's new, let's resolve it */ - if (event == AVAHI_BROWSER_NEW) - - /* We ignore the returned resolver object. In the callback function - we free it. If the server is terminated before the callback - function is called the server will free the resolver for us. */ - - if (!(avahi_s_service_resolver_new(s, interface, protocol, name, type, domain, AVAHI_PROTO_UNSPEC, resolve_callback, s))) - fprintf(stderr, "Failed to resolve service '%s': %s\n", name, avahi_strerror(avahi_server_errno(s))); -} - -int main(int argc, char*argv[]) { - AvahiServerConfig config; - AvahiServer *server = NULL; - AvahiSServiceBrowser *sb; - int error; - int ret = 1; - - /* Initialize the psuedo-RNG */ - srand(time(NULL)); - - /* Allocate main loop object */ - if (!(simple_poll = avahi_simple_poll_new())) { - fprintf(stderr, "Failed to create simple poll object.\n"); - goto fail; - } - - /* Do not publish any local records */ - avahi_server_config_init(&config); - config.publish_hinfo = 0; - config.publish_addresses = 0; - config.publish_workstation = 0; - config.publish_domain = 0; - - /* Allocate a new server */ - server = avahi_server_new(avahi_simple_poll_get(simple_poll), &config, NULL, NULL, &error); - - /* Free the configuration data */ - avahi_server_config_free(&config); - - /* Check wether creating the server object succeeded */ - if (!server) { - fprintf(stderr, "Failed to create server: %s\n", avahi_strerror(error)); - goto fail; - } - - /* Create the service browser */ - if (!(sb = avahi_s_service_browser_new(server, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, "_http._tcp", NULL, browse_callback, server))) { - fprintf(stderr, "Failed to create service browser: %s\n", avahi_strerror(avahi_server_errno(server))); - goto fail; - } - - /* Run the main loop */ - for (;;) - if (avahi_simple_poll_iterate(simple_poll, -1) != 0) - break; - - ret = 0; - -fail: - - /* Cleanup things */ - if (sb) - avahi_s_service_browser_free(sb); - - if (server) - avahi_server_free(server); - - if (simple_poll) - avahi_simple_poll_free(simple_poll); - - return ret; -} diff --git a/examples/client-browse-services.c b/examples/client-browse-services.c new file mode 100644 index 0000000..80fa934 --- /dev/null +++ b/examples/client-browse-services.c @@ -0,0 +1,164 @@ +/* $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 + USA. +***/ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include +#include + +#include +#include +#include +#include + +static AvahiSimplePoll *simple_poll = NULL; + +static void resolve_callback( + AvahiServiceResolver *r, + AvahiIfIndex interface, + AvahiProtocol protocol, + AvahiResolverEvent event, + const char *name, + const char *type, + const char *domain, + const char *host_name, + const AvahiAddress *address, + uint16_t port, + AvahiStringList *txt, + void* userdata) { + + assert(r); + + /* Called whenever a service has been resolved successfully or timed out */ + + if (event == AVAHI_RESOLVER_TIMEOUT) + fprintf(stderr, "Failed to resolve service '%s' of type '%s' in domain '%s'.\n", name, type, domain); + else { + char a[128], *t; + + assert(event == AVAHI_RESOLVER_FOUND); + + fprintf(stderr, "Service '%s' of type '%s' in domain '%s':\n", name, type, domain); + + avahi_address_snprint(a, sizeof(a), address); + t = avahi_string_list_to_string(txt); + fprintf(stderr, "\t%s:%u (%s) TXT=%s\n", host_name, port, a, t); + avahi_free(t); + } + + avahi_service_resolver_free(r); +} + +static void browse_callback( + AvahiServiceBrowser *b, + AvahiIfIndex interface, + AvahiProtocol protocol, + AvahiBrowserEvent event, + const char *name, + const char *type, + const char *domain, + void* userdata) { + + AvahiClient *c = userdata; + assert(b); + + /* Called whenever a new services becomes available on the LAN or is removed from the LAN */ + + fprintf(stderr, "%s: service '%s' of type '%s' in domain '%s'\n", + event == AVAHI_BROWSER_NEW ? "NEW" : "REMOVED", + name, + type, + domain); + + /* If it's new, let's resolve it */ + if (event == AVAHI_BROWSER_NEW) + + /* We ignore the returned resolver object. In the callback function + we free it. If the server is terminated before the callback + function is called the server will free the resolver for us. */ + + if (!(avahi_service_resolver_new(c, interface, protocol, name, type, domain, AVAHI_PROTO_UNSPEC, resolve_callback, c))) + fprintf(stderr, "Failed to resolve service '%s': %s\n", name, avahi_strerror(avahi_client_errno(c))); +} + +static void client_callback(AvahiClient *c, AvahiClientState state, void * userdata) { + assert(c); + + /* Called whenever the client or server state changes */ + + if (state == AVAHI_CLIENT_DISCONNECTED) { + fprintf(stderr, "Server connection terminated.\n"); + avahi_simple_poll_quit(simple_poll); + } +} + +int main(int argc, char*argv[]) { + AvahiClient *client = NULL; + AvahiServiceBrowser *sb; + int error; + int ret = 1; + + /* Allocate main loop object */ + if (!(simple_poll = avahi_simple_poll_new())) { + fprintf(stderr, "Failed to create simple poll object.\n"); + goto fail; + } + + /* Allocate a new client */ + client = avahi_client_new(avahi_simple_poll_get(simple_poll), client_callback, NULL, &error); + + /* Check wether creating the client object succeeded */ + if (!client) { + fprintf(stderr, "Failed to create client: %s\n", avahi_strerror(error)); + goto fail; + } + + /* Create the service browser */ + if (!(sb = avahi_service_browser_new(client, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, "_http._tcp", NULL, browse_callback, client))) { + fprintf(stderr, "Failed to create service browser: %s\n", avahi_strerror(avahi_client_errno(client))); + goto fail; + } + + /* Run the main loop */ + for (;;) + if (avahi_simple_poll_iterate(simple_poll, -1) != 0) + break; + + ret = 0; + +fail: + + /* Cleanup things */ + if (sb) + avahi_service_browser_free(sb); + + if (client) + avahi_client_free(client); + + if (simple_poll) + avahi_simple_poll_free(simple_poll); + + return ret; +} diff --git a/examples/client-publish-service.c b/examples/client-publish-service.c new file mode 100644 index 0000000..9b12f5c --- /dev/null +++ b/examples/client-publish-service.c @@ -0,0 +1,178 @@ +/* $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 + USA. +***/ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +static AvahiEntryGroup *group = NULL; +static AvahiSimplePoll *simple_poll = NULL; +static char *name = NULL; + +static void create_services(AvahiClient *c); + +static void entry_group_callback(AvahiEntryGroup *g, AvahiEntryGroupState state, void *userdata) { + assert(g == group); + + /* Called whenever the entry group state changes */ + + if (state == AVAHI_ENTRY_GROUP_ESTABLISHED) + /* The entry group has been established successfully */ + fprintf(stderr, "Service '%s' successfully established.\n", name); + + else if (state == AVAHI_ENTRY_GROUP_COLLISION) { + char *n; + + /* A service name collision happened. Let's pick a new name */ + n = avahi_alternative_service_name(name); + avahi_free(name); + name = n; + + fprintf(stderr, "Service name collision, renaming service to '%s'\n", name); + + /* And recreate the services */ + create_services(avahi_entry_group_get_client(g)); + } +} + +static void create_services(AvahiClient *c) { + char r[128]; + int ret; + assert(c); + + /* If this is the first time we're called, let's create a new entry group */ + if (!group) { + if (!(group = avahi_entry_group_new(c, entry_group_callback, NULL))) { + fprintf(stderr, "avahi_entry_group_new() failed: %s\n", avahi_strerror(avahi_client_errno(c))); + goto fail; + } + } + + fprintf(stderr, "Adding service '%s'\n", name); + + /* Create some random TXT data */ + snprintf(r, sizeof(r), "random=%i", rand()); + + /* Add the service for IPP */ + if ((ret = avahi_entry_group_add_service(group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, name, "_ipp._tcp", NULL, NULL, 651, "test=blah", r, NULL)) < 0) { + fprintf(stderr, "Failed to add _ipp._tcp service: %s\n", avahi_strerror(ret)); + goto fail; + } + + /* Add the same service for BSD LPR */ + if ((ret = avahi_entry_group_add_service(group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, name, "_printer._tcp", NULL, NULL, 515, NULL)) < 0) { + fprintf(stderr, "Failed to add _printer._tcp service: %s\n", avahi_strerror(ret)); + goto fail; + } + + /* Tell the server to register the service */ + if ((ret = avahi_entry_group_commit(group)) < 0) { + fprintf(stderr, "Failed to commit entry_group: %s\n", avahi_strerror(ret)); + goto fail; + } + + return; + +fail: + avahi_simple_poll_quit(simple_poll); + return; +} + +static void client_callback(AvahiClient *c, AvahiClientState state, void * userdata) { + assert(c); + + /* Called whenever the client or server state changes */ + + if (state == AVAHI_CLIENT_S_RUNNING) + /* The serve has startup successfully and registered its host + * name on the network, so it's time to create our services */ + create_services(c); + + else if (state == AVAHI_CLIENT_S_COLLISION) { + /* Let's drop our registered services. When the server is back + * in AVAHI_SERVER_RUNNING state we will register them + * again with the new host name. */ + if (group) + avahi_entry_group_reset(group); + + } else if (state == AVAHI_CLIENT_DISCONNECTED) { + + fprintf(stderr, "Server connection terminated.\n"); + avahi_simple_poll_quit(simple_poll); + } +} + +int main(int argc, char*argv[]) { + AvahiClient *client = NULL; + int error; + int ret = 1; + + /* Allocate main loop object */ + if (!(simple_poll = avahi_simple_poll_new())) { + fprintf(stderr, "Failed to create simple poll object.\n"); + goto fail; + } + + name = avahi_strdup("MegaPrinter"); + + /* Allocate a new client */ + client = avahi_client_new(avahi_simple_poll_get(simple_poll), client_callback, NULL, &error); + + /* Check wether creating the client object succeeded */ + if (!client) { + fprintf(stderr, "Failed to create client: %s\n", avahi_strerror(error)); + goto fail; + } + + /* Run the main loop */ + for (;;) + if (avahi_simple_poll_iterate(simple_poll, -1) != 0) + break; + + ret = 0; + +fail: + + /* Cleanup things */ + if (group) + avahi_entry_group_free(group); + + if (client) + avahi_client_free(client); + + if (simple_poll) + avahi_simple_poll_free(simple_poll); + + avahi_free(name); + + return ret; +} diff --git a/examples/core-browse-services.c b/examples/core-browse-services.c new file mode 100644 index 0000000..7227bd7 --- /dev/null +++ b/examples/core-browse-services.c @@ -0,0 +1,166 @@ +/* $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 + USA. +***/ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include +#include + +#include +#include +#include + +static AvahiSimplePoll *simple_poll = NULL; + +static void resolve_callback( + AvahiSServiceResolver *r, + AvahiIfIndex interface, + AvahiProtocol protocol, + AvahiResolverEvent event, + const char *name, + const char *type, + const char *domain, + const char *host_name, + const AvahiAddress *address, + uint16_t port, + AvahiStringList *txt, + void* userdata) { + + assert(r); + + /* Called whenever a service has been resolved successfully or timed out */ + + if (event == AVAHI_RESOLVER_TIMEOUT) + fprintf(stderr, "Failed to resolve service '%s' of type '%s' in domain '%s'.\n", name, type, domain); + else { + char a[128], *t; + + assert(event == AVAHI_RESOLVER_FOUND); + + fprintf(stderr, "Service '%s' of type '%s' in domain '%s':\n", name, type, domain); + + avahi_address_snprint(a, sizeof(a), address); + t = avahi_string_list_to_string(txt); + fprintf(stderr, "\t%s:%u (%s) TXT=%s\n", host_name, port, a, t); + avahi_free(t); + } + + avahi_s_service_resolver_free(r); +} + +static void browse_callback( + AvahiSServiceBrowser *b, + AvahiIfIndex interface, + AvahiProtocol protocol, + AvahiBrowserEvent event, + const char *name, + const char *type, + const char *domain, + void* userdata) { + + AvahiServer *s = userdata; + assert(b); + + /* Called whenever a new services becomes available on the LAN or is removed from the LAN */ + + fprintf(stderr, "%s: service '%s' of type '%s' in domain '%s'\n", + event == AVAHI_BROWSER_NEW ? "NEW" : "REMOVED", + name, + type, + domain); + + /* If it's new, let's resolve it */ + if (event == AVAHI_BROWSER_NEW) + + /* We ignore the returned resolver object. In the callback function + we free it. If the server is terminated before the callback + function is called the server will free the resolver for us. */ + + if (!(avahi_s_service_resolver_new(s, interface, protocol, name, type, domain, AVAHI_PROTO_UNSPEC, resolve_callback, s))) + fprintf(stderr, "Failed to resolve service '%s': %s\n", name, avahi_strerror(avahi_server_errno(s))); +} + +int main(int argc, char*argv[]) { + AvahiServerConfig config; + AvahiServer *server = NULL; + AvahiSServiceBrowser *sb; + int error; + int ret = 1; + + /* Initialize the psuedo-RNG */ + srand(time(NULL)); + + /* Allocate main loop object */ + if (!(simple_poll = avahi_simple_poll_new())) { + fprintf(stderr, "Failed to create simple poll object.\n"); + goto fail; + } + + /* Do not publish any local records */ + avahi_server_config_init(&config); + config.publish_hinfo = 0; + config.publish_addresses = 0; + config.publish_workstation = 0; + config.publish_domain = 0; + + /* Allocate a new server */ + server = avahi_server_new(avahi_simple_poll_get(simple_poll), &config, NULL, NULL, &error); + + /* Free the configuration data */ + avahi_server_config_free(&config); + + /* Check wether creating the server object succeeded */ + if (!server) { + fprintf(stderr, "Failed to create server: %s\n", avahi_strerror(error)); + goto fail; + } + + /* Create the service browser */ + if (!(sb = avahi_s_service_browser_new(server, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, "_http._tcp", NULL, browse_callback, server))) { + fprintf(stderr, "Failed to create service browser: %s\n", avahi_strerror(avahi_server_errno(server))); + goto fail; + } + + /* Run the main loop */ + for (;;) + if (avahi_simple_poll_iterate(simple_poll, -1) != 0) + break; + + ret = 0; + +fail: + + /* Cleanup things */ + if (sb) + avahi_s_service_browser_free(sb); + + if (server) + avahi_server_free(server); + + if (simple_poll) + avahi_simple_poll_free(simple_poll); + + return ret; +} diff --git a/examples/core-publish-service.c b/examples/core-publish-service.c new file mode 100644 index 0000000..dace548 --- /dev/null +++ b/examples/core-publish-service.c @@ -0,0 +1,200 @@ +/* $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 + USA. +***/ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include +#include + +#include +#include +#include + +static AvahiSEntryGroup *group = NULL; +static AvahiSimplePoll *simple_poll = NULL; +static char *name = NULL; + +static void create_services(AvahiServer *s); + +static void entry_group_callback(AvahiServer *s, AvahiSEntryGroup *g, AvahiEntryGroupState state, void *userdata) { + assert(s); + assert(g == group); + + /* Called whenever the entry group state changes */ + + if (state == AVAHI_ENTRY_GROUP_ESTABLISHED) + /* The entry group has been established successfully */ + fprintf(stderr, "Service '%s' successfully established.\n", name); + + else if (state == AVAHI_ENTRY_GROUP_COLLISION) { + char *n; + + /* A service name collision happened. Let's pick a new name */ + n = avahi_alternative_service_name(name); + avahi_free(name); + name = n; + + fprintf(stderr, "Service name collision, renaming service to '%s'\n", name); + + /* And recreate the services */ + create_services(s); + } +} + +static void create_services(AvahiServer *s) { + char r[128]; + int ret; + assert(s); + + /* If this is the first time we're called, let's create a new entry group */ + if (!group) { + if (!(group = avahi_s_entry_group_new(s, entry_group_callback, NULL))) { + fprintf(stderr, "avahi_entry_group_new() failed: %s\n", avahi_strerror(avahi_server_errno(s))); + goto fail; + } + } + + fprintf(stderr, "Adding service '%s'\n", name); + + /* Create some random TXT data */ + snprintf(r, sizeof(r), "random=%i", rand()); + + /* Add the service for IPP */ + if ((ret = avahi_server_add_service(s, group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, name, "_ipp._tcp", NULL, NULL, 651, "test=blah", r, NULL)) < 0) { + fprintf(stderr, "Failed to add _ipp._tcp service: %s\n", avahi_strerror(ret)); + goto fail; + } + + /* Add the same service for BSD LPR */ + if ((ret = avahi_server_add_service(s, group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, name, "_printer._tcp", NULL, NULL, 515, NULL)) < 0) { + fprintf(stderr, "Failed to add _printer._tcp service: %s\n", avahi_strerror(ret)); + goto fail; + } + + /* Tell the server to register the service */ + if ((ret = avahi_s_entry_group_commit(group)) < 0) { + fprintf(stderr, "Failed to commit entry_group: %s\n", avahi_strerror(ret)); + goto fail; + } + + return; + +fail: + avahi_simple_poll_quit(simple_poll); + return; +} + +static void server_callback(AvahiServer *s, AvahiServerState state, void * userdata) { + assert(s); + + /* Called whenever the server state changes */ + + if (state == AVAHI_SERVER_RUNNING) + /* The serve has startup successfully and registered its host + * name on the network, so it's time to create our services */ + create_services(s); + + else if (state == AVAHI_SERVER_COLLISION) { + char *n; + int r; + + /* A host name collision happened. Let's pick a new name for the server */ + n = avahi_alternative_host_name(avahi_server_get_host_name(s)); + fprintf(stderr, "Host name collision, retrying with '%s'\n", n); + r = avahi_server_set_host_name(s, n); + avahi_free(n); + + if (r < 0) { + fprintf(stderr, "Failed to set new host name: %s\n", avahi_strerror(r)); + + avahi_simple_poll_quit(simple_poll); + return; + } + + /* Let's drop our registered services. When the server is back + * in AVAHI_SERVER_RUNNING state we will register them + * again with the new host name. */ + if (group) + avahi_s_entry_group_reset(group); + } +} + +int main(int argc, char*argv[]) { + AvahiServerConfig config; + AvahiServer *server = NULL; + int error; + int ret = 1; + + /* Initialize the pseudo-RNG */ + srand(time(NULL)); + + /* Allocate main loop object */ + if (!(simple_poll = avahi_simple_poll_new())) { + fprintf(stderr, "Failed to create simple poll object.\n"); + goto fail; + } + + name = avahi_strdup("MegaPrinter"); + + /* Let's set the host name for this server. */ + avahi_server_config_init(&config); + config.host_name = avahi_strdup("gurkiman"); + config.publish_workstation = 0; + + /* Allocate a new server */ + server = avahi_server_new(avahi_simple_poll_get(simple_poll), &config, server_callback, NULL, &error); + + /* Free the configuration data */ + avahi_server_config_free(&config); + + /* Check wether creating the server object succeeded */ + if (!server) { + fprintf(stderr, "Failed to create server: %s\n", avahi_strerror(error)); + goto fail; + } + + /* Run the main loop */ + for (;;) + if (avahi_simple_poll_iterate(simple_poll, -1) != 0) + break; + + ret = 0; + +fail: + + /* Cleanup things */ + if (group) + avahi_s_entry_group_free(group); + + if (server) + avahi_server_free(server); + + if (simple_poll) + avahi_simple_poll_free(simple_poll); + + avahi_free(name); + + return ret; +} diff --git a/examples/publish-service.c b/examples/publish-service.c deleted file mode 100644 index 6132622..0000000 --- a/examples/publish-service.c +++ /dev/null @@ -1,200 +0,0 @@ -/* $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 - USA. -***/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include -#include -#include - -#include -#include -#include - -static AvahiSEntryGroup *group = NULL; -static AvahiSimplePoll *simple_poll = NULL; -static char *name = NULL; - -static void create_services(AvahiServer *s); - -static void entry_group_callback(AvahiServer *s, AvahiSEntryGroup *g, AvahiEntryGroupState state, void *userdata) { - assert(s); - assert(g == group); - - /* Called whenever the entry group state changes */ - - if (state == AVAHI_ENTRY_GROUP_ESTABLISHED) - /* The entry group has been established successfully */ - fprintf(stderr, "Service '%s' successfully established.\n", name); - - else if (state == AVAHI_ENTRY_GROUP_COLLISION) { - char *n; - - /* A service name collision happened. Let's pick a new name */ - n = avahi_alternative_service_name(name); - avahi_free(name); - name = n; - - fprintf(stderr, "Service name collision, renaming service to '%s'\n", name); - - /* And recreate the services */ - create_services(s); - } -} - -static void create_services(AvahiServer *s) { - char r[128]; - int ret; - assert(s); - - /* If this is the first time we're called, let's create a new entry group */ - if (!group) { - if (!(group = avahi_s_entry_group_new(s, entry_group_callback, NULL))) { - fprintf(stderr, "avahi_entry_group_new() failed: %s\n", avahi_strerror(avahi_server_errno(s))); - goto fail; - } - } - - fprintf(stderr, "Adding service '%s'\n", name); - - /* Create some random TXT data */ - snprintf(r, sizeof(r), "random=%i", rand()); - - /* Add the service for IPP */ - if ((ret = avahi_server_add_service(s, group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, name, "_ipp._tcp", NULL, NULL, 651, "test=blah", r, NULL)) < 0) { - fprintf(stderr, "Failed to add _ipp._tcp service: %s\n", avahi_strerror(ret)); - goto fail; - } - - /* Add the same service for BSD LPR */ - if ((ret = avahi_server_add_service(s, group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, name, "_printer._tcp", NULL, NULL, 515, NULL)) < 0) { - fprintf(stderr, "Failed to add _printer._tcp service: %s\n", avahi_strerror(ret)); - goto fail; - } - - /* Tell the server to register the service */ - if ((ret = avahi_s_entry_group_commit(group)) < 0) { - fprintf(stderr, "Failed to commit entry_group: %s\n", avahi_strerror(ret)); - goto fail; - } - - return; - -fail: - avahi_simple_poll_quit(simple_poll); - return; -} - -static void server_callback(AvahiServer *s, AvahiServerState state, void * userdata) { - assert(s); - - /* Called whenever the server state changes */ - - if (state == AVAHI_SERVER_RUNNING) - /* The serve has startup successfully and registered its host - * name on the network, so it's time to create our services */ - create_services(s); - - else if (state == AVAHI_SERVER_COLLISION) { - char *n; - int r; - - /* A host name collision happened. Let's pick a new name for the server */ - n = avahi_alternative_host_name(avahi_server_get_host_name(s)); - fprintf(stderr, "Host name collision, retrying with '%s'\n", n); - r = avahi_server_set_host_name(s, n); - avahi_free(n); - - if (r < 0) { - fprintf(stderr, "Failed to set new host name: %s\n", avahi_strerror(r)); - - avahi_simple_poll_quit(simple_poll); - return; - } - - /* Let's drop our registered services. When the server is back - * in AVAHI_SERVER_RUNNING state we will register them - * again with the new host name. */ - if (group) - avahi_s_entry_group_reset(group); - } -} - -int main(int argc, char*argv[]) { - AvahiServerConfig config; - AvahiServer *server = NULL; - int error; - int ret = 1; - - /* Initialize the pseudo-RNG */ - srand(time(NULL)); - - /* Allocate main loop object */ - if (!(simple_poll = avahi_simple_poll_new())) { - fprintf(stderr, "Failed to create simple poll object.\n"); - goto fail; - } - - name = avahi_strdup("MegaPrinter"); - - /* Let's set the host name for this server. */ - avahi_server_config_init(&config); - config.host_name = avahi_strdup("gurkiman"); - config.publish_workstation = 0; - - /* Allocate a new server */ - server = avahi_server_new(avahi_simple_poll_get(simple_poll), &config, server_callback, NULL, &error); - - /* Free the configuration data */ - avahi_server_config_free(&config); - - /* Check wether creating the server object succeeded */ - if (!server) { - fprintf(stderr, "Failed to create server: %s", avahi_strerror(error)); - goto fail; - } - - /* Run the main loop */ - for (;;) - if (avahi_simple_poll_iterate(simple_poll, -1) != 0) - break; - - ret = 0; - -fail: - - /* Cleanup things */ - if (group) - avahi_s_entry_group_free(group); - - if (server) - avahi_server_free(server); - - if (simple_poll) - avahi_simple_poll_free(simple_poll); - - avahi_free(name); - - return ret; -} -- cgit