Changeset 1166

Timestamp:

11/20/08 15:37:28 (2 months ago)

Author:

isbyun

Message:

--

Files:

• Provider_Common_Library/trunk/Common.cpp (modified) (7 diffs)
• Provider_Common_Library/trunk/Common.h (modified) (1 diff)
• Provider_Common_Library/trunk/EmbeddedInstance.h (modified) (1 diff)
• Provider_Common_Library/trunk/Makefile.am (modified) (2 diffs)
• Provider_Common_Library/trunk/net_dev.cpp (added)
• Provider_Common_Library/trunk/net_dev.h (added)

Provider_Common_Library/trunk/Common.cpp

@@ -30 +30 @@
-
-#include "Common.h"
+#include "net_dev.h"
+#include <netdb.h>
+#include <sys/utsname.h>
-
-using namespace std;
@@ -253 +256 @@
-// If '/bin/hostname -f' fails, it tries to execute '/bin/hostname' without options.
-int CF_getSystemName(string& sysName, string& errorMessage) {
-       
+/*     vi t/
-        if (CF_runCommand("/bin/hostname -f", sysName, errout, errorMessage)!=OK) {
-                CF_assert( CF_runCommand("/bin/hostname", sysName, errout, errorMessage));
-        }
-        sysName = CF_trimText(sysName);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -264 +287 @@
-// Modified by Frederic Desmons (2007/07/10)
-int CF_getOSName(string& OSName, string& errorMessage) {
-
+
+
+
+
+
+
+
+
+
+
-        return OK;
-}
-
-// Added by Ilsoo Byun (2007/05/09)
+//Deprecated
-int CF_getEthernetPortNames(vector<string>& result, string& errorMessage) {
-        string value, stderr;
@@ -305 +338 @@
-        // Modified by Frederic Desmons (2007/11/12)
-        // Get only the first line of the std output
-
+/*
-        CF_assert( CF_runCommandFL("/sbin/ifconfig "+ethName+" | gawk '/HWaddr/{} /inet addr/{print $2}'", value, errorMessage) );
-        ip = CF_trimText(value);
-        if ( CF_startsWithNoCase(ip, "addr:") )
-                ip = ip.substr(5);
+        return OK;*/
+
+        // Modified by Ilsoo Byun(2008/10/02)
+        const char* result = cf_get_ip(ethName.c_str());
+        if (result == NULL) {
+                errorMessage = "CF_getIP failed";
+                return FAILED;
+        }
+        ip = string(result);
+        free((void *) result);
-        return OK;
-}
@@ -316 +359 @@
-int CF_getMachineIP(string& ip, string& errorMessage) {
-
-
+//
-        // Modified by Frederic Desmons (2007/11/12)
-        // Ignore loopback and empty results as well (case there is more than one interface)
-
+/*
-        CF_assert(CF_getEthernetPortNames(result, errorMessage));
-        for (unsigned int i=0; i < result.size(); i++) {
@@ -327 +370 @@
-                        return OK;
-                }
-
+*/
-        // Means the system has no configured interface... unlikely
-
-
+//
+//
-        /*
-        int rc = OK;
@@ -350 +393 @@
-        return rc;
-        */
+
+        struct net_proc* devices;
+        int count = cf_get_net_devices(&devices);
+
+        for (int i = 0; i < count; ++i) {
+                if (!CF_startsWith(devices[i].name, "eth")) continue;
+                const char* _ip = cf_get_ip(devices[i].name);
+                if (_ip == NULL || strcmp(_ip, "127.0.0.1") == 0) {
+                        free((void *) _ip);
+                        continue;
+                } else {
+cout << devices[i].name << endl;
+                        ip = _ip;
+                        free((void *) _ip);
+                        return OK;
+                }
+        }
+        cf_release_net_devices(&devices, count);
+
+        ip = "127.0.0.1";
+        return OK;
+
-}
-

Provider_Common_Library/trunk/Common.h

@@ -142 +142 @@
-
-//Get the list of ethernet port
+//Deprecated
-int CF_getEthernetPortNames(vector<string>& result, string& errorMessage);
-
-//Get IP by the ethernet port name
+//Deprecated
-int CF_getIP(const string& ethName, string& ip, string& errorMessage);
-

Provider_Common_Library/trunk/EmbeddedInstance.h

@@ -17 +17 @@
-
-#endif
+

Provider_Common_Library/trunk/Makefile.am

@@ -36 +36 @@
-commonlib_LTLIBRARIES = libOpenDRIMCommon.la
-
-
+ net_dev.cpp
-
-libOpenDRIMCommon_la_LDFLAGS = -lpthread -avoid-version -Wl,--rpath -Wl,$(COMMONLIBDIR) -lxml2
@@ -46 +46 @@
-install-providerdir:
-        $(INSTALL) -d $(OPENDRIMCOMMONINCLUDE)/cmpi /var/local/OpenDRIM
-
+net_dev.h 
-        $(INSTALL) -m 644 cmpi/* $(OPENDRIMCOMMONINCLUDE)/cmpi/
-