X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?p=systembsd.git;a=blobdiff_plain;f=src%2Finterfaces%2Flocaled%2Flocaled.c;h=160caafa932d40e628d33030a27fd7a7016621a5;hp=a40e4580a400c1c679a662b4915a62e34caa0f69;hb=254ceec0baac22cb12b44d2e7e223562b12c8d46;hpb=b70beb08c1c83303a7d811b19caa4f23f927cf7b

diff --git a/src/interfaces/localed/localed.c b/src/interfaces/localed/localed.c
index a40e458..160caaf 100644
--- a/src/interfaces/localed/localed.c
+++ b/src/interfaces/localed/localed.c
@@ -16,6 +16,7 @@
 
 #include <unistd.h>
 #include <limits.h>
+#include <signal.h>
 
 #include <sys/param.h>
 #include <string.h>
@@ -29,6 +30,11 @@
 GPtrArray *localed_freeable;
 Locale1 *localed_interf;
 
+GMainLoop *localed_loop;
+
+guint bus_descriptor;
+gboolean dbus_interface_exported; /* reliable because of gdbus operational guarantees */
+
 /* --- begin method/property/dbus signal code --- */
 
 /*static gboolean
@@ -64,16 +70,8 @@ static void localed_on_bus_acquired(GDBusConnection *conn,
                                     const gchar *name,
                                     gpointer user_data) {
 
-    g_print("got bus, name: %s\n", name);   
-
-}
-
-static void localed_on_name_acquired(GDBusConnection *conn,
-    		                         const gchar *name,
-                                     gpointer user_data) {
-
-    g_print("got '%s' on system bus\n", name);
-
+    g_printf("got bus/name, exporting %s's interface...\n", name);
+ 
     localed_interf = locale1_skeleton_new();
 
     /* attach function pointers to generated struct's method handlers 
@@ -87,35 +85,74 @@ static void localed_on_name_acquired(GDBusConnection *conn,
                                          "/org/freedesktop/locale1",
                                          NULL)) {
 
-        g_printf("Failed to export Locale1's interface!");
+        g_printf("failed to export %s's interface!\n", name);
+        localed_mem_clean();
+
+    } else {
+
+        dbus_interface_exported = TRUE;
+        g_printf("exported %s's interface on the system bus...\n", name);
     }
+}
+
+static void localed_on_name_acquired(GDBusConnection *conn,
+    		                         const gchar *name,
+                                     gpointer user_data) {
 
+	g_printf("success!\n");
 }
 
 static void localed_on_name_lost(GDBusConnection *conn,
                                    const gchar *name,
                                    gpointer user_data) {
 
-    g_print("lost name %s, exiting...", name);
+	if(!conn) {
 
-    localed_mem_clean();
-    g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(localed_interf));
+		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);
+		localed_mem_clean();
+	}
+
+	g_print("lost name %s, exiting...\n", name);
 
+    localed_mem_clean();
 }
 
 /* --- end bus/name handlers, begin misc unix functions --- */
 
-/* free()'s */
+/* safe call to clean and then exit
+ * this stops our GMainLoop safely before letting main() return */
 void localed_mem_clean() {
 
-    g_ptr_array_foreach(localed_freeable, (GFunc) g_free, NULL);
-	g_ptr_array_free(localed_freeable, TRUE);
+	g_printf("exiting...\n");
+
+	if(dbus_interface_exported)
+		g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(localed_interf));
+
+	if(g_main_loop_is_running(localed_loop))
+		g_main_loop_quit(localed_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");
+
+	localed_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() {
 
-	guint bus_descriptor;
-	GMainLoop *localed_loop;
+	set_signal_handlers();
 
 	localed_loop = g_main_loop_new(NULL, TRUE);
 	localed_freeable = g_ptr_array_new();
@@ -130,11 +167,14 @@ int main() {
                                     NULL);
 
 	g_main_loop_run(localed_loop);
+	/* runs until single g_main_loop_quit() call is raised inside <interface>_mem_clean() */
 	g_main_loop_unref(localed_loop);
 
+	/* guaranteed unownable */
 	g_bus_unown_name(bus_descriptor);
 
-	localed_mem_clean();
+	/* at this point no operations can occur with our data, it is safe to free it + its container */
+	g_ptr_array_free(localed_freeable, TRUE);
 
 	return 0;
 }