X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?a=blobdiff_plain;f=src%2Finterfaces%2Flogind%2Flogind.c;h=b08db9f17f3de7d9ddbbde3a3ce56451c8b708b0;hb=ca5a7f9fddc137fca1cb9bdaa9fbfd7525fb03cc;hp=de810576176f835af8f5162b7e92cc41fc40d8b8;hpb=ba9914b6971c9ed56173b30620f2839a862a1356;p=systembsd.git

diff --git a/src/interfaces/logind/logind.c b/src/interfaces/logind/logind.c
index de81057..b08db9f 100644
--- a/src/interfaces/logind/logind.c
+++ b/src/interfaces/logind/logind.c
@@ -16,6 +16,7 @@
 
 #include <unistd.h>
 #include <limits.h>
+#include <signal.h>
 
 #include <sys/param.h>
 #include <string.h>
@@ -24,11 +25,17 @@
 #include <glib-unix.h>
 
 #include "logind-gen.h"
+#include "logind.h"
 
 GPtrArray *logind_freeable;
 Login1Manager *logind_interf;
 
-/* --- begin method/property/signal code --- */
+GMainLoop *logind_loop;
+
+guint bus_descriptor;
+gboolean dbus_interface_exported; /* reliable because of gdbus operational guarantees */
+
+/* --- begin method/property/dbus signal code --- */
 
 /*static gboolean
 on_handle_set_hostname(Login1Manager *hn1_passed_interf,
@@ -57,21 +64,13 @@ our_get_hostname() {
 	return strncpy(ret, hostname_buf, hostname_divider);
 }*/
 
-/* --- end method/property/signal code, begin bus/name handlers --- */
+/* --- end method/property/dbus signal code, begin bus/name handlers --- */
 
 static void logind_on_bus_acquired(GDBusConnection *conn,
                                    const gchar *name,
                                    gpointer user_data) {
 
-    g_print("got bus, name: %s\n", name);   
-
-}
-
-static void logind_on_name_acquired(GDBusConnection *conn,
-    		                        const gchar *name,
-                                    gpointer user_data) {
-
-    g_print("got '%s' on system bus\n", name);
+    g_print("got bus/name, exporting %s's interface...\n", name);
 
     logind_interf = login1_manager_skeleton_new();
 
@@ -86,36 +85,50 @@ static void logind_on_name_acquired(GDBusConnection *conn,
                                          "/org/freedesktop/login1_manager",
                                          NULL)) {
 
-        g_printf("Failed to export Login1Manager's interface!");
-    }
+        g_printf("failed to export %s's interface!\n", name);
+        logind_mem_clean();
 
-}
+    } else {
 
-/* --- end bus/name handlers, begin misc functions --- */
+        dbus_interface_exported = TRUE;
+        g_printf("exported %s's interface on the system bus...\n", name);
+    }
+}
 
-/* free()'s */
-void logind_mem_clean() {
+static void logind_on_name_acquired(GDBusConnection *conn,
+    		                        const gchar *name,
+                                    gpointer user_data) {
 
-    g_ptr_array_foreach(logind_freeable, (GFunc) g_free, NULL);
-	g_ptr_array_free(logind_freeable, TRUE);
+   g_printf("success!\n");
 }
 
 static void logind_on_name_lost(GDBusConnection *conn,
                                 const gchar *name,
                                 gpointer user_data) {
 
-    g_print("lost name %s, exiting...", name);
+    if(!conn) {
+
+        g_printf("failed to connect to the system bus while trying to acquire name '%s': either dbus-daemon isn't running or we don't have permission to push names and/or their interfaces to it.\n", name);
+
+    }
+
+    g_print("lost name %s, exiting...\n", name);
 
     logind_mem_clean();
-    g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(logind_interf));
+}
+
+/* --- end bus/name handlers, begin misc unix functions --- */
+
+/* safe call to clean and then exit
+ * this stops our GMainLoop sfaely before letting main() return */
+void logind_mem_clean() {
 
+    g_ptr_array_foreach(logind_freeable, (GFunc) g_free, NULL);
+	g_ptr_array_free(logind_freeable, TRUE);
 }
 
 int main() {
 
-	guint bus_descriptor;
-	GMainLoop *logind_loop;
-
 	logind_loop = g_main_loop_new(NULL, TRUE);
 	logind_freeable = g_ptr_array_new();