Added line numbers to debug lines as this will become the 'norm'

[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 9095b817bb387e7e8826b90b38268b7595be4f07..0fbfee3739b5ba4c0b21f6fe29665f083141d14a 100644 (file)
--- a/application/hub/main/helper/connection/tcp/class_TcpConnectionHelper.php
+++ b/application/hub/main/helper/connection/tcp/class_TcpConnectionHelper.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  * @todo               Find an interface for hub helper
@@ -71,7 +71,7 @@ class TcpConnectionHelper extends BaseConnectionHelper implements ConnectionHelp
                // Check if there was an error else
                if ($socketError > 0) {
                        // Handle this socket error with a faked recipientData array
-                       $helperInstance->handleSocketError($socketResource, array('0.0.0.0', '0'));
+                       $helperInstance->handleSocketError(__METHOD__, __LINE__, $socketResource, array('0.0.0.0', '0'));
 
                        // Then throw again
                        throw new SocketCreationException(array($helperInstance, gettype($socketResource), $socketError, socket_strerror($socketError)), BaseListener::EXCEPTION_SOCKET_CREATION_FAILED);
@@ -93,7 +93,7 @@ class TcpConnectionHelper extends BaseConnectionHelper implements ConnectionHelp
                        $recipientData = explode(':', HubTools::resolveSessionId($packageData[NetworkPackage::PACKAGE_DATA_RECIPIENT]));
                } catch (NoValidHostnameException $e) {
                        // Debug message
-                       $helperInstance->debugOutput('CONNECTION: Failed to resolve ' . $packageData[NetworkPackage::PACKAGE_DATA_RECIPIENT] . ':' . $e->getMessage());
+                       self::createDebugInstance(__CLASS__)->debugOutput('CONNECTION-HELPER[' . __LINE__ . ']: 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,13 +121,10 @@ 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($socketResource, $recipientData);
+                       $helperInstance->handleSocketError(__METHOD__, __LINE__, $socketResource, $recipientData);
                } // END - if
 
                // Okay, that should be it. Return it...
@@ -143,13 +140,13 @@ class TcpConnectionHelper extends BaseConnectionHelper implements ConnectionHelp
         */
        public function doShutdown () {
                // Debug message
-               $this->debugOutput('HELPER: Shutting down socket resource ' . $this->getSocketResource());
+               self::createDebugInstance(__CLASS__)->debugOutput('HELPER[' . __LINE__ . ']: Shutting down socket resource ' . $this->getSocketResource());
 
                // Clear any previous errors
                socket_clear_error($this->getSocketResource());
 
                // Call the shutdown function on the currently set socket
-               if (!@socket_shutdown($this->getSocketResource())) {
+               if (!socket_shutdown($this->getSocketResource())) {
                        // Could not shutdown socket, this is fine if e.g. the other side is not connected, so analyse it
                        if (socket_last_error($this->getSocketResource()) != 107) {
                                // Something bad happened while we shutdown a socket
@@ -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