Enable XDMCP configuration so it works. Previously only xdmcp/Enable was

2009-02-17 Brian Cameron <brian.cameron@sun.com>

        * common/gdm-settings-direct.[ch], common/gdm-settings-keys.h,
        daemon/gdm-simple-slave.c, daemon/gdm-xdmcp-chooser-slave.c,
        daemon/gdm-xdmcp-display-factory.c, data/gdm.schemas.in.in,
        docs/C/gdm.xml: Enable XDMCP configuration so it works.  Previously
        only xdmcp/Enable was being used in the code.  Also add support for
        chooser/Multicast and chooser/MulticastAddr configuration options.
        Now set the default values of MAX_DISPLAY_PER_HOST to 1 and MAX_WAIT to
        30 as specified in the docs.  Add a gdm_settings_direct_get_uint
        function to get unsigned integer configuration values more cleanly
        without the need to cast.  Fixes bug #569876.

svn path=/trunk/; revision=6715

3 files changed, 73 insertions, 5 deletions

diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
index 6a009316..3a2623c0 100644
--- a/daemon/gdm-simple-slave.c
+++ b/daemon/gdm-simple-slave.c
@@ -53,13 +53,16 @@
 #include "gdm-session-direct.h"
 #include "gdm-greeter-server.h"
 #include "gdm-greeter-session.h"
+#include "gdm-settings-direct.h"
+#include "gdm-settings-keys.h"
 
 #define GDM_SIMPLE_SLAVE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_SIMPLE_SLAVE, GdmSimpleSlavePrivate))
 
 #define GDM_DBUS_NAME              "org.gnome.DisplayManager"
 #define GDM_DBUS_DISPLAY_INTERFACE "org.gnome.DisplayManager.Display"
 
