X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?a=blobdiff_plain;f=src%2Finterfaces%2Fhostnamed%2Fhostnamed.c;h=114ad10043d138b85cf143b7ad39a86976b9342f;hb=6de394d4129d558807da8d52bc736494ccfbb387;hp=4d4332bed0dac607680a00448ecbdcce47c0e6d3;hpb=a622ef09a6520566359ce83a2f540cc519648307;p=systembsd.git

diff --git a/src/interfaces/hostnamed/hostnamed.c b/src/interfaces/hostnamed/hostnamed.c
index 4d4332b..114ad10 100644
--- a/src/interfaces/hostnamed/hostnamed.c
+++ b/src/interfaces/hostnamed/hostnamed.c
@@ -5,63 +5,64 @@ GDBusNodeInfo *spect_data;
 GMainLoop *loop;
 
 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) {
+			   				   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_printf("%s wants to call %s, at %s with interface %s\n", sender, method_name, obj_path, interf_name);
 
-		GString  *xml_ret;
-		GVariant *xml_ret_gvar;
+	GString  *xml_ret;
+	GVariant *xml_ret_gvar;
 
-		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);
+	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);
 
 }
 
 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 *sender,
+									  const gchar *obj_path,
+									  const gchar *interf_name,
+									  const gchar *prop_name,
+									  GError **err,
+									  gpointer usr_data) {
 		
-		GVariant *ret;
+	GVariant *ret;
 
-		return ret;
+	return ret;
 }
 
 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;
+									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;
 }
 
 /* "hot" functions initially passed to gdbus */
 static const GDBusInterfaceVTable interface_vtable =
 {
-  handle_method_call,
-  handle_get_property,
-  handle_set_property
+	handle_method_call,
+	handle_get_property,
+	handle_set_property
 };
 
 /* end method/property functions, begin bus name handlers
@@ -69,7 +70,9 @@ static const GDBusInterfaceVTable interface_vtable =
  * 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) {
+static void on_bus_acquired(GDBusConnection *conn,
+							const gchar *name,
+							gpointer user_data) {
 	g_print("got bus, name: %s\n", name);
 	
 	guint reg_id;
@@ -80,28 +83,34 @@ static void on_bus_acquired(GDBusConnection *conn, const gchar *name, gpointer u
 											   &interface_vtable,
 											   NULL,
 											   NULL,
-											   NULL );
+											   NULL);
 	g_assert(reg_id > 0);
 }
 
-static void on_name_acquired(GDBusConnection *conn, const gchar *name, gpointer user_data) {
+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_name_lost(GDBusConnection *conn,
+						 const gchar *name,
+						 gpointer user_data) {
+
 	g_print("lost name %s, exiting...\n", name);
 	g_main_loop_quit(loop);
 }
 
 /* safe call to try and start hostnamed */
-GError hostnamed_init() {
+GError * hostnamed_init() {
 
 	guint bus_descriptor;
 	GError *err = NULL;	
 
 	spect_data = g_dbus_node_info_new_for_xml(SYSTEMD_HOSTNAMED_XML, &err);
 
-	bus_descriptor = g_bus_own_name(G_BUS_TYPE_SESSION,
+	bus_descriptor = g_bus_own_name(G_BUS_TYPE_SYSTEM,
 	                                (gchar *)"org.freedesktop.hostname1",
 				                    G_BUS_NAME_OWNER_FLAGS_NONE,
 				                    on_bus_acquired,
@@ -113,9 +122,6 @@ GError hostnamed_init() {
 	loop = g_main_loop_new(NULL, FALSE);
 	g_main_loop_run(loop);
 
-	/* i am not sure what the system state is once g_main_loop exits */
-
-	g_bus_unown_name(bus_descriptor);
-	g_dbus_node_info_unref(spect_data);
+	//TODO: malloc and return reference as if a main() closed
+	return err;
 }
-