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=1638b31aaa3a5d4be8a972fd21c4b1a558c534c9;hb=fd8852d9a5a230f7fd075aa27b892a4980667cff;hpb=c992721530292cac0e5e3cbbe808e54f1ac5509c

diff --git a/src/interfaces/hostnamed/hostnamed.c b/src/interfaces/hostnamed/hostnamed.c
index 1638b31..95539fb 100644
--- a/src/interfaces/hostnamed/hostnamed.c
+++ b/src/interfaces/hostnamed/hostnamed.c
@@ -1,184 +1,67 @@
+#include <unistd.h>
+#include <limits.h>
+
+#include <glib.h>
 #include <gio/gio.h>
 
-/* testing, for now */
-static GDBusNodeInfo *spect_data = NULL;
-static const gchar spect_xml[] = 
-		"<node>"
-		" <interface name='org.freedesktop.DBus.Peer'>"
-		"  <method name='Ping'/>"
-		"  <method name='GetMachineId'>"
-		"   <arg type='s' name='machine_uuid' direction='out'/>"
-		"  </method>"
-		" </interface>"
-		" <interface name='org.freedesktop.DBus.Introspectable'>"
-		"  <method name='Introspect'>"
-		"   <arg name='data' type='s' direction='out'/>"
-		"  </method>"
-		" </interface>"
-		" <interface name='org.freedesktop.DBus.Properties'>"
-		"  <method name='Get'>"
-		"   <arg name='interface' direction='in' type='s'/>"
-		"   <arg name='property' direction='in' type='s'/>"
-		"   <arg name='value' direction='out' type='v'/>"
-		"  </method>"
-		"  <method name='GetAll'>"
-		"   <arg name='interface' direction='in' type='s'/>"
-		"   <arg name='properties' direction='out' type='a{sv}'/>"
-		"  </method>"
-		"  <method name='Set'>"
-		"   <arg name='interface' direction='in' type='s'/>"
-		"   <arg name='property' direction='in' type='s'/>"
-		"   <arg name='value' direction='in' type='v'/>"
-		"  </method>"
-		"  <signal name='PropertiesChanged'>"
-		"   <arg type='s' name='interface'/>"
-		"   <arg type='a{sv}' name='changed_properties'/>"
-		"   <arg type='as' name='invalidated_properties'/>"
-		"  </signal>"
-		" </interface>"
-		" <interface name='org.freedesktop.hostname1'>"
-		"  <property name='Hostname' type='s' access='read'>"
-		"   <annotation name='org.freedesktop.DBus.Property.EmitsChangedSignal' value='false'/>"
-		"  </property>"
-		"  <property name='StaticHostname' type='s' access='read'>"
-		"  </property>"
-		"  <property name='PrettyHostname' type='s' access='read'>"
-		"  </property>"
-		"  <property name='IconName' type='s' access='read'>"
-		"  </property>"
-		"  <property name='Chassis' type='s' access='read'>"
-		"  </property>"
-		"  <property name='KernelName' type='s' access='read'>"
-		"   <annotation name='org.freedesktop.DBus.Property.EmitsChangedSignal' value='const'/>"
-		"  </property>"
-		"  <property name='KernelRelease' type='s' access='read'>"
-		"   <annotation name='org.freedesktop.DBus.Property.EmitsChangedSignal' value='const'/>"
-		"  </property>"
-		"  <property name='KernelVersion' type='s' access='read'>"
-		"   <annotation name='org.freedesktop.DBus.Property.EmitsChangedSignal' value='const'/>"
-		"  </property>"
-		"  <property name='OperatingSystemPrettyName' type='s' access='read'>"
-		"   <annotation name='org.freedesktop.DBus.Property.EmitsChangedSignal' value='const'/>"
-		"  </property>"
-		"  <property name='OperatingSystemCPEName' type='s' access='read'>"
-		"   <annotation name='org.freedesktop.DBus.Property.EmitsChangedSignal' value='const'/>"
-		"  </property>"
-		"  <method name='SetHostname'>"
-		"   <arg type='s' direction='in'/>"
-		"   <arg type='b' direction='in'/>"
-		"  </method>"
-		"  <method name='SetStaticHostname'>"
-		"   <arg type='s' direction='in'/>"
-		"   <arg type='b' direction='in'/>"
-		"  </method>"
-		"  <method name='SetPrettyHostname'>"
-		"   <arg type='s' direction='in'/>"
-		"   <arg type='b' direction='in'/>"
-		"  </method>"
-		"  <method name='SetIconName'>"
-		"   <arg type='s' direction='in'/>"
-		"   <arg type='b' direction='in'/>"
-		"  </method>"
-		"  <method name='SetChassis'>"
-		"   <arg type='s' direction='in'/>"
-		"   <arg type='b' direction='in'/>"
-		"  </method>"
-		" </interface>"
-		"</node>";
-
-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) {
-
-		g_printf("%s wants to call %s, at %s with interface %s\n", sender, method_name, obj_path, interf_name);
-
-		g_dbus_method_invocation_return_value(invc, &spect_xml);
+#include "hostnamed.h"
+#include "hostnamed-gen.c"
 
-}
+GPtrArray *hostnamed_freeable;
+GDBusNodeInfo *spect_data;
 
