* include dbus-protocol.h in dbus-protocol.c

[catta] / avahi-daemon / main.c

diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c
index 9a02391da8283270994446e9b632fa43137ff649..3ac3a63988bf17cf6a648b0e96b6b3e14924d7ee 100644 (file)
--- a/avahi-daemon/main.c
+++ b/avahi-daemon/main.c
@@ -25,140 +25,74 @@
 
 #include <avahi-core/core.h>
 
-#define DBUS_API_SUBJECT_TO_CHANGE
-#include <dbus/dbus.h>
-#include <dbus/dbus-glib-lowlevel.h>
-
-#define DBUS_SERVICE_AVAHI "org.freedesktop.Avahi"
-
-static DBusHandlerResult
-do_register (DBusConnection *conn, DBusMessage *message)
-{
-       DBusError error;
-       char *s;
-
-       dbus_error_init (&error);
-
-       dbus_message_get_args (message, &error,
-                       DBUS_TYPE_STRING, &s,
-                       DBUS_TYPE_INVALID);
-
-       if (dbus_error_is_set (&error))
-       {
-               g_warning ("Error parsing register attempt");
-               dbus_error_free (&error);
-
-               return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-       }
-
-       g_message ("Register received from: %s", s);
-
-       return DBUS_HANDLER_RESULT_HANDLED;
+#include "main.h"
+#include "simple-protocol.h"
+#include "static-services.h"
+
+AvahiServer *avahi_server = NULL;
+
+static void server_callback(AvahiServer *s, AvahiServerState state, gpointer userdata) {
+    g_assert(s);
+
+    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;
+
+        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);
+    }
 }
 
-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;
-    DBusError error;
-
-    loop = g_main_loop_new(NULL, FALSE);
+    gint r = 255;
+    AvahiServerConfig config;
 
-    dbus_error_init (&error);
+    avahi_server_config_init(&config);
 
+    loop = g_main_loop_new(NULL, FALSE);
 
-    bus = dbus_bus_get (DBUS_BUS_SYSTEM, &error);
+    if (simple_protocol_setup(NULL) < 0)
+        goto finish;
 
-    if (bus == NULL)
-    {
-           g_warning ("dbus_bus_get(): %s", error.message);
-           dbus_error_free (&error);
+#ifdef ENABLE_DBUS
+    if (dbus_protocol_setup () < 0)
+        goto finish;
+#endif
 
-           return -1;
-    }
+    if (!(avahi_server = avahi_server_new(NULL, &config, server_callback, NULL)))
+        goto finish;
 
-    dbus_connection_setup_with_g_main (bus, NULL);
-    dbus_connection_set_exit_on_disconnect (bus, FALSE);
+    static_service_load();
 
-    dbus_bus_acquire_service (bus, DBUS_SERVICE_AVAHI, 0, &error);
+    g_main_loop_run(loop);
 
-    if (dbus_error_is_set (&error))
-    {
-           g_warning ("dbus_error_is_set (): %s", error.message);
-           dbus_error_free (&error);
+    r = 0;
+    
+finish:
 
-           return -1;
-    }
+    static_service_remove_from_server();
+    static_service_free_all();
+    
+    simple_protocol_shutdown();
 
-    dbus_connection_add_filter (bus, signal_filter, loop, NULL);
-    dbus_bus_add_match (bus,
-                   "type='method_call',interface='org.freedesktop.Avahi'",
-                   &error);
+#ifdef ENABLE_DBUS
+    dbus_protocol_shutdown();
+#endif
 
-    if (dbus_error_is_set (&error))
-    {
-           g_warning ("dbus_bus_add_match (): %s", error.message);
-           dbus_error_free (&error);
+    if (avahi_server)
+        avahi_server_free(avahi_server);
+    
+    if (loop)
+        g_main_loop_unref(loop);
 
-           return -1;
-    }
+    avahi_server_config_free(&config);
 
-    g_main_loop_run(loop);
-    g_main_loop_unref(loop);
-    
-    return 0;
+    return r;
 }