More debugging (yupp, more is required), rewrote isSocketRegistered()

[hub.git] / application / hub / main / listener / class_BaseListener.php

diff --git a/application/hub/main/listener/class_BaseListener.php b/application/hub/main/listener/class_BaseListener.php
index c367b30d4037605371ef0d13e770f40858823fa8..61b231e868289d425772fd763823732a6c437c6b 100644 (file)
--- a/application/hub/main/listener/class_BaseListener.php
+++ b/application/hub/main/listener/class_BaseListener.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 Hub Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Hub Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -23,9 +23,15 @@
  */
 class BaseListener extends BaseHubSystem implements Visitable {
        // Exception code constants
-       const EXCEPTION_INVALID_SOCKET            = 0xa00;
-       const EXCEPTION_SOCKET_ALREADY_REGISTERED = 0xa01;
-       const EXCEPTION_SOCKET_CREATION_FAILED    = 0xa02;
+       const EXCEPTION_INVALID_SOCKET                   = 0xa00;
+       const EXCEPTION_SOCKET_ALREADY_REGISTERED        = 0xa01;
+       const EXCEPTION_SOCKET_CREATION_FAILED           = 0xa02;
+       const EXCEPTION_NO_SOCKET_ERROR                  = 0xa03;
+       const EXCEPTION_CONNECTION_ALREADY_REGISTERED    = 0xa04;
+       const EXCEPTION_UNEXPECTED_PACKAGE_STATUS        = 0xa05;
+       const EXCEPTION_UNSUPPORTED_PACKAGE_CODE_HANDLER = 0xa06;
+       const EXCEPTION_FINAL_CHUNK_VERIFICATION         = 0xa07;
+       const EXCEPTION_INVALID_DATA_CHECKSUM            = 0xa08;
 
        /**
         * Used protocol (Default: invalid, which is indeed invalid...)
@@ -43,7 +49,7 @@ class BaseListener extends BaseHubSystem implements Visitable {
        private $listenPort = 0; // This port MUST be changed by your application
 
        /**
-        * Wether we are in blocking or non-blocking mode (default: non-blocking
+        * Whether we are in blocking or non-blocking mode (default: non-blocking
         */
        private $blockingMode = false;
 
@@ -64,10 +70,10 @@ class BaseListener extends BaseHubSystem implements Visitable {
        }
 
        /**
-        * Checks wether the given socket resource is a server socket
+        * Checks whether the given socket resource is a server socket
         *
         * @param       $socketResource         A valid socket resource
-        * @return      $isServerSocket         Wether the socket resource is a server socket
+        * @return      $isServerSocket         Whether the socket resource is a server socket
         */
        protected function isServerSocketResource ($socketResource) {
                // Check it
@@ -176,7 +182,7 @@ class BaseListener extends BaseHubSystem implements Visitable {
        /**
         * Setter for blocking-mode
         *
-        * @param       $blockingMode   Wether blocking-mode is disabled (default) or enabled
+        * @param       $blockingMode   Whether blocking-mode is disabled (default) or enabled
         * @return      void
         */
        protected final function setBlockingMode ($blockingMode) {
@@ -184,9 +190,9 @@ class BaseListener extends BaseHubSystem implements Visitable {
        }
 
        /**
-        * Checks wether blocking-mode is enabled or disabled
+        * Checks whether blocking-mode is enabled or disabled
         *
-        * @return      $blockingMode   Wether blocking mode is disabled or enabled
+        * @return      $blockingMode   Whether blocking mode is disabled or enabled
         */
        public final function isBlockingModeEnabled () {
                return $this->blockingMode;
@@ -236,13 +242,16 @@ class BaseListener extends BaseHubSystem implements Visitable {
 
                // Register the socket
                $registryInstance->registerSocket($this, $socketResource);
+
+               // And set it here
+               $this->setSocketResource($socketResource);
        }
 
        /**
-        * Checks wether given socket resource is registered in socket registry
+        * Checks whether given socket resource is registered in socket registry
         *
         * @param       $socketResource         A valid server socket resource
-        * @return      $isRegistered           Wether given server socket is registered
+        * @return      $isRegistered           Whether given server socket is registered
         */
        protected function isServerSocketRegistered ($socketResource) {
                // Get a socket registry instance (singleton)
@@ -255,22 +264,6 @@ class BaseListener extends BaseHubSystem implements Visitable {
                return $isRegistered;
        }
 
-       /**
-        * Getter for "this" socket resource
-        *
-        * @return      $socketResource         A valid socket resource
-        */
-       public final function getSocketResource () {
-               // Get a socket registry instance (singleton)
-               $registryInstance = SocketRegistryFactory::createSocketRegistryInstance();
-
-               // Get the socket resource
-               $socketResource = $registryInstance->getRegisteredSocketResource($this);
-
-               // Return it
-               return $socketResource;
-       }
-
        /**
         * Accepts the visitor to process the visit "request"
         *
@@ -296,7 +289,7 @@ class BaseListener extends BaseHubSystem implements Visitable {
        /**
         * Monitors incoming raw data from the handler and transfers it to the
         * given receiver instance. This method should not be called, please call
-        * the decorator's version instead to seperator node/client traffic.
+        * the decorator's version instead to separator node/client traffic.
         *
         * @param       $receiverInstance       An instance of a Receivable class
         * @return      void