Rename some server side objects/symbols so that they do not conflict with the same...

[catta] / avahi-daemon / simple-protocol.c

diff --git a/avahi-daemon/simple-protocol.c b/avahi-daemon/simple-protocol.c
index 87c9ee6ba68bd351b009d31b099caf2b52b3b94e..ec43049c1005d42efbd374faa170565946a28922 100644 (file)
--- a/avahi-daemon/simple-protocol.c
+++ b/avahi-daemon/simple-protocol.c
@@ -33,7 +33,7 @@
 
 #include <glib.h>
 
-#include <avahi-core/llist.h>
+#include <avahi-common/llist.h>
 #include <avahi-core/log.h>
 
 #include "simple-protocol.h"
@@ -65,9 +65,9 @@ struct Client {
     gchar inbuf[BUFFER_SIZE], outbuf[BUFFER_SIZE];
     guint inbuf_length, outbuf_length;
 
-    AvahiHostNameResolver *host_name_resolver;
-    AvahiAddressResolver *address_resolver;
-    AvahiDNSServerBrowser *dns_server_browser;
+    AvahiSHostNameResolver *host_name_resolver;
+    AvahiSAddressResolver *address_resolver;
+    AvahiSDNSServerBrowser *dns_server_browser;
 
     AvahiProtocol afquery;
     
@@ -94,13 +94,13 @@ static void client_free(Client *c) {
     c->server->n_clients--;
 
     if (c->host_name_resolver)
-        avahi_host_name_resolver_free(c->host_name_resolver);
+        avahi_s_host_name_resolver_free(c->host_name_resolver);
 
     if (c->address_resolver)
-        avahi_address_resolver_free(c->address_resolver);
+        avahi_s_address_resolver_free(c->address_resolver);
 
     if (c->dns_server_browser)
-        avahi_dns_server_browser_free(c->dns_server_browser);
+        avahi_s_dns_server_browser_free(c->dns_server_browser);
     
     g_source_remove_poll(&c->server->source, &c->poll_fd);
     close(c->fd);
@@ -151,7 +151,7 @@ static void client_output(Client *c, const guint8*data, guint size) {
     c->poll_fd.events |= G_IO_OUT;
 }
 
-static void client_output_printf(Client *c, gchar *format, ...) {
+static void client_output_printf(Client *c, const gchar *format, ...) {
     gchar *t;
     va_list ap;
     
@@ -164,14 +164,21 @@ static void client_output_printf(Client *c, gchar *format, ...) {
 }
 
 
-static void host_name_resolver_callback(AvahiHostNameResolver *r, gint iface, guchar protocol, AvahiBrowserEvent event, const gchar *hostname, const AvahiAddress *a, gpointer userdata) {
+static void host_name_resolver_callback(
+    AvahiSHostNameResolver *r,
+    AvahiIfIndex iface,
+    AvahiProtocol protocol,
+    AvahiResolverEvent event,
+    const char *hostname,
+    const AvahiAddress *a,
+    void* userdata) {
+
     Client *c = userdata;
     
     g_assert(c);
 
-
     if (event == AVAHI_RESOLVER_TIMEOUT)
-        client_output_printf(c, "- Query timed out\n");
+        client_output_printf(c, "%+i Query timed out\n", AVAHI_ERR_TIMEOUT);
     else {
         gchar t[64];
         avahi_address_snprint(t, sizeof(t), a);
@@ -181,21 +188,37 @@ static void host_name_resolver_callback(AvahiHostNameResolver *r, gint iface, gu
     c->state = CLIENT_DEAD;
 }
 
-static void address_resolver_callback(AvahiAddressResolver *r, gint iface, guchar protocol, AvahiBrowserEvent event, const AvahiAddress *a, const gchar *hostname, gpointer userdata) {
-    Client *c = userdata;
+static void address_resolver_callback(
+    AvahiSAddressResolver *r,
+    AvahiIfIndex iface,
+    AvahiProtocol protocol,
+    AvahiResolverEvent event,
+    const AvahiAddress *a,
+    const char *hostname,
+    void* userdata) {
     
+    Client *c = userdata;
     
     g_assert(c);
 
     if (event == AVAHI_RESOLVER_TIMEOUT)
-        client_output_printf(c, "- Query timed out\n");
+        client_output_printf(c, "%+i Query timed out\n", AVAHI_ERR_TIMEOUT);
     else 
         client_output_printf(c, "+ %i %u %s\n", iface, protocol, hostname);
 
     c->state = CLIENT_DEAD;
 }
 
-static void dns_server_browser_callback(AvahiDNSServerBrowser *b, gint interface, guchar protocol, AvahiBrowserEvent event, const gchar *host_name, const AvahiAddress *a, guint16 port, gpointer userdata) {
+static void dns_server_browser_callback(
+    AvahiSDNSServerBrowser *b,
+    AvahiIfIndex interface,
+    AvahiProtocol protocol,
+    AvahiBrowserEvent event,
+    const char *host_name,
+    const AvahiAddress *a,
+    uint16_t port,
+    void* userdata) {
+    
     Client *c = userdata;
     gchar t[64];
     
@@ -219,7 +242,7 @@ static void handle_line(Client *c, const gchar *s) {
         return;
 
     if ((n_args = sscanf(s, "%63s %63s", cmd, arg)) < 1 ) {
-        client_output_printf(c, "- Failed to parse command, try \"HELP\".\n");
+        client_output_printf(c, "%+i Failed to parse command, try \"HELP\".\n", AVAHI_ERR_INVALID_OPERATION);
         c->state = CLIENT_DEAD;
         return;
     }
@@ -236,43 +259,56 @@ static void handle_line(Client *c, const gchar *s) {
                              "+      BROWSE-DNS-SERVERS-IPV6\n");
         c->state = CLIENT_DEAD; }
     else if (strcmp(cmd, "FUCK") == 0 && n_args == 1) {
-        client_output_printf(c, "FUCK: Go fuck yourself!\n");
+        client_output_printf(c, "+ FUCK: Go fuck yourself!\n");
         c->state = CLIENT_DEAD;
     } else if (strcmp(cmd, "RESOLVE-HOSTNAME-IPV4") == 0 && n_args == 2) {
         c->state = CLIENT_RESOLVE_HOSTNAME;
-        c->host_name_resolver = avahi_host_name_resolver_new(avahi_server, -1, AF_UNSPEC, arg, c->afquery = AF_INET, host_name_resolver_callback, c);
+        if (!(c->host_name_resolver = avahi_s_host_name_resolver_new(avahi_server, -1, AF_UNSPEC, arg, c->afquery = AF_INET, host_name_resolver_callback, c)))
+            goto fail;
     } else if (strcmp(cmd, "RESOLVE-HOSTNAME-IPV6") == 0 && n_args == 2) {
         c->state = CLIENT_RESOLVE_HOSTNAME;
-        c->host_name_resolver = avahi_host_name_resolver_new(avahi_server, -1, AF_UNSPEC, arg, c->afquery = AF_INET6, host_name_resolver_callback, c);
+        if (!(c->host_name_resolver = avahi_s_host_name_resolver_new(avahi_server, -1, AF_UNSPEC, arg, c->afquery = AF_INET6, host_name_resolver_callback, c)))
+            goto fail;
     } else if (strcmp(cmd, "RESOLVE-HOSTNAME") == 0 && n_args == 2) {
         c->state = CLIENT_RESOLVE_HOSTNAME;
-        c->host_name_resolver = avahi_host_name_resolver_new(avahi_server, -1, AF_UNSPEC, arg, c->afquery = AF_UNSPEC, host_name_resolver_callback, c);
+        if (!(c->host_name_resolver = avahi_s_host_name_resolver_new(avahi_server, -1, AF_UNSPEC, arg, c->afquery = AF_UNSPEC, host_name_resolver_callback, c)))
+            goto fail;
     } else if (strcmp(cmd, "RESOLVE-ADDRESS") == 0 && n_args == 2) {
         AvahiAddress addr;
         
         if (!(avahi_address_parse(arg, AF_UNSPEC, &addr))) {
-            client_output_printf(c, "- Failed to parse address \"%s\".\n", arg);
+            client_output_printf(c, "%+i Failed to parse address \"%s\".\n", AVAHI_ERR_INVALID_ADDRESS, arg);
             c->state = CLIENT_DEAD;
         } else {
             c->state = CLIENT_RESOLVE_ADDRESS;
-            c->address_resolver = avahi_address_resolver_new(avahi_server, -1, AF_UNSPEC, &addr, address_resolver_callback, c);
+            if (!(c->address_resolver = avahi_s_address_resolver_new(avahi_server, -1, AF_UNSPEC, &addr, address_resolver_callback, c)))
+                goto fail;
         }
     } else if (strcmp(cmd, "BROWSE-DNS-SERVERS-IPV4") == 0 && n_args == 1) {
         c->state = CLIENT_BROWSE_DNS_SERVERS;
-        c->dns_server_browser = avahi_dns_server_browser_new(avahi_server, -1, AF_UNSPEC, NULL, AVAHI_DNS_SERVER_RESOLVE, c->afquery = AF_INET, dns_server_browser_callback, c);
+        if (!(c->dns_server_browser = avahi_s_dns_server_browser_new(avahi_server, -1, AF_UNSPEC, NULL, AVAHI_DNS_SERVER_RESOLVE, c->afquery = AF_INET, dns_server_browser_callback, c)))
+            goto fail;
         client_output_printf(c, "+ Browsing ...\n");
     } else if (strcmp(cmd, "BROWSE-DNS-SERVERS-IPV6") == 0 && n_args == 1) {
         c->state = CLIENT_BROWSE_DNS_SERVERS;
-        c->dns_server_browser = avahi_dns_server_browser_new(avahi_server, -1, AF_UNSPEC, NULL, AVAHI_DNS_SERVER_RESOLVE, c->afquery = AF_INET6, dns_server_browser_callback, c);
+        if (!(c->dns_server_browser = avahi_s_dns_server_browser_new(avahi_server, -1, AF_UNSPEC, NULL, AVAHI_DNS_SERVER_RESOLVE, c->afquery = AF_INET6, dns_server_browser_callback, c)))
+            goto fail;
         client_output_printf(c, "+ Browsing ...\n");
     } else if (strcmp(cmd, "BROWSE-DNS-SERVERS") == 0 && n_args == 1) {
         c->state = CLIENT_BROWSE_DNS_SERVERS;
-        c->dns_server_browser = avahi_dns_server_browser_new(avahi_server, -1, AF_UNSPEC, NULL, AVAHI_DNS_SERVER_RESOLVE, c->afquery = AF_UNSPEC, dns_server_browser_callback, c);
+        if (!(c->dns_server_browser = avahi_s_dns_server_browser_new(avahi_server, -1, AF_UNSPEC, NULL, AVAHI_DNS_SERVER_RESOLVE, c->afquery = AF_UNSPEC, dns_server_browser_callback, c)))
+            goto fail;
         client_output_printf(c, "+ Browsing ...\n");
     } else {
-        client_output_printf(c, "- Invalid command \"%s\", try \"HELP\".\n", cmd);
+        client_output_printf(c, "%+i Invalid command \"%s\", try \"HELP\".\n", AVAHI_ERR_INVALID_OPERATION, cmd);
         c->state = CLIENT_DEAD;
     }
+
+    return;
+
+fail:
+    client_output_printf(c, "%+i %s\n", avahi_server_errno(avahi_server), avahi_strerror(avahi_server_errno(avahi_server)));
+    c->state = CLIENT_DEAD;
 }
 
 static void handle_input(Client *c) {
@@ -492,8 +528,8 @@ void simple_protocol_restart_queries(void) {
 
     for (c = server->clients; c; c = c->clients_next)
         if (c->state == CLIENT_BROWSE_DNS_SERVERS && c->dns_server_browser) {
-            avahi_dns_server_browser_free(c->dns_server_browser);
-            c->dns_server_browser = avahi_dns_server_browser_new(avahi_server, -1, AF_UNSPEC, NULL, AVAHI_DNS_SERVER_RESOLVE, c->afquery, dns_server_browser_callback, c);
+            avahi_s_dns_server_browser_free(c->dns_server_browser);
+            c->dns_server_browser = avahi_s_dns_server_browser_new(avahi_server, -1, AF_UNSPEC, NULL, AVAHI_DNS_SERVER_RESOLVE, c->afquery, dns_server_browser_callback, c);
         }
 }