X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?p=systembsd.git;a=blobdiff_plain;f=src%2Finterfaces%2Fhostnamed%2Fhostnamed.c;h=95539fb36ece9d9c84f4e1449226a1dc093606bc;hp=42137cde94e27b8418da12ab4fa3bfb85343c648;hb=fd8852d9a5a230f7fd075aa27b892a4980667cff;hpb=929eb2a9b45b11b5e3d76f1d4ac744853b7ab2fe

diff --git a/src/interfaces/hostnamed/hostnamed.c b/src/interfaces/hostnamed/hostnamed.c
index 42137cd..95539fb 100644
--- a/src/interfaces/hostnamed/hostnamed.c
+++ b/src/interfaces/hostnamed/hostnamed.c
@@ -1,87 +1,28 @@
-#include <gio/gio.h>
-
-GDBusNodeInfo *spect_data;
-
-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) {
+#include <unistd.h>
+#include <limits.h>
 
-	//if(g_strcmp0(method_name, "Introspect"
-
-	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);
-
-}
+#include <glib.h>
+#include <gio/gio.h>
 
-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) {
-		
-	GVariant *ret;
-
-	return ret;
-}
+#include "hostnamed.h"
+#include "hostnamed-gen.c"
 
-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;
-}
+GPtrArray *hostnamed_freeable;
+GDBusNodeInfo *spect_data;
 
-/* "hot" functions initially passed to gdbus */
-static const GDBusInterfaceVTable interface_vtable =
-{
-	handle_method_call,
-	handle_get_property,
-	handle_set_property
-};
-
-/* end method/property functions, begin bus name handlers
- * TODO: these should be intertwined as to handle edge cases
- * for when the system cannot immediately grab the name, as
- * well as cases where the system unintendedly loses the name
- */
 static void on_bus_acquired(GDBusConnection *conn,
 							const gchar *name,
 							gpointer user_data) {
-	g_print("got bus, name: %s\n", name);
-	
-	guint reg_id;
-
-	reg_id = g_dbus_connection_register_object(conn,
-											   "/org/freedesktop/hostname1",
-											   spect_data->interfaces[0], 
-											   &interface_vtable,
-											   NULL,
-											   NULL,
-											   NULL);
+
+	GError *err;
+
+	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,
@@ -96,18 +37,31 @@ static void on_name_lost(GDBusConnection *conn,
 						 gpointer user_data) {
 
 	g_print("lost name %s, exiting...", name);
+
+	hostnamed_mem_clean();
+
 	//TODO exit through g_main_loop properly...
-	exit(0);
 }
 
 /* safe call to try and start hostnamed */
 GError * hostnamed_init() {
 
 	guint bus_descriptor;
-	GError *err = NULL;	
-	
+	GError *err = NULL;
+	gchar **hostnamed_ispect_xml;
+	gchar  *hostnamed_joined_xml;
+
+	hostnamed_freeable = g_ptr_array_new();
+
+	g_file_get_contents("conf/hostnamed-ispect.xml", hostnamed_ispect_xml, GUINT_TO_POINTER(3000), &err);
+	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,
-	                                (gchar *)"org.freedesktop.hostname1",
+	                                "org.freedesktop.hostname1",
 				                    G_BUS_NAME_OWNER_FLAGS_NONE,
 				                    on_bus_acquired,
 				                    on_name_acquired,
@@ -118,3 +72,71 @@ GError * hostnamed_init() {
 	//TODO: malloc and return reference as if a main() closed
 	return err;
 }
+
+//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;
+	}
+
+	return FALSE;
+}*/
+
+/* free()'s */
+void hostnamed_mem_clean() {
+
+	g_ptr_array_foreach(hostnamed_freeable, (GFunc) g_free, NULL);
+}
+
+//TODO figure out DMI variables on obsd
+/*static gchar *guess_icon_name() {
+
+    gchar *filebuf = NULL;
+    gchar *ret = NULL;
+
+	//TODO vm check
+
+	#if defined(__i386__) || defined(__x86_64__)
+    /*
+       Taken with a few minor changes from systemd's hostnamed.c,
+       copyright 2011 Lennart Poettering.
+
+       See the SMBIOS Specification 2.7.1 section 7.4.1 for
+       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)) {
+        case 0x3:
+        case 0x4:
+        case 0x5:
+        case 0x6:
+        case 0x7:
+            ret = g_strdup ("computer-desktop");
+            goto out;
+        case 0x9:
+        case 0xA:
+        case 0xE:
+            ret = g_strdup ("computer-laptop");
+            goto out;
+        case 0x11:
+        case 0x17:
+        case 0x1C:
+        case 0x1D:
+            ret = g_strdup ("computer-server");
+            goto out;
+        }
+    }
+	#endif
+    ret = g_strdup ("computer");
+  out:
+    g_free (filebuf);
+    return ret;
+}*/