Introduced self::createDebugInstance()

[hub.git] / application / hub / main / helper / connection / tcp / class_TcpConnectionHelper.php

diff --git a/application/hub/main/helper/connection/tcp/class_TcpConnectionHelper.php b/application/hub/main/helper/connection/tcp/class_TcpConnectionHelper.php
index 5b10f3fd4e7e1a3fcf8ed421add8622588ecd63a..e515c284b7d0c6b023fd70c6d8dfad3dc46b85c3 100644 (file)
--- a/application/hub/main/helper/connection/tcp/class_TcpConnectionHelper.php
+++ b/application/hub/main/helper/connection/tcp/class_TcpConnectionHelper.php
@@ -90,10 +90,10 @@ class TcpConnectionHelper extends BaseConnectionHelper implements ConnectionHelp
                // Try to solve the recipient
                try {
                        // Resolve any session ids; 0 = IP, 1 = Port
-                       $recipientData = explode(':', HubTools::resolveSessionId($packageData[NetworkPackage::PACKAGE_DATA_RECIPIENT], 'TCP'));
+                       $recipientData = explode(':', HubTools::resolveSessionId($packageData[NetworkPackage::PACKAGE_DATA_RECIPIENT], NetworkPackage::PROTOCOL_TCP));
                } catch (NoValidHostnameException $e) {
                        // Debug message
-                       $helperInstance->debugOutput('CONNECTION: Failed to resolve ' . $packageData[NetworkPackage::PACKAGE_DATA_RECIPIENT] . ':' . $e->getMessage());
+                       $helperInstance->debugOutput('CONNECTION-HELPER: Failed to resolve ' . $packageData[NetworkPackage::PACKAGE_DATA_RECIPIENT] . ':' . $e->getMessage());
 
                        // Is the recipient equal as configured IP
                        if (substr($packageData[NetworkPackage::PACKAGE_DATA_RECIPIENT], 0, strlen($helperInstance->getConfigInstance()->getConfigEntry('external_ip'))) == $helperInstance->getConfigInstance()->getConfigEntry('external_ip')) {
@@ -121,11 +121,8 @@ class TcpConnectionHelper extends BaseConnectionHelper implements ConnectionHelp
                $helperInstance->setAddress($recipientData[0]);
                $helperInstance->setPort($recipientData[1]);
 
-               // Debug message
-               $helperInstance->debugOutput('CONNECTION: Connecting to ' . $recipientData[0] . ':' . $recipientData[1]);
-
                // Now connect to it
-               if (!$helperInstance->connectToPeerByRecipientDataArray($recipientData)) {
+               if (!$helperInstance->connectToPeerByRecipientData($recipientData)) {
                        // Handle socket error
                        $helperInstance->handleSocketError(__METHOD__, __LINE__, $socketResource, $recipientData);
                } // END - if
@@ -163,7 +160,7 @@ class TcpConnectionHelper extends BaseConnectionHelper implements ConnectionHelp
                // Drop all data (don't sent any on socket closure)
                socket_set_option($this->getSocketResource(), SOL_SOCKET, SO_LINGER, array('l_onoff' => 1, 'l_linger' => 0));
 
-               // Finally free some resources
+               // Finally close socket to free some resources
                socket_close($this->getSocketResource());
 
                // Mark this connection as shutted down