X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?a=blobdiff_plain;f=src%2Finterfaces%2Fhostnamed%2Fhostnamed.c;h=6d06a34a1a57b48c007b0377dd36d84038aca9f3;hb=80328454ca561690a6be6ccc4940b073a1a54a3c;hp=dff5115875f1e03b1ab01e5f07655aa6e9be8404;hpb=7ce16a3590b7a8822dc56fe17dddf15035a0dfdb;p=systembsd.git

diff --git a/src/interfaces/hostnamed/hostnamed.c b/src/interfaces/hostnamed/hostnamed.c
index dff5115..6d06a34 100644
--- a/src/interfaces/hostnamed/hostnamed.c
+++ b/src/interfaces/hostnamed/hostnamed.c
@@ -25,10 +25,13 @@
 
 GPtrArray *hostnamed_freeable;
 GDBusNodeInfo *spect_data;
-Hostname1 *hostnamed_interf;
+hostnamedHostname1 *hostnamed_interf;
 
+/* begin method/property/signal code */
+
+/* TODO make sure these guys only work if called by root */
 static gboolean
-on_handle_set_hostname(Hostname1 *hn1_passed_interf,
+on_handle_set_hostname(hostnamedHostname1 *hn1_passed_interf,
                        GDBusMethodInvocation *invoc,
                        const gchar *greet,
                        gpointer data) {
@@ -36,7 +39,7 @@ on_handle_set_hostname(Hostname1 *hn1_passed_interf,
 }
 
 static gboolean
-on_handle_set_static_hostname(Hostname1 *hn1_passed_interf,
+on_handle_set_static_hostname(hostnamedHostname1 *hn1_passed_interf,
                               GDBusMethodInvocation *invoc,
                               const gchar *greet,
                               gpointer data) {
@@ -44,7 +47,7 @@ on_handle_set_static_hostname(Hostname1 *hn1_passed_interf,
 }
 
 static gboolean
-on_handle_set_pretty_hostname(Hostname1 *hn1_passed_interf,
+on_handle_set_pretty_hostname(hostnamedHostname1 *hn1_passed_interf,
                               GDBusMethodInvocation *invoc,
                               const gchar *greet,
                               gpointer data) {
@@ -52,7 +55,7 @@ on_handle_set_pretty_hostname(Hostname1 *hn1_passed_interf,
 }
 
 static gboolean
-on_handle_set_chassis(Hostname1 *hn1_passed_interf,
+on_handle_set_chassis(hostnamedHostname1 *hn1_passed_interf,
                       GDBusMethodInvocation *invoc,
                       const gchar *greet,
                       gpointer data) {
@@ -60,13 +63,79 @@ on_handle_set_chassis(Hostname1 *hn1_passed_interf,
 }
 
 static gboolean
-on_handle_set_icon_name(Hostname1 *hn1_passed_interf,
+on_handle_set_icon_name(hostnamedHostname1 *hn1_passed_interf,
                         GDBusMethodInvocation *invoc,
                         const gchar *greet,
                         gpointer data) {
     return FALSE;
 }
 
+/* note: all hostnamed/hostname1's properties are read-only,
+ * and do not need set_ functions, gdbus-codegen realized
+ * this from the XML and handled the to-be error of trying
+ * to set a read-only property's value 
+ */
+
+const gchar *
+our_get_hostname() {
+
+    return "TODO";
+}
+
+const gchar *
+our_get_static_hostname() {
+
+    return "TODO";
+}
+
+const gchar *
+our_get_pretty_hostname() {
+
+    return "TODO";
+}
+
+const gchar *
+our_get_chassis() {
+
+    return "TODO";
+}
+
+const gchar *
+our_get_icon_name() {
+
+    return "TODO";
+}
+
+const gchar *
+our_get_kernel_name() {
+
+    return "TODO";
+}
+
+const gchar *
+our_get_kernel_version() {
+
+    return "TODO";
+}
+
+const gchar *
+our_get_kernel_release() {
+
+    return "TODO";
+}
+
+const gchar *
+our_get_os_cpename() {
+
+    return "TODO";
+}
+
+const gchar *
+our_get_os_pretty_name() {
+
+    return "TODO";
+}
+
 /* end method/property/signal code, begin bus/name handlers */
 
 static void on_bus_acquired(GDBusConnection *conn,
@@ -83,15 +152,27 @@ static void on_name_acquired(GDBusConnection *conn,
 
     g_print("got '%s' on system bus\n", name);
 
-    hostnamed_interf = hostname1_skeleton_new();
+    hostnamed_interf = hostnamed_hostname1_skeleton_new();
 
-    /* attach function pointers to generated vfunc table struct */
+    /* attach function pointers to generated struct's method handlers */
     g_signal_connect(hostnamed_interf, "handle-set-hostname", G_CALLBACK(on_handle_set_hostname), NULL);
     g_signal_connect(hostnamed_interf, "handle-set-static-hostname", G_CALLBACK(on_handle_set_static_hostname), NULL);
     g_signal_connect(hostnamed_interf, "handle-set-pretty-hostname", G_CALLBACK(on_handle_set_pretty_hostname), NULL);
     g_signal_connect(hostnamed_interf, "handle-set-chassis", G_CALLBACK(on_handle_set_chassis), NULL);
     g_signal_connect(hostnamed_interf, "handle-set-icon-name", G_CALLBACK(on_handle_set_icon_name), NULL);
 
+    /* set our properties before export */
+    hostnamed_hostname1_set_hostname(hostnamed_interf, our_get_hostname());
+    hostnamed_hostname1_set_static_hostname(hostnamed_interf, our_get_static_hostname());
+    hostnamed_hostname1_set_pretty_hostname(hostnamed_interf, our_get_pretty_hostname());
+    hostnamed_hostname1_set_chassis(hostnamed_interf, our_get_chassis());
+    hostnamed_hostname1_set_icon_name(hostnamed_interf, our_get_icon_name());
+    hostnamed_hostname1_set_kernel_name(hostnamed_interf, our_get_kernel_name());
+    hostnamed_hostname1_set_kernel_version(hostnamed_interf, our_get_kernel_version());
+    hostnamed_hostname1_set_kernel_release(hostnamed_interf, our_get_kernel_release());
+    hostnamed_hostname1_set_operating_system_cpename(hostnamed_interf, our_get_os_cpename());
+    hostnamed_hostname1_set_operating_system_pretty_name(hostnamed_interf, our_get_os_pretty_name());
+ 
     if(!g_dbus_interface_skeleton_export(G_DBUS_INTERFACE_SKELETON(hostnamed_interf),
                                                                    conn,
                                                                    "/org/freedesktop/hostname1",