New singleton-factories introduced:

[hub.git] / application / hub / main / handler / network / tcp / class_TcpNetworkPackageHandler.php

diff --git a/application/hub/main/handler/network/tcp/class_TcpNetworkPackageHandler.php b/application/hub/main/handler/network/tcp/class_TcpNetworkPackageHandler.php
index 2d634cc3a5cdc2a0309edc7b8b3abcb1389c3a82..7b644f83bc754286c5d4f0d95680672ddf836081 100644 (file)
--- a/application/hub/main/handler/network/tcp/class_TcpNetworkPackageHandler.php
+++ b/application/hub/main/handler/network/tcp/class_TcpNetworkPackageHandler.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009, 2010 Hub Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Hub Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -30,83 +30,53 @@ class TcpNetworkPackageHandler extends BaseNetworkPackageHandler implements Netw
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
+
+               // Set handler name
+               $this->setHandlerName('tcp');
        }
 
        /**
         * Creates an instance of this class
         *
-        * @return      $handlerInstance                An instance of a Networkable class
+        * @return      $handlerInstance        An instance of a Networkable class
         */
-       public final static function createTcpNetworkPackageHandler () {
+       public static final function createTcpNetworkPackageHandler () {
                // Get new instance
                $handlerInstance = new TcpNetworkPackageHandler();
 
-               // Initialize new resolver instance
-               $resolverInstance = ObjectFactory::createObjectByConfiguredName('network_state_resolver_class');
-
-               // Set it in this class
-               $handlerInstance->setResolverInstance($resolverInstance);
-
                // Return the prepared instance
                return $handlerInstance;
        }
 
        /**
-        * Verifies the package data itself (only rudymentary check)
-        *
-        * @param       $rawData        Raw package data (as string
-        * @return      $isValid        Wether the package data is valid
-        */
-       private function isPackageDataValid ($rawData) {
-               // Default is not valid
-               $isValid = false;
-
-               // Convert it back into an array
-               $packageData = explode(NetworkPackage::PACKAGE_DATA_SEPERATOR, $rawData);
-
-               // This should be at least three entries: sender|recipient|raw data
-               if (count($packageData) < 3) {
-                       // Not enougth fields in $packageData!
-                       $this->setErrorCode(self::PACKAGE_ERROR_INCOMPLETE_DATA);
-               } elseif (count(explode(NetworkPackage::PACKAGE_MASK_SEPERATOR, $packageData[2])) < 2) {
-                       // Not entougth fields in content
-                       $this->setErrorCode(self::PACKAGE_ERROR_INVALID_CONTENT);
-               } else {
-                       // This check went fine...
-                       $isValid = true;
-               }
-
-               // Return the result
-               return $isValid;
-       }
-
-       /**
-        * Processes a package from given resource. This is mostly useful for TCP
+        * Processes raw data from given resource. This is mostly useful for TCP
         * package handling and is implemented in the TcpListener class
         *
         * @param       $resource       A valid resource identifier
         * @return      void
-        * @throws      InvalidResourceException        If the given resource is invalid
-        * @todo        ~10% done
         */
-       public function processResourcePackage ($resource) {
+       public function processResourceRawData ($resource) {
                // Check the resource
                if (!is_resource($resource)) {
                        // Throw an exception
                        throw new InvalidResourceException($this, self::EXCEPTION_INVALID_RESOURCE);
                } // END - if
 
-               // Init package data array
-               $packageData = array();
-
                // Reset error code to unhandled
                $this->setErrorCode(self::SOCKET_ERROR_UNHANDLED);
 
                // Debug message
-               $this->debugOutput('HANDLER: Handling TCP package from peer ' . $resource);
+               //* NOISY-DEBUG: */ $this->debugOutput('HANDLER: Handling TCP package from peer ' . $resource);
 
-               // Read the raw data from socket
-               $rawData = socket_read($resource, $this->getConfigInstance()->getConfigEntry('tcp_buffer_length'), PHP_NORMAL_READ);
+               /*
+                * Read the raw data from socket. If you change PHP_BINARY_READ to
+                * PHP_NORMAL_READ, this line will endless block. We only have
+                * simultanous threads and no real threads.
+                */
+               $rawData = socket_read($resource, $this->getConfigInstance()->getConfigEntry('tcp_buffer_length'), PHP_BINARY_READ);
+
+               // Debug output of read data length
+               //* NOISY-DEBUG: */ $this->debugOutput('LISTENER: rawData[]=' . strlen($rawData));
 
                // Is it valid?
                if (($rawData === false) || (socket_last_error($resource) > 0)) {
@@ -115,23 +85,15 @@ class TcpNetworkPackageHandler extends BaseNetworkPackageHandler implements Netw
                } elseif (empty($rawData)) {
                        // The peer did send nothing to us
                        $this->setErrorCode(self::SOCKET_ERROR_EMPTY_DATA);
-               } elseif (!$this->isPackageDataValid($rawData)) {
-                       // Invalid package data
-                       if ($this->getErrorCode() == self::SOCKET_ERROR_UNHANDLED) {
-                               // Set it to PACKAGE_ERROR_INVALID_DATA, because SOCKET_ERROR_UNHANDLED should not be used
-                               $this->setErrorCode(self::PACKAGE_ERROR_INVALID_DATA);
-                       } // END - if
                } else {
-                       // Prepare the package data
-                       $packageData = explode(NetworkPackage::PACKAGE_DATA_SEPERATOR, $rawData);
+                       // Low-level checks of the raw data went all fine, we can now decode the raw data
+                       $decodedData = $this->getInputStreamInstance()->streamData($rawData);
 
-                       // Low-level checks are all green
-                       $this->setErrorCode(self::PACKAGE_LEVEL_CHECK_OKAY);
+                       // Is the decoded data false, then streamData() could not validate it
+                       if ($decodedData !== false) {
+                               die('decodedData(' . strlen($decodedData) . ')=' . $decodedData . "\n");
+                       } // END - if
                }
-
-               // Get a state from the resolver for this package
-               $stateInstance = $this->getResolverInstance()->resolveStateByPackage($this, $packageData);
-               die('UNFINISHED:'.$stateInstance->__toString());
        }
 }