X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?p=systembsd.git;a=blobdiff_plain;f=src%2Finterfaces%2Fhostnamed%2Fhostnamed.c;h=3d1b3d2305d98d553ca9bae1811b5b136fcbb24f;hp=dff5115875f1e03b1ab01e5f07655aa6e9be8404;hb=4c04b514283b9d35d0e7693bd4e2a40545ec89ab;hpb=3d53b5010764d142493dd2052096065a19dea124 diff --git a/src/interfaces/hostnamed/hostnamed.c b/src/interfaces/hostnamed/hostnamed.c index dff5115..3d1b3d2 100644 --- a/src/interfaces/hostnamed/hostnamed.c +++ b/src/interfaces/hostnamed/hostnamed.c @@ -17,18 +17,21 @@ #include #include -#include -#include +#include -#include "hostnamed.h" -#include "hostnamed-gen.c" +#include + +#include "hostnamed-gen.h" 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,88 @@ 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() { + + int hostname_try; + gchar *hostname_buf; + + hostname_buf = (gchar*) g_malloc0(MAXHOSTNAMELEN); + hostname_try = gethostname(hostname_buf, MAXHOSTNAMELEN); + + return hostname_buf; +} + +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 +152,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 +189,13 @@ static void on_name_acquired(GDBusConnection *conn, } -static void on_name_lost(GDBusConnection *conn, +/* free()'s */ +void hostnamed_mem_clean() { + + g_ptr_array_foreach(hostnamed_freeable, (GFunc) g_free, NULL); +} + +static void hostnamed_on_name_lost(GDBusConnection *conn, const gchar *name, gpointer user_data) { @@ -115,40 +208,35 @@ 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 */ -void hostnamed_mem_clean() { +int main() { - g_ptr_array_foreach(hostnamed_freeable, (GFunc) g_free, NULL); + GMainLoop *hostnamed_loop; + hostnamed_loop = g_main_loop_new(NULL, TRUE); + + /* config stuff here */ + + + hostnamed_init(); + g_main_loop_run(hostnamed_loop); + g_main_loop_unref(hostnamed_loop); + + return 0; } /* TODO figure out DMI variables on obsd */ @@ -196,3 +284,4 @@ void hostnamed_mem_clean() { g_free (filebuf); return ret; }*/ +