GDBusServer with kdbus transport - initial implementation

diff --git a/gio/gdbusserver.c b/gio/gdbusserver.c
index 02508e6..20374b2 100644 (file)
--- a/gio/gdbusserver.c
+++ b/gio/gdbusserver.c
@@ -634,6 +634,16 @@ random_ascii (void)
   return ret;
 }
 
+static gboolean
+try_kdbus (GDBusServer *server,
+           const gchar *address_entry,
+           GHashTable  *key_value_pairs,
+           GError     **error)
+{
+  g_print ("GDBusServer - KDBUS\n");
+  return TRUE;
+}
+
 /* note that address_entry has already been validated => exactly one of path, tmpdir or abstract keys are set */
 static gboolean
 try_unix (GDBusServer  *server,
@@ -1071,6 +1081,8 @@ initable_init (GInitable     *initable,
 #ifdef G_OS_UNIX
           else if (g_strcmp0 (transport_name, "unix") == 0)
             ret = try_unix (server, address_entry, key_value_pairs, &this_error);
+          else if (g_strcmp0 (transport_name, "kdbus") == 0)
+            ret = try_kdbus (server, address_entry, key_value_pairs, &this_error);
 #endif
           else if (g_strcmp0 (transport_name, "tcp") == 0)
             ret = try_tcp (server, address_entry, key_value_pairs, FALSE, &this_error);

diff --git a/gio/gkdbus.c b/gio/gkdbus.c
index d2c8617..0242471 100644 (file)
--- a/gio/gkdbus.c
+++ b/gio/gkdbus.c
@@ -101,6 +101,7 @@ struct _GKdbusPrivate
   gchar          *sender;
   gint            peer_id;
   guint64         bloom_size;
+  guint           registered : 1;
   guint           closed : 1;
   guint           inited : 1;
   guint           timeout;
@@ -330,6 +331,7 @@ g_kdbus_close (GKdbus  *kdbus,
 
   kdbus->priv->closed = TRUE;
   kdbus->priv->fd = -1;
+  kdbus->priv->registered = FALSE;
   
   return TRUE;
 }
@@ -371,6 +373,7 @@ gboolean g_kdbus_register(GKdbus           *kdbus)
       return FALSE;
     }
 
+  kdbus->priv->registered = TRUE;
   kdbus->priv->peer_id = hello.id;
 
   #ifdef KDBUS_DEBUG
@@ -764,25 +767,26 @@ g_kdbus_send_message (GDBusWorker     *worker,
   guint64 kmsg_size = 0;
   const gchar *name;
   guint64 dst_id = KDBUS_DST_ID_BROADCAST;
-  
-  if (g_strcmp0(g_dbus_message_get_member(dbus_msg), "Hello") == 0)
+
+  if (kdbus->priv->registered == FALSE)
     {
-      #ifdef KDBUS_DEBUG    
-        g_print (" KDBUS_DEBUG: (%s()): sending \"Hello\" message!\n",__FUNCTION__);
-      #endif
+      if (!g_kdbus_register(kdbus))
+        {
+          g_error (" KDBUS_DEBUG: (%s()): registering failed!\n",__FUNCTION__);
+          return -1;
+        }
 
-      if(!g_kdbus_register(kdbus))
-      {
-        #ifdef KDBUS_DEBUG
-          g_print (" KDBUS_DEBUG: (%s()): registering failed!\n",__FUNCTION__);
-        #endif
-        return -1;
-      }
+      if (g_strcmp0(g_dbus_message_get_member(dbus_msg), "Hello") == 0)
+        {
+          #ifdef KDBUS_DEBUG    
+            g_print (" KDBUS_DEBUG: (%s()): sending \"Hello\" message!\n",__FUNCTION__);
+          #endif
 
-      g_kdbus_send_reply(worker, kdbus, dbus_msg);
-      goto out;
+          g_kdbus_send_reply(worker, kdbus, dbus_msg);
+          goto out;
+        }
     }
-  
+
   if ((name = g_dbus_message_get_destination(dbus_msg)))
     {
       dst_id = KDBUS_DST_ID_WELL_KNOWN_NAME;
@@ -793,11 +797,6 @@ g_kdbus_send_message (GDBusWorker     *worker,
         }
     }
 
-  #ifdef KDBUS_DEBUG
-    g_print (" KDBUS_DEBUG: (%s()): destination name: %s\n",__FUNCTION__,name);
-    g_print (" KDBUS_DEBUG: (%s()): blob size: %d\n",__FUNCTION__,(gint)blob_size);
-  #endif
-
   kmsg_size = sizeof(struct kdbus_msg);
   kmsg_size += KDBUS_ITEM_SIZE(sizeof(struct kdbus_vec)); //vector for blob
 
@@ -821,7 +820,9 @@ g_kdbus_send_message (GDBusWorker     *worker,
   kmsg->src_id = kdbus->priv->peer_id;
   kmsg->cookie = g_dbus_message_get_serial(dbus_msg);
 
-  #ifdef KDBUS_DEBUG 
+  #ifdef KDBUS_DEBUG
+    g_print (" KDBUS_DEBUG: (%s()): destination name: %s\n",__FUNCTION__,name);
+    g_print (" KDBUS_DEBUG: (%s()): blob size: %d\n",__FUNCTION__,(gint)blob_size);
     g_print (" KDBUS_DEBUG: (%s()): serial: %i\n",__FUNCTION__,kmsg->cookie);
     g_print (" KDBUS_DEBUG: (%s()): src_id/peer_id: %i\n",__FUNCTION__,kdbus->priv->peer_id);
   #endif