2003-01-04 Havoc Pennington <hp@pobox.com>

	* dbus/dbus-sysdeps.c (_dbus_sleep_milliseconds): new function
	(_dbus_poll): new function

	* dbus/dbus-internals.h (_DBUS_STRUCT_OFFSET): new macro
	copied from GLib

	* bus/loop.c: initial code for the daemon main loop

1 files changed, 161 insertions, 0 deletions

diff --git a/bus/main.c b/bus/main.c
index 1025a0e7..199a10f0 100644
--- a/bus/main.c
+++ b/bus/main.c
@@ -1,8 +1,169 @@
+/* -*- mode: C; c-file-style: "gnu" -*- */
+/* main.c  main() for message bus
+ *
+ * Copyright (C) 2003 Red Hat, Inc.
+ *
+ * Licensed under the Academic Free License version 1.2
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+#include "loop.h"
+#include <dbus/dbus-list.h>
+#include <dbus/dbus.h>
+
+static DBusList *connections = NULL;
+
+static void
+connection_error_handler (DBusConnection *connection,
+                          DBusResultCode  error_code,
+                          void           *data)
+{
+  _dbus_warn ("Error on connection: %s\n",
+              dbus_result_to_string (error_code));
+
+  /* we don't want to be called again since we're dropping the connection */
+  dbus_connection_set_error_function (connection, NULL, NULL, NULL);
+
+  _dbus_list_remove (&connections, connection);    
+  dbus_connection_unref (connection);
+}
+
+static void
+connection_watch_callback (DBusWatch     *watch,
+                           unsigned int   condition,
+                           void          *data)
+{
+  DBusConnection *connection = data;
+
+  dbus_connection_handle_watch (connection, watch, condition);
+}
+
+static void
+server_watch_callback (DBusWatch     *watch,
+                       unsigned int   condition,
+                       void          *data)
+{
+  DBusServer *server = data;
+
+  dbus_server_handle_watch (server, watch, condition);
+}
+
+static void
+add_connection_watch (DBusWatch      *watch,
+                      DBusConnection *connection)
+{
+  bus_loop_add_watch (watch, connection_watch_callback, connection,
+                      NULL);
+}
+
+static void
+remove_connection_watch (DBusWatch      *watch,
+                         DBusConnection *connection)
+{
+  bus_loop_remove_watch (watch, connection_watch_callback, connection);
+}
+
+static void
+add_server_watch (DBusWatch      *watch,
+                  DBusServer     *server)
+{
+  bus_loop_add_watch (watch, server_watch_callback, server,
+                      NULL);
+}
+
+static void
+remove_server_watch (DBusWatch      *watch,
+                     DBusServer     *server)
+{
+  bus_loop_remove_watch (watch, server_watch_callback, server);
+}
+
+static dbus_bool_t
+setup_connection (DBusConnection *connection)
+{
+  if (!_dbus_list_append (&connections, connection))
+    {
+      dbus_connection_disconnect (connection);
+      return FALSE;
+    }
+
+  dbus_connection_ref (connection);
+  
+  dbus_connection_set_watch_functions (connection,
+                                       (DBusAddWatchFunction) add_connection_watch,
+                                       (DBusRemoveWatchFunction) remove_connection_watch,
+                                       connection,
+                                       NULL);
+
+  dbus_connection_set_error_function (connection,
+                                      connection_error_handler,
+                                      NULL, NULL);
+
+  return TRUE;
+}
+
+static void
+setup_server (DBusServer *server)
+{
+  dbus_server_set_watch_functions (server,
+                                   (DBusAddWatchFunction) add_server_watch,
+                                   (DBusRemoveWatchFunction) remove_server_watch,
+                                   server,
+                                   NULL);
+}
+
+static void
+new_connection_callback (DBusServer     *server,
+                         DBusConnection *new_connection,
+                         void           *data)
+{
+  if (!setup_connection (new_connection))
+    ; /* we won't have ref'd the connection so it will die */
+}
 
 int
 main (int argc, char **argv)
 {
+  DBusServer *server;
+  DBusResultCode result;
+
+  if (argc < 2)
+    {
+      _dbus_warn ("Give the server address as an argument\n");
+      return 1;
+    }
+
+  server = dbus_server_listen (argv[1], &result);
+  if (server == NULL)
+    {
+      _dbus_warn ("Failed to start server on %s: %s\n",
+                  argv[1], dbus_result_to_string (result));
+      return 1;
+    }
+
+  setup_server (server);
 
+  dbus_server_set_new_connection_function (server,
+                                           new_connection_callback,
+                                           NULL, NULL);
+  
+  bus_loop_run ();
+  
+  dbus_server_disconnect (server);
+  dbus_server_unref (server);
 
   return 0;
 }