X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=application%2Fhub%2Fmain%2Fpackage%2Fclass_NetworkPackage.php;h=4c5dc1b10defb8e8738e9543ffe4444e48040118;hb=2eeb79458f7c3704f9e1919bb0b0f57e0a07cf57;hp=fc55db7104fbb6ad0f6d502e4a2a20f9913a71ab;hpb=86d598813ff6b78315f466d57ff021939bdf4d1c;p=hub.git

diff --git a/application/hub/main/package/class_NetworkPackage.php b/application/hub/main/package/class_NetworkPackage.php
index fc55db710..4c5dc1b10 100644
--- a/application/hub/main/package/class_NetworkPackage.php
+++ b/application/hub/main/package/class_NetworkPackage.php
@@ -17,7 +17,7 @@
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Hub Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Hub Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  * @todo		Needs to add functionality for handling the object's type
@@ -73,34 +73,38 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 	/**
 	 * Array indexes for raw package array
 	 */
-	const INDEX_PACKAGE_SENDER    = 0;
-	const INDEX_PACKAGE_RECIPIENT = 1;
-	const INDEX_PACKAGE_CONTENT   = 2;
-	const INDEX_PACKAGE_STATUS    = 3;
-	const INDEX_PACKAGE_SIGNATURE = 4;
+	const INDEX_PACKAGE_SENDER           = 0;
+	const INDEX_PACKAGE_RECIPIENT        = 1;
+	const INDEX_PACKAGE_CONTENT          = 2;
+	const INDEX_PACKAGE_STATUS           = 3;
+	const INDEX_PACKAGE_HASH             = 4;
+	const INDEX_PACKAGE_PRIVATE_KEY_HASH = 5;
 
 	/**
-	 * Size of the decoded data array ('status' is not included)
+	 * Size of the decoded data array
 	 */
-	const DECODED_DATA_ARRAY_SIZE = 4;
+	const DECODED_DATA_ARRAY_SIZE = 6;
 
 	/**
 	 * Named array elements for decoded package content
 	 */
-	const PACKAGE_CONTENT_EXTENSION = 'compressor';
-	const PACKAGE_CONTENT_MESSAGE   = 'message';
-	const PACKAGE_CONTENT_TAGS      = 'tags';
-	const PACKAGE_CONTENT_CHECKSUM  = 'checksum';
+	const PACKAGE_CONTENT_EXTENSION        = 'compressor';
+	const PACKAGE_CONTENT_MESSAGE          = 'message';
+	const PACKAGE_CONTENT_TAGS             = 'tags';
+	const PACKAGE_CONTENT_CHECKSUM         = 'checksum';
+	const PACKAGE_CONTENT_SENDER           = 'sender';
+	const PACKAGE_CONTENT_HASH             = 'hash';
+	const PACKAGE_CONTENT_PRIVATE_KEY_HASH = 'pkhash';
 
 	/**
 	 * Named array elements for package data
 	 */
-	const PACKAGE_DATA_SENDER    = 'sender';
-	const PACKAGE_DATA_RECIPIENT = 'recipient';
-	const PACKAGE_DATA_PROTOCOL  = 'protocol';
-	const PACKAGE_DATA_CONTENT   = 'content';
-	const PACKAGE_DATA_STATUS    = 'status';
-	const PACKAGE_DATA_SIGNATURE = 'signature';
+	const PACKAGE_DATA_SENDER           = 'sender';
+	const PACKAGE_DATA_RECIPIENT        = 'recipient';
+	const PACKAGE_DATA_CONTENT          = 'content';
+	const PACKAGE_DATA_STATUS           = 'status';
+	const PACKAGE_DATA_HASH             = 'hash';
+	const PACKAGE_DATA_PRIVATE_KEY_HASH = 'pkhash';
 
 	/**
 	 * All package status
@@ -113,8 +117,11 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 	/**
 	 * Constants for message data array
 	 */
-	const MESSAGE_ARRAY_DATA = 'message_data';
-	const MESSAGE_ARRAY_TYPE = 'message_type';
+	const MESSAGE_ARRAY_DATA   = 'message_data';
+	const MESSAGE_ARRAY_TYPE   = 'message_type';
+	const MESSAGE_ARRAY_SENDER = 'message_sender';
+	const MESSAGE_ARRAY_HASH   = 'message_hash';
+	const MESSAGE_ARRAY_TAGS   = 'message_tags';
 
 	/**
 	 * Generic answer status field
@@ -208,13 +215,43 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 	const STACKER_NAME_PROCESSED_MESSAGE = 'package_processed_message';
 
 	/**************************************************************************
-	 *                   Stacker for other/internal purposes                  *
+	 *                      Stacker for raw data handling                     *
 	 **************************************************************************/
 
 	/**
-	 * Stacker name for "back-buffered" packages
+	 * Stacker for outgoing data stream
 	 */
-	const STACKER_NAME_BACK_BUFFER = 'package_backbuffer';
+	const STACKER_NAME_OUTGOING_STREAM = 'outgoing_stream';
+
+	/**
+	 * Array index for final hash
+	 */
+	const RAW_FINAL_HASH_INDEX = 'hash';
+
+	/**
+	 * Array index for encoded data
+	 */
+	const RAW_ENCODED_DATA_INDEX = 'data';
+
+	/**
+	 * Array index for sent bytes
+	 */
+	const RAW_SENT_BYTES_INDEX = 'sent';
+
+	/**
+	 * Array index for socket resource
+	 */
+	const RAW_SOCKET_INDEX = 'socket';
+
+	/**
+	 * Array index for buffer size
+	 */
+	const RAW_BUFFER_SIZE_INDEX = 'buffer';
+
+	/**
+	 * Array index for diff between buffer and sent bytes
+	 */
+	const RAW_DIFF_INDEX = 'diff';
 
 	/**************************************************************************
 	 *                            Protocol names                              *
@@ -250,16 +287,16 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 		 * which have no recipient address and stamp... ;-) This stacker will
 		 * also be used for incoming raw data to handle it.
 		 */
-		$stackerInstance = ObjectFactory::createObjectByConfiguredName('network_package_stacker_class');
+		$stackInstance = ObjectFactory::createObjectByConfiguredName('network_package_stacker_class');
 
 		// At last, set it in this class
-		$packageInstance->setStackerInstance($stackerInstance);
+		$packageInstance->setStackInstance($stackInstance);
 
 		// Init all stacker
 		$packageInstance->initStacks();
 
 		// Get a visitor instance for speeding up things and set it
-		$visitorInstance = ObjectFactory::createObjectByConfiguredName('node_raw_data_monitor_visitor_class', array($packageInstance));
+		$visitorInstance = ObjectFactory::createObjectByConfiguredName('node_raw_data_monitor_visitor_class');
 		$packageInstance->setVisitorInstance($visitorInstance);
 
 		// Get crypto instance and set it, too
@@ -270,6 +307,15 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 		$assemblerInstance = PackageAssemblerFactory::createAssemblerInstance($packageInstance);
 		$packageInstance->setAssemblerInstance($assemblerInstance);
 
+		// Get node instance
+		$nodeInstance = NodeObjectFactory::createNodeInstance();
+
+		// Get pool instance from node
+		$poolInstance = $nodeInstance->getListenerPoolInstance();
+
+		// And set it here
+		$packageInstance->setListenerPoolInstance($poolInstance);
+
 		// Return the prepared instance
 		return $packageInstance;
 	}
