]> git.mxchange.org Git - hub.git/commitdiff
Renamed exception, added new one
authorRoland Häder <roland@mxchange.org>
Fri, 17 Aug 2012 20:11:29 +0000 (20:11 +0000)
committerRoland Häder <roland@mxchange.org>
Fri, 17 Aug 2012 20:11:29 +0000 (20:11 +0000)
14 files changed:
.gitattributes
application/hub/exceptions/hub/class_HubAlreadyAnnouncedException.php
application/hub/exceptions/node/.htaccess [new file with mode: 0644]
application/hub/exceptions/node/class_NodeAlreadyAnnouncedException.php [new file with mode: 0644]
application/hub/exceptions/node/class_NodeSessionIdVerficationException.php [new file with mode: 0644]
application/hub/interfaces/handler/answer-status/class_HandleableAnswerStatus.php
application/hub/interfaces/nodes/class_NodeHelper.php
application/hub/main/class_BaseHubSystem.php
application/hub/main/handler/answer-status/announcement/class_AnnouncementAnswerOkayHandler.php
application/hub/main/handler/answer-status/class_BaseAnserStatusHandler.php
application/hub/main/handler/class_BaseHandler.php
application/hub/main/handler/message-types/answer/class_NodeMessageAnnouncementAnswerHandler.php
application/hub/main/handler/network/class_BaseRawDataHandler.php
application/hub/main/nodes/class_BaseHubNode.php

index 64ccc87222c1cc428bb3885f3aab358df7e1eb71..ada260a725ba25652eb284524c9110fccfe26354 100644 (file)
@@ -21,6 +21,9 @@ application/hub/exceptions/lists/.htaccess -text svneol=unset#text/plain
 application/hub/exceptions/lists/class_InvalidListHashException.php svneol=native#text/plain
 application/hub/exceptions/lists/class_ListGroupAlreadyAddedException.php svneol=native#text/plain
 application/hub/exceptions/lists/class_NoListGroupException.php svneol=native#text/plain
+application/hub/exceptions/node/.htaccess -text svneol=unset#text/plain
+application/hub/exceptions/node/class_NodeAlreadyAnnouncedException.php svneol=native#text/plain
+application/hub/exceptions/node/class_NodeSessionIdVerficationException.php svneol=native#text/plain
 application/hub/exceptions/package/.htaccess -text svneol=unset#text/plain
 application/hub/exceptions/package/class_FinalChunkVerificationException.php svneol=native#text/plain
 application/hub/exceptions/package/class_InvalidDataChecksumException.php svneol=native#text/plain
index 03b3beacf6cad40260ad644cfde76d279c753f49..f551ef47b7591c74e7b59193e56a1fa6505a87ab 100644 (file)
@@ -1,45 +1,3 @@
 <?php
-/**
- * This exception is thrown when a hash is invalid
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @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
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-class HubAlreadyAnnouncedException extends FrameworkException {
-       /**
-        * The super constructor for all exceptions
-        *
-        * @param       $messageArray   Error message array
-        * @param       $code                   Error code
-        * @return      void
-        */
-       public function __construct (NodeHelper $nodeInstance, $code) {
-               // Construct the message
-               $message = sprintf("[%s:%d] This hub is already announced. Please fix this.",
-                       $nodeInstance->__toString(),
-                       $this->getLine()
-               );
-
-               // Call parent exception constructor
-               parent::__construct($message, $code);
-       }
-}
-
-// [EOF]
+// @DEPRECATED
 ?>
