X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?p=systembsd.git;a=blobdiff_plain;f=src%2Finterfaces%2Fhostnamed%2Fhostnamed.c;h=e1614978c1cb03309ac61ed3ffb49f1576282b3d;hp=3fac9a4e8dcf6a0414169d0e0deafb5271fbe20f;hb=d15318db3e7290d10cca372000cbdd0bdbc9fc6a;hpb=76b67a1868f8e9f47121d87819147ac157889432 diff --git a/src/interfaces/hostnamed/hostnamed.c b/src/interfaces/hostnamed/hostnamed.c index 3fac9a4..e161497 100644 --- a/src/interfaces/hostnamed/hostnamed.c +++ b/src/interfaces/hostnamed/hostnamed.c @@ -17,6 +17,8 @@ #include #include +#include + #include #include @@ -25,13 +27,13 @@ GPtrArray *hostnamed_freeable; GDBusNodeInfo *spect_data; -Hostname1 *hostnamed_interf; +hostnamedHostname1 *hostnamed_interf; /* begin method/property/signal code */ /* TODO make sure these guys only work if called by root */ static gboolean -on_handle_set_hostname(Hostname1 *hn1_passed_interf, +on_handle_set_hostname(hostnamedHostname1 *hn1_passed_interf, GDBusMethodInvocation *invoc, const gchar *greet, gpointer data) { @@ -39,7 +41,7 @@ on_handle_set_hostname(Hostname1 *hn1_passed_interf, } static gboolean -on_handle_set_static_hostname(Hostname1 *hn1_passed_interf, +on_handle_set_static_hostname(hostnamedHostname1 *hn1_passed_interf, GDBusMethodInvocation *invoc, const gchar *greet, gpointer data) { @@ -47,7 +49,7 @@ on_handle_set_static_hostname(Hostname1 *hn1_passed_interf, } static gboolean -on_handle_set_pretty_hostname(Hostname1 *hn1_passed_interf, +on_handle_set_pretty_hostname(hostnamedHostname1 *hn1_passed_interf, GDBusMethodInvocation *invoc, const gchar *greet, gpointer data) { @@ -55,7 +57,7 @@ on_handle_set_pretty_hostname(Hostname1 *hn1_passed_interf, } static gboolean -on_handle_set_chassis(Hostname1 *hn1_passed_interf, +on_handle_set_chassis(hostnamedHostname1 *hn1_passed_interf, GDBusMethodInvocation *invoc, const gchar *greet, gpointer data) { @@ -63,7 +65,7 @@ on_handle_set_chassis(Hostname1 *hn1_passed_interf, } static gboolean -on_handle_set_icon_name(Hostname1 *hn1_passed_interf, +on_handle_set_icon_name(hostnamedHostname1 *hn1_passed_interf, GDBusMethodInvocation *invoc, const gchar *greet, gpointer data) { @@ -79,7 +81,13 @@ on_handle_set_icon_name(Hostname1 *hn1_passed_interf, const gchar * our_get_hostname() { - return "TODO"; + int hostname_try; + gchar *hostname_buf; + + hostname_buf = (gchar*) g_malloc0(MAXHOSTNAMELEN); + hostname_try = gethostname(hostname_buf, MAXHOSTNAMELEN); + + return hostname_buf; } const gchar * @@ -138,7 +146,7 @@ our_get_os_pretty_name() { /* 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 +154,13 @@ static void on_bus_acquired(GDBusConnection *conn, } -static void on_name_acquired(GDBusConnection *conn, +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 = hostname1_skeleton_new(); + hostnamed_interf = hostnamed_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,16 +170,16 @@ 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 */ - 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()); + 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()); if(!g_dbus_interface_skeleton_export(G_DBUS_INTERFACE_SKELETON(hostnamed_interf), conn, @@ -183,7 +191,7 @@ static void on_name_acquired(GDBusConnection *conn, } -static void on_name_lost(GDBusConnection *conn, +static void hostnamed_on_name_lost(GDBusConnection *conn, const gchar *name, gpointer user_data) { @@ -196,34 +204,20 @@ static void on_name_lost(GDBusConnection *conn, } /* safe call to try and start hostnamed */ -GError *hostnamed_init() { +void hostnamed_init() { guint bus_descriptor; - GError *err = NULL; - gchar **hostnamed_ispect_xml; - gchar *hostnamed_joined_xml; - - hostnamed_freeable = g_ptr_array_new(); - hostnamed_ispect_xml = g_malloc(3000); - - 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); - - g_free(hostnamed_ispect_xml); - g_ptr_array_add(hostnamed_freeable, hostnamed_joined_xml); 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; } /* free()'s */