File 0003-Provide-correct-SystemName-close-session-o... of Package openhpi-cim

Overview Repositories Revisions Requests Users Attributes Meta

File 0003-Provide-correct-SystemName-close-session-on-Cleanup.patch of Package openhpi-cim (Revision 7c4f91e01cf23077523542938c4d0239)

Currently displaying revision 7c4f91e01cf23077523542938c4d0239 , Show latest

From 4a762684286afc27ad274998dc12cef12dfc2290 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
Date: Wed, 19 Oct 2011 14:15:01 +0200
Subject: [PATCH 3/3] Provide correct SystemName, close session on Cleanup()

---
 src/Hpi.c |   38 ++++++++++++++++++++++++++++++--------
 1 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/src/Hpi.c b/src/Hpi.c
index 159d6cc..a38ecdb 100644
--- a/src/Hpi.c
+++ b/src/Hpi.c
@@ -29,6 +29,10 @@ static char _CLASSNAME[] = "HPI_LogicalDevice";
 #include "cmpimacs.h"
 #include <SaHpi.h>
 #include <oh_utils.h>
+#include <stdlib.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <sys/socket.h>
 
 /* NULL terminated list of key property names for this class */
 static char * _KEYNAMES[] = {"RID", NULL};
@@ -56,6 +60,20 @@ static struct hpi_handle {
 /* Handle to the CIM broker. This is initialized by the CIMOM when the provider is loaded */
 static const CMPIBroker * _BROKER;
 
+static char *fqdn()
+{
+#ifndef   NI_MAXHOST
+#define   NI_MAXHOST 1025
+#endif
+	char buf[NI_MAXHOST];
+	char *s;
+	gethostname(buf, NI_MAXHOST);
+	s = buf + strlen(buf);
+	*s++ = '.';
+	getdomainname(s, NI_MAXHOST-(s-buf+1));
+	
+	return strdup(buf);
+}
 
 /* ---------------------------------------------------------------------------
  * CMPI INSTANCE PROVIDER FUNCTIONS
@@ -101,6 +119,7 @@ static CMPIStatus EnumInstanceNames(
 
                         rdr_id = SAHPI_FIRST_ENTRY;
                         do {
+				char *s;
                                 memset(&rdr, 0, sizeof(rdr));
                                 error = saHpiRdrGet(hpi_hnd.sid,
                                                     entry.ResourceId,
@@ -137,10 +156,11 @@ static CMPIStatus EnumInstanceNames(
 
                                 CMAddKey(objectpath, "DeviceID", (CMPIValue *)buf, CMPI_chars);
 
-                                CMAddKey(objectpath, "SystemCreationClassName", (CMPIValue *)"Linux_ComputerSystem", CMPI_chars);
-
-                                CMAddKey(objectpath, "SystemName", (CMPIValue *)"Laptop", CMPI_chars);
+                                CMAddKey(objectpath, "SystemCreationClassName", (CMPIValue *)"HPI_LogicalDevice", CMPI_chars);
 
+				s = fqdn();
+                                CMAddKey(objectpath, "SystemName", (CMPIValue *)s, CMPI_chars);
+				free(s);
                                 CMAddKey(objectpath, "CreationClassName", (CMPIValue *)"HPI_LogicalDevice", CMPI_chars);
 
                                 /* Add the object path for this resource to the list of results */
@@ -148,7 +168,6 @@ static CMPIStatus EnumInstanceNames(
 
                         } while (rdr_id != SAHPI_LAST_ENTRY);
 
-
         } while (entry_id != SAHPI_LAST_ENTRY);
 
         /* Finished EnumInstanceNames */
@@ -188,7 +207,7 @@ static CMPIStatus EnumInstances(
         _OSBASE_TRACE(1,("%s:EnumInstances() called", _CLASSNAME));
 
         do {
-
+		char *s;
 
                 error = saHpiRptEntryGet(hpi_hnd.sid, entry_id, &entry_id, &entry);
 
@@ -235,8 +254,11 @@ static CMPIStatus EnumInstances(
                         CMSetProperty(instance, "DeviceID",
                                       (CMPIValue *)buf, CMPI_chars);
 
-                        CMSetProperty(instance, "SystemCreationClassName", (CMPIValue *)"Linux_ComputerSystem", CMPI_chars);
-                        CMSetProperty(instance, "SystemName", (CMPIValue *)"Laptop", CMPI_chars);
+                        CMSetProperty(instance, "SystemCreationClassName", (CMPIValue *)"HPI_LogicalDevice", CMPI_chars);
+			s = fqdn();
+                        CMSetProperty(instance, "SystemName", (CMPIValue *)s, CMPI_chars);
+			free(s);
+
                         CMSetProperty(instance, "CreationClassName", (CMPIValue *)"HPI_LogicalDevice", CMPI_chars);
 
                         /* SessionId */
@@ -535,7 +557,7 @@ static CMPIStatus Cleanup(
 
         _OSBASE_TRACE(1,("%s:Cleanup() called", self->ft->miName));
 
-        /* Nothing needs to be done for cleanup */
+	saHpiSessionClose(hpi_hnd.sid);
 
         /* Finished */
 
-- 
1.7.6.1

Places

File 0003-Provide-correct-SystemName-close-session-on-Cleanup.patch of Package openhpi-cim (Revision 7c4f91e01cf23077523542938c4d0239)

Places