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

diff --git a/src/interfaces/logind/logind.c b/src/interfaces/logind/logind.c
index b08db9f..02323d0 100644
--- a/src/interfaces/logind/logind.c
+++ b/src/interfaces/logind/logind.c
@@ -23,10 +23,13 @@
 
 #include <glib/gprintf.h>
 #include <glib-unix.h>
+#include <polkit/polkit.h>
 
 #include "logind-gen.h"
 #include "logind.h"
 
+#include "../../util.h"
+
 GPtrArray *logind_freeable;
 Login1Manager *logind_interf;
 
@@ -48,20 +51,20 @@ on_handle_set_hostname(Login1Manager *hn1_passed_interf,
 /*const gchar *
 our_get_hostname() {
 
-	gchar *hostname_buf, *ret;
-	size_t hostname_divider;
+    gchar *hostname_buf, *ret;
+    size_t hostname_divider;
 
-	hostname_buf = (gchar*) g_malloc0(MAXHOSTNAMELEN);
-	ret          = (gchar*) g_malloc0(MAXHOSTNAMELEN);
-	g_ptr_array_add(logind_freeable, hostname_buf);
-	g_ptr_array_add(logind_freeable, ret);
+    hostname_buf = (gchar*) g_malloc0(MAXHOSTNAMELEN);
+    ret          = (gchar*) g_malloc0(MAXHOSTNAMELEN);
+    g_ptr_array_add(logind_freeable, hostname_buf);
+    g_ptr_array_add(logind_freeable, ret);
 
-	if(gethostname(hostname_buf, MAXHOSTNAMELEN))
-		return "";
+    if(gethostname(hostname_buf, MAXHOSTNAMELEN))
+        return "";
 
-	hostname_divider = strcspn(hostname_buf, ".");
+    hostname_divider = strcspn(hostname_buf, ".");
 
-	return strncpy(ret, hostname_buf, hostname_divider);
+    return strncpy(ret, hostname_buf, hostname_divider);
 }*/
 
 /* --- end method/property/dbus signal code, begin bus/name handlers --- */
@@ -70,7 +73,7 @@ static void logind_on_bus_acquired(GDBusConnection *conn,
                                    const gchar *name,
                                    gpointer user_data) {
 
-    g_print("got bus/name, exporting %s's interface...\n", name);
+    g_printf("got bus/name, exporting %s's interface...\n", name);
 
     logind_interf = login1_manager_skeleton_new();
 
@@ -96,7 +99,7 @@ static void logind_on_bus_acquired(GDBusConnection *conn,
 }
 
 static void logind_on_name_acquired(GDBusConnection *conn,
-    		                        const gchar *name,
+                                    const gchar *name,
                                     gpointer user_data) {
 
    g_printf("success!\n");
@@ -123,16 +126,41 @@ static void logind_on_name_lost(GDBusConnection *conn,
  * 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);
+    g_printf("exiting...\n");
+
+    if(dbus_interface_exported)
+        g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(logind_interf));
+
+    if(g_main_loop_is_running(logind_loop))
+        g_main_loop_quit(logind_loop);
+
+}
+
+/* wrapper for glib's unix signal handling; called only once if terminating signal is raised against us */
+gboolean unix_sig_terminate_handler(gpointer data) {
+
+    g_printf("caught SIGINT/HUP/TERM, exiting\n");
+
+    logind_mem_clean();
+    return G_SOURCE_REMOVE;
+}
+
+void set_signal_handlers() {
+
+    /* we don't care about its descriptor, we never need to unregister these */
+    g_unix_signal_add(SIGINT,  unix_sig_terminate_handler, NULL);
+    g_unix_signal_add(SIGHUP,  unix_sig_terminate_handler, NULL);
+    g_unix_signal_add(SIGTERM, unix_sig_terminate_handler, NULL);
 }
 
 int main() {
 
-	logind_loop = g_main_loop_new(NULL, TRUE);
-	logind_freeable = g_ptr_array_new();
+    set_signal_handlers();
+
+    logind_loop = g_main_loop_new(NULL, TRUE);
+    logind_freeable = g_ptr_array_new();
 
-	 bus_descriptor = g_bus_own_name(G_BUS_TYPE_SYSTEM,
+     bus_descriptor = g_bus_own_name(G_BUS_TYPE_SYSTEM,
                                     "org.freedesktop.login1_manager",
                                     G_BUS_NAME_OWNER_FLAGS_NONE,
                                     logind_on_bus_acquired,
@@ -141,12 +169,16 @@ int main() {
                                     NULL,
                                     NULL);
 
-	g_main_loop_run(logind_loop);
-	g_main_loop_unref(logind_loop);
+    g_main_loop_run(logind_loop);
+    /* runs until single g_main_loop_quit() call is raised inside <interface>_mem_clean() */
+    g_main_loop_unref(logind_loop);
+
+    /* guaranteed unownable */
+    g_bus_unown_name(bus_descriptor);
 
-	g_bus_unown_name(bus_descriptor);
+    /* at this point no operations can occur with our data, it is safe to free it + its container */
+     g_ptr_array_free(logind_freeable, TRUE);
 
-	logind_mem_clean();
 
-	return 0;
+    return 0;
 }