-#define MAX_CONNECT_ATTEMPTS 10
+#define MAX_CONNECT_ATTEMPTS  10
+#define DEFAULT_PING_INTERVAL 15
 
 struct GdmSimpleSlavePrivate
 {
@@ -862,6 +865,7 @@ start_greeter (GdmSimpleSlave *slave)
         char          *display_hostname;
         char          *auth_file;
         char          *address;
+        gboolean       res;
 
         g_debug ("GdmSimpleSlave: Running greeter");
 
@@ -889,6 +893,10 @@ start_greeter (GdmSimpleSlave *slave)
         /* FIXME: send a signal back to the master */
 
         /* If XDMCP setup pinging */
+        slave->priv->ping_interval = DEFAULT_PING_INTERVAL;
+        res = gdm_settings_direct_get_int (GDM_KEY_PING_INTERVAL,
+                                           &(slave->priv->ping_interval));
+
         if ( ! display_is_local && slave->priv->ping_interval > 0) {
                 alarm (slave->priv->ping_interval);
         }
diff --git a/daemon/gdm-xdmcp-chooser-slave.c b/daemon/gdm-xdmcp-chooser-slave.c
index 5898efd5..3117ff93 100644
--- a/daemon/gdm-xdmcp-chooser-slave.c
+++ b/daemon/gdm-xdmcp-chooser-slave.c
@@ -48,13 +48,16 @@
 #include "gdm-server.h"
 #include "gdm-chooser-server.h"
 #include "gdm-chooser-session.h"
+#include "gdm-settings-direct.h"
+#include "gdm-settings-keys.h"
 
 #define GDM_XDMCP_CHOOSER_SLAVE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_XDMCP_CHOOSER_SLAVE, GdmXdmcpChooserSlavePrivate))
 
 #define GDM_DBUS_NAME              "org.gnome.DisplayManager"
 #define GDM_DBUS_DISPLAY_INTERFACE "org.gnome.DisplayManager.Display"
 
-#define MAX_CONNECT_ATTEMPTS 10
+#define MAX_CONNECT_ATTEMPTS  10
+#define DEFAULT_PING_INTERVAL 15
 
 struct GdmXdmcpChooserSlavePrivate
 {
@@ -164,6 +167,7 @@ run_chooser (GdmXdmcpChooserSlave *slave)
         char          *display_hostname;
         char          *auth_file;
         char          *address;
+        gboolean       res;
 
         g_debug ("GdmXdmcpChooserSlave: Running chooser");
 
@@ -185,6 +189,10 @@ run_chooser (GdmXdmcpChooserSlave *slave)
         /* FIXME: send a signal back to the master */
 
         /* If XDMCP setup pinging */
+        slave->priv->ping_interval = DEFAULT_PING_INTERVAL;
+        res = gdm_settings_direct_get_int (GDM_KEY_PING_INTERVAL,
+                                           &(slave->priv->ping_interval));
+
         if (slave->priv->ping_interval > 0) {
                 alarm (slave->priv->ping_interval);
         }
diff --git a/daemon/gdm-xdmcp-display-factory.c b/daemon/gdm-xdmcp-display-factory.c
index aa68ae06..05d0261b 100644
--- a/daemon/gdm-xdmcp-display-factory.c
+++ b/daemon/gdm-xdmcp-display-factory.c
@@ -57,6 +57,8 @@
 #include "gdm-display-factory.h"
 #include "gdm-xdmcp-display-factory.h"
 #include "gdm-display-store.h"
+#include "gdm-settings-direct.h"
+#include "gdm-settings-keys.h"
 
 /*
  * On Sun, we need to define allow_severity and deny_severity to link
@@ -74,10 +76,11 @@ int deny_severity = LOG_WARNING;
 #define DEFAULT_USE_MULTICAST         FALSE
 #define DEFAULT_MULTICAST_ADDRESS     "ff02::1"
 #define DEFAULT_HONOR_INDIRECT        TRUE
-#define DEFAULT_MAX_DISPLAYS_PER_HOST 2
+#define DEFAULT_MAX_DISPLAYS_PER_HOST 1
 #define DEFAULT_MAX_DISPLAYS          16
 #define DEFAULT_MAX_PENDING_DISPLAYS  4
-#define DEFAULT_MAX_WAIT              15
+#define DEFAULT_MAX_WAIT              30
+#define DEFAULT_MAX_WAIT_INDIRECT     30
 #define DEFAULT_WILLING_SCRIPT        GDMCONFDIR "/Xwilling"
 
 #define GDM_MAX_FORWARD_QUERIES 10
@@ -186,6 +189,7 @@ struct GdmXdmcpDisplayFactoryPrivate
         guint            max_displays;
         guint            max_pending_displays;
         guint            max_wait;
+        guint            max_wait_indirect;
 };
 
 enum {
@@ -199,6 +203,7 @@ enum {
         PROP_MAX_DISPLAYS,
         PROP_MAX_PENDING_DISPLAYS,
         PROP_MAX_WAIT,
+        PROP_MAX_WAIT_INDIRECT,
 };
 
 static void     gdm_xdmcp_display_factory_class_init    (GdmXdmcpDisplayFactoryClass *klass);
@@ -1174,7 +1179,7 @@ indirect_client_lookup (GdmXdmcpDisplayFactory *factory,
                         break;
                 }
 
-                if (ic->acctime > 0 && curtime > ic->acctime + factory->priv->max_wait) {
+                if (ic->acctime > 0 && curtime > ic->acctime + factory->priv->max_wait_indirect) {
                         g_debug ("GdmXdmcpDisplayFactory: Disposing stale forward query from %s:%s",
                                  host, serv);
 
@@ -2905,10 +2910,33 @@ gdm_xdmcp_display_factory_start (GdmDisplayFactory *base_factory)
         gboolean                ret;
         GIOChannel             *ioc;
         GdmXdmcpDisplayFactory *factory = GDM_XDMCP_DISPLAY_FACTORY (base_factory);
+        gboolean                res;
 
         g_return_val_if_fail (GDM_IS_XDMCP_DISPLAY_FACTORY (factory), FALSE);
         g_return_val_if_fail (factory->priv->socket_fd == -1, FALSE);
 
+        /* read configuration */
+        res = gdm_settings_direct_get_uint    (GDM_KEY_UDP_PORT,
+                                               &(factory->priv->port));
+        res = gdm_settings_direct_get_boolean (GDM_KEY_MULTICAST,
+                                               &(factory->priv->use_multicast));
+        res = gdm_settings_direct_get_string  (GDM_KEY_MULTICAST_ADDR,
+                                               &(factory->priv->multicast_address));
+        res = gdm_settings_direct_get_boolean (GDM_KEY_INDIRECT,
+                                               &(factory->priv->honor_indirect));
+        res = gdm_settings_direct_get_uint    (GDM_KEY_DISPLAYS_PER_HOST,
+                                               &(factory->priv->max_displays_per_host));
+        res = gdm_settings_direct_get_uint    (GDM_KEY_MAX_SESSIONS,
+                                               &(factory->priv->max_displays));
+        res = gdm_settings_direct_get_uint    (GDM_KEY_MAX_PENDING,
+                                               &(factory->priv->max_pending_displays));
+        res = gdm_settings_direct_get_uint    (GDM_KEY_MAX_WAIT,
+                                               &(factory->priv->max_wait));
+        res = gdm_settings_direct_get_uint    (GDM_KEY_MAX_WAIT_INDIRECT,
+                                               &(factory->priv->max_wait_indirect));
+        res = gdm_settings_direct_get_string  (GDM_KEY_WILLING,
+                                               &(factory->priv->willing_script));
+
         ret = open_port (factory);
         if (! ret) {
                 return ret;
@@ -3027,6 +3055,15 @@ gdm_xdmcp_display_factory_set_max_wait (GdmXdmcpDisplayFactory *factory,
 }
 
 static void
+gdm_xdmcp_display_factory_set_max_wait_indirect (GdmXdmcpDisplayFactory *factory,
+                                                 guint                   num)
+{
+        g_return_if_fail (GDM_IS_XDMCP_DISPLAY_FACTORY (factory));
+
+        factory->priv->max_wait_indirect = num;
+}
+
+static void
 gdm_xdmcp_display_factory_set_willing_script (GdmXdmcpDisplayFactory *factory,
                                               const char             *script)
 {
@@ -3071,6 +3108,9 @@ gdm_xdmcp_display_factory_set_property (GObject       *object,
         case PROP_MAX_WAIT:
                 gdm_xdmcp_display_factory_set_max_wait (self, g_value_get_uint (value));
                 break;
+        case PROP_MAX_WAIT_INDIRECT:
+                gdm_xdmcp_display_factory_set_max_wait_indirect (self, g_value_get_uint (value));
+                break;
         case PROP_WILLING_SCRIPT:
                 gdm_xdmcp_display_factory_set_willing_script (self, g_value_get_string (value));
                 break;
@@ -3115,6 +3155,9 @@ gdm_xdmcp_display_factory_get_property (GObject    *object,
         case PROP_MAX_WAIT:
                 g_value_set_uint (value, self->priv->max_wait);
                 break;
+        case PROP_MAX_WAIT_INDIRECT:
+                g_value_set_uint (value, self->priv->max_wait_indirect);
+                break;
         case PROP_WILLING_SCRIPT:
                 g_value_set_string (value, self->priv->willing_script);
                 break;
@@ -3210,6 +3253,15 @@ gdm_xdmcp_display_factory_class_init (GdmXdmcpDisplayFactoryClass *klass)
                                                             G_MAXINT,
                                                             DEFAULT_MAX_WAIT,
                                                             G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+        g_object_class_install_property (object_class,
+                                         PROP_MAX_WAIT_INDIRECT,
+                                         g_param_spec_uint ("max-wait-indirect",
+                                                            "max-wait-indirect",
+                                                            "max-wait-indirect",
+                                                            0,
+                                                            G_MAXINT,
+                                                            DEFAULT_MAX_WAIT_INDIRECT,
+                                                            G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 
         g_type_class_add_private (klass, sizeof (GdmXdmcpDisplayFactoryPrivate));
 }