Rewrites, some more methods:

[hub.git] / application / hub / main / tools / class_HubTools.php

diff --git a/application/hub/main/tools/class_HubTools.php b/application/hub/main/tools/class_HubTools.php
index b81939b7621968ee1c4f4288056d5aac145fdb52..e69c4f7dcde1beacc24676c31e68dbbde5323015 100644 (file)
--- a/application/hub/main/tools/class_HubTools.php
+++ b/application/hub/main/tools/class_HubTools.php
@@ -89,7 +89,7 @@ class HubTools extends BaseHubSystem {
         */
        protected function resolveIpPortBySessionId ($sessionId, $protocol) {
                // Get a DHT instance
-               $dhtInstance = DhtObjectFactory::createDhtObjectInstance();
+               $dhtInstance = DhtObjectFactory::createDhtObjectInstance('node');
 
                // And ask it for ip:port by given session id
                $recipient = $dhtInstance->findNodeBySessionId($sessionId, $protocol);
@@ -103,7 +103,7 @@ class HubTools extends BaseHubSystem {
                        // Is the session id the same?
                        if ($nodeInstance->getSessionId() == $sessionId) {
                                // Then get the ip:port from it, assume TCP by default
-                               $recipient = self::determineOwnExternalIp() . ':' . $nodeInstance->getConfigInstance()->getConfigEntry('node_' . strtolower($protocol) . '_listen_port');
+                               $recipient = self::determineOwnExternalIp() . ':' . $nodeInstance->getConfigInstance()->getConfigEntry('node_listen_port');
                        } // END - if
                } // END - if
 
@@ -121,7 +121,7 @@ class HubTools extends BaseHubSystem {
         */
        public static function resolveSessionIdByIpPort ($ipPort, $protocol) {
                // Get a DHT instance
-               $dhtInstance = DhtObjectFactory::createDhtObjectInstance();
+               $dhtInstance = DhtObjectFactory::createDhtObjectInstance('node');
 
                // And ask it for session id by given ip:port
                $recipient = $dhtInstance->findNodeByIpPort($ipPort, $protocol);