diff --git a/application/hub/exceptions/node/.htaccess b/application/hub/exceptions/node/.htaccess
new file mode 100644 (file)
index 0000000..3a42882
--- /dev/null
@@ -0,0 +1 @@
+Deny from all
diff --git a/application/hub/exceptions/node/class_NodeAlreadyAnnouncedException.php b/application/hub/exceptions/node/class_NodeAlreadyAnnouncedException.php
new file mode 100644 (file)
index 0000000..c0b9704
--- /dev/null
@@ -0,0 +1,45 @@
+<?php
+/**
+ * This exception is thrown when *this* (local) node has already been announced.
+ *
+ * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @version            0.0.0
+ * @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
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+class NodeAlreadyAnnouncedException extends FrameworkException {
+       /**
+        * The super constructor for all exceptions
+        *
+        * @param       $messageArray   Error message array
+        * @param       $code                   Error code
+        * @return      void
+        */
+       public function __construct (NodeHelper $nodeInstance, $code) {
+               // Construct the message
+               $message = sprintf("[%s:%d] This node is already announced. Please fix this.",
+                       $nodeInstance->__toString(),
+                       $this->getLine()
+               );
+
+               // Call parent exception constructor
+               parent::__construct($message, $code);
+       }
+}
+
+// [EOF]
+?>
diff --git a/application/hub/exceptions/node/class_NodeSessionIdVerficationException.php b/application/hub/exceptions/node/class_NodeSessionIdVerficationException.php
new file mode 100644 (file)
index 0000000..657fb8d
--- /dev/null
@@ -0,0 +1,53 @@
+<?php
+/**
+ * This exception is thrown when a provided session id in a message cannot be
+ * verified. This can be the case when e.g. it doesn't match any records or the
+ * IP/port combination doesn't match to it.
+ *
+ * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @version            0.0.0
+ * @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
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+class NodeSessionIdVerficationException extends FrameworkException {
+       /**
+        * The super constructor for all exceptions
+        *
+        * @param       $messageArray   Error message array
+        * @param       $code                   Error code
+        * @return      void
+        */
+       public function __construct (array $messageArray, $code) {
+               // Construct the message
+               $message = sprintf("[%s:%d] Session id %s cannot be verfied. ip=%s/%s,tcp.port=%s,udp.port=%s,status=%s.",
+                       $messageArray[0]->__toString(),
+                       $this->getLine(),
+                       $messageArray[1][XmlAnnouncementAnswerTemplateEngine::ANNOUNCEMENT_DATA_SESSION_ID],
+                       $messageArray[1][XmlAnnouncementAnswerTemplateEngine::ANNOUNCEMENT_DATA_EXTERNAL_IP],
+                       $messageArray[1][XmlAnnouncementAnswerTemplateEngine::ANNOUNCEMENT_DATA_INTERNAL_IP],
+                       $messageArray[1][XmlAnnouncementAnswerTemplateEngine::ANNOUNCEMENT_DATA_TCP_PORT],
+                       $messageArray[1][XmlAnnouncementAnswerTemplateEngine::ANNOUNCEMENT_DATA_UDP_PORT],
+                       $messageArray[1][XmlAnnouncementAnswerTemplateEngine::ANNOUNCEMENT_DATA_NODE_STATUS]
+               );
+
+               // Call parent exception constructor
+               parent::__construct($message, $code);
+       }
+}
+
+// [EOF]
+?>
index 6044e868c9a4c59e6dff02b5ac4239c2cb2e2acc..ac5e2658cf475ea52480b7ece46dbffd10441bdb 100644 (file)
@@ -29,6 +29,15 @@ interface HandleableAnswerStatus extends Handleable {
          * @return     void
          */
        function handleAnswerMessageData (array $messageData);
+
+       /**
+        * Adds all required elements from given array into data set instance
+        *
+        * @param       $dataSetInstance        An instance of a StoreableCriteria class
+        * @param       $messageData            An array with all message data
+        * @return      void
+        */
+       function addArrayToDataSet (StoreableCriteria $dataSetInstance, array $messageData);
 }
 
 // [EOF]
