r1571 + renderSNMPPortFinder(): init FQDN likewise SW version

diff --git a/ChangeLog b/ChangeLog
index 2bc7b314f5d2d1bc3b4bfc4048e2e13e1cf1b9dd..ccb9a97cb02a739572a1b27bb841e161c08c2231 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@
                MAC addresses on a port
        update: fixed tabindex in NATv4 rules form
        update: better dictionary editor layout
+       update: get FQDN over SNMP
        new feature: more information for rack view
        new feature: rack thumbnails caching
        new feature: rackspace and IPv4 subnets utilization indicator

diff --git a/inc/interface.php b/inc/interface.php
index cf42a3742f66aed5c3642e594be206ce022cdfab..d2ea75aeeabaad0f32633b0741bc5db128c89920 100644 (file)
--- a/inc/interface.php
+++ b/inc/interface.php
@@ -3346,6 +3346,7 @@ function renderSNMPPortFinder ($object_id = 0)
                $community = $_REQUEST['community'];
                $objectInfo = getObjectInfo ($object_id);
                $endpoints = findAllEndpoints ($object_id, $objectInfo['name']);
+               $sysName = substr (snmpget ($endpoints[0], $community, 'sysName.0'), strlen ('STRING: '));
                $sysDescr = snmpget ($endpoints[0], $community, 'sysDescr.0');
                // Strip the object type, it's always string here.
                $sysDescr = substr ($sysDescr, strlen ('STRING: '));
@@ -3363,6 +3364,15 @@ function renderSNMPPortFinder ($object_id = 0)
                // Only fill in attribute values, if they are not set.
                // FIXME: this is hardcoded
 
+               if (empty ($attrs[3]['value']) && !empty ($sysName)) // FQDN
+               {
+                       $error = commitUpdateAttrValue ($object_id, 3, $sysName);
+                       if ($error == TRUE)
+                               $log[] = array ('code' => 'success', 'message' => 'FQDN set to ' . $sysName);
+                       else
+                               $log[] = array ('code' => 'error', 'message' => 'Failed settig FQDN: ' . $error);
+               }
+
                if (empty ($attrs[5]['value'])) // SW version
                {
                        $IOSversion = ereg_replace ('^.*, Version ([^ ]+), .*$', '\\1', $sysDescr);