X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?p=systembsd.git;a=blobdiff_plain;f=src%2Finterfaces%2Fhostnamed%2Fhostnamed.c;h=979df6e78da437ed16d09f7b034ef61137804ab8;hp=e1614978c1cb03309ac61ed3ffb49f1576282b3d;hb=0f3399596f94b2d543371eb621609cb9b01ec37c;hpb=d15318db3e7290d10cca372000cbdd0bdbc9fc6a diff --git a/src/interfaces/hostnamed/hostnamed.c b/src/interfaces/hostnamed/hostnamed.c index e161497..979df6e 100644 --- a/src/interfaces/hostnamed/hostnamed.c +++ b/src/interfaces/hostnamed/hostnamed.c @@ -16,24 +16,29 @@ #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; -hostnamedHostname1 *hostnamed_interf; +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(hostnamedHostname1 *hn1_passed_interf, +on_handle_set_hostname(Hostname1 *hn1_passed_interf, GDBusMethodInvocation *invoc, const gchar *greet, gpointer data) { @@ -41,7 +46,7 @@ on_handle_set_hostname(hostnamedHostname1 *hn1_passed_interf, } static gboolean -on_handle_set_static_hostname(hostnamedHostname1 *hn1_passed_interf, +on_handle_set_static_hostname(Hostname1 *hn1_passed_interf, GDBusMethodInvocation *invoc, const gchar *greet, gpointer data) { @@ -49,7 +54,7 @@ on_handle_set_static_hostname(hostnamedHostname1 *hn1_passed_interf, } static gboolean -on_handle_set_pretty_hostname(hostnamedHostname1 *hn1_passed_interf, +on_handle_set_pretty_hostname(Hostname1 *hn1_passed_interf, GDBusMethodInvocation *invoc, const gchar *greet, gpointer data) { @@ -57,7 +62,7 @@ on_handle_set_pretty_hostname(hostnamedHostname1 *hn1_passed_interf, } static gboolean -on_handle_set_chassis(hostnamedHostname1 *hn1_passed_interf, +on_handle_set_chassis(Hostname1 *hn1_passed_interf, GDBusMethodInvocation *invoc, const gchar *greet, gpointer data) { @@ -65,7 +70,7 @@ on_handle_set_chassis(hostnamedHostname1 *hn1_passed_interf, } static gboolean -on_handle_set_icon_name(hostnamedHostname1 *hn1_passed_interf, +on_handle_set_icon_name(Hostname1 *hn1_passed_interf, GDBusMethodInvocation *invoc, const gchar *greet, gpointer data) { @@ -81,13 +86,20 @@ on_handle_set_icon_name(hostnamedHostname1 *hn1_passed_interf, const gchar * our_get_hostname() { - int hostname_try; - gchar *hostname_buf; + gchar *hostname_buf, *ret; + size_t hostname_divider; + + 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); - hostname_buf = (gchar*) g_malloc0(MAXHOSTNAMELEN); - hostname_try = gethostname(hostname_buf, MAXHOSTNAMELEN); + if(gethostname(hostname_buf, MAXHOSTNAMELEN)) + return ""; - return hostname_buf; + hostname_divider = strcspn(hostname_buf, "."); + + return strncpy(ret, hostname_buf, hostname_divider); } const gchar * @@ -144,23 +156,15 @@ 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 = hostnamed_hostname1_skeleton_new(); + hostnamed_interf = hostname1_skeleton_new(); /* attach function pointers to generated struct's method handlers */ g_signal_connect(hostnamed_interf, "handle-set-hostname", G_CALLBACK(on_handle_set_hostname), NULL); @@ -170,60 +174,117 @@ static void hostnamed_on_name_acquired(GDBusConnection *conn, g_signal_connect(hostnamed_interf, "handle-set-icon-name", G_CALLBACK(on_handle_set_icon_name), NULL); /* set our properties before export */ - hostnamed_hostname1_set_hostname(hostnamed_interf, our_get_hostname()); - hostnamed_hostname1_set_static_hostname(hostnamed_interf, our_get_static_hostname()); - hostnamed_hostname1_set_pretty_hostname(hostnamed_interf, our_get_pretty_hostname()); - hostnamed_hostname1_set_chassis(hostnamed_interf, our_get_chassis()); - hostnamed_hostname1_set_icon_name(hostnamed_interf, our_get_icon_name()); - hostnamed_hostname1_set_kernel_name(hostnamed_interf, our_get_kernel_name()); - hostnamed_hostname1_set_kernel_version(hostnamed_interf, our_get_kernel_version()); - hostnamed_hostname1_set_kernel_release(hostnamed_interf, our_get_kernel_release()); - hostnamed_hostname1_set_operating_system_cpename(hostnamed_interf, our_get_os_cpename()); - hostnamed_hostname1_set_operating_system_pretty_name(hostnamed_interf, our_get_os_pretty_name()); + hostname1_set_hostname(hostnamed_interf, our_get_hostname()); + hostname1_set_static_hostname(hostnamed_interf, our_get_static_hostname()); + hostname1_set_pretty_hostname(hostnamed_interf, our_get_pretty_hostname()); + hostname1_set_chassis(hostnamed_interf, our_get_chassis()); + hostname1_set_icon_name(hostnamed_interf, our_get_icon_name()); + hostname1_set_kernel_name(hostnamed_interf, our_get_kernel_name()); + hostname1_set_kernel_version(hostnamed_interf, our_get_kernel_version()); + hostname1_set_kernel_release(hostnamed_interf, our_get_kernel_release()); + hostname1_set_operating_system_cpename(hostnamed_interf, our_get_os_cpename()); + 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 hostname1's interface on system bus!"); - } + g_printf("failed to export %s's interface!\n", name); /* unusual edge case, TODO check errno */ + hostnamed_mem_clean(); + + } else { + + dbus_interface_exported = TRUE; + g_printf("exported %s's interface on the system bus...", name); + } } +static void hostnamed_on_name_acquired(GDBusConnection *conn, + const gchar *name, + gpointer user_data) { + + g_printf("success!\n"); + +} + static void hostnamed_on_name_lost(GDBusConnection *conn, - const gchar *name, - gpointer user_data) { + const gchar *name, + gpointer user_data) { + + if(!conn) { - g_print("lost name %s, exiting...", name); + 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", name); + + hostnamed_mem_clean(); + } + + g_printf("lost name %s, exiting...", 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 */ -void 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; + g_printf("caught SIGINT/HUP/TERM, exiting\n"); - 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); + hostnamed_mem_clean(); + return G_SOURCE_REMOVE; +} + +void set_signal_handlers() { - /* TODO: malloc and return reference as if a main() closed */ + /* 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); } -/* 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(); + + 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_ptr_array_foreach(hostnamed_freeable, (GFunc) g_free, 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 */ @@ -271,3 +332,4 @@ void hostnamed_mem_clean() { g_free (filebuf); return ret; }*/ +