X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?a=blobdiff_plain;f=src%2Finterfaces%2Fhostnamed%2Fhostnamed.c;h=522d750959eadf90b853d641b74c299b422232f4;hb=1cd5e6fecdb03d2a3611f72fdc6021cbdf998afc;hp=e5155333a3ef46b26f1c61e34bab503241d57a4f;hpb=5931d07a82a8cb8c86f6049467d47216e4be3291;p=systembsd.git diff --git a/src/interfaces/hostnamed/hostnamed.c b/src/interfaces/hostnamed/hostnamed.c index e515533..522d750 100644 --- a/src/interfaces/hostnamed/hostnamed.c +++ b/src/interfaces/hostnamed/hostnamed.c @@ -1,246 +1,94 @@ +/* + * Copyright (c) 2014 Ian Sutton + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + #include #include + +#include #include -#include "src/interfaces/hostnamed/hostnamed-gen.c" +#include "hostnamed.h" +#include "hostnamed-gen.c" +GPtrArray *hostnamed_freeable; GDBusNodeInfo *spect_data; -/* handled by codegen -static gchar *hostname; -static gchar *pretty_hostname; -static gchar *static_hostname; -static gchar *icon_name; -static gchar *chassis; -static gchar *kernel_name; -static gchar *kernel_release; -static gchar *kernel_version; -static gchar *os_prettyname; -static gchar *os_cpe; //common platform enumeration string -*/ - -/* handled by codegen -static void handle_method_call(GDBusConnection *conn, - const gchar *sender, - const gchar *obj_path, - const gchar *interf_name, - const gchar *method_name, - GVariant *params, - GDBusMethodInvocation *invc, - gpointer usrdat) { - - if(g_strcmp0(interf_name, "org.freedesktop.DBus.Introspectable") == 0 - && g_strcmp0(method_name, "Introspect") == 0) { - - GVariant *xml_ret_gvar; - GString *xml_ret; - - g_dbus_interface_info_generate_xml(spect_data->interfaces[0], (guint)0, xml_ret); - xml_ret_gvar = g_variant_new_string(xml_ret->str); - g_dbus_method_invocation_return_value(invc, xml_ret_gvar); - } - -} -*/ - -/* handled by codegen -static GVariant * handle_get_property(GDBusConnection *conn, - const gchar *sender, - const gchar *obj_path, - const gchar *interf_name, - const gchar *prop_name, - GError **err, - gpointer usr_data) { - - const gchar *our_interf_name = "org.freedesktop.hostname1"; - const gchar *our_obj_path = "/org/freedesktop/hostname1"; - - if(g_strcmp0(interf_name, our_interf_name) != 0 - || g_strcmp0(obj_path, our_obj_path) != 0) { - - return NULL; //TODO error - } - - if(g_strcmp0(prop_name, "Hostname") == 0) - return g_variant_new_string(hostname); - - else if(g_strcmp0(prop_name, "StaticHostname") == 0) - return g_variant_new_string(static_hostname); - - else if(g_strcmp0(prop_name, "PrettyHostname") == 0) - return g_variant_new_string(pretty_hostname); - - else if(g_strcmp0(prop_name, "IconName") == 0) - return g_variant_new_string(icon_name); - - else - return NULL; //TODO error - -} -*/ - -/* handled by codegen -static gboolean handle_set_property(GDBusConnection *conn, - const gchar *sender, - const gchar *obj_path, - const gchar *interf_name, - const gchar *prop_name, - GVariant *val, - GError **err, - gpointer usr_data) { - - g_dbus_connection_emit_signal(conn, - NULL, - obj_path, - "org.freedesktop.DBus.Properties", - "PropertiesChanged", - NULL, //incorrect - NULL); - - return TRUE; -} -*/ - -/* handled by codegen -static const GDBusInterfaceVTable interface_vtable = -{ - handle_method_call, - handle_get_property, - handle_set_property -}; - -*/ - static void on_bus_acquired(GDBusConnection *conn, - const gchar *name, - gpointer user_data) { - - GError *err; + const gchar *name, + gpointer user_data) { - g_print("got bus, name: %s\n", name); + GError *err; - //GDBusObjectSkeleton *hostnamed_dbobj = g_dbus_object_skeleton_new("/org/freedesktop/hostname1"); + g_print("got bus, name: %s\n", name); - g_dbus_connection_register_object(conn, - "/org/freedesktop/hostname1", - spect_data->interfaces[0], - &interface_vtable, - NULL, NULL, NULL); } static void on_name_acquired(GDBusConnection *conn, - const gchar *name, - gpointer user_data) { + const gchar *name, + gpointer user_data) { - g_print("got name %s\n", name); + g_print("got name %s\n", name); } static void on_name_lost(GDBusConnection *conn, - const gchar *name, - gpointer user_data) { - - g_print("lost name %s, exiting...", name); - //TODO exit through g_main_loop properly... - exit(0); -} - -/* safe call to try and start hostnamed */ -GError * hostnamed_init() { + const gchar *name, + gpointer user_data) { - guint bus_descriptor; - GError *err = NULL; - gchar **hostnamed_ispect_xml = g_malloc(3000); - gchar *hostnamed_joined_xml = g_malloc(3000); + g_print("lost name %s, exiting...", name); - g_file_get_contents("conf/hostnamed-ispect.xml", hostnamed_ispect_xml, NULL, err); - hostnamed_joined_xml = g_strjoinv("\n", hostnamed_ispect_xml); - spect_data = g_dbus_node_info_new_for_xml(hostnamed_joined_xml, NULL); + hostnamed_mem_clean(); - if(!init_props()) - return err; //TODO error - - 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, - NULL, - NULL); - - //TODO: malloc and return reference as if a main() closed - return err; -} -/* handled by codegen -gboolean init_props() { - - if(init_hostname() - && init_static_hostname() - && init_pretty_hostname() - && init_icon_name() - && init_chassis() - && init_kernel_name() - && init_kernel_version() - && init_os_name() - && init_os_cpe() ) - return TRUE; - - return FALSE; + //TODO exit through g_main_loop properly... } -//POSIX, for future ports try_hostname should be checked for null-termination -gboolean init_hostname() { - - gchar try_hostname[HOST_NAME_MAX]; - - if(!gethostname(try_hostname, HOST_NAME_MAX)) { - hostname = try_hostname; - return TRUE; - } +/* safe call to try and start hostnamed */ +GError *hostnamed_init() { - return FALSE; -} -*/ + guint bus_descriptor; + GError *err = NULL; + gchar **hostnamed_ispect_xml; + gchar *hostnamed_joined_xml; -/* handled by codegen -gboolean init_static_hostname() { - //TODO - return TRUE; -} - -gboolean init_pretty_hostname() { - //TODO - return TRUE; -} + hostnamed_freeable = g_ptr_array_new(); + hostnamed_ispect_xml = g_malloc(3000); -gboolean init_icon_name() { - //TODO - return TRUE; -} + 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); -gboolean init_chassis() { - //TODO - return TRUE; -} + g_free(hostnamed_ispect_xml); + g_ptr_array_add(hostnamed_freeable, hostnamed_joined_xml); -gboolean init_kernel_name() { - //TODO - return TRUE; -} + 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, + NULL, + NULL); -gboolean init_kernel_version() { - //TODO - return TRUE; + //TODO: malloc and return reference as if a main() closed + return err; } -gboolean init_os_name() { - //TODO - return TRUE; -} +/* free()'s */ +void hostnamed_mem_clean() { -gboolean init_os_cpe() { - //TODO - return TRUE; + g_ptr_array_foreach(hostnamed_freeable, (GFunc) g_free, NULL); } //TODO figure out DMI variables on obsd @@ -249,10 +97,10 @@ gboolean init_os_cpe() { gchar *filebuf = NULL; gchar *ret = NULL; - //TODO vm check + //TODO vm check - #if defined(__i386__) || defined(__x86_64__) - /* + #if defined(__i386__) || defined(__x86_64__) + Taken with a few minor changes from systemd's hostnamed.c, copyright 2011 Lennart Poettering. @@ -260,7 +108,7 @@ gboolean init_os_cpe() { details about the values listed here: http://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf - */ /* + if (g_file_get_contents ("/sys/class/dmi/id/chassis_type", &filebuf, NULL, NULL)) { switch (g_ascii_strtoull (filebuf, NULL, 10)) { @@ -284,7 +132,7 @@ gboolean init_os_cpe() { goto out; } } - #endif + #endif ret = g_strdup ("computer"); out: g_free (filebuf);