X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?p=systembsd.git;a=blobdiff_plain;f=src%2Finterfaces%2Fhostnamed%2Fhostnamed.c;h=d54fb379dc4de93a6a47253fc70508c8ba573527;hp=6d06a34a1a57b48c007b0377dd36d84038aca9f3;hb=8caf1f61176468ec3d887fb401c213df57fdfa11;hpb=a06e63a197ec1fff9ef5da6a8cda74deaef2f5d9 diff --git a/src/interfaces/hostnamed/hostnamed.c b/src/interfaces/hostnamed/hostnamed.c index 6d06a34..d54fb37 100644 --- a/src/interfaces/hostnamed/hostnamed.c +++ b/src/interfaces/hostnamed/hostnamed.c @@ -17,21 +17,21 @@ #include #include -#include -#include +#include +#include -#include "hostnamed.h" -#include "hostnamed-gen.c" +#include +#include + +#include "hostnamed-gen.h" GPtrArray *hostnamed_freeable; -GDBusNodeInfo *spect_data; -hostnamedHostname1 *hostnamed_interf; +Hostname1 *hostnamed_interf; -/* begin method/property/signal code */ +/* --- begin method/property/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) { @@ -39,7 +39,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) { @@ -47,7 +47,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) { @@ -55,7 +55,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) { @@ -63,7 +63,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) { @@ -79,7 +79,20 @@ on_handle_set_icon_name(hostnamedHostname1 *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)) + return ""; + + hostname_divider = strcspn(hostname_buf, "."); + + return strncpy(ret, hostname_buf, hostname_divider); } const gchar * @@ -136,9 +149,9 @@ our_get_os_pretty_name() { return "TODO"; } -/* end method/property/signal code, begin bus/name handlers */ +/* --- end method/property/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) { @@ -146,13 +159,13 @@ static void on_bus_acquired(GDBusConnection *conn, } -static void on_name_acquired(GDBusConnection *conn, - const gchar *name, - gpointer user_data) { +static void hostnamed_on_name_acquired(GDBusConnection *conn, + const gchar *name, + gpointer user_data) { g_print("got '%s' on system bus\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); @@ -162,74 +175,72 @@ static void 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 Hostname1's interface!"); } } -static void on_name_lost(GDBusConnection *conn, - const gchar *name, - gpointer user_data) { +/* --- end bus/name handlers, begin misc functions --- */ + +/* free()'s */ +void hostnamed_mem_clean() { + + g_ptr_array_foreach(hostnamed_freeable, (GFunc) g_free, NULL); + g_ptr_array_free(hostnamed_freeable, TRUE); +} + +static void hostnamed_on_name_lost(GDBusConnection *conn, + const gchar *name, + gpointer user_data) { g_print("lost name %s, exiting...", name); hostnamed_mem_clean(); g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(hostnamed_interf)); - /* TODO exit through g_main_loop properly... */ } -/* safe call to try and start hostnamed */ -GError *hostnamed_init() { - - guint bus_descriptor; - GError *err = NULL; - gchar **hostnamed_ispect_xml; - gchar *hostnamed_joined_xml; +int main() { - hostnamed_freeable = g_ptr_array_new(); - hostnamed_ispect_xml = g_malloc(3000); + guint bus_descriptor; + GMainLoop *hostnamed_loop; - 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); + hostnamed_loop = g_main_loop_new(NULL, TRUE); + hostnamed_freeable = g_ptr_array_new(); - g_free(hostnamed_ispect_xml); - g_ptr_array_add(hostnamed_freeable, hostnamed_joined_xml); - - bus_descriptor = g_bus_own_name(G_BUS_TYPE_SYSTEM, + 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, + hostnamed_on_bus_acquired, + hostnamed_on_name_acquired, + hostnamed_on_name_lost, NULL, NULL); - /* TODO: malloc and return reference as if a main() closed */ - return err; -} + g_main_loop_run(hostnamed_loop); + g_main_loop_unref(hostnamed_loop); -/* free()'s */ -void hostnamed_mem_clean() { + g_bus_unown_name(bus_descriptor); - g_ptr_array_foreach(hostnamed_freeable, (GFunc) g_free, NULL); + hostnamed_mem_clean(); + + return 0; } /* TODO figure out DMI variables on obsd */ @@ -277,3 +288,4 @@ void hostnamed_mem_clean() { g_free (filebuf); return ret; }*/ +