@@ -282,7 +328,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 	 */
 	protected function initStacks ($forceReInit = FALSE) {
 		// Initialize all
-		$this->getStackerInstance()->initStacks(array(
+		$this->getStackInstance()->initStacks(array(
 			self::STACKER_NAME_UNDECLARED,
 			self::STACKER_NAME_DECLARED,
 			self::STACKER_NAME_OUTGOING,
@@ -291,10 +337,41 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 			self::STACKER_NAME_DECODED_CHUNKED,
 			self::STACKER_NAME_NEW_MESSAGE,
 			self::STACKER_NAME_PROCESSED_MESSAGE,
-			self::STACKER_NAME_BACK_BUFFER
+			self::STACKER_NAME_OUTGOING_STREAM
 		), $forceReInit);
 	}
 
+	/**
+	 * Determines private key hash from given session id
+	 *
+	 * @param	$decodedData	Array with decoded data
+	 * @return	$hash			Private key's hash
+	 */
+	private function determineSenderPrivateKeyHash (array $decodedData) {
+		// Get DHT instance
+		$dhtInstance = DhtObjectFactory::createDhtInstance('node');
+
+		// Ask DHT for session id
+		$senderData = $dhtInstance->findNodeLocalBySessionId($decodedData[self::PACKAGE_CONTENT_SENDER]);
+
+		// Is an entry found?
+		if (count($senderData) > 0) {
+			// Make sure the element 'private_key_hash' is there
+			/* NOISY-DEBUG */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: senderData=' . print_r($senderData, TRUE));
+			assert(isset($senderData[NodeDistributedHashTableDatabaseWrapper::DB_COLUMN_PRIVATE_KEY_HASH]));
+
+			// Return it
+			return $senderData[NodeDistributedHashTableDatabaseWrapper::DB_COLUMN_PRIVATE_KEY_HASH];
+		} // END - if
+
+		// Make sure the requested element is there
+		//* DEBUG-DIE */ die('decodedData=' . print_r($decodedData, TRUE));
+		assert(isset($decodedData[self::PACKAGE_CONTENT_PRIVATE_KEY_HASH]));
+
+		// There is no DHT entry so, accept the hash from decoded data
+		return $decodedData[self::PACKAGE_CONTENT_PRIVATE_KEY_HASH];
+	}
+
 	/**
 	 * "Getter" for hash from given content
 	 *
@@ -303,7 +380,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 	 */
 	private function getHashFromContent ($content) {
 		// Debug message
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __LINE__ . ']: content[md5]=' . md5($content) . ',sender=' . $this->getSessionId() . ',compressor=' . $this->getCompressorInstance()->getCompressorExtension());
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: content[md5]=' . md5($content) . ',sender=' . $this->getSessionId() . ',compressor=' . $this->getCompressorInstance()->getCompressorExtension());
 
 		// Create the hash
 		// @TODO md5() is very weak, but it needs to be fast
@@ -316,7 +393,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 		);
 
 		// Debug message
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __LINE__ . ']: content[md5]=' . md5($content) . ',sender=' . $this->getSessionId() . ',hash=' . $hash . ',compressor=' . $this->getCompressorInstance()->getCompressorExtension());
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: content[md5]=' . md5($content) . ',sender=' . $this->getSessionId() . ',hash=' . $hash . ',compressor=' . $this->getCompressorInstance()->getCompressorExtension());
 
 		// And return it
 		return $hash;
