* Split out the dbus stuff in the daemon to a separate file so it can be built condi...

[catta] / avahi-daemon / main.c

diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c
index ecc8c8378e14cc68295f3f7bb92e91a96c401e3e..4639ba8f87b9d7a2926e21898dc71a9ab31d9af8 100644 (file)
--- a/avahi-daemon/main.c
+++ b/avahi-daemon/main.c
@@ -25,10 +25,6 @@
 
 #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"
@@ -37,86 +33,6 @@
 
 AvahiServer *avahi_server = NULL;
 
-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;
-}
-
-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;
-}
-
 static void server_callback(AvahiServer *s, AvahiServerState state, gpointer userdata) {
     g_assert(s);
 
@@ -137,8 +53,6 @@ static void server_callback(AvahiServer *s, AvahiServerState state, gpointer use
 
 int main(int argc, char *argv[]) {
     GMainLoop *loop = NULL;
-    DBusConnection *bus = NULL;
-    DBusError error;
     gint r = 255;
     AvahiServerConfig config;
 
@@ -146,46 +60,13 @@ int main(int argc, char *argv[]) {
 
     loop = g_main_loop_new(NULL, FALSE);
 
-    dbus_error_init (&error);
-
-    bus = dbus_bus_get (DBUS_BUS_SYSTEM, &error);
-
-    if (bus == NULL)
-    {
-        g_warning ("dbus_bus_get(): %s", error.message);
-        dbus_error_free (&error);
-
-        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);
-
-        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);
-
+    if (simple_protocol_setup(NULL) < 0)
         goto finish;
-    }
 
-    if (simple_protocol_setup(NULL) < 0)
+#ifdef ENABLE_DBUS
+    if (dbus_protocol_setup () < 0)
         goto finish;
+#endif
 
     if (!(avahi_server = avahi_server_new(NULL, &config, server_callback, NULL)))
         goto finish;
@@ -203,10 +84,9 @@ finish:
     
     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);