Publication of DHT entries requires a fully booted DHT as else it will only find...

[hub.git] / application / hub / main / class_BaseHubSystem.php

diff --git a/application/hub/main/class_BaseHubSystem.php b/application/hub/main/class_BaseHubSystem.php
index 03579227987b32f3114470a5900b96f0ebb9471d..a14384e1cfa5d9db6e036d168645a412dedb38c5 100644 (file)
--- a/application/hub/main/class_BaseHubSystem.php
+++ b/application/hub/main/class_BaseHubSystem.php
@@ -2,11 +2,11 @@
 /**
  * A general hub system class
  *
- * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @author             Roland Haeder <webmaster@shipsimu.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
+ * @link               http://www.shipsimu.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
@@ -23,11 +23,15 @@
  */
 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_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;
+       const EXCEPTION_REQUEST_NOT_ACCEPTED          = 0x907;
+       const SOCKET_ERROR_CONNECTION_RESET_BY_PEER   = 0x908;
 
        // Message status codes
        const MESSAGE_STATUS_CODE_OKAY = 'OKAY';
@@ -443,22 +447,22 @@ class BaseHubSystem extends BaseFrameworkSystem {
         */
        protected function isValidFinalChunk (array $chunks) {
                // Default is all fine
-               $isValid = true;
+               $isValid = TRUE;
 
                // Split the (possible) EOP chunk
                $chunkSplits = explode(PackageFragmenter::CHUNK_DATA_HASH_SEPARATOR, $chunks[count($chunks) - 1]);
 
                // Make sure chunks with only 3 elements are parsed (for details see ChunkHandler)
-               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('eopChunk=' . $chunks[count($chunks) - 1] . ',chunkSplits=' . print_r($chunkSplits,true));
+               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('eopChunk=' . $chunks[count($chunks) - 1] . ',chunkSplits=' . print_r($chunkSplits, TRUE));
                assert(count($chunkSplits) == 3);
 
                // Validate final chunk
                if (substr($chunkSplits[ChunkHandler::CHUNK_SPLITS_INDEX_RAW_DATA], 0, strlen(PackageFragmenter::END_OF_PACKAGE_IDENTIFIER)) != PackageFragmenter::END_OF_PACKAGE_IDENTIFIER) {
                        // Not fine
-                       $isValid = false;
+                       $isValid = FALSE;
                } elseif (substr_count($chunkSplits[ChunkHandler::CHUNK_SPLITS_INDEX_RAW_DATA], PackageFragmenter::CHUNK_HASH_SEPARATOR) != 1) {
                        // CHUNK_HASH_SEPARATOR shall only be found once
-                       $isValid = false;
+                       $isValid = FALSE;
                }
 
                // Return status
@@ -485,6 +489,10 @@ class BaseHubSystem extends BaseFrameworkSystem {
                                $errorName = BaseRawDataHandler::SOCKET_ERROR_RESOURCE_UNAVAILABLE;
                                break;
 
+                       case 104: // "Connection reset by peer"
+                               $errorName = BaseRawDataHandler::SOCKET_ERROR_CONNECTION_RESET_BY_PEER;
+                               break;
+
                        case 107: // "Transport end-point not connected"
                        case 134: // On some (?) systems for 'transport end-point not connected'
                                // @TODO On some systems it is 134, on some 107?
@@ -593,20 +601,6 @@ class BaseHubSystem extends BaseFrameworkSystem {
                // Return result
                return $stateName;
        }
-
-       /**
-        * Checks whether start/end marker are set
-        *
-        * @param       $data   Data to be checked
-        * @return      $isset  Whether start/end marker are set
-        */
-       public final function ifStartEndMarkerSet ($data) {
-               // Determine it
-               $isset = ((substr($data, 0, strlen(BaseRawDataHandler::STREAM_START_MARKER)) == BaseRawDataHandler::STREAM_START_MARKER) && (substr($data, -1 * strlen(BaseRawDataHandler::STREAM_END_MARKER), strlen(BaseRawDataHandler::STREAM_END_MARKER)) == BaseRawDataHandler::STREAM_END_MARKER));
-
-               // ... and return it
-               return $isset;
-       }
 }
 
 // [EOF]