X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?p=systembsd.git;a=blobdiff_plain;f=src%2Finterfaces%2Fhostnamed%2Fhostnamed.c;h=ad7df31fa55ba1badf37f2b7aa7d7742c314db18;hp=dff5115875f1e03b1ab01e5f07655aa6e9be8404;hb=5b005882b2af5868261a01a386028291516aabb0;hpb=3d53b5010764d142493dd2052096065a19dea124 diff --git a/src/interfaces/hostnamed/hostnamed.c b/src/interfaces/hostnamed/hostnamed.c index dff5115..ad7df31 100644 --- a/src/interfaces/hostnamed/hostnamed.c +++ b/src/interfaces/hostnamed/hostnamed.c @@ -25,10 +25,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) { @@ -36,7 +39,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) { @@ -44,7 +47,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) { @@ -52,7 +55,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) { @@ -60,16 +63,82 @@ 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) { return FALSE; } +/* note: all hostnamed/hostname1's properties are read-only, + * and do not need set_ functions, gdbus-codegen realized + * this from the XML and handled the to-be error of trying + * to set a read-only property's value + */ + +const gchar * +our_get_hostname() { + + return "TODO"; +} + +const gchar * +our_get_static_hostname() { + + return "TODO"; +} + +const gchar * +our_get_pretty_hostname() { + + return "TODO"; +} + +const gchar * +our_get_chassis() { + + return "TODO"; +} + +const gchar * +our_get_icon_name() { + + return "TODO"; +} + +const gchar * +our_get_kernel_name() { + + return "TODO"; +} + +const gchar * +our_get_kernel_version() { + + return "TODO"; +} + +const gchar * +our_get_kernel_release() { + + return "TODO"; +} + +const gchar * +our_get_os_cpename() { + + return "TODO"; +} + +const gchar * +our_get_os_pretty_name() { + + return "TODO"; +} + /* 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) { @@ -77,21 +146,33 @@ 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 vfunc table struct */ + /* attach function pointers to generated struct's method handlers */ g_signal_connect(hostnamed_interf, "handle-set-hostname", G_CALLBACK(on_handle_set_hostname), NULL); g_signal_connect(hostnamed_interf, "handle-set-static-hostname", G_CALLBACK(on_handle_set_static_hostname), NULL); g_signal_connect(hostnamed_interf, "handle-set-pretty-hostname", G_CALLBACK(on_handle_set_pretty_hostname), NULL); g_signal_connect(hostnamed_interf, "handle-set-chassis", G_CALLBACK(on_handle_set_chassis), NULL); 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()); + if(!g_dbus_interface_skeleton_export(G_DBUS_INTERFACE_SKELETON(hostnamed_interf), conn, "/org/freedesktop/hostname1", @@ -102,7 +183,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) { @@ -135,9 +216,9 @@ GError *hostnamed_init() { 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);