merging

2024-10-07 16:52:45 +00:00 · 2016-02-02 12:58:05 +01:00
parent 8a3d14f9e2 c3d5a2a46c
commit 6de58f55df
107 changed files with 4982 additions and 480 deletions
--- a/includes/common.php
+++ b/includes/common.php
@@ -114,7 +114,7 @@ function delete_port($int_id) {
    dbDelete('links', "`remote_port_id` =  ?", array($int_id));
    dbDelete('bill_ports', "`port_id` =  ?", array($int_id));

-    unlink(trim($config['rrd_dir'])."/".trim($interface['hostname'])."/port-".$interface['ifIndex'].".rrd");
+    unlink(get_port_rrdfile_path ($interface['hostname'], $interface['port_id']));
 }

 function sgn($int) {
@@ -143,6 +143,15 @@ function get_sensor_rrd($device, $sensor) {
    return($rrd_file);
 }

+function get_port_rrdfile_path ($hostname, $port_id, $suffix = '') {
+    global $config;
+
+    if (! empty ($suffix))
+        $suffix = '-' . $suffix;
+
+    return trim ($config['rrd_dir']) . '/' . safename ($hostname) . '/' . 'port-id' . safename($port_id) . safename ($suffix) . '.rrd';
+}
+
 function get_port_by_index_cache($device_id, $ifIndex) {
    global $port_index_cache;

@@ -1103,3 +1112,155 @@ function ip_to_sysname($device,$ip) {
    }
    return $ip;
 }//end ip_to_sysname
+
+/**
+ * Return valid port association modes
+ * @param bool $no_cache No-Cache flag (optional, default false)
+ * @return array
+ */
+function get_port_assoc_modes ($no_cache = false) {
+    global $config;
+
+    if ($config['memcached']['enable'] && $no_cache === false) {
+        $assoc_modes = $config['memcached']['resource']->get (hash ('sha512', "port_assoc_modes"));
+        if (! empty ($assoc_modes))
+            return $assoc_modes;
+    }
+
+    $assoc_modes = Null;
+        foreach (dbFetchRows ("SELECT `name` FROM `port_association_mode` ORDER BY pom_id") as $row)
+        $assoc_modes[] = $row['name'];
+
+    if ($config['memcached']['enable'] && $no_cache === false)
+        $config['memcached']['resource']->set (hash ('sha512', "port_assoc_modes"), $assoc_modes, $config['memcached']['ttl']);
+
+    return $assoc_modes;
+}
+
+/**
+ * Validate port_association_mode
+ * @param string $port_assoc_mode
+ * @return bool
+ */
+function is_valid_port_assoc_mode ($port_assoc_mode) {
+    return in_array ($port_assoc_mode, get_port_assoc_modes ());
+}
+
+/**
+ * Get DB id of given port association mode name
+ * @param string $port_assoc_mode
+ * @param bool $no_cache No-Cache flag (optional, default false)
+ */
+function get_port_assoc_mode_id ($port_assoc_mode, $no_cache = false) {
+    global $config;
+
+    if ($config['memcached']['enable'] && $no_cache === false) {
+        $id = $config['memcached']['resource']->get (hash ('sha512', "port_assoc_mode_id|$port_assoc_mode"));
+        if (! empty ($id))
+            return $id;
+    }
+
+    $id = Null;
+    $row = dbFetchRow ("SELECT `pom_id` FROM `port_association_mode` WHERE name = ?", array ($port_assoc_mode));
+    if ($row) {
+        $id = $row['pom_id'];
+        if ($config['memcached']['enable'] && $no_cache === false)
+            $config['memcached']['resource']->set (hash ('sha512', "port_assoc_mode_id|$port_assoc_mode"), $id, $config['memcached']['ttl']);
+    }
+
+    return $id;
+}
+
+/**
+ * Get name of given port association_mode ID
+ * @param int $port_assoc_mode_id Port association mode ID
+ * @param bool $no_cache No-Cache flag (optional, default false)
+ * @return bool
+ */
+function get_port_assoc_mode_name ($port_assoc_mode_id, $no_cache = false) {
+    global $config;
+
+    if ($config['memcached']['enable'] && $no_cache === false) {
+        $name = $config['memcached']['resource']->get (hash ('sha512', "port_assoc_mode_name|$port_assoc_mode_id"));
+        if (! empty ($name))
+            return $name;
+    }
+
+    $name = Null;
+    $row = dbFetchRow ("SELECT `name` FROM `port_association_mode` WHERE pom_id = ?", array ($port_assoc_mode_id));
+    if ($row) {
+        $name = $row['name'];
+        if ($config['memcached']['enable'] && $no_cache === false)
+            $config['memcached']['resource']->set (hash ('sha512', "port_assoc_mode_name|$port_assoc_mode_id"), $name, $config['memcached']['ttl']);
+    }
+
+    return $name;
+}
+
+/**
+ * Query all ports of the given device (by ID) and build port array and
+ * port association maps for ifIndex, ifName, ifDescr. Query port stats
+ * if told to do so, too.
+ * @param int $device_id ID of device to query ports for
+ * @param bool $with_statistics Query port statistics, too. (optional, default false)
+ * @return array
+ */
+function get_ports_mapped ($device_id, $with_statistics = false) {
+    $ports = array();
+    $maps = array(
+        'ifIndex' => array(),
+        'ifName'  => array(),
+        'ifDescr' => array(),
+    );
+
+    /* Query all information available for ports for this device ... */
+    $query = 'SELECT * FROM `ports` WHERE `device_id` = ? ORDER BY port_id';
+    if ($with_statistics) {
+        /* ... including any related ports_statistics if requested */
+        $query = 'SELECT *, `ports_statistics`.`port_id` AS `ports_statistics_port_id`, `ports`.`port_id` AS `port_id` FROM `ports` LEFT OUTER JOIN `ports_statistics` ON `ports`.`port_id` = `ports_statistics`.`port_id` WHERE `ports`.`device_id` = ? ORDER BY ports.port_id';
+    }
+
+    // Query known ports in order of discovery to make sure the latest
+    // discoverd/polled port is in the mapping tables.
+    foreach (dbFetchRows ($query, array ($device_id)) as $port) {
+        // Store port information by ports port_id from DB
+        $ports[$port['port_id']] = $port;
+
+        // Build maps from ifIndex, ifName, ifDescr to port_id
+        $maps['ifIndex'][$port['ifIndex']] = $port['port_id'];
+        $maps['ifName'][$port['ifName']]   = $port['port_id'];
+        $maps['ifDescr'][$port['ifDescr']] = $port['port_id'];
+    }
+
+    return array(
+        'ports' => $ports,
+        'maps'  => $maps,
+    );
+}
+
+/**
+ * Calculate port_id of given port using given devices port information and port association mode
+ * @param array $ports_mapped Port information of device queried by get_ports_mapped()
+ * @param array $port Port information as fetched from DB
+ * @param string $port_association_mode Port association mode to use for mapping
+ * @return int port_id (or Null)
+ */
+function get_port_id ($ports_mapped, $port, $port_association_mode) {
+    // Get port_id according to port_association_mode used for this device
+    $port_id = Null;
+
+    /*
+     * Information an all ports is available through $ports_mapped['ports']
+     * This might come in handy sometime in the future to add you nifty new
+     * port mapping schema:
+     *
+     * $ports = $ports_mapped['ports'];
+    */
+    $maps  = $ports_mapped['maps'];
+
+    if (in_array ($port_association_mode, array ('ifIndex', 'ifName', 'ifDescr'))) {
+        $port_id = $maps[$port_association_mode][$port[$port_association_mode]];
+    }
+
+    return $port_id;
+}