X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?p=systembsd.git;a=blobdiff_plain;f=src%2Finterfaces%2Ftimedated%2Ftimedated.c;h=67f7a0c4a9bcac07a81f92d447c53a87c7306d43;hp=83f3c5fa22f10182b823c6f163ca41626f60cd35;hb=904d744df98f63a70ec8832764bdfba1adda073a;hpb=ccd2f75bfcd00cf5c7b79f480c2d3f38ad837fa6 diff --git a/src/interfaces/timedated/timedated.c b/src/interfaces/timedated/timedated.c index 83f3c5f..67f7a0c 100644 --- a/src/interfaces/timedated/timedated.c +++ b/src/interfaces/timedated/timedated.c @@ -16,18 +16,26 @@ #include #include +#include #include #include #include #include +#include #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 @@ -41,20 +49,20 @@ on_handle_set_hostname(Timedate1 *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(timedated_freeable, hostname_buf); - g_ptr_array_add(timedated_freeable, ret); + hostname_buf = (gchar*) g_malloc0(MAXHOSTNAMELEN); + ret = (gchar*) g_malloc0(MAXHOSTNAMELEN); + g_ptr_array_add(timedated_freeable, hostname_buf); + g_ptr_array_add(timedated_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 --- */ @@ -63,15 +71,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_printf("got bus/name, exporting %s's interface...\n", name); timedated_interf = timedate1_skeleton_new(); @@ -86,40 +86,79 @@ 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 { + + dbus_interface_exported = TRUE; + g_printf("exported %s's interface on the system bus...\n", name); } +} + +static void timedated_on_name_acquired(GDBusConnection *conn, + const gchar *name, + gpointer user_data) { + g_printf("success!\n"); +} + +static void timedated_on_name_lost(GDBusConnection *conn, + const gchar *name, + gpointer user_data) { + + 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(); } /* --- 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 timedated_mem_clean() { - g_ptr_array_foreach(timedated_freeable, (GFunc) g_free, NULL); - g_ptr_array_free(timedated_freeable, TRUE); + 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); + } -static void timedated_on_name_lost(GDBusConnection *conn, - const gchar *name, - gpointer user_data) { +/* 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_print("lost name %s, exiting...", name); + g_printf("caught SIGINT/HUP/TERM, exiting\n"); timedated_mem_clean(); - g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(timedated_interf)); + 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(); + timedated_loop = g_main_loop_new(NULL, TRUE); + timedated_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.timedate1", G_BUS_NAME_OWNER_FLAGS_NONE, timedated_on_bus_acquired, @@ -128,12 +167,15 @@ int main() { NULL, NULL); - g_main_loop_run(timedated_loop); - g_main_loop_unref(timedated_loop); + g_main_loop_run(timedated_loop); + /* runs until single g_main_loop_quit() call is raised inside _mem_clean() */ + g_main_loop_unref(timedated_loop); - g_bus_unown_name(bus_descriptor); + /* 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; + return 0; }