Changeset 1168

Timestamp:

11/20/08 16:06:53 (2 months ago)

Author:

tex

Message:

commit missing files

Files:

• Provider_Common_Library/tags/1.0.2 (modified) (1 prop)
• Provider_Common_Library/tags/1.0.2/Common.cpp (modified) (6 diffs)
• Provider_Common_Library/tags/1.0.2/net_dev.cpp (added)
• Provider_Common_Library/tags/1.0.2/net_dev.h (added)

Provider_Common_Library/tags/1.0.2/Common.cpp

@@ -31 +31 @@
-#include "Common.h"
-#include "net_dev.h"
+#include <netdb.h>
+#include <sys/utsname.h>
-
-using namespace std;
@@ -254 +256 @@
-// If '/bin/hostname -f' fails, it tries to execute '/bin/hostname' without options.
-int CF_getSystemName(string& sysName, string& errorMessage) {
-
+/*
-        if (CF_runCommand("/bin/hostname -f", sysName, errout, errorMessage)!=OK) {
-                CF_assert( CF_runCommand("/bin/hostname", sysName, errout, errorMessage));
-        }
-        sysName = CF_trimText(sysName);
+        return OK;*/
+        /*string ip;
+        CF_getMachineIP(ip, errorMessage);
+        struct hostent* host = gethostbyname(ip.c_str());
+        if (host == NULL)
+                return FAILED;
+
+        sysName = host->h_name;
+        free(host);
+        return OK;*/
+
+        // Modified by Ilsoo Byun(2008/10/02)
+        struct utsname uts;
+        if (uname(&uts) < 0) {
+                errorMessage = "failed to get system name: " + (string) strerror(errno);
+                return FAILED;
+        }
+
+        sysName = uts.nodename;
-        return OK;
-}
@@ -265 +286 @@
-// 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;
@@ -306 +337 @@
-        // 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;
-}
@@ -356 +397 @@
-
-        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) {
@@ -361 +403 @@
-                        continue;
-                } else {
+cout << devices[i].name << endl;
-                        ip = _ip;
-                        free((void *) _ip);