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 61a9a941ec7707504d14e73dc8ddb036c4329a9c..7b644f83bc754286c5d4f0d95680672ddf836081 100644 (file)
--- a/application/hub/main/handler/network/tcp/class_TcpNetworkPackageHandler.php
+++ b/application/hub/main/handler/network/tcp/class_TcpNetworkPackageHandler.php
@@ -44,45 +44,39 @@ class TcpNetworkPackageHandler extends BaseNetworkPackageHandler implements Netw
                // 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;
        }
 
        /**
-        * 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
-        * @todo        We need to handle the raw data over to the NetworkPackage class if the state if fine
         */
-       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
+               /*
+                * 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
-               $this->debugOutput('rawData[]=' . strlen($rawData));
+               //* NOISY-DEBUG: */ $this->debugOutput('LISTENER: rawData[]=' . strlen($rawData));
 
                // Is it valid?
                if (($rawData === false) || (socket_last_error($resource) > 0)) {
@@ -91,11 +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);
-               }
+               } else {
+                       // Low-level checks of the raw data went all fine, we can now decode the raw data
+                       $decodedData = $this->getInputStreamInstance()->streamData($rawData);
 
-               // Get a state from the resolver for this package data array
-               $stateInstance = $this->getResolverInstance()->resolveStateByPackage($this, $packageData, $resource);
-               die('UNFINISHED:'.$stateInstance->__toString()."\n");
+                       // Is the decoded data false, then streamData() could not validate it
+                       if ($decodedData !== false) {
+                               die('decodedData(' . strlen($decodedData) . ')=' . $decodedData . "\n");
+                       } // END - if
+               }
        }
 }