@@ -350,22 +427,22 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 	 */
 	private function changePackageStatus (array $packageData, $stackerName, $newStatus) {
 		// Skip this for empty stacks
-		if ($this->getStackerInstance()->isStackEmpty($stackerName)) {
+		if ($this->getStackInstance()->isStackEmpty($stackerName)) {
 			// This avoids an exception after all packages has failed
 			return;
 		} // END - if
 
 		// Pop the entry (it should be it)
-		$nextData = $this->getStackerInstance()->popNamed($stackerName);
+		$nextData = $this->getStackInstance()->popNamed($stackerName);
 
-		// Compare both signatures
-		assert($nextData[self::PACKAGE_DATA_SIGNATURE] == $packageData[self::PACKAGE_DATA_SIGNATURE]);
+		// Compare both hashes
+		assert($nextData[self::PACKAGE_DATA_HASH] == $packageData[self::PACKAGE_DATA_HASH]);
 
 		// Temporary set the new status
 		$packageData[self::PACKAGE_DATA_STATUS] = $newStatus;
 
 		// And push it again
-		$this->getStackerInstance()->pushNamed($stackerName, $packageData);
+		$this->getStackInstance()->pushNamed($stackerName, $packageData);
 	}
 
 	/**
@@ -377,7 +454,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 	 */
 	public function getHashFromContentSessionId (array $decodedContent, $sessionId) {
 		// Debug message
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __LINE__ . ']: content[md5]=' . md5($decodedContent[self::PACKAGE_CONTENT_MESSAGE]) . ',sender=' . $sessionId . ',compressor=' . $decodedContent[self::PACKAGE_CONTENT_EXTENSION]);
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: content[md5]=' . md5($decodedContent[self::PACKAGE_CONTENT_MESSAGE]) . ',sender=' . $sessionId . ',compressor=' . $decodedContent[self::PACKAGE_CONTENT_EXTENSION]);
 
 		// Create the hash
 		// @TODO md5() is very weak, but it needs to be fast
@@ -398,7 +475,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 	///////////////////////////////////////////////////////////////////////////
 
 	/**
-	 * Delivers the given raw package data.
+	 * Declares the given raw package data by discovering recipients
 	 *
 	 * @param	$packageData	Raw package data in an array
 	 * @return	void
@@ -421,6 +498,9 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 		// Now get an iterator
 		$iteratorInstance = $discoveryInstance->getIterator();
 
+		// Make sure the iterator instance is valid
+		assert($iteratorInstance instanceof Iterator);
+
 		// Rewind back to the beginning
 		$iteratorInstance->rewind();
 
@@ -430,16 +510,16 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 			$currentRecipient = $iteratorInstance->current();
 
 			// Debug message
-			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __LINE__ . ']: Setting recipient to ' . $currentRecipient . ',previous=' . $packageData[self::PACKAGE_DATA_RECIPIENT]);
+			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: Setting recipient to ' . $currentRecipient . ',previous=' . $packageData[self::PACKAGE_DATA_RECIPIENT]);
 
 			// Set the recipient
 			$packageData[self::PACKAGE_DATA_RECIPIENT] = $currentRecipient;
 
-			// And enqueue it to the writer class
-			$this->getStackerInstance()->pushNamed(self::STACKER_NAME_DECLARED, $packageData);
+			// Push the declared package to the next stack.
+			$this->getStackInstance()->pushNamed(self::STACKER_NAME_DECLARED, $packageData);
 
 			// Debug message
-			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __LINE__ . ']: Package declared for recipient ' . $currentRecipient);
+			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: Package declared for recipient ' . $currentRecipient);
 
 			// Skip to next entry
 			$iteratorInstance->next();
@@ -481,47 +561,56 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 		$socketResource = $discoveryInstance->discoverSocket($packageData, BaseConnectionHelper::CONNECTION_TYPE_OUTGOING);
 
 		// Debug message
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __LINE__ . ']: Reached line ' . __LINE__ . ' after discoverSocket() has been called.');
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: Reached line ' . __LINE__ . ' after discoverSocket() has been called.');
 
-		// We have to put this socket in our registry, so get an instance
+		// Debug message
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: stateInstance=' . $helperInstance->getStateInstance());
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: Reached line ' . __LINE__ . ' before isSocketRegistered() has been called.');
+
+		// The socket needs to be put in a special registry that can handle such data
 		$registryInstance = SocketRegistryFactory::createSocketRegistryInstance();
 
-		// Get the listener from registry
+		// Get the connection helper from registry
 		$helperInstance = Registry::getRegistry()->getInstance('connection');
 
-		// Debug message
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __LINE__ . ']: stateInstance=' . $helperInstance->getStateInstance());
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __LINE__ . ']: Reached line ' . __LINE__ . ' before isSocketRegistered() has been called.');
+		// And make sure it is valid
+		assert($helperInstance instanceof ConnectionHelper);
+
+		// Get connection info class
+		$infoInstance = ConnectionInfoFactory::createConnectionInfoInstance($helperInstance->getProtocolName(), 'helper');
+
+		// Will the info instance with connection helper data
+		$infoInstance->fillWithConnectionHelperInformation($helperInstance);
 
 		// Is it not there?
-		if ((is_resource($socketResource)) && (!$registryInstance->isSocketRegistered($helperInstance, $socketResource))) {
+		if ((is_resource($socketResource)) && (!$registryInstance->isSocketRegistered($infoInstance, $socketResource))) {
 			// Debug message
-			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __LINE__ . ']: Registering socket ' . $socketResource . ' ...');
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: Registering socket ' . $socketResource . ' ...');
 
 			// Then register it
-			$registryInstance->registerSocket($helperInstance, $socketResource, $packageData);
+			$registryInstance->registerSocket($infoInstance, $socketResource, $packageData);
 		} elseif (!$helperInstance->getStateInstance()->isPeerStateConnected()) {
 			// Is not connected, then we cannot send
-			self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __LINE__ . ']: Unexpected peer state ' . $helperInstance->getStateInstance()->__toString() . ' detected.');
+			self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: Unexpected peer state ' . $helperInstance->getStateInstance()->__toString() . ' detected.');
 
 			// Shutdown the socket
 			$this->shutdownSocket($socketResource);
 		}
 
 		// Debug message
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __LINE__ . ']: Reached line ' . __LINE__ . ' after isSocketRegistered() has been called.');
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: Reached line ' . __LINE__ . ' after isSocketRegistered() has been called.');
 
 		// Make sure the connection is up
 		$helperInstance->getStateInstance()->validatePeerStateConnected();
 
 		// Debug message
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __LINE__ . ']: Reached line ' . __LINE__ . ' after validatePeerStateConnected() has been called.');
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: Reached line ' . __LINE__ . ' after validatePeerStateConnected() has been called.');
 
 		// Enqueue it again on the out-going queue, the connection is up and working at this point
-		$this->getStackerInstance()->pushNamed(self::STACKER_NAME_OUTGOING, $packageData);
+		$this->getStackInstance()->pushNamed(self::STACKER_NAME_OUTGOING, $packageData);
 
 		// Debug message
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __LINE__ . ']: Reached line ' . __LINE__ . ' after pushNamed() has been called.');
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: Reached line ' . __LINE__ . ' after pushNamed() has been called.');
 	}
 
 	/**
@@ -535,7 +624,18 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 		$sentBytes = 0;
 
 		// Get the right connection instance
-		$helperInstance = SocketRegistryFactory::createSocketRegistryInstance()->getHandlerInstanceFromPackageData($packageData);
+		$infoInstance = SocketRegistryFactory::createSocketRegistryInstance()->getInfoInstanceFromPackageData($packageData);
+
+		// Test helper instance
+		assert($infoInstance instanceof ShareableInfo);
+
+		// Get helper instance
+		$helperInstance = $infoInstance->getHelperInstance();
+
+		// Some sanity-checks on the object
+		//* DEBUG-DIE: */ die('[' . __METHOD__ . ':' . __LINE__ . ']: p1=' . $infoInstance->getProtocolName() . ',p2=' . $helperInstance->getProtocolName() . ',infoInstance=' . print_r($infoInstance, TRUE));
+		assert($helperInstance instanceof ConnectionHelper);
+		assert($infoInstance->getProtocolName() == $helperInstance->getProtocolName());
 
 		// Is this connection still alive?
 		if ($helperInstance->isShuttedDown()) {
@@ -545,48 +645,77 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 		} // END - if
 
 		// Sent out package data
-		$sentBytes = $helperInstance->sendRawPackageData($packageData);
-
-		// Remember unsent raw bytes in back-buffer, if any
-		$this->storeUnsentBytesInBackBuffer($packageData, $sentBytes);
+		$helperInstance->sendRawPackageData($packageData);
 	}
 
 	/**
-	 * Generates a signature for given raw package content and sender id
+	 * Generates a secure hash for given raw package content and sender id
 	 *
 	 * @param	$content	Raw package data
-	 * @param	$senderId	Sender id to generate a signature for
-	 * @return	$signature	Signature as BASE64-encoded string
+	 * @param	$senderId	Sender id to generate a hash for
+	 * @return	$hash		Hash as hex-encoded string
 	 */
