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

diff --git a/src/interfaces/hostnamed/hostnamed.c b/src/interfaces/hostnamed/hostnamed.c
index 95539fb..522d750 100644
--- a/src/interfaces/hostnamed/hostnamed.c
+++ b/src/interfaces/hostnamed/hostnamed.c
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2014 Ian Sutton <ian@kremlin.cc>
+ *
+ * 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 <unistd.h>
 #include <limits.h>
 
@@ -11,86 +27,68 @@ GPtrArray *hostnamed_freeable;
 GDBusNodeInfo *spect_data;
 
 static void on_bus_acquired(GDBusConnection *conn,
-							const gchar *name,
-							gpointer user_data) {
+                            const gchar *name,
+                            gpointer user_data) {
 
-	GError *err;
+    GError *err;
 
-	g_print("got bus, name: %s\n", name);	
+    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) {
+                         const gchar *name,
+                         gpointer user_data) {
 
-	g_print("lost name %s, exiting...", name);
+    g_print("lost name %s, exiting...", name);
 
-	hostnamed_mem_clean();
+    hostnamed_mem_clean();
 
-	//TODO exit through g_main_loop properly...
+    //TODO exit through g_main_loop properly...
 }
 
 /* safe call to try and start hostnamed */
-GError * hostnamed_init() {
-
-	guint bus_descriptor;
-	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,
-	                                "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;
+GError *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,
+                                    NULL,
+                                    NULL);
+
+    //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);
+    g_ptr_array_foreach(hostnamed_freeable, (GFunc) g_free, NULL);
 }
 
 //TODO figure out DMI variables on obsd
@@ -99,10 +97,10 @@ void hostnamed_mem_clean() {
     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.
 
@@ -110,7 +108,7 @@ void hostnamed_mem_clean() {
        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)) {
@@ -134,7 +132,7 @@ void hostnamed_mem_clean() {
             goto out;
         }
     }
-	#endif
+    #endif
     ret = g_strdup ("computer");
   out:
     g_free (filebuf);