X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?p=systembsd.git;a=blobdiff_plain;f=src%2Finterfaces%2Fhostnamed%2Fhostnamed.c;h=6d83852788ab13c6faf08b88f5eaeffafdcce55a;hp=33ea79ead417772803d6eb5c7f7ee73ebbb8b2e0;hb=90f544079ab170636e65ed7815317559f2a7924b;hpb=28cac2f0037a0f2d5f8f8f783cd157af858530ab diff --git a/src/interfaces/hostnamed/hostnamed.c b/src/interfaces/hostnamed/hostnamed.c index 33ea79e..6d83852 100644 --- a/src/interfaces/hostnamed/hostnamed.c +++ b/src/interfaces/hostnamed/hostnamed.c @@ -16,18 +16,26 @@ #include #include +#include #include #include #include +#include #include "hostnamed-gen.h" +#include "hostnamed.h" GPtrArray *hostnamed_freeable; Hostname1 *hostnamed_interf; -/* --- begin method/property/signal code --- */ +GMainLoop *hostnamed_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(Hostname1 *hn1_passed_interf, @@ -78,20 +86,20 @@ on_handle_set_icon_name(Hostname1 *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(hostnamed_freeable, hostname_buf); - g_ptr_array_add(hostnamed_freeable, ret); + hostname_buf = (gchar*) g_malloc0(MAXHOSTNAMELEN); /* todo check & free */ + ret = (gchar*) g_malloc0(MAXHOSTNAMELEN); + g_ptr_array_add(hostnamed_freeable, hostname_buf); + g_ptr_array_add(hostnamed_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); } const gchar * @@ -148,21 +156,13 @@ our_get_os_pretty_name() { return "TODO"; } -/* --- end method/property/signal code, begin bus/name handlers --- */ +/* --- end method/property/dbus signal code, begin bus/name handlers --- */ static void hostnamed_on_bus_acquired(GDBusConnection *conn, const gchar *name, gpointer user_data) { - g_print("got bus, name: %s\n", name); - -} - -static void hostnamed_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); hostnamed_interf = hostname1_skeleton_new(); @@ -190,56 +190,102 @@ static void hostnamed_on_name_acquired(GDBusConnection *conn, "/org/freedesktop/hostname1", NULL)) { - g_printf("Failed to export Hostname1's interface!"); - } + g_printf("failed to export %s's interface!\n", name); /* unusual edge case, TODO check errno */ + hostnamed_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 hostnamed_mem_clean() { +static void hostnamed_on_name_acquired(GDBusConnection *conn, + const gchar *name, + gpointer user_data) { - g_ptr_array_foreach(hostnamed_freeable, (GFunc) g_free, NULL); - g_ptr_array_free(hostnamed_freeable, TRUE); + g_printf("success!\n"); } static void hostnamed_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); + hostnamed_mem_clean(); + } + + g_printf("lost name %s, exiting...\n", name); hostnamed_mem_clean(); - g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(hostnamed_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 hostnamed_mem_clean() { + + g_printf("exiting...\n"); + + if(dbus_interface_exported) + g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(hostnamed_interf)); + + if(g_main_loop_is_running(hostnamed_loop)) + g_main_loop_quit(hostnamed_loop); } -int main() { +/* wrapper for glib's unix signal handling; called only once if terminatating signal is raised against us */ +gboolean unix_sig_terminate_handler(gpointer data) { + + g_printf("caught SIGINT/HUP/TERM, exiting\n"); - guint bus_descriptor; - GMainLoop *hostnamed_loop; + hostnamed_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); + + /* TODO: the "only once" guarantee only counts towards specific signals. + * make sure calling a SIGINT and SIGHUP doesn't cause term_handler() + * to be called twice */ +} + +int main() { + + set_signal_handlers(); - hostnamed_loop = g_main_loop_new(NULL, TRUE); - hostnamed_freeable = g_ptr_array_new(); + hostnamed_loop = g_main_loop_new(NULL, TRUE); + hostnamed_freeable = g_ptr_array_new(); - bus_descriptor = g_bus_own_name(G_BUS_TYPE_SYSTEM, - "org.freedesktop.hostname1", - G_BUS_NAME_OWNER_FLAGS_NONE, - hostnamed_on_bus_acquired, - hostnamed_on_name_acquired, - hostnamed_on_name_lost, - NULL, - NULL); + bus_descriptor = g_bus_own_name(G_BUS_TYPE_SYSTEM, + "org.freedesktop.hostname1", + G_BUS_NAME_OWNER_FLAGS_NONE, + hostnamed_on_bus_acquired, + hostnamed_on_name_acquired, + hostnamed_on_name_lost, + NULL, + NULL); - g_main_loop_run(hostnamed_loop); - g_main_loop_unref(hostnamed_loop); + g_main_loop_run(hostnamed_loop); + /* runs until single g_main_loop_quit() call is raised inside _mem_clean() */ + g_main_loop_unref(hostnamed_loop); - g_bus_unown_name(bus_descriptor); + /* guaranteed unownable */ + g_bus_unown_name(bus_descriptor); - hostnamed_mem_clean(); + /* at this point no operations can occur with our data, it is safe to free it + its container */ + g_ptr_array_free(hostnamed_freeable, TRUE); - return 0; + return 0; } /* TODO figure out DMI variables on obsd */