X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?p=systembsd.git;a=blobdiff_plain;f=src%2Finterfaces%2Fhostnamed%2Fhostnamed.c;h=432c53b46c879c3854393e84c1aee1bb49638524;hp=15d1b9f15c780d1bb4e6e19109d9cbd56992f76e;hb=bd24ff313da7148b53671091be49504f250fa782;hpb=f8257c5d06d66707f51c032950ab3a64908fe1d3

diff --git a/src/interfaces/hostnamed/hostnamed.c b/src/interfaces/hostnamed/hostnamed.c
index 15d1b9f..432c53b 100644
--- a/src/interfaces/hostnamed/hostnamed.c
+++ b/src/interfaces/hostnamed/hostnamed.c
@@ -23,6 +23,7 @@
 #include <sys/sysctl.h>
 #include <sys/sensors.h>
 #include <sys/ioctl.h>
+#include <sys/utsname.h>
 
 #include <machine/apmvar.h>
 
@@ -80,6 +81,8 @@ guint bus_descriptor;
 gboolean dbus_interface_exported; /* reliable because of gdbus operational guarantees */
 
 gchar *CHASSIS, *ICON;
+gchar *OS_CPENAME;
+gchar *KERN_NAME, *KERN_RELEASE, *KERN_VERS;
 
 /* TODO no specific vm or laptop icon in gnome
  * NOTE paravirtualization on xen is only available for linuxes right now
@@ -88,6 +91,7 @@ gchar *CHASSIS, *ICON;
 const struct SYSCTL_LOOKUP_TABLE chassis_indicator_table[] =
 {
     { "QEMU Virtual CPU",        "container", NULL,              FALSE, FALSE }, /* could be QEMU running in userspace or as part of KVM */
+    { "KVM",                     "vm",        "drive-multidisk", FALSE, FALSE },
     { "SmartDC HVM",             "vm",        "drive-multidisk", TRUE,  TRUE  }, /* oracle solaris kvm */
     { "VirtualBox",              "container", "drive-optical",   TRUE,  TRUE  },
     { "VMware, Inc.",            "container", "drive-optical",   TRUE,  TRUE  },
@@ -232,31 +236,40 @@ our_get_icon_name() {
 const gchar *
 our_get_kernel_name() {
 
-    return "TODO";
+    if(KERN_NAME)
+        return KERN_NAME;
+
+    return "";
 }
 
 const gchar *
 our_get_kernel_version() {
 
-    return "TODO";
+    if(KERN_VERS)
+        return KERN_VERS;
+
+    return "";
 }
 
 const gchar *
 our_get_kernel_release() {
 
-    return "TODO";
+    if(KERN_RELEASE)
+        return KERN_RELEASE;
+
+    return "";
 }
 
 const gchar *
 our_get_os_cpename() {
 
-    return "TODO";
+    return "ONEDAY";
 }
 
 const gchar *
 our_get_os_pretty_name() {
 
-    return "TODO";
+    return "OpenBSD";
 }
 
 /* --- end method/property/dbus signal code, begin bus/name handlers --- */
@@ -363,14 +376,20 @@ void set_signal_handlers() {
 }
 
 int main() {
-    
+ 
+    hostnamed_freeable = g_ptr_array_new();
+  
+    /* TODO: check for valid, writable config at init. if no, complain to `make install` */
+
+    CHASSIS = ICON = OS_CPENAME = 0;
+    KERN_NAME = KERN_RELEASE = KERN_VERS = 0;
+ 
     set_signal_handlers();
 
-    if(!determine_chassis_and_icon())
+    if(!determine_chassis_and_icon() || !set_uname_properties())
         return 1;
     
     hostnamed_loop     = g_main_loop_new(NULL, TRUE);
-    hostnamed_freeable = g_ptr_array_new();
 
     bus_descriptor = g_bus_own_name(G_BUS_TYPE_SYSTEM,
                                    "org.freedesktop.hostname1",
@@ -394,15 +413,51 @@ int main() {
     return 0;
 }
 
+gboolean set_uname_properties() {
+
+    struct utsname un;
+
+    if(-1 == uname(&un))
+        return FALSE;
+
+    KERN_NAME = (gchar*)g_malloc0(sizeof(un.sysname));
+    g_ptr_array_add(hostnamed_freeable, KERN_NAME);
+    g_strlcpy(KERN_NAME, un.sysname, sizeof(un.sysname));
+
+    KERN_RELEASE = (gchar*)g_malloc0(sizeof(un.release));
+    g_ptr_array_add(hostnamed_freeable, KERN_RELEASE);
+    g_strlcpy(KERN_RELEASE, un.release, sizeof(un.release));
+
+    KERN_VERS = (gchar*)g_malloc0(sizeof(un.version));
+    g_ptr_array_add(hostnamed_freeable, KERN_VERS);
+    g_strlcpy(KERN_VERS, un.version, sizeof(un.version));
+
+    return TRUE;
+}
+
 gboolean determine_chassis_and_icon() {
 
+    const size_t bufsize = 4096;    
+
     char *hwproduct, *hwmodel, *hwvendor, *hwmachine;
     size_t hwproduct_size, hwmodel_size, hwvendor_size, hwmachine_size;
     int hwproduct_name[2], hwmodel_name[2], hwvendor_name[2], hwmachine_name[2];
     unsigned int i;
     gboolean UNSURE_CHASSIS_FLAG, UNSURE_ICON_FLAG;
 
-    hwproduct = hwmodel = hwvendor = hwmachine = NULL;
+    hwproduct_size = hwmodel_size = hwvendor_size = hwmachine_size = bufsize;
+    UNSURE_CHASSIS_FLAG = UNSURE_ICON_FLAG = FALSE;
+    i = 0;
+
+    hwproduct = (char*)g_malloc0(4096);
+    hwmodel   = (char*)g_malloc0(4096);
+    hwvendor  = (char*)g_malloc0(4096);
+    hwmachine = (char*)g_malloc0(4096);
+
+    g_ptr_array_add(hostnamed_freeable, hwproduct);
+    g_ptr_array_add(hostnamed_freeable, hwmodel);
+    g_ptr_array_add(hostnamed_freeable, hwvendor);
+    g_ptr_array_add(hostnamed_freeable, hwmachine);
 
     hwproduct_name[0] = CTL_HW;
     hwproduct_name[1] = HW_PRODUCT;
@@ -540,50 +595,3 @@ gboolean up_native_get_sensordev(const char * id, struct sensordev * snsrdev) {
 
     return FALSE;
 }
-
-/* TODO figure out DMI variables on obsd */
-/*static gchar *guess_icon_name() {
-
-    gchar *filebuf = NULL;
-    gchar *ret = NULL;
-
-    #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;
-}*/
-