Continued rewriting:

[hub.git] / application / hub / main / wrapper / node / class_NodeDistributedHashTableDatabaseWrapper.php

diff --git a/application/hub/main/wrapper/node/class_NodeDistributedHashTableDatabaseWrapper.php b/application/hub/main/wrapper/node/class_NodeDistributedHashTableDatabaseWrapper.php
index 928eb3310072f37ab4ca31be2ed3871cd3c77b31..218e5163bb98bd27a16fe63b93c982a76ad02e5b 100644 (file)
--- a/application/hub/main/wrapper/node/class_NodeDistributedHashTableDatabaseWrapper.php
+++ b/application/hub/main/wrapper/node/class_NodeDistributedHashTableDatabaseWrapper.php
@@ -33,7 +33,7 @@ class NodeDistributedHashTableDatabaseWrapper extends BaseDatabaseWrapper implem
        // Constants for database column names
        const DB_COLUMN_NODE_ID            = 'node_id';
        const DB_COLUMN_SESSION_ID         = 'session_id';
-       const DB_COLUMN_EXTERNAL_IP        = 'external_ip';
+       const DB_COLUMN_EXTERNAL_ADDRESS   = 'external_address';
        const DB_COLUMN_LISTEN_PORT        = 'listen_port';
        const DB_COLUMN_PRIVATE_KEY_HASH   = 'private_key_hash';
        const DB_COLUMN_NODE_MODE          = 'node_mode';
@@ -86,7 +86,7 @@ class NodeDistributedHashTableDatabaseWrapper extends BaseDatabaseWrapper implem
                $elements = array(
                        self::DB_COLUMN_NODE_ID,
                        self::DB_COLUMN_SESSION_ID,
-                       self::DB_COLUMN_EXTERNAL_IP,
+                       self::DB_COLUMN_EXTERNAL_ADDRESS,
                        self::DB_COLUMN_LISTEN_PORT,
                        self::DB_COLUMN_PRIVATE_KEY_HASH,
                        self::DB_COLUMN_NODE_MODE,
@@ -162,7 +162,7 @@ class NodeDistributedHashTableDatabaseWrapper extends BaseDatabaseWrapper implem
 
                // Add public node data
                $dataSetInstance->addCriteria(self::DB_COLUMN_NODE_MODE       , $requestInstance->getRequestElement('mode'));
-               $dataSetInstance->addCriteria(self::DB_COLUMN_EXTERNAL_IP     , $unl[0]);
+               $dataSetInstance->addCriteria(self::DB_COLUMN_EXTERNAL_ADDRESS     , $unl[0]);
                $dataSetInstance->addCriteria(self::DB_COLUMN_LISTEN_PORT     , $unl[1]);
                $dataSetInstance->addCriteria(self::DB_COLUMN_NODE_ID         , $nodeInstance->getNodeId());
                $dataSetInstance->addCriteria(self::DB_COLUMN_SESSION_ID      , $nodeInstance->getSessionId());
@@ -177,7 +177,7 @@ class NodeDistributedHashTableDatabaseWrapper extends BaseDatabaseWrapper implem
 
        /**
         * Checks whether the local (*this*) node is registered in the DHT by
-        * checking if the external ip/port is found.
+        * checking if the external address is found.
         *
         * @return      $isRegistered   Whether *this* node is registered in the DHT
         */
@@ -200,7 +200,7 @@ class NodeDistributedHashTableDatabaseWrapper extends BaseDatabaseWrapper implem
                assert(($unl[0] !== 'invalid') && ($unl[1] !== 'invalid') && ($unl[2] !== 'invalid'));
 
                // Add Universal Node Locator/node id as criteria
-               $searchInstance->addCriteria(self::DB_COLUMN_EXTERNAL_IP, $unl[0]);
+               $searchInstance->addCriteria(self::DB_COLUMN_EXTERNAL_ADDRESS, $unl[0]);
                $searchInstance->addCriteria(self::DB_COLUMN_LISTEN_PORT, $unl[1]);
                $searchInstance->addCriteria(self::DB_COLUMN_NODE_ID    , $nodeInstance->getNodeId());
                $searchInstance->addCriteria(self::DB_COLUMN_SESSION_ID , $nodeInstance->getSessionId());
@@ -379,9 +379,9 @@ class NodeDistributedHashTableDatabaseWrapper extends BaseDatabaseWrapper implem
                        $searchInstance,
                        // Only look for these array elements ("keys")
                        array(
-                               self::DB_COLUMN_NODE_ID     => TRUE,
-                               self::DB_COLUMN_EXTERNAL_IP => TRUE,
-                               self::DB_COLUMN_LISTEN_PORT => TRUE,
+                               self::DB_COLUMN_NODE_ID          => TRUE,
+                               self::DB_COLUMN_EXTERNAL_ADDRESS => TRUE,
+                               self::DB_COLUMN_LISTEN_PORT      => TRUE,
                        )
                );