X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?p=systembsd.git;a=blobdiff_plain;f=src%2Finterfaces%2Ftimedated%2Ftimedated.c;h=a0d536de09c7ad9c7a8813f8339495eaff8c6b98;hp=53a3a3cb76265a1ae72e6f576bbbc8bc2bea398b;hb=9728ae1fd2b7c7851673a27f698ae2e3c8c03461;hpb=1ce41045ba731467499b85d409c65e2dc96dd74d

diff --git a/src/interfaces/timedated/timedated.c b/src/interfaces/timedated/timedated.c
index 53a3a3c..a0d536d 100644
--- a/src/interfaces/timedated/timedated.c
+++ b/src/interfaces/timedated/timedated.c
@@ -16,6 +16,7 @@
 
 #include <unistd.h>
 #include <limits.h>
+#include <signal.h>
 
 #include <sys/param.h>
 #include <string.h>
@@ -24,10 +25,16 @@
 #include <glib-unix.h>
 
 #include "timedated-gen.h"
+#include "timedated.h"
 
 GPtrArray *timedated_freeable;
 Timedate1 *timedated_interf;
 
+GMainLoop *timedated_loop;
+
+guint bus_descriptor;
+gboolean dbus_interface_exported; /* reliable because of gdbus operational guarantees */
+
 /* --- begin method/property/dbus signal code --- */
 
 /*static gboolean
@@ -63,15 +70,7 @@ static void timedated_on_bus_acquired(GDBusConnection *conn,
                                       const gchar *name,
                                       gpointer user_data) {
 
-    g_print("got bus, name: %s\n", name);   
-
-}
-
-static void timedated_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);
 
     timedated_interf = timedate1_skeleton_new();
 
@@ -86,35 +85,74 @@ static void timedated_on_name_acquired(GDBusConnection *conn,
                                          "/org/freedesktop/timedate1",
                                          NULL)) {
 
-        g_printf("Failed to export Timedate1's interface!");
-    }
+        g_printf("failed to export %s's interface!\n", name);
+        timedated_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 timedated_mem_clean() {
+static void timedated_on_name_acquired(GDBusConnection *conn,
+    		                           const gchar *name,
+                                       gpointer user_data) {
 
-    g_ptr_array_foreach(timedated_freeable, (GFunc) g_free, NULL);
-	g_ptr_array_free(timedated_freeable, TRUE);
+   g_printf("success!\n"); 
 }
 
 static void timedated_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);
+        timedated_mem_clean();
+    }
+
+    g_print("lost name %s, exiting...\n", name);
 
     timedated_mem_clean();
-    g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(timedated_interf));
+}
+
+/* --- end bus/name handlers, begin misc unix functions --- */
+
+/* safe call to clean and then exit
+ * this stops our GMainLoop safely before letting main() return */
+void timedated_mem_clean() {
+
+    g_printf("exiting...\n");
+
+    if(dbus_interface_exported)
+        g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(timedated_interf));
+
+     if(g_main_loop_is_running(timedated_loop))
+        g_main_loop_quit(timedated_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");
+
+    timedated_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 *timedated_loop;
+    set_signal_handlers();
 
 	timedated_loop = g_main_loop_new(NULL, TRUE);
 	timedated_freeable = g_ptr_array_new();
@@ -129,11 +167,14 @@ int main() {
                                     NULL);
 
 	g_main_loop_run(timedated_loop);
+    /* runs until single g_main_loop_quit() call is raised inside <interface>_mem_clean() */
 	g_main_loop_unref(timedated_loop);
 
+    /* guaranteed unownable */
 	g_bus_unown_name(bus_descriptor);
 
-	timedated_mem_clean();
+    /* at this point no operations can occur with our data, it is safe to free it + its container */
+    g_ptr_array_free(timedated_freeable, TRUE);
 
 	return 0;
 }