-	private function generatePackageSignature ($content, $senderId) {
-		// Hash content and sender id together, use md5() as last algo
-		$hash = md5($this->getCryptoInstance()->hashString($senderId . $content, $this->getPrivateKey(), FALSE));
+	private function generatePackageHash ($content, $senderId) {
+		// Debug message
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: content()=' . strlen($content) . ',senderId=' . $senderId . ' - CALLED!');
+
+		// Is the feature enabled?
+		if (!FrameworkFeature::isFeatureAvailable('hubcoin_reward')) {
+			// Feature is not enabled
+			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: Feature "hubcoin_reward" not available, not generating package hash. Returning NULL ...');
+			return NULL;
+		} // END - if
 
-		// Encrypt the content again with the hash as a key
-		$encryptedContent = $this->getCryptoInstance()->encryptString($content, $hash);
+		// Fake array
+		$data = array(
+			self::PACKAGE_CONTENT_SENDER           => $senderId,
+			self::PACKAGE_CONTENT_MESSAGE          => $content,
+			self::PACKAGE_CONTENT_PRIVATE_KEY_HASH => ''
+		);
+	
+		// Hash content and sender id together, use scrypt
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: senderId=' . $senderId . ',content()=' . strlen($content));
+		$hash = FrameworkFeature::callFeature('hubcoin_reward', 'generateHash', array($senderId . ':' . $content . ':' . $this->determineSenderPrivateKeyHash($data)));
 
-		// Encode it with BASE64
-		$signature = base64_encode($encryptedContent);
+		// Debug message
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: hash=' . $hash . ' - EXIT!');
 
 		// Return it
-		return $signature;
+		return $hash;
 	}
 
 	/**
-	 * Checks whether the signature of given package data is 'valid', here that
+	 * Checks whether the hash of given package data is 'valid', here that
 	 * means it is the same or not.
 	 *
 	 * @param	$decodedArray		An array with 'decoded' (explode() was mostly called) data
-	 * @return	$isSignatureValid	Whether the signature is valid
-	 * @todo	Unfinished area, signatures are currently NOT fully supported
+	 * @return	$isHashValid	Whether the hash is valid
+	 * @todo	Unfinished area, hashes are currently NOT fully supported
 	 */
-	private function isPackageSignatureValid (array $decodedArray) {
-		// Generate the signature of comparing it
-		$signature = $this->generatePackageSignature($decodedArray[self::INDEX_PACKAGE_CONTENT], $decodedArray[self::INDEX_PACKAGE_SENDER]);
+	private function isPackageHashValid (array $decodedArray) {
+		// Debug message
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: decodedArray=' . print_r($decodedArray, TRUE) . ' - CALLED!');
+
+		// Make sure the required array elements are there
+		assert(isset($decodedArray[self::PACKAGE_CONTENT_SENDER]));
+		assert(isset($decodedArray[self::PACKAGE_CONTENT_MESSAGE]));
+		assert(isset($decodedArray[self::PACKAGE_CONTENT_HASH]));
+
+		// Is the feature enabled?
+		if (!FrameworkFeature::isFeatureAvailable('hubcoin_reward')) {
+			// Feature is not enabled, so hashes are always valid
+			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: Feature "hubcoin_reward" not available, not checking hash. Returning TRUE ...');
+			return TRUE;
+		} // END - if
 
-		// Is it the same?
-		//$isSignatureValid = 
-		exit(__METHOD__.': signature='.$signature.chr(10).',decodedArray='.print_r($decodedArray, TRUE));
+		// Check validity
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: senderId=' . $decodedArray[self::PACKAGE_CONTENT_SENDER] . ',message()=' . strlen($decodedArray[self::PACKAGE_CONTENT_MESSAGE]) . '),hash=' . $decodedArray[self::PACKAGE_CONTENT_HASH]);
+		//* DEBUG-DIE: */ die(__METHOD__ . ': decodedArray=' . print_r($decodedArray, TRUE));
+		$isHashValid = FrameworkFeature::callFeature('hubcoin_reward', 'checkHash', array($decodedArray[self::PACKAGE_CONTENT_SENDER] . ':' . $decodedArray[self::PACKAGE_CONTENT_MESSAGE] . ':' . $this->determineSenderPrivateKeyHash($decodedArray), $decodedArray[self::PACKAGE_CONTENT_HASH]));
+
+		// Return it
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: isHashValid=' . intval($isHashValid) . ' - EXIT!');
+		return $isHashValid;
 	}
 
 	/**
@@ -594,17 +723,19 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 	 * from given helper's template instance and pushing it on the 'undeclared'
 	 * stack.
 	 *
-	 * @param	$helperInstance		An instance of a Helper class
-	 * @param	$protocol			Name of used protocol (TCP/UDP)
+	 * @param	$helperInstance		An instance of a HubHelper class
 	 * @return	void
 	 */
-	public function enqueueRawDataFromTemplate (Helper $helperInstance, $protocolName) {
+	public function enqueueRawDataFromTemplate (HubHelper $helperInstance) {
+		// Debug message
+		//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ': CALLED!');
+
 		// Get the raw content ...
 		$content = $helperInstance->getTemplateInstance()->getRawTemplateData();
 		//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('content(' . strlen($content) . ')=' . $content);
 
 		// ... and compress it
-		$content = $this->getCompressorInstance()->compressStream($content);
+		$compressed = $this->getCompressorInstance()->compressStream($content);
 
 		// Add magic in front of it and hash behind it, including BASE64 encoding
 		$packageContent = sprintf(self::PACKAGE_MASK,
@@ -612,8 +743,8 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 			$this->getCompressorInstance()->getCompressorExtension(),
 			// - separator
 			self::PACKAGE_MASK_SEPARATOR,
-			// 2.) Raw package content, encoded with BASE64
-			base64_encode($content),
+			// 2.) Compressed raw package content, encoded with BASE64
+			base64_encode($compressed),
 			// - separator
 			self::PACKAGE_MASK_SEPARATOR,
 			// 3.) Tags
@@ -621,18 +752,24 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 			// - separator
 			self::PACKAGE_MASK_SEPARATOR,
 			// 4.) Checksum
-			$this->getHashFromContent($content)
+			$this->getHashFromContent($compressed)
 		);
 
+		// Debug message
+		//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ': Enqueueing package for recipientType=' . $helperInstance->getRecipientType() . ' ...');
+
 		// Now prepare the temporary array and push it on the 'undeclared' stack
-		$this->getStackerInstance()->pushNamed(self::STACKER_NAME_UNDECLARED, array(
-			self::PACKAGE_DATA_SENDER    => $this->getSessionId(),
-			self::PACKAGE_DATA_RECIPIENT => $helperInstance->getRecipientType(),
-			self::PACKAGE_DATA_PROTOCOL  => $protocolName,
-			self::PACKAGE_DATA_CONTENT   => $packageContent,
-			self::PACKAGE_DATA_STATUS    => self::PACKAGE_STATUS_NEW,
-			self::PACKAGE_DATA_SIGNATURE => $this->generatePackageSignature($packageContent, $this->getSessionId())
+		$this->getStackInstance()->pushNamed(self::STACKER_NAME_UNDECLARED, array(
+			self::PACKAGE_DATA_SENDER           => $this->getSessionId(),
+			self::PACKAGE_DATA_RECIPIENT        => $helperInstance->getRecipientType(),
+			self::PACKAGE_DATA_CONTENT          => $packageContent,
+			self::PACKAGE_DATA_STATUS           => self::PACKAGE_STATUS_NEW,
+			self::PACKAGE_DATA_HASH             => $this->generatePackageHash($content, $this->getSessionId()),
+			self::PACKAGE_DATA_PRIVATE_KEY_HASH => $this->getPrivateKeyHash(),
 		));
+
+		// Debug message
+		//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ': EXIT!');
 	}
 
 	/**
@@ -642,7 +779,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 	 */
 	public function isPackageEnqueued () {
 		// Check whether the stacker is not empty
-		$isEnqueued = (($this->getStackerInstance()->isStackInitialized(self::STACKER_NAME_UNDECLARED)) && (!$this->getStackerInstance()->isStackEmpty(self::STACKER_NAME_UNDECLARED)));
+		$isEnqueued = (($this->getStackInstance()->isStackInitialized(self::STACKER_NAME_UNDECLARED)) && (!$this->getStackInstance()->isStackEmpty(self::STACKER_NAME_UNDECLARED)));
 
 		// Return the result
 		return $isEnqueued;
@@ -655,7 +792,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 	 */
 	public function isPackageDeclared () {
 		// Check whether the stacker is not empty
-		$isDeclared = (($this->getStackerInstance()->isStackInitialized(self::STACKER_NAME_DECLARED)) && (!$this->getStackerInstance()->isStackEmpty(self::STACKER_NAME_DECLARED)));
+		$isDeclared = (($this->getStackInstance()->isStackInitialized(self::STACKER_NAME_DECLARED)) && (!$this->getStackInstance()->isStackEmpty(self::STACKER_NAME_DECLARED)));
 
 		// Return the result
 		return $isDeclared;
@@ -668,12 +805,25 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 	 */
 	public function isPackageWaitingForDelivery () {
 		// Check whether the stacker is not empty
-		$isWaitingDelivery = (($this->getStackerInstance()->isStackInitialized(self::STACKER_NAME_OUTGOING)) && (!$this->getStackerInstance()->isStackEmpty(self::STACKER_NAME_OUTGOING)));
+		$isWaitingDelivery = (($this->getStackInstance()->isStackInitialized(self::STACKER_NAME_OUTGOING)) && (!$this->getStackInstance()->isStackEmpty(self::STACKER_NAME_OUTGOING)));
 
 		// Return the result
 		return $isWaitingDelivery;
 	}
 
+	/**
+	 * Checks whether encoded (raw) data is pending
+	 *
+	 * @return	$isPending		Whether encoded data is pending
+	 */
+	public function isEncodedDataPending () {
+		// Check whether the stacker is not empty
+		$isPending = (($this->getStackInstance()->isStackInitialized(self::STACKER_NAME_OUTGOING_STREAM)) && (!$this->getStackInstance()->isStackEmpty(self::STACKER_NAME_OUTGOING_STREAM)));
+
+		// Return the result
+		return $isPending;
+	}
+
 	/**
 	 * Delivers an enqueued package to the stated destination. If a non-session
 	 * id is provided, recipient resolver is being asked (and instanced once).
@@ -685,10 +835,13 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 	 * @throws	NoTargetException	If no target can't be determined
 	 */
 	public function declareEnqueuedPackage () {
+		// Debug message
+		//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ': CALLED!');
+
 		// Make sure this method isn't working if there is no package enqueued
 		if (!$this->isPackageEnqueued()) {
 			// This is not fatal but should be avoided
-			// @TODO Add some logging here
+			self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: No raw package data waiting declaration, but ' . __METHOD__ . ' has been called!');
 			return;
 		} // END - if
 
@@ -696,10 +849,13 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 		 * Now there are for sure packages to deliver, so start with the first
 		 * one.
 		 */
-		$packageData = $this->getStackerInstance()->popNamed(self::STACKER_NAME_UNDECLARED);
+		$packageData = $this->getStackInstance()->popNamed(self::STACKER_NAME_UNDECLARED);
 
 		// Declare the raw package data for delivery
 		$this->declareRawPackageData($packageData);
+
+		// Debug message
+		//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ': EXIT!');
 	}
 
 	/**
@@ -709,16 +865,19 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 	 *
 	 * @return	void
 	 */
-	public function deliverDeclaredPackage () {
+	public function processDeclaredPackage () {
+		// Debug message
+		//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ': CALLED!');
+
 		// Sanity check if we have packages declared
 		if (!$this->isPackageDeclared()) {
 			// This is not fatal but should be avoided
-			self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __LINE__ . ']: No package has been declared, but ' . __METHOD__ . ' has been called!');
+			self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: No package has been declared, but ' . __METHOD__ . ' has been called!');
 			return;
 		} // END - if
 
 		// Get the package
-		$packageData = $this->getStackerInstance()->getNamed(self::STACKER_NAME_DECLARED);
+		$packageData = $this->getStackInstance()->getNamed(self::STACKER_NAME_DECLARED);
 
 		// Assert on it
 		assert(isset($packageData[self::PACKAGE_DATA_RECIPIENT]));
@@ -729,14 +888,17 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 			$this->deliverRawPackageData($packageData);
 
 			// And remove it finally
-			$this->getStackerInstance()->popNamed(self::STACKER_NAME_DECLARED);
+			$this->getStackInstance()->popNamed(self::STACKER_NAME_DECLARED);
 		} catch (InvalidStateException $e) {
 			// The state is not excepected (shall be 'connected')
-			self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __LINE__ . ']: Caught ' . $e->__toString() . ',message=' . $e->getMessage());
+			self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: Caught ' . $e->__toString() . ',message=' . $e->getMessage());
 
 			// Mark the package with status failed
 			$this->changePackageStatus($packageData, self::STACKER_NAME_DECLARED, self::PACKAGE_STATUS_FAILED);
 		}
+
+		// Debug message
+		//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ': EXIT!');
 	}
 
 	/**
@@ -745,32 +907,108 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 	 * @return	void
 	 */
 	public function sendWaitingPackage () {
-		// Send any waiting bytes in the back-buffer before sending a new package
-		$this->sendBackBufferBytes();
+		// Debug message
+		//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ': CALLED!');
 
 		// Sanity check if we have packages waiting for delivery
 		if (!$this->isPackageWaitingForDelivery()) {
 			// This is not fatal but should be avoided
-			self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __LINE__ . ']: No package is waiting for delivery, but ' . __METHOD__ . ' was called.');
+			self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: No package is waiting for delivery, but ' . __METHOD__ . ' was called.');
 			return;
 		} // END - if
 
 		// Get the package
-		$packageData = $this->getStackerInstance()->getNamed(self::STACKER_NAME_OUTGOING);
+		$packageData = $this->getStackInstance()->getNamed(self::STACKER_NAME_OUTGOING);
 
 		try {
 			// Now try to send it
 			$this->sendOutgoingRawPackageData($packageData);
 
 			// And remove it finally
-			$this->getStackerInstance()->popNamed(self::STACKER_NAME_OUTGOING);
+			$this->getStackInstance()->popNamed(self::STACKER_NAME_OUTGOING);
 		} catch (InvalidSocketException $e) {
 			// Output exception message
-			self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __LINE__ . ']: Package was not delivered: ' . $e->getMessage());
+			self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: Package was not delivered: ' . $e->getMessage());
 
 			// Mark package as failed
 			$this->changePackageStatus($packageData, self::STACKER_NAME_OUTGOING, self::PACKAGE_STATUS_FAILED);
 		}
+
+		// Debug message
+		//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ': EXIT!');
+	}
+
+	/**
+	 * Sends out encoded data to a socket
+	 *
+	 * @return	void
+	 */
+	public function sendEncodedData () {
+		// Debug message
+		//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ': CALLED!');
+
+		// Make sure there is pending encoded data
+		assert($this->isEncodedDataPending());
+
+		// Pop current data from stack
+		$encodedDataArray = $this->getStackInstance()->popNamed(self::STACKER_NAME_OUTGOING_STREAM);
+
+		// Init in this round sent bytes
+		$sentBytes = 0;
+
+		// Assert on socket
+		assert(is_resource($encodedDataArray[self::RAW_SOCKET_INDEX]));
+
+		// And deliver it
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('CONNECTION-HELPER[' . __METHOD__ . ':' . __LINE__ . ']: Sending out ' . strlen($encodedDataArray[self::RAW_ENCODED_DATA_INDEX]) . ' bytes,rawBufferSize=' . $encodedDataArray[self::RAW_BUFFER_SIZE_INDEX] . ',diff=' . $encodedDataArray[self::RAW_DIFF_INDEX]);
+		if ($encodedDataArray[self::RAW_DIFF_INDEX] >= 0) {
+			// Send all out (encodedData is smaller than or equal buffer size)
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('CONNECTION-HELPER[' . __METHOD__ . ':' . __LINE__ . ']: MD5=' . md5(substr($encodedDataArray[self::RAW_ENCODED_DATA_INDEX], 0, ($encodedDataArray[self::RAW_BUFFER_SIZE_INDEX] - $encodedDataArray[self::RAW_DIFF_INDEX]))));
+			$sentBytes = @socket_write($encodedDataArray[self::RAW_SOCKET_INDEX], $encodedDataArray[self::RAW_ENCODED_DATA_INDEX], ($encodedDataArray[self::RAW_BUFFER_SIZE_INDEX] - $encodedDataArray[self::RAW_DIFF_INDEX]));
+		} else {
+			// Send buffer size out
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('CONNECTION-HELPER[' . __METHOD__ . ':' . __LINE__ . ']: MD5=' . md5(substr($encodedDataArray[self::RAW_ENCODED_DATA_INDEX], 0, $encodedDataArray[self::RAW_BUFFER_SIZE_INDEX])));
+			$sentBytes = @socket_write($encodedDataArray[self::RAW_SOCKET_INDEX], $encodedDataArray[self::RAW_ENCODED_DATA_INDEX], $encodedDataArray[self::RAW_BUFFER_SIZE_INDEX]);
+		}
+
+		// If there was an error, we don't continue here
+		if ($sentBytes === FALSE) {
+			// Handle the error with a faked recipientData array
+			$this->handleSocketError(__METHOD__, __LINE__, $encodedDataArray[self::RAW_SOCKET_INDEX], array('0.0.0.0', '0'));
+
+			// And throw it
+			throw new InvalidSocketException(array($this, $encodedDataArray[self::RAW_SOCKET_INDEX], $socketError, $errorMessage), BaseListener::EXCEPTION_INVALID_SOCKET);
+		} elseif (($sentBytes === 0) && (strlen($encodedDataArray[self::RAW_ENCODED_DATA_INDEX]) > 0)) {
+			// Nothing sent means we are done
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('CONNECTION-HELPER[' . __METHOD__ . ':' . __LINE__ . ']: All sent! (LINE=' . __LINE__ . ')');
+			return;
+		} else {
+			// The difference between sent bytes and length of raw data should not go below zero
+			assert((strlen($encodedDataArray[self::RAW_ENCODED_DATA_INDEX]) - $sentBytes) >= 0);
+
+			// Add total sent bytes
+			$encodedDataArray[self::RAW_SENT_BYTES_INDEX] += $sentBytes;
+
+			// Cut out the last unsent bytes
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('CONNECTION-HELPER[' . __METHOD__ . ':' . __LINE__ . ']: Sent out ' . $sentBytes . ' of ' . strlen($encodedDataArray[self::RAW_ENCODED_DATA_INDEX]) . ' bytes ...');
+			$encodedDataArray[self::RAW_ENCODED_DATA_INDEX] = substr($encodedDataArray[self::RAW_ENCODED_DATA_INDEX], $sentBytes);
+
+			// Calculate difference again
+			$encodedDataArray[self::RAW_DIFF_INDEX] = $encodedDataArray[self::RAW_BUFFER_SIZE_INDEX] - strlen($encodedDataArray[self::RAW_ENCODED_DATA_INDEX]);
+
+			// Can we abort?
+			if (strlen($encodedDataArray[self::RAW_ENCODED_DATA_INDEX]) <= 0) {
+				// Abort here, all sent!
+				//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('CONNECTION-HELPER[' . __METHOD__ . ':' . __LINE__ . ']: All sent! (LINE=' . __LINE__ . ')');
+				return;
+			} // END - if
+		}
+
+		// Push array back in stack
+		$this->getStackInstance()->pushNamed(self::STACKER_NAME_OUTGOING_STREAM, $encodedDataArray);
+
+		// Debug message
+		//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ': EXIT!');
 	}
 
 	///////////////////////////////////////////////////////////////////////////
@@ -784,7 +1022,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 	 */
 	private function isRawDataPending () {
 		// Just return whether the stack is not empty
-		$isPending = (!$this->getStackerInstance()->isStackEmpty(self::STACKER_NAME_DECODED_INCOMING));
+		$isPending = (!$this->getStackInstance()->isStackEmpty(self::STACKER_NAME_DECODED_INCOMING));
 
 		// Return the status
 		return $isPending;
@@ -793,12 +1031,11 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 	/**
 	 * Checks whether new raw package data has arrived at a socket
 	 *
-	 * @param	$poolInstance	An instance of a PoolableListener class
 	 * @return	$hasArrived		Whether new raw package data has arrived for processing
 	 */
-	public function isNewRawDataPending (PoolableListener $poolInstance) {
+	public function isNewRawDataPending () {
 		// Visit the pool. This monitors the pool for incoming raw data.
-		$poolInstance->accept($this->getVisitorInstance());
+		$this->getListenerPoolInstance()->accept($this->getVisitorInstance());
 
 		// Check for new data arrival
 		$hasArrived = $this->isRawDataPending();
@@ -821,15 +1058,15 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 		 */
 		if (!$this->isRawDataPending()) {
 			// This is not fatal but should be avoided
-			// @TODO Add some logging here
+			self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: No raw (decoded?) data is pending, but ' . __METHOD__ . ' has been called!');
 			return;
 		} // END - if
 
 		// Very noisy debug message:
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __LINE__ . ']: Stacker size is ' . $this->getStackerInstance()->getStackCount(self::STACKER_NAME_DECODED_INCOMING) . ' entries.');
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: Stacker size is ' . $this->getStackInstance()->getStackCount(self::STACKER_NAME_DECODED_INCOMING) . ' entries.');
 
 		// "Pop" the next entry (the same array again) from the stack
-		$decodedData = $this->getStackerInstance()->popNamed(self::STACKER_NAME_DECODED_INCOMING);
+		$decodedData = $this->getStackInstance()->popNamed(self::STACKER_NAME_DECODED_INCOMING);
 
 		// Make sure both array elements are there
 		assert(
@@ -842,17 +1079,18 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 		 * Also make sure the error code is SOCKET_ERROR_UNHANDLED because we
 		 * only want to handle unhandled packages here.
 		 */
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __LINE__ . ']: errorCode=' . $decodedData[BaseRawDataHandler::PACKAGE_ERROR_CODE] . '(' . BaseRawDataHandler::SOCKET_ERROR_UNHANDLED . ')');
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: errorCode=' . $decodedData[BaseRawDataHandler::PACKAGE_ERROR_CODE] . '(' . BaseRawDataHandler::SOCKET_ERROR_UNHANDLED . ')');
 		assert($decodedData[BaseRawDataHandler::PACKAGE_ERROR_CODE] == BaseRawDataHandler::SOCKET_ERROR_UNHANDLED);
 
-		// Remove the last chunk SEPARATOR (because it is being added and we don't need it)
+		// Remove the last chunk SEPARATOR (because there is no need for it)
 		if (substr($decodedData[BaseRawDataHandler::PACKAGE_RAW_DATA], -1, 1) == PackageFragmenter::CHUNK_SEPARATOR) {
 			// It is there and should be removed
 			$decodedData[BaseRawDataHandler::PACKAGE_RAW_DATA] = substr($decodedData[BaseRawDataHandler::PACKAGE_RAW_DATA], 0, -1);
 		} // END - if
 
 		// This package is "handled" and can be pushed on the next stack
-		$this->getStackerInstance()->pushNamed(self::STACKER_NAME_DECODED_HANDLED, $decodedData);
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: Pushing ' . strlen($decodedData[BaseRawDataHandler::PACKAGE_RAW_DATA]) . ' bytes to stack ' . self::STACKER_NAME_DECODED_HANDLED . ' ...');
+		$this->getStackInstance()->pushNamed(self::STACKER_NAME_DECODED_HANDLED, $decodedData);
 	}
 
 	/**
@@ -869,10 +1107,10 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 		$decodedData = $handlerInstance->getNextRawData();
 
 		// Very noisy debug message:
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __LINE__ . ']: decodedData[' . gettype($decodedData) . ']=' . print_r($decodedData, TRUE));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: decodedData[' . gettype($decodedData) . ']=' . print_r($decodedData, TRUE));
 
 		// And push it on our stack
-		$this->getStackerInstance()->pushNamed(self::STACKER_NAME_DECODED_INCOMING, $decodedData);
+		$this->getStackInstance()->pushNamed(self::STACKER_NAME_DECODED_INCOMING, $decodedData);
 	}
 
 	/**
@@ -882,7 +1120,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 	 */
 	public function isIncomingRawDataHandled () {
 		// Determine if the stack is not empty
-		$isHandled = (!$this->getStackerInstance()->isStackEmpty(self::STACKER_NAME_DECODED_HANDLED));
+		$isHandled = (!$this->getStackInstance()->isStackEmpty(self::STACKER_NAME_DECODED_HANDLED));
 
 		// Return it
 		return $isHandled;
@@ -901,6 +1139,19 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 		return $isHandled;
 	}
 
+	/**
+	 * Checks whether the assembler has multiple packages pending
+	 *
+	 * @return	$isPending	Whether the assembler has multiple packages pending
+	 */
+	public function ifMultipleMessagesPending () {
+		// Determine if the stack is not empty
+		$isPending = ($this->getAssemblerInstance()->ifMultipleMessagesPending());
+
+		// Return it
+		return $isPending;
+	}
+
 	/**
 	 * Handles the attached assemler's pending data queue to be finally
 	 * assembled to the raw package data back.
@@ -912,6 +1163,16 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 		$this->getAssemblerInstance()->handlePendingData();
 	}
 
+	/**
+	 * Handles multiple messages.
+	 *
+	 * @return	void
+	 */
+	public function handleMultipleMessages () {
+		// Handle it
+		$this->getAssemblerInstance()->handleMultipleMessages();
+	}
+
 	/**
 	 * Assembles incoming decoded data so it will become an abstract network
 	 * package again. The assembler does later do it's job by an other task,
@@ -924,16 +1185,24 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 		assert($this->isIncomingRawDataHandled());
 
 		// Get current package content (an array with two elements; see handleIncomingDecodedData() for details)
-		$packageContent = $this->getStackerInstance()->getNamed(self::STACKER_NAME_DECODED_HANDLED);
+		$packageContent = $this->getStackInstance()->getNamed(self::STACKER_NAME_DECODED_HANDLED);
+
+		// Assert on some elements
+		assert(
+			(is_array($packageContent)) &&
+			(isset($packageContent[BaseRawDataHandler::PACKAGE_RAW_DATA])) &&
+			(isset($packageContent[BaseRawDataHandler::PACKAGE_ERROR_CODE]))
+		);
 
 		// Start assembling the raw package data array by chunking it
 		$this->getAssemblerInstance()->chunkPackageContent($packageContent);
 
 		// Remove the package from 'handled_decoded' stack ...
-		$this->getStackerInstance()->popNamed(self::STACKER_NAME_DECODED_HANDLED);
+		$this->getStackInstance()->popNamed(self::STACKER_NAME_DECODED_HANDLED);
 
 		// ... and push it on the 'chunked' stacker
-		$this->getStackerInstance()->pushNamed(self::STACKER_NAME_DECODED_CHUNKED, $packageContent);
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: Pushing ' . strlen($packageContent[BaseRawDataHandler::PACKAGE_RAW_DATA]) . ' bytes on stack ' . self::STACKER_NAME_DECODED_CHUNKED . ',packageContent=' . print_r($packageContent, TRUE));
+		$this->getStackInstance()->pushNamed(self::STACKER_NAME_DECODED_CHUNKED, $packageContent);
 	}
 
 	/**
@@ -944,13 +1213,16 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 	 */
 	public function accept (Visitor $visitorInstance) {
 		// Debug message
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __LINE__ . ']: ' . $visitorInstance->__toString() . ' has visited - START');
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: ' . $visitorInstance->__toString() . ' has visited - CALLED!');
 
 		// Visit the package
 		$visitorInstance->visitNetworkPackage($this);
 
+		// Then visit the assembler to handle multiple packages
+		$this->getAssemblerInstance()->accept($visitorInstance);
+
 		// Debug message
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __LINE__ . ']: ' . $visitorInstance->__toString() . ' has visited - FINISHED');
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: ' . $visitorInstance->__toString() . ' has visited - EXIT!');
 	}
 
 	/**
@@ -963,7 +1235,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 		$this->initStacks(TRUE);
 
 		// Debug message
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __LINE__ . ']: All stacker have been re-initialized.');
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: All stacker have been re-initialized.');
 	}
 
 	/**
@@ -976,7 +1248,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 	 */
 	public function removeFirstFailedPackage () {
 		// Get the package again
-		$packageData = $this->getStackerInstance()->getNamed(self::STACKER_NAME_DECLARED);
+		$packageData = $this->getStackInstance()->getNamed(self::STACKER_NAME_DECLARED);
 
 		// Is the package status 'failed'?
 		if ($packageData[self::PACKAGE_DATA_STATUS] != self::PACKAGE_STATUS_FAILED) {
@@ -985,7 +1257,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 		} // END - if
 
 		// Remove this entry
-		$this->getStackerInstance()->popNamed(self::STACKER_NAME_DECLARED);
+		$this->getStackInstance()->popNamed(self::STACKER_NAME_DECLARED);
 	}
 
 	/**
@@ -1001,24 +1273,16 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 		// Assert on count (should be always 3)
 		assert(count($decodedArray) == self::DECODED_DATA_ARRAY_SIZE);
 
-		// Generate the signature of comparing it
 		/*
-		 * @todo Unsupported feature of "signed" messages commented out
-		if (!$this->isPackageSignatureValid($decodedArray)) {
-			// Is not valid, so throw an exception here
-			exit(__METHOD__ . ':INVALID SIG! UNDER CONSTRUCTION!' . chr(10));
-		} // END - if
-		*/
-
-		/*
-		 * Create 'decodedData' array with all assoziative array elements,
-		 * except signature.
+		 * Create 'decodedData' array with all assoziative array elements.
 		 */
 		$decodedData = array(
-			self::PACKAGE_DATA_SENDER    => $decodedArray[self::INDEX_PACKAGE_SENDER],
-			self::PACKAGE_DATA_RECIPIENT => $decodedArray[self::INDEX_PACKAGE_RECIPIENT],
-			self::PACKAGE_DATA_CONTENT   => $decodedArray[self::INDEX_PACKAGE_CONTENT],
-			self::PACKAGE_DATA_STATUS    => self::PACKAGE_STATUS_DECODED
+			self::PACKAGE_DATA_SENDER           => $decodedArray[self::INDEX_PACKAGE_SENDER],
+			self::PACKAGE_DATA_RECIPIENT        => $decodedArray[self::INDEX_PACKAGE_RECIPIENT],
+			self::PACKAGE_DATA_CONTENT          => $decodedArray[self::INDEX_PACKAGE_CONTENT],
+			self::PACKAGE_DATA_STATUS           => self::PACKAGE_STATUS_DECODED,
+			self::PACKAGE_DATA_HASH             => $decodedArray[self::INDEX_PACKAGE_HASH],
+			self::PACKAGE_DATA_PRIVATE_KEY_HASH => $decodedArray[self::INDEX_PACKAGE_PRIVATE_KEY_HASH]
 		);
 
 		// And return it
@@ -1050,13 +1314,19 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 		 */
 		$decodedContent = array(
 			// Compressor's extension used to compress the data
-			self::PACKAGE_CONTENT_EXTENSION => $decodedContent[self::INDEX_COMPRESSOR_EXTENSION],
+			self::PACKAGE_CONTENT_EXTENSION        => $decodedContent[self::INDEX_COMPRESSOR_EXTENSION],
 			// Package data (aka "message") in BASE64-decoded form but still compressed
-			self::PACKAGE_CONTENT_MESSAGE   => base64_decode($decodedContent[self::INDEX_PACKAGE_DATA]),
+			self::PACKAGE_CONTENT_MESSAGE          => base64_decode($decodedContent[self::INDEX_PACKAGE_DATA]),
 			// Tags as an indexed array for "tagging" the message
-			self::PACKAGE_CONTENT_TAGS      => explode(self::PACKAGE_TAGS_SEPARATOR, $decodedContent[self::INDEX_TAGS]),
+			self::PACKAGE_CONTENT_TAGS             => explode(self::PACKAGE_TAGS_SEPARATOR, $decodedContent[self::INDEX_TAGS]),
 			// Checksum of the _decoded_ data
-			self::PACKAGE_CONTENT_CHECKSUM  => $decodedContent[self::INDEX_CHECKSUM]
+			self::PACKAGE_CONTENT_CHECKSUM         => $decodedContent[self::INDEX_CHECKSUM],
+			// Sender's id
+			self::PACKAGE_CONTENT_SENDER           => $decodedData[self::PACKAGE_DATA_SENDER],
+			// Hash from decoded raw data
+			self::PACKAGE_CONTENT_HASH             => $decodedData[self::PACKAGE_DATA_HASH],
+			// Hash of private key
+			self::PACKAGE_CONTENT_PRIVATE_KEY_HASH => $decodedData[self::PACKAGE_DATA_PRIVATE_KEY_HASH]
 		);
 
 		// Is the checksum valid?
@@ -1072,7 +1342,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 		$decodedContent[self::PACKAGE_CONTENT_MESSAGE] = $this->getCompressorInstance()->decompressStream($decodedContent[self::PACKAGE_CONTENT_MESSAGE]);
 
 		// And push it on the next stack
-		$this->getStackerInstance()->pushNamed(self::STACKER_NAME_NEW_MESSAGE, $decodedContent);
+		$this->getStackInstance()->pushNamed(self::STACKER_NAME_NEW_MESSAGE, $decodedContent);
 	}
 
 	/**
@@ -1082,7 +1352,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 	 */
 	public function isNewMessageArrived () {
 		// Determine if the stack is not empty
-		$hasArrived = (!$this->getStackerInstance()->isStackEmpty(self::STACKER_NAME_NEW_MESSAGE));
+		$hasArrived = (!$this->getStackInstance()->isStackEmpty(self::STACKER_NAME_NEW_MESSAGE));
 
 		// Return it
 		return $hasArrived;
@@ -1095,8 +1365,17 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 	 * @todo	Implement verification of all sent tags here?
 	 */
 	public function handleNewlyArrivedMessage () {
+		// Make sure there is at least one message
+		assert($this->isNewMessageArrived());
+
 		// Get it from the stacker, it is the full array with the decoded message
-		$decodedContent = $this->getStackerInstance()->popNamed(self::STACKER_NAME_NEW_MESSAGE);
+		$decodedContent = $this->getStackInstance()->popNamed(self::STACKER_NAME_NEW_MESSAGE);
+
+		// Generate the hash of comparing it
+		if (!$this->isPackageHashValid($decodedContent)) {
+			// Is not valid, so throw an exception here
+			exit(__METHOD__ . ':INVALID HASH! UNDER CONSTRUCTION!' . chr(10));
+		} // END - if
 
 		// Now get a filter chain back from factory with given tags array
 		$chainInstance = PackageFilterChainFactory::createChainByTagsArray($decodedContent[self::PACKAGE_CONTENT_TAGS]);
@@ -1105,7 +1384,13 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 		 * Process the message through all filters, note that all other
 		 * elements from $decodedContent are no longer needed.
 		 */
-		$chainInstance->processMessage($decodedContent[self::PACKAGE_CONTENT_MESSAGE], $this);
+		$chainInstance->processMessage($decodedContent, $this);
+
+		/*
+		 * Post-processing of message data (this won't remote the message from
+		 * the stack).
+		 */
+		$chainInstance->postProcessMessage($this);
 	}
 
 	/**
@@ -1115,7 +1400,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 	 */
 	public function isProcessedMessagePending () {
 		// Check it
-		$isPending = (!$this->getStackerInstance()->isStackEmpty(self::STACKER_NAME_PROCESSED_MESSAGE));
+		$isPending = (!$this->getStackInstance()->isStackEmpty(self::STACKER_NAME_PROCESSED_MESSAGE));
 
 		// Return it
 		return $isPending;
@@ -1128,19 +1413,65 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 	 */
 	public function handleProcessedMessage () {
 		// Get it from the stacker, it is the full array with the processed message
-		$messageArray = $this->getStackerInstance()->popNamed(self::STACKER_NAME_PROCESSED_MESSAGE);
+		$messageArray = $this->getStackInstance()->popNamed(self::STACKER_NAME_PROCESSED_MESSAGE);
 
 		// Add type for later easier handling
 		$messageArray[self::MESSAGE_ARRAY_DATA][self::MESSAGE_ARRAY_TYPE] = $messageArray[self::MESSAGE_ARRAY_TYPE];
 
 		// Debug message
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __LINE__ . ']: messageArray=' . print_r($messageArray, TRUE));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: messageArray=' . print_r($messageArray, TRUE));
 
 		// Create a handler instance from given message type
 		$handlerInstance = MessageTypeHandlerFactory::createMessageTypeHandlerInstance($messageArray[self::MESSAGE_ARRAY_TYPE]);
 
 		// Handle message data
 		$handlerInstance->handleMessageData($messageArray[self::MESSAGE_ARRAY_DATA], $this);
+
+		// Post-handling of message data
+		$handlerInstance->postHandleMessageData($messageArray, $this);
+	}
+
+	/**
+	 * Feeds the hash and sender (as recipient for the 'sender' reward) to the
+	 * miner's queue, unless the message is not a "reward claim" message as this
+	 * leads to an endless loop. You may wish to run the miner to get some
+	 * reward ("Hubcoins") for "mining" this hash.
+	 *
+	 * @param	$messageData	Array with message data
+	 * @return	void
+	 * @todo	~10% done?
+	 */
+	public function feedHashToMiner (array $messageData) {
+		// Is the feature enabled?
+		if (!FrameworkFeature::isFeatureAvailable('hubcoin_reward')) {
+			/*
+			 * Feature is not enabled, don't feed the hash to the miner as it
+			 *may be invalid.
+			 */
+			return;
+		} // END - if
+
+		// Make sure the required elements are there
+		assert(isset($messageData[self::MESSAGE_ARRAY_SENDER]));
+		assert(isset($messageData[self::MESSAGE_ARRAY_HASH]));
+		assert(isset($messageData[self::MESSAGE_ARRAY_TAGS]));
+
+		// Debug message
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NETWORK-PACKAGE[' . __METHOD__ . ':' . __LINE__ . ']: messageData=' . print_r($messageData, TRUE));
+
+		// Resolve session id ('sender' is a session id) into node id
+		$nodeId = HubTools::resolveNodeIdBySessionId($messageData[self::MESSAGE_ARRAY_SENDER]);
+
+		// Is 'claim_reward' the message type?
+		if (in_array('claim_reward', $messageData[self::MESSAGE_ARRAY_TAGS])) {
+			/*
+			 * Then don't feed this message to the miner as this causes an
+			 * endless loop of mining.
+			 */
+			return;
+		} // END - if
+
+		$this->partialStub('@TODO nodeId=' . $nodeId . ',messageData=' . print_r($messageData, TRUE));
 	}
 }