X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?p=systembsd.git;a=blobdiff_plain;f=src%2Finterfaces%2Fhostnamed%2Fhostnamed.c;h=38d811cd952f078a59f3442a967574a0edb058a1;hp=3fac9a4e8dcf6a0414169d0e0deafb5271fbe20f;hb=a2fffc07173bab908d10ac2d66f73d33f085c601;hpb=76b67a1868f8e9f47121d87819147ac157889432 diff --git a/src/interfaces/hostnamed/hostnamed.c b/src/interfaces/hostnamed/hostnamed.c index 3fac9a4..38d811c 100644 --- a/src/interfaces/hostnamed/hostnamed.c +++ b/src/interfaces/hostnamed/hostnamed.c @@ -16,20 +16,27 @@ #include #include +#include -#include -#include +#include +#include +#include +#include + +#include "hostnamed-gen.h" #include "hostnamed.h" -#include "hostnamed-gen.c" GPtrArray *hostnamed_freeable; -GDBusNodeInfo *spect_data; 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 --- */ -/* TODO make sure these guys only work if called by root */ static gboolean on_handle_set_hostname(Hostname1 *hn1_passed_interf, GDBusMethodInvocation *invoc, @@ -79,19 +86,60 @@ on_handle_set_icon_name(Hostname1 *hn1_passed_interf, const gchar * our_get_hostname() { - return "TODO"; + 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); + + if(gethostname(hostname_buf, MAXHOSTNAMELEN) || g_strcmp0(hostname_buf, "") == 0) + return "localhost"; + + hostname_divider = strcspn(hostname_buf, "."); + + return strncpy(ret, hostname_buf, hostname_divider); } const gchar * our_get_static_hostname() { - return "TODO"; + gchar *pretty_hostname; + gchar *ret; + + pretty_hostname = our_get_pretty_hostname(); + + if(g_strcmp0(pretty_hostname, "") == 0) + ret = our_get_hostname(); + + else if(ret = g_hostname_to_ascii(pretty_hostname)) { + + g_ptr_array_add(hostnamed_freeable, ret); + return ret; + } + + return ret; } const gchar * our_get_pretty_hostname() { - return "TODO"; + GKeyFile *config; + gchar *ret; + + if(g_key_file_load_from_file(config, "/etc/systemd_compat.conf", G_KEY_FILE_NONE, NULL) + && ret = g_key_file_get_value(config, "hostnamed", "PrettyHostname", NULL)) { /* ret might need to be freed, docs dont specify but i am suspicious */ + + g_free(config); + return ret; + } + + if(config) + g_free(config); + + return ""; } const gchar * @@ -136,21 +184,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 on_bus_acquired(GDBusConnection *conn, +static void hostnamed_on_bus_acquired(GDBusConnection *conn, const gchar *name, gpointer user_data) { - g_print("got bus, name: %s\n", name); - -} - -static void 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(); @@ -174,62 +214,106 @@ static void on_name_acquired(GDBusConnection *conn, hostname1_set_operating_system_pretty_name(hostnamed_interf, our_get_os_pretty_name()); if(!g_dbus_interface_skeleton_export(G_DBUS_INTERFACE_SKELETON(hostnamed_interf), - conn, - "/org/freedesktop/hostname1", - NULL)) { + conn, + "/org/freedesktop/hostname1", + NULL)) { + + g_printf("failed to export %s's interface!\n", name); /* unusual edge case, TODO check errno */ + hostnamed_mem_clean(); - g_printf("failed to export hostname1's interface on system bus!"); + } else { + + dbus_interface_exported = TRUE; + g_printf("exported %s's interface on the system bus...\n", name); } +} +static void hostnamed_on_name_acquired(GDBusConnection *conn, + const gchar *name, + gpointer user_data) { + + g_printf("success!\n"); } -static void on_name_lost(GDBusConnection *conn, - const gchar *name, - gpointer user_data) { +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); - /* TODO exit through g_main_loop properly... */ } -/* safe call to try and start hostnamed */ -GError *hostnamed_init() { +/* wrapper for glib's unix signal handling; called only once if terminatating signal is raised against us */ +gboolean unix_sig_terminate_handler(gpointer data) { - guint bus_descriptor; - GError *err = NULL; - gchar **hostnamed_ispect_xml; - gchar *hostnamed_joined_xml; + g_printf("caught SIGINT/HUP/TERM, exiting\n"); - hostnamed_freeable = g_ptr_array_new(); - hostnamed_ispect_xml = g_malloc(3000); + hostnamed_mem_clean(); + return G_SOURCE_REMOVE; +} - g_file_get_contents("conf/hostnamed-ispect.xml", hostnamed_ispect_xml, NULL, NULL); - hostnamed_joined_xml = g_strjoinv("\n", hostnamed_ispect_xml); - spect_data = g_dbus_node_info_new_for_xml(hostnamed_joined_xml, NULL); +void set_signal_handlers() { - g_free(hostnamed_ispect_xml); - g_ptr_array_add(hostnamed_freeable, hostnamed_joined_xml); + /* 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); - bus_descriptor = g_bus_own_name(G_BUS_TYPE_SYSTEM, - "org.freedesktop.hostname1", - G_BUS_NAME_OWNER_FLAGS_NONE, - on_bus_acquired, - on_name_acquired, - on_name_lost, - NULL, - NULL); - - /* TODO: malloc and return reference as if a main() closed */ - return err; + /* 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 */ } -/* free()'s */ -void hostnamed_mem_clean() { +int main() { + + set_signal_handlers(); + + hostnamed_loop = g_main_loop_new(NULL, TRUE); + hostnamed_freeable = g_ptr_array_new(); - g_ptr_array_foreach(hostnamed_freeable, (GFunc) g_free, 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); + /* runs until single g_main_loop_quit() call is raised inside _mem_clean() */ + g_main_loop_unref(hostnamed_loop); + + /* guaranteed unownable */ + 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(hostnamed_freeable, TRUE); + + return 0; } /* TODO figure out DMI variables on obsd */ @@ -277,3 +361,4 @@ void hostnamed_mem_clean() { g_free (filebuf); return ret; }*/ +