+static void on_bus_acquired(GDBusConnection *conn,
+							const gchar *name,
+							gpointer user_data) {
 
-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;
-		ret = g_variant_new_string("");
-		g_snprintf(ret, 100, "%s touched property %s at %s", sender, prop_name, obj_path);
+	GError *err;
 
-		return ret;
-}
+	g_print("got bus, name: %s\n", name);	
 
-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;
+	/*g_dbus_connection_register_object(conn,
+									  "/org/freedesktop/hostname1",
+									  spect_data->interfaces[0],
+									  &interface_vtable,
+									  NULL, NULL, NULL);*/
 }
 
-static const GDBusInterfaceVTable interface_vtable =
-{
-  handle_method_call,
-  handle_get_property,
-  handle_set_property
-};
+static void on_name_acquired(GDBusConnection *conn,
+							 const gchar *name,
+							 gpointer user_data) {
 
+	g_print("got name %s\n", name);
+}
 
+static void on_name_lost(GDBusConnection *conn,
+						 const gchar *name,
+						 gpointer user_data) {
 
-static void on_bus_acquired(GDBusConnection *conn, const gchar *name, gpointer user_data) {
-	g_print("got bus, name: %s\n", name);
-	
-	guint reg_id;
+	g_print("lost name %s, exiting...", name);
 
-	reg_id = g_dbus_connection_register_object (conn,
-												"/org/freedesktop/hostname1",
-												spect_data->interfaces[0], 
-												&interface_vtable,
-												NULL,
-												NULL,
-												NULL );
-	g_assert(reg_id > 0);
-}
+	hostnamed_mem_clean();
 
-static void on_name_acquired(GDBusConnection *conn, const gchar *name, gpointer user_data) {
-	g_print("got name %s\n", name);
+	//TODO exit through g_main_loop properly...
 }
 
-static void on_name_lost(GDBusConnection *conn, const gchar *name, gpointer user_data) {
-	g_print("lost name %s, exiting...\n", name);
-	exit(1);
-}
-
-void hostnamed_init() {
+/* safe call to try and start hostnamed */
+GError * hostnamed_init() {
 
 	guint bus_descriptor;
 	GError *err = NULL;
-	GMainLoop *loop;
+	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);
 
-	spect_data = g_dbus_node_info_new_for_xml(spect_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_SESSION,
-	                                (gchar *)"org.freedesktop.hostname1",
+	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,
@@ -186,12 +69,74 @@ void hostnamed_init() {
 				                    NULL,
 				                    NULL);
 
-	loop = g_main_loop_new(NULL, FALSE);
-	g_main_loop_run(loop);
+	//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;
+}*/
 
-	/* unclear */
+/* free()'s */
+void hostnamed_mem_clean() {
 
-	g_bus_unown_name(bus_descriptor);
-	g_dbus_node_info_unref(spect_data);
+	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;
+}*/