X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-daemon%2Fmain.c;h=3ac3a63988bf17cf6a648b0e96b6b3e14924d7ee;hb=3a1dbb2f9ed114446ce39eb9c63d213a33771b51;hp=3875865c380441aa798e8cb8c221fef024a36b3b;hpb=969d343114a3ad07e9f1617ec1df465ca501d222;p=catta

diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c
index 3875865..3ac3a63 100644
--- a/avahi-daemon/main.c
+++ b/avahi-daemon/main.c
@@ -25,142 +25,51 @@
 
 #include <avahi-core/core.h>
 
-#define DBUS_API_SUBJECT_TO_CHANGE
-#include <dbus/dbus.h>
-#include <dbus/dbus-glib-lowlevel.h>
-
+#include "main.h"
 #include "simple-protocol.h"
+#include "static-services.h"
 
-#define DBUS_SERVICE_AVAHI "org.freedesktop.Avahi"
-
-static DBusHandlerResult
-do_register (DBusConnection *conn, DBusMessage *message)
-{
-    DBusError error;
-    char *s;
+AvahiServer *avahi_server = NULL;
 
-    dbus_error_init (&error);
+static void server_callback(AvahiServer *s, AvahiServerState state, gpointer userdata) {
+    g_assert(s);
 
-    dbus_message_get_args (message, &error,
-                           DBUS_TYPE_STRING, &s,
-                           DBUS_TYPE_INVALID);
+    if (state == AVAHI_SERVER_RUNNING) {
+        g_message("Server startup complete.  Host name is <%s>", avahi_server_get_host_name_fqdn(s));
+        static_service_add_to_server();
+    } else if (state == AVAHI_SERVER_COLLISION) {
+        gchar *n;
 
-    if (dbus_error_is_set (&error))
-    {
-        g_warning ("Error parsing register attempt");
-        dbus_error_free (&error);
-
-        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+        static_service_remove_from_server();
+        
+        n = avahi_alternative_host_name(avahi_server_get_host_name(s));
+        g_message("Host name conflict, retrying with <%s>", n);
+        avahi_server_set_host_name(s, n);
+        g_free(n);
     }
-
-    g_message ("Register received from: %s", s);
-
-    return DBUS_HANDLER_RESULT_HANDLED;
 }
 
-static DBusHandlerResult
-signal_filter (DBusConnection *conn, DBusMessage *message, void *user_data)
-{
-    GMainLoop *loop = user_data;
-    DBusError error;
-
-    dbus_error_init (&error);
-
-    g_message ("dbus: interface=%s, path=%s, member=%s",
-               dbus_message_get_interface (message),
-               dbus_message_get_path (message),
-               dbus_message_get_member (message));
-
-    if (dbus_message_is_signal (message,
-                                DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL,
-                                "Disconnected"))
-    {
-        /* No, we shouldn't quit, but until we get somewhere
-         * usefull such that we can restore our state, we will */
-        g_warning ("Disconnnected from d-bus");
-
-        g_main_loop_quit (loop);
-        return DBUS_HANDLER_RESULT_HANDLED;
-    } else if (dbus_message_is_method_call (message, DBUS_SERVICE_AVAHI,
-                                            "Register"))
-    {
-        return do_register (conn, message);
-    } else if (dbus_message_is_signal (message,
-                                       DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
-                                       "ServiceAcquired"))
-    {
-        char *name;
-
-        dbus_message_get_args (message, &error,
-                               DBUS_TYPE_STRING, &name,
-                               DBUS_TYPE_INVALID);
-
-        if (dbus_error_is_set (&error))
-        {
-            g_warning ("Error parsing NameAcquired message");
-            dbus_error_free (&error);
-
-            return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-        }
-
-        g_message ("dbus: ServiceAcquired (%s)", name);
-
-        return DBUS_HANDLER_RESULT_HANDLED;
-    }
-
-    g_message ("dbus: missed event");
-
-    return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-}
-                
 int main(int argc, char *argv[]) {
     GMainLoop *loop = NULL;
-    DBusConnection *bus = NULL;
-    DBusError error;
-    gint r = -1;
-
-    loop = g_main_loop_new(NULL, FALSE);
-
-    dbus_error_init (&error);
+    gint r = 255;
+    AvahiServerConfig config;
 
-    bus = dbus_bus_get (DBUS_BUS_SYSTEM, &error);
+    avahi_server_config_init(&config);
 
-    if (bus == NULL)
-    {
-        g_warning ("dbus_bus_get(): %s", error.message);
-        dbus_error_free (&error);
+    loop = g_main_loop_new(NULL, FALSE);
 
+    if (simple_protocol_setup(NULL) < 0)
         goto finish;
-    }
-
-    dbus_connection_setup_with_g_main (bus, NULL);
-    dbus_connection_set_exit_on_disconnect (bus, FALSE);
-
-    dbus_bus_acquire_service (bus, DBUS_SERVICE_AVAHI, 0, &error);
-
-    if (dbus_error_is_set (&error))
-    {
-        g_warning ("dbus_error_is_set (): %s", error.message);
-        dbus_error_free (&error);
 
+#ifdef ENABLE_DBUS
+    if (dbus_protocol_setup () < 0)
         goto finish;
-    }
-
-    dbus_connection_add_filter (bus, signal_filter, loop, NULL);
-    dbus_bus_add_match (bus,
-                        "type='method_call',interface='org.freedesktop.Avahi'",
-                        &error);
-
-    if (dbus_error_is_set (&error))
-    {
-        g_warning ("dbus_bus_add_match (): %s", error.message);
-        dbus_error_free (&error);
+#endif
 
+    if (!(avahi_server = avahi_server_new(NULL, &config, server_callback, NULL)))
         goto finish;
-    }
 
-    if (simple_protocol_setup(NULL) < 0)
-        goto finish;
+    static_service_load();
 
     g_main_loop_run(loop);
 
@@ -168,15 +77,22 @@ int main(int argc, char *argv[]) {
     
 finish:
 
+    static_service_remove_from_server();
+    static_service_free_all();
+    
     simple_protocol_shutdown();
 
-    if (bus) {
-        dbus_connection_disconnect(bus);
-        dbus_connection_unref(bus);
-    }
+#ifdef ENABLE_DBUS
+    dbus_protocol_shutdown();
+#endif
 
+    if (avahi_server)
+        avahi_server_free(avahi_server);
+    
     if (loop)
         g_main_loop_unref(loop);
 
+    avahi_server_config_free(&config);
+
     return r;
 }