index f3c87c29dff164edce19d318c2ce35ff79703e16..763f88a6c44ea08449be32041359fd38c5ad6900 100644 (file)
@@ -109,7 +109,7 @@ interface NodeHelper extends FrameworkInterface {
         *
         * @param       $taskInstance   The task instance running this announcement
         * @return      void
-        * @throws      HubAlreadyAnnouncedException    If this hub is already announced
+        * @throws      NodeAlreadyAnnouncedException   If this hub is already announced
         */
        function announceSelfToUpperNodes (Taskable $taskInstance);
 
index 391e014898b773edac12ba5d3502f13172c2c80e..d801735f562d2a83c33dd2c319f67dcb9a792b3a 100644 (file)
  */
 class BaseHubSystem extends BaseFrameworkSystem {
        // Exception codes
-       const EXCEPTION_UNSUPPORTED_ERROR_HANDLER    = 0x900;
-       const EXCEPTION_CHUNK_ALREADY_ASSEMBLED      = 0x901;
-       const EXCEPTION_ANNOUNCEMENT_NOT_ACCEPTED    = 0x902;
-       const EXCEPTION_INVALID_CONNECTION_TYPE      = 0x903;
-       const EXCEPTION_ANNOUNCEMENT_NOT_ATTEMPTED   = 0x904;
-       const EXCEPTION_BASE64_ENCODING_NOT_MODULO_4 = 0x905;
+       const EXCEPTION_UNSUPPORTED_ERROR_HANDLER     = 0x900;
+       const EXCEPTION_CHUNK_ALREADY_ASSEMBLED       = 0x901;
+       const EXCEPTION_ANNOUNCEMENT_NOT_ACCEPTED     = 0x902;
+       const EXCEPTION_INVALID_CONNECTION_TYPE       = 0x903;
+       const EXCEPTION_ANNOUNCEMENT_NOT_ATTEMPTED    = 0x904;
+       const EXCEPTION_BASE64_ENCODING_NOT_MODULO_4  = 0x905;
+       const EXCEPTION_NODE_SESSION_ID_NOT_VERIFYING = 0x906;
 
        // Message status codes
        const MESSAGE_STATUS_CODE_OKAY = 'OKAY';
index d9cc21b2306ddfaa6cda7915df4659198caeb29b..5be1a0abc01fe861a774f5c86bc0dc673431fcbb 100644 (file)
@@ -51,11 +51,36 @@ class AnnouncementAnswerOkayHandler extends BaseAnserStatusHandler implements Ha
        /**
         * Handles given message data array
         *
-         * @param      $messageData    An array of message data
-         * @return     void
-         */
+        * @param       $messageData    An array of message data
+        * @return      void
+        * @throws      NodeSessionIdVerficationException       If the provided session id is not matching
+        */
        public function handleAnswerMessageData (array $messageData) {
-               $this->partialStub('Please implement this method.');
+               // Get a database wrapper instance
+               $wrapperInstance = ObjectFactory::createObjectByConfiguredName('node_list_db_wrapper_class');
+
+               // Get also a search criteria instance
+               $searchInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class');
+
+               // Lookup external session id/external IP/port
+               $searchInstance->addCriteria('node_session_id' , $messageData[XmlAnnouncementAnswerTemplateEngine::ANNOUNCEMENT_DATA_SESSION_ID]);
+               $searchInstance->addCriteria('node_external_ip', $messageData[XmlAnnouncementAnswerTemplateEngine::ANNOUNCEMENT_DATA_EXTERNAL_IP]);
+               $searchInstance->addCriteria('node_tcp_port'   , $messageData[XmlAnnouncementAnswerTemplateEngine::ANNOUNCEMENT_DATA_TCP_PORT]);
+
+               // Only one entry is fine
+               $searchInstance->setLimit(1);
+
+               // Run the query
+               $resultInstance = $wrapperInstance->doSelectByCriteria($searchInstance);
+
+               // Is there an try?
+               if (!$resultInstance->next()) {
+                       // This is fatal, caused by "stolen" session id and/or not matching IP number/port combination
+                       throw new NodeSessionIdVerficationException(array($this, $messageData), BaseHubSystem::EXCEPTION_NODE_SESSION_ID_NOT_VERIFYING);
+               } // END - if
+
+               // Update node data (include status code)
+               $wrapperInstance->updateNodeByMessageData($messageData, $this, $searchInstance);
        }
 }
 
index 4c1a6efb52a61de291e2d041468749905bb4cd89..93d24ed21ffc6dd2df0a57dfe498a22ab8812a0c 100644 (file)
@@ -57,6 +57,17 @@ class BaseAnserStatusHandler extends BaseHandler {
        protected final function getLastException () {
                return $this->lastException;
        }
+
+       /**
+        * Adds all required elements from given array into data set instance
+        *
+        * @param       $dataSetInstance        An instance of a StoreableCriteria class
+        * @param       $messageData            An array with all message data
+        * @return      void
+        */
+       public function addArrayToDataSet (StoreableCriteria $dataSetInstance, array $messageData) {
+               die(__METHOD__.chr(10));
+       }
 }
 
 // [EOF]
index f551ef47b7591c74e7b59193e56a1fa6505a87ab..aebb056257f5eb4d92339f2864f02b5ad21d9f2d 100644 (file)
@@ -1,3 +1,62 @@
 <?php
-// @DEPRECATED
+/**
+ * A general Handler
+ *
+ * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @version            0.0.0
+ * @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
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+class BaseHandler extends BaseHubSystem {
+       /**
+        * Handler name
+        */
+       private $handlerName = 'invalid';
+
+       /**
+        * Protected constructor
+        *
+        * @param       $className      Name of the class
+        * @return      void
+        */
+       protected function __construct ($className) {
+               // Call parent constructor
+               parent::__construct($className);
+       }
+
+       /**
+        * Getter for handler name
+        *
+        * @return      $handlerName    Name of this handler
+        */
+       public final function getHandlerName () {
+               return $this->handlerName;
+       }
+
+       /**
+        * Setter for handler name
+        *
+        * @param       $handlerName    Name of this handler
+        * @return      void
+        */
+       protected final function setHandlerName ($handlerName) {
+               $this->handlerName = $handlerName;
+       }
+}
+
+// [EOF]
 ?>
