The packageData array should be used for handling package data

diff --git a/application/hub/main/handler/network/tcp/class_TcpNetworkPackageHandler.php b/application/hub/main/handler/network/tcp/class_TcpNetworkPackageHandler.php
index 7e1033f126a7d4058fce3f5449e0aa290480769a..6e8cef5a16b69ecae2ba515cc5f4d42badbe675c 100644 (file)
--- a/application/hub/main/handler/network/tcp/class_TcpNetworkPackageHandler.php
+++ b/application/hub/main/handler/network/tcp/class_TcpNetworkPackageHandler.php
@@ -91,8 +91,11 @@ class TcpNetworkPackageHandler extends BaseNetworkPackageHandler implements Netw
                        $this->setErrorCode(self::PACKAGE_LEVEL_CHECK_OKAY);
                }
 
+               // Prepare the package data
+               $packageData = explode(NetworkPackage::PACKAGE_DATA_SEPERATOR, $rawData);
+
                // Get a state from the resolver for this package
-               $stateInstance = $this->getResolverInstance()->resolveStateByPackage($this, $rawData);
+               $stateInstance = $this->getResolverInstance()->resolveStateByPackage($this, $packageData);
                die('UNFINISHED:'.$stateInstance->__toString());
        }
 }

diff --git a/application/hub/main/resolver/state/network/class_NetworkStateResolver.php b/application/hub/main/resolver/state/network/class_NetworkStateResolver.php
index 925a37a052ccb7f9bc8c93e02656e30fe6edf8b4..60ef2ec3b36b7fc633c586f51992ad18c15fc3cf 100644 (file)
--- a/application/hub/main/resolver/state/network/class_NetworkStateResolver.php
+++ b/application/hub/main/resolver/state/network/class_NetworkStateResolver.php
@@ -62,11 +62,14 @@ class NetworkStateResolver extends BaseStateResolver implements StateResolver {
         * Returns an state instance for a given package class
         *
         * @param       $packageInstance        An instance of a package class
-        * @param       $rawData                        The raw data
+        * @param       $packageData            Raw package data
         * @return      $stateInstance          An instance of the resolved state
         * @todo        ~30% done
         */
-       public function resolveStateByPackage (Networkable $packageInstance, $rawData) {
+       public function resolveStateByPackage (Networkable $packageInstance, array $packageData) {
+               // Init state instance
+               $stateInstance = null;
+
                // Get error code
                $errorCode = $packageInstance->getErrorCode();
 
@@ -85,7 +88,10 @@ class NetworkStateResolver extends BaseStateResolver implements StateResolver {
 
                // @TODO We need to somehow detect the state/status of the remote peer and still maintain good speed.
                // @TODO So maybe some pre-instancing of classes might help here to speedup this I/O intensive process.
-               $this->partialStub('errorCode=' . $errorCode . ',rawData[] = ' . gettype($rawData) . '(' . strlen($rawData) . ')');
+               $this->partialStub('errorCode=' . $errorCode . ',rawData[] = ' . gettype($rawData) . '(' . count($rawData) . ')');
+
+               // Return the prepared instance
+               return $stateInstance;
        }
 }