Initial support for XDMCP IndirectQuery choosers. Also fix broken

2008-01-30  William Jon McCann  <mccann@jhu.edu>

	* common/gdm-address.c: (add_local_siocgifconf),
	(add_local_addrinfo), (gdm_address_peek_local_list):
	* daemon/Makefile.am:
	* daemon/gdm-chooser-server.c: (generate_address),
	(handle_select_hostname), (handle_disconnect),
	(chooser_handle_child_message), (do_introspect),
	(chooser_server_message_handler),
	(chooser_server_unregister_handler), (connection_filter_function),
	(allow_user_function), (handle_connection),
	(gdm_chooser_server_start), (gdm_chooser_server_stop),
	(gdm_chooser_server_get_address),
	(_gdm_chooser_server_set_display_id),
	(_gdm_chooser_server_set_user_name),
	(_gdm_chooser_server_set_group_name),
	(gdm_chooser_server_set_property),
	(gdm_chooser_server_get_property),
	(gdm_chooser_server_constructor), (gdm_chooser_server_class_init),
	(gdm_chooser_server_init), (gdm_chooser_server_finalize),
	(gdm_chooser_server_new):
	* daemon/gdm-chooser-server.h:
	* daemon/gdm-chooser-session.c: (listify_hash),
	(get_chooser_environment), (chooser_session_child_watch),
	(spawn_child_setup), (spawn_command_line_sync_as_user),
	(spawn_command_line_async_as_user), (parse_value_as_integer),
	(parse_dbus_launch_output), (start_dbus_daemon),
	(stop_dbus_daemon), (gdm_chooser_session_spawn),
	(gdm_chooser_session_start), (wait_on_child),
	(chooser_session_died), (gdm_chooser_session_stop),
	(gdm_chooser_session_set_server_address),
	(_gdm_chooser_session_set_x11_display_name),
	(_gdm_chooser_session_set_x11_display_hostname),
	(_gdm_chooser_session_set_x11_display_device),
	(_gdm_chooser_session_set_x11_authority_file),
	(_gdm_chooser_session_set_user_name),
	(_gdm_chooser_session_set_group_name),
	(gdm_chooser_session_set_property),
	(gdm_chooser_session_get_property),
	(gdm_chooser_session_constructor),
	(gdm_chooser_session_class_init), (gdm_chooser_session_init),
	(gdm_chooser_session_finalize), (gdm_chooser_session_new):
	* daemon/gdm-chooser-session.h:
	* daemon/gdm-display.c: (gdm_display_real_set_slave_bus_name),
	(gdm_display_set_slave_bus_name), (gdm_display_class_init):
	* daemon/gdm-display.h:
	* daemon/gdm-display.xml:
	* daemon/gdm-factory-slave.c:
	* daemon/gdm-greeter-server.c:
	* daemon/gdm-greeter-session.c: (gdm_greeter_session_init):
	* daemon/gdm-product-slave.c:
	* daemon/gdm-simple-slave.c:
	* daemon/gdm-slave.c: (gdm_slave_set_slave_bus_name),
	(gdm_slave_real_start), (register_slave), (gdm_slave_constructor):
	* daemon/gdm-xdmcp-chooser-display.c: (on_hostname_selected),
	(gdm_xdmcp_chooser_display_set_slave_bus_name),
	(gdm_xdmcp_chooser_display_manage),
	(gdm_xdmcp_chooser_display_class_init),
	(gdm_xdmcp_chooser_display_init),
	(gdm_xdmcp_chooser_display_finalize),
	(gdm_xdmcp_chooser_display_new):
	* daemon/gdm-xdmcp-chooser-display.h:
	* daemon/gdm-xdmcp-chooser-display.xml:
	* daemon/gdm-xdmcp-chooser-slave.c: (on_chooser_session_start),
	(on_chooser_session_stop), (on_chooser_session_exited),
	(on_chooser_session_died), (on_chooser_hostname_selected),
	(on_chooser_disconnected), (on_chooser_connected), (setup_server),
	(run_chooser), (idle_connect_to_display),
	(gdm_xdmcp_chooser_slave_run), (gdm_xdmcp_chooser_slave_start),
	(gdm_xdmcp_chooser_slave_stop),
	(gdm_xdmcp_chooser_slave_set_property),
	(gdm_xdmcp_chooser_slave_get_property),
	(gdm_xdmcp_chooser_slave_constructor),
	(gdm_xdmcp_chooser_slave_class_init),
	(gdm_xdmcp_chooser_slave_init), (gdm_xdmcp_chooser_slave_finalize),
	(gdm_xdmcp_chooser_slave_new):
	* daemon/gdm-xdmcp-chooser-slave.h:
	* daemon/gdm-xdmcp-display-factory.c: (set_port_for_request),
	(gdm_xdmcp_send_forward_query), (indirect_client_create),
	(indirect_client_destroy), (indirect_client_lookup_by_chosen),
	(indirect_client_lookup), (gdm_xdmcp_handle_indirect_query),
	(forward_query_destroy), (remove_oldest_forward),
	(forward_query_create), (forward_query_lookup),
	(gdm_xdmcp_handle_forward_query), (gdm_xdmcp_send_decline),
	(on_hostname_selected), (gdm_xdmcp_display_create),
	(gdm_xdmcp_handle_request), (gdm_xdmcp_send_refuse),
	(gdm_xdmcp_handle_manage), (gdm_xdmcp_handle_managed_forward):
	* daemon/gdm-xdmcp-display.c: (gdm_xdmcp_display_class_init),
	(gdm_xdmcp_display_finalize):
	* daemon/gdm-xdmcp-display.h:
	* daemon/gdm-xdmcp-display.xml:
	* daemon/gdm-xdmcp-greeter-display.c:
	(gdm_xdmcp_greeter_display_class_init),
	(gdm_xdmcp_greeter_display_init),
	(gdm_xdmcp_greeter_display_finalize),
	(gdm_xdmcp_greeter_display_new):
	* daemon/gdm-xdmcp-greeter-display.h:
	* daemon/xdmcp-chooser-slave-main.c: (get_system_bus), (signal_cb),
	(on_slave_stopped), (main):
	* data/gdm.conf:
	* gui/simple-chooser/Makefile.am:
	* gui/simple-chooser/chooser-main.c: (assistive_registry_launch),
	(filter_watch), (filter_timeout), (assistive_registry_start),
	(at_set_gtk_modules), (load_a11y), (main):
	* gui/simple-chooser/gdm-chooser-client.c:
	(gdm_chooser_client_error_quark), (send_dbus_string_method),
	(send_dbus_void_method), (gdm_chooser_client_call_select_hostname),
	(gdm_chooser_client_call_disconnect), (client_dbus_handle_message),
	(client_dbus_filter_function), (gdm_chooser_client_start),
	(gdm_chooser_client_stop), (gdm_chooser_client_set_property),
	(gdm_chooser_client_get_property),
	(gdm_chooser_client_constructor), (gdm_chooser_client_dispose),
	(gdm_chooser_client_class_init), (gdm_chooser_client_init),
	(gdm_chooser_client_finalize), (gdm_chooser_client_new):
	* gui/simple-chooser/gdm-chooser-client.h:
	* gui/simple-chooser/gdm-chooser-session.c: (launch_compiz),
	(launch_metacity), (start_window_manager), (start_settings_daemon),
	(on_dialog_response), (gdm_chooser_session_start),
	(gdm_chooser_session_stop), (gdm_chooser_session_set_property),
	(gdm_chooser_session_get_property),
	(gdm_chooser_session_constructor), (gdm_chooser_session_dispose),
	(gdm_chooser_session_class_init), (gdm_chooser_session_init),
	(gdm_chooser_session_finalize), (gdm_chooser_session_new):
	* gui/simple-chooser/gdm-chooser-session.h:
	* gui/simple-chooser/test-host-chooser.c:
	(assistive_registry_launch), (filter_watch), (filter_timeout),
	(assistive_registry_start), (at_set_gtk_modules), (load_a11y),
	(main):
	* gui/simple-greeter/greeter-main.c: (load_a11y), (main):
	Initial support for XDMCP IndirectQuery choosers.
	Also fix broken gdm_address_is_local.


svn path=/trunk/; revision=5645

1 files changed, 234 insertions, 0 deletions

diff --git a/daemon/gdm-xdmcp-chooser-display.c b/daemon/gdm-xdmcp-chooser-display.c
new file mode 100644
index 00000000..85bd3b71
--- /dev/null
+++ b/daemon/gdm-xdmcp-chooser-display.c
@@ -0,0 +1,234 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2008 William Jon McCann <jmccann@redhat.com>
+ *
+ * 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 "config.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <string.h>
+#include <signal.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <errno.h>
+
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <glib-object.h>
+
+#include "gdm-display.h"
+#include "gdm-xdmcp-chooser-display.h"
+#include "gdm-xdmcp-chooser-display-glue.h"
+
+#include "gdm-common.h"
+#include "gdm-address.h"
+
+#define DEFAULT_SLAVE_COMMAND LIBEXECDIR"/gdm-xdmcp-chooser-slave"
+
+#define GDM_DBUS_NAME                          "/org/gnome/DisplayManager"
+#define GDM_XDMCP_CHOOSER_SLAVE_DBUS_INTERFACE "org.gnome.DisplayManager.XdmcpChooserSlave"
+
+#define GDM_XDMCP_CHOOSER_DISPLAY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_XDMCP_CHOOSER_DISPLAY, GdmXdmcpChooserDisplayPrivate))
+
+struct GdmXdmcpChooserDisplayPrivate
+{
+        DBusGProxy      *slave_proxy;
+};
+
+enum {
+        PROP_0,
+};
+
+enum {
+        HOSTNAME_SELECTED,
+        LAST_SIGNAL
+};
+
+static guint signals [LAST_SIGNAL] = { 0, };
+
+static void     gdm_xdmcp_chooser_display_class_init    (GdmXdmcpChooserDisplayClass *klass);
+static void     gdm_xdmcp_chooser_display_init          (GdmXdmcpChooserDisplay      *xdmcp_chooser_display);
+static void     gdm_xdmcp_chooser_display_finalize      (GObject                     *object);
+
+G_DEFINE_TYPE (GdmXdmcpChooserDisplay, gdm_xdmcp_chooser_display, GDM_TYPE_XDMCP_DISPLAY)
+
+static void
+on_hostname_selected (DBusGProxy             *proxy,
+                      const char             *hostname,
+                      GdmXdmcpChooserDisplay *display)
+{
+        g_debug ("GdmXdmcpChooserDisplay: hostname selected: %s", hostname);
+        g_signal_emit (display, signals [HOSTNAME_SELECTED], 0, hostname);
+}
+
+static gboolean
+gdm_xdmcp_chooser_display_set_slave_bus_name (GdmDisplay *display,
+                                              const char *name,
+                                              GError    **error)
+{
+        char            *display_id;
+        const char      *slave_num;
+        char            *slave_id;
+        DBusGConnection *connection;
+        GError          *local_error;
+        GdmXdmcpChooserDisplay *chooser_display;
+
+        display_id = NULL;
+        slave_id = NULL;
+        slave_num = NULL;
+
+        chooser_display = GDM_XDMCP_CHOOSER_DISPLAY (display);
+        if (chooser_display->priv->slave_proxy != NULL) {
+                g_object_unref (chooser_display->priv->slave_proxy);
+        }
+
+        g_object_get (display, "id", &display_id, NULL);
+
+        if (g_str_has_prefix (display_id, "/org/gnome/DisplayManager/Display")) {
+                slave_num = display_id + strlen ("/org/gnome/DisplayManager/Display");
+        }
+
+        slave_id = g_strdup_printf ("/org/gnome/DisplayManager/Slave%s", slave_num);
+
+        local_error = NULL;
+        connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &local_error);
+        if (connection == NULL) {
+                if (local_error != NULL) {
+                        g_critical ("error getting system bus: %s", local_error->message);
+                        g_error_free (local_error);
+                }
+        }
+
+        g_debug ("GdmXdmcpChooserDisplay: creating proxy for %s on %s", slave_id, name);
+
+        chooser_display->priv->slave_proxy = dbus_g_proxy_new_for_name (connection,
+                                                                         name,
+                                                                         slave_id,
+                                                                         GDM_XDMCP_CHOOSER_SLAVE_DBUS_INTERFACE);
+        if (chooser_display->priv->slave_proxy == NULL) {
+                g_warning ("Failed to connect to the slave object");
+                goto out;
+        }
+        dbus_g_proxy_add_signal (chooser_display->priv->slave_proxy,
+                                 "HostnameSelected",
+                                 G_TYPE_STRING,
+                                 G_TYPE_INVALID);
+        dbus_g_proxy_connect_signal (chooser_display->priv->slave_proxy,
+                                     "HostnameSelected",
+                                     G_CALLBACK (on_hostname_selected),
+                                     display,
+                                     NULL);
+ out:
+
+        g_free (display_id);
+        g_free (slave_id);
+
+        return GDM_DISPLAY_CLASS (gdm_xdmcp_chooser_display_parent_class)->set_slave_bus_name (display, name, error);
+}
+
+static gboolean
+gdm_xdmcp_chooser_display_manage (GdmDisplay *display)
+{
+        g_return_val_if_fail (GDM_IS_DISPLAY (display), FALSE);
+
+        GDM_DISPLAY_CLASS (gdm_xdmcp_chooser_display_parent_class)->manage (display);
+
+        return TRUE;
+}
+
+static void
+gdm_xdmcp_chooser_display_class_init (GdmXdmcpChooserDisplayClass *klass)
+{
+        GObjectClass    *object_class = G_OBJECT_CLASS (klass);
+        GdmDisplayClass *display_class = GDM_DISPLAY_CLASS (klass);
+
+        object_class->finalize = gdm_xdmcp_chooser_display_finalize;
+
+        display_class->manage = gdm_xdmcp_chooser_display_manage;
+        display_class->set_slave_bus_name = gdm_xdmcp_chooser_display_set_slave_bus_name;
+
+        signals [HOSTNAME_SELECTED] =
+                g_signal_new ("hostname-selected",
+                              G_OBJECT_CLASS_TYPE (object_class),
+                              G_SIGNAL_RUN_FIRST,
+                              G_STRUCT_OFFSET (GdmXdmcpChooserDisplayClass, hostname_selected),
+                              NULL,
+                              NULL,
+                              g_cclosure_marshal_VOID__STRING,
+                              G_TYPE_NONE,
+                              1,
+                              G_TYPE_STRING);
+
+        g_type_class_add_private (klass, sizeof (GdmXdmcpChooserDisplayPrivate));
+
+        dbus_g_object_type_install_info (GDM_TYPE_XDMCP_CHOOSER_DISPLAY, &dbus_glib_gdm_xdmcp_chooser_display_object_info);
+}
+
+static void
+gdm_xdmcp_chooser_display_init (GdmXdmcpChooserDisplay *xdmcp_chooser_display)
+{
+
+        xdmcp_chooser_display->priv = GDM_XDMCP_CHOOSER_DISPLAY_GET_PRIVATE (xdmcp_chooser_display);
+}
+
+static void
+gdm_xdmcp_chooser_display_finalize (GObject *object)
+{
+        GdmXdmcpChooserDisplay *chooser_display;
+
+        g_return_if_fail (object != NULL);
+        g_return_if_fail (GDM_IS_XDMCP_CHOOSER_DISPLAY (object));
+
+        chooser_display = GDM_XDMCP_CHOOSER_DISPLAY (object);
+
+        g_return_if_fail (chooser_display->priv != NULL);
+
+        if (chooser_display->priv->slave_proxy != NULL) {
+                g_object_unref (chooser_display->priv->slave_proxy);
+        }
+
+        G_OBJECT_CLASS (gdm_xdmcp_chooser_display_parent_class)->finalize (object);
+}
+
+GdmDisplay *
+gdm_xdmcp_chooser_display_new (const char              *hostname,
+                               int                      number,
+                               GdmAddress              *address,
+                               gint32                   session_number)
+{
+        GObject *object;
+        char    *x11_display;
+
+        x11_display = g_strdup_printf ("%s:%d", hostname, number);
+        object = g_object_new (GDM_TYPE_XDMCP_CHOOSER_DISPLAY,
+                               "slave-command", DEFAULT_SLAVE_COMMAND,
+                               "remote-hostname", hostname,
+                               "x11-display-number", number,
+                               "x11-display-name", x11_display,
+                               "is-local", FALSE,
+                               "remote-address", address,
+                               "session-number", session_number,
+                               NULL);
+        g_free (x11_display);
+
+        return GDM_DISPLAY (object);
+}