index df124db2f978bb994076d41a6d10b407d77002ce..2f6f7a5a784d8fc7d910781dc6fa0b07d129c575 100644 (file)
@@ -125,8 +125,11 @@ class NodeMessageAnnouncementAnswerHandler extends BaseMessageHandler implements
                        // Is it there?
                        assert(isset($messageData[$key]));
 
-                       // Add it
-                       $dataSetInstance->addCriteria('node_' . $key, $messageData[$key]);
+                       /*
+                        * Add it, but remove any 'my-' prefixes as they are not used in
+                        * database layer.
+                        */
+                       $dataSetInstance->addCriteria('node_' . str_replace('my-', '', $key), $messageData[$key]);
                } // END - foreach
        }
 
index f551ef47b7591c74e7b59193e56a1fa6505a87ab..96147ecb3afb5ff0a4bd652e38fb1085109cdb1b 100644 (file)
@@ -1,3 +1,180 @@
 <?php
-// @DEPRECATED
+/**
+ * A general Handler for raw data from sockets
+ *
+ * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @version            0.0.0
+ * @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
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+class BaseRawDataHandler extends BaseHandler {
+       // Error codes:
+       // - Socket raw data stream errors
+       const SOCKET_ERROR_UNKNOWN                    = 'unknown_error';              // Unknown error (should not happen)
+       const SOCKET_ERROR_TRANSPORT_ENDPOINT         = 'transport_endpoint';         // Transport endpoint has closed
+       const SOCKET_ERROR_INVALID_BASE64_MODULO      = 'base64_modulo';              // Length is not modulo 4
+       const SOCKET_ERROR_INVALID_BASE64_MESSAGE     = 'base64_message';             // Raw data is not Base64-encoded
+       const SOCKET_ERROR_UNHANDLED                  = 'unhandled_package';          // Unhandled raw data (not bad)
+       const SOCKET_ERROR_CONNECTION_REFUSED         = 'connection_refused';         // The name says it: connection refused
+       const SOCKET_ERROR_CONNECTION_TIMED_OUT       = 'connection_timed_out';       // The name says it: connection attempt has timed-out
+       const SOCKET_ERROR_OPERATION_IN_PROGRESS      = 'operation_in_progress';      // 'Operation now in progress'
+       const SOCKET_ERROR_OPERATION_ALREADY_PROGRESS = 'operation_already_progress'; // 'Operation already in progress'
+       const SOCKET_ERROR_RESOURCE_UNAVAILABLE       = 'resource_unavailable';       // 'Resource temporary unavailable'
+       const SOCKET_ERROR_NO_ROUTE_TO_HOST           = 'no_route_to_host';           // The name says it: no route to host
+       const SOCKET_CONNECTED                        = 'connected';                  // Nothing errorous happens, socket is connected
+
+       // - Package errors
+       const PACKAGE_ERROR_INVALID_DATA       = 'invalid_data';    // Invalid data in package found
+       const PACKAGE_ERROR_INCOMPLETE_DATA    = 'incomplete_data'; // Incomplete data sent (e.g. field is missing)
+       const PACKAGE_ERROR_INVALID_CONTENT    = 'invalid_content'; // Content is invalid (e.g. not well-formed)
+       const PACKAGE_ERROR_RECIPIENT_MISMATCH = 'recipient_error'; // Recipient is not us
+       const PACKAGE_LEVEL_CHECK_OKAY         = 'checked_package'; // Package is fine
+
+       // Package data
+       const PACKAGE_RAW_DATA   = 'raw_data';
+       const PACKAGE_ERROR_CODE = 'error_code';
+
+       // Start/end marker
+       const STREAM_START_MARKER = '[[S]]';
+       const STREAM_END_MARKER   = '[[E]]';
+
+       /**
+        * Stacker for raw data
+        */
+       const STACKER_NAME_RAW_DATA = 'raw_data';
+
+       /**
+        * Error code from socket
+        */
+       private $errorCode = -1;
+
+       /**
+        * Protected constructor
+        *
+        * @param       $className      Name of the class
+        * @return      void
+        */
+       protected function __construct ($className) {
+               // Call parent constructor
+               parent::__construct($className);
+
+               // Set error code to 'unknown'
+               $this->setErrorCode(self::SOCKET_ERROR_UNKNOWN);
+
+               // Init stacker instance for processed raw data
+               $stackerInstance = ObjectFactory::createObjectByConfiguredName('node_raw_data_stacker_class');
+
+               // Remember this in this package handler
+               $this->setStackerInstance($stackerInstance);
+
+               // Init stacker
+               $this->initStacker();
+       }
+
+       /**
+        * Initializes the stacker for raw data
+        *
+        * @return      void
+        */
+       protected function initStacker () {
+               $this->getStackerInstance()->initStacker(self::STACKER_NAME_RAW_DATA);
+       }
+
+       /**
+        * Adds given raw data to the raw data stacker
+        *
+        * @param       $rawData        raw data from the socket resource
+        * @return      void
+        */
+       protected function addRawDataToStacker ($rawData) {
+               /*
+                * Add the deocoded data and error code to the stacker so other classes
+                * (e.g. NetworkPackage) can "pop" it from the stacker.
+                */
+               $this->getStackerInstance()->pushNamed(self::STACKER_NAME_RAW_DATA, array(
+                       self::PACKAGE_RAW_DATA   => $rawData,
+                       self::PACKAGE_ERROR_CODE => $this->getErrorCode()
+               ));
+       }
+
+       /**
+        * Checks whether raw data is pending for further processing.
+        *
+        * @return      $isPending      Whether raw data is pending
+        */
+       public function isRawDataPending () {
+               // Does the stacker have some entries (not empty)?
+               $isPending = (!$this->getStackerInstance()->isStackEmpty(self::STACKER_NAME_RAW_DATA));
+
+               // Return it
+               return $isPending;
+       }
+
+       /**
+        * "Getter" for next raw data from the stacker
+        *
+        * @return      $rawData        Raw data from the stacker
+        */
+       public function getNextRawData () {
+               // "Pop" the raw data from the stacker
+               $rawData = $this->getStackerInstance()->popNamed(self::STACKER_NAME_RAW_DATA);
+
+               // And return it
+               return $rawData;
+       }
+
+       /**
+        * Checks whether the 'recipient' field matches our own address:port
+        * combination.
+        *
+        * @param       $packageData    Raw package data
+        * @return      $matches                Whether it matches
+        * @todo        This method will be moved to a better place
+        */
+       protected function ifRecipientMatchesOwnAddress (array $packageData) {
+               // Construct own address first
+               $ownAddress = Registry::getRegistry()->getInstance('node')->getAddressPort($this);
+
+               // Does it match?
+               $matches = ($ownAddress === $packageData[NetworkPackage::PACKAGE_DATA_RECIPIENT]);
+
+               // Return result
+               return $matches;
+       }
+
+       /**
+        * Setter for error code
+        *
+        * @param       $errorCode      The error code we shall set
+        * @return      void
+        */
+       public final function setErrorCode ($errorCode) {
+               $this->errorCode = $errorCode;
+       }
+
+       /**
+        * Getter for error code
+        *
+        * @return      $errorCode      The error code
+        */
+       public final function getErrorCode () {
+               return $this->errorCode;
+       }
+}
+
+// [EOF]
 ?>
index 3a2be5ce3366e64acba669cff1d7b0713d62c3f0..386980413d0a6559548cf93b11c3cd6e08c7b9dd 100644 (file)
@@ -481,14 +481,14 @@ class BaseHubNode extends BaseHubSystem implements Updateable {
         *
         * @param       $taskInstance   The task instance running this announcement
         * @return      void
-        * @throws      HubAlreadyAnnouncedException    If this hub is already announced
+        * @throws      NodeAlreadyAnnouncedException   If this hub is already announced
         * @todo        Change the first if() block to check for a specific state
         */
        public function announceSelfToUpperNodes (Taskable $taskInstance) {
                // Is this hub node announced?
                if ($this->hubIsAnnounced === true) {
                        // Already announced!
-                       throw new HubAlreadyAnnouncedException($this, self::EXCEPTION_HUB_ALREADY_ANNOUNCED);
+                       throw new NodeAlreadyAnnouncedException($this, self::EXCEPTION_HUB_ALREADY_ANNOUNCED);
                } // END - if
 
                // Debug output