Index: source/ariba/AribaModule.cpp
===================================================================
--- source/ariba/AribaModule.cpp	(revision 7464)
+++ source/ariba/AribaModule.cpp	(revision 7468)
@@ -61,10 +61,5 @@
 AribaModule::AribaModule()
 	: started(false), base_comm(NULL), sideport_sniffer(NULL) {
-
 	endpoints = "tcp{41322};rfcomm{10};";
-
-	//srand( time(NULL) );
-	//uint16_t tcpport = (rand() + 1024) % 50000;
-	//uint16_t udpport = (rand() + 1024) % 50000;
 }
 
@@ -203,4 +198,5 @@
 	if (key == "endpoints") return endpoints; // TODO: return local endpoints
 	else if (key == "bootstrap.hints") return getBootstrapHints();
+	return "";
 }
 
Index: source/ariba/CommunicationListener.cpp
===================================================================
--- source/ariba/CommunicationListener.cpp	(revision 7464)
+++ source/ariba/CommunicationListener.cpp	(revision 7468)
@@ -61,6 +61,5 @@
 }
 
-bool CommunicationListener::onLinkRequest(const NodeID& remote,
-	const DataMessage& msg) {
+bool CommunicationListener::onLinkRequest(const NodeID& remote) {
 	return true;
 }
@@ -70,22 +69,6 @@
 }
 
-bool CommunicationListener::onEnableSideportListener() {
-	return true;
+void CommunicationListener::onKeyValue( const Data& key, const vector<Data>& value ) {
 }
 
-void CommunicationListener::onKeyValue( const Data& key, const vector<Data>& value ) {
-
-}
-
-
-// --- extended message functionality ---
-//void CommunicationListener::onLinkQoSChanged(const LinkID& l, const NodeID& r,
-//		const LinkProperties& p) {
-//}
-
-// --- extended message functionality ---
-// void CommunicationListener::onMessageSent(seqnum_t seq_num, bool failed,
-// 		const DataMessage& msg) {
-// }
-
 } // namespace ariba
Index: source/ariba/CommunicationListener.h
===================================================================
--- source/ariba/CommunicationListener.h	(revision 7464)
+++ source/ariba/CommunicationListener.h	(revision 7468)
@@ -78,5 +78,5 @@
 	virtual void onLinkFail(const LinkID& lnk, const NodeID& remote);
 
-	virtual bool onLinkRequest(const NodeID& remote, const DataMessage& msg = DataMessage::UNSPECIFIED);
+	virtual bool onLinkRequest(const NodeID& remote);
 
 	// --- general receive method ---
@@ -85,21 +85,8 @@
 			const LinkID& lnk = LinkID::UNSPECIFIED);
 
-	// --- sniffing related method ---
-
-	virtual bool onEnableSideportListener();
-
 	// --- dht functionality ---
 
 	virtual void onKeyValue( const Data& key, const vector<Data>& value );
 
-	// --- extended message functionality ---
-
-	// virtual void onLinkQoSChanged(const LinkID& lnk, const NodeID& remote,
-	//			const LinkProperties& prop);
-
-	// --- extended message functionality ---
-
-	//	virtual void onMessageSent(seqnum_t seq_num, bool failed,
-	//		const DataMessage& msg = DataMessage::UNSPECIFIED);
 };
 
Index: source/ariba/Identifiers.h
===================================================================
--- source/ariba/Identifiers.h	(revision 7464)
+++ source/ariba/Identifiers.h	(revision 7468)
@@ -46,10 +46,8 @@
 
 namespace ariba {
-
-typedef utility::NodeID NodeID;
-typedef utility::LinkID LinkID;
-typedef utility::SpoVNetID SpoVNetID;
-typedef utility::ServiceID ServiceID;
-
+	typedef utility::NodeID NodeID;
+	typedef utility::LinkID LinkID;
+	typedef utility::SpoVNetID SpoVNetID;
+	typedef utility::ServiceID ServiceID;
 } // namespace ariba
 
Index: source/ariba/LinkProperties.cpp
===================================================================
--- source/ariba/LinkProperties.cpp	(revision 7464)
+++ source/ariba/LinkProperties.cpp	(revision 7468)
@@ -44,7 +44,4 @@
 
 LinkProperties::LinkProperties() {
-	this->reliable = true;
-//	this->confidential = false;
-//	this->integrity = false;
 }
 
@@ -53,7 +50,5 @@
 
 string LinkProperties::toString() const {
-	std::ostringstream buf;
-	buf << "[reliable=" << (reliable ? "yes" : "no") << "]";
-	return buf.str();
+	return "";
 }
 
Index: source/ariba/LinkProperties.h
===================================================================
--- source/ariba/LinkProperties.h	(revision 7464)
+++ source/ariba/LinkProperties.h	(revision 7468)
@@ -60,14 +60,4 @@
 	string toString() const;
 	static const LinkProperties DEFAULT;
-
-	bool reliable;
-
-	//TODO: to be extended!
-//	bool confidential;
-//	bool integrity;
-
-	//TODO: implement quality-of-service containers
-//	SpoQ qosUpstream;
-//	SpoQ qosDownstream;
 };
 
Index: source/ariba/Makefile.am
===================================================================
--- source/ariba/Makefile.am	(revision 7464)
+++ source/ariba/Makefile.am	(revision 7468)
@@ -83,6 +83,6 @@
   LinkProperties.h \
   Message.h \
+  Module.h \
   DataMessage.h \
-  Module.h \
   Name.h \
   Node.h \
Index: source/ariba/Message.h
===================================================================
--- source/ariba/Message.h	(revision 7464)
+++ source/ariba/Message.h	(revision 7468)
@@ -46,6 +46,6 @@
 
 namespace ariba {
-typedef uint16_t seqnum_t;
-typedef utility::Message Message;
+	typedef uint16_t seqnum_t;
+	typedef utility::Message Message;
 } // namespace ariba
 
Index: source/ariba/Node.cpp
===================================================================
--- source/ariba/Node.cpp	(revision 7464)
+++ source/ariba/Node.cpp	(revision 7468)
@@ -164,5 +164,4 @@
 	// now that we have a listener, we can ask if sniffing is ok
 	if( ariba_mod.sideport_sniffer != NULL ){
-//		bool allow = listener->onEnableSideportListener();
 		base_overlay->registerSidePort(ariba_mod.sideport_sniffer);
 	}
@@ -186,37 +185,7 @@
 
 // @see Module.h
-void Node::initialize() {
-
-}
-
-// @see Module.h
-void Node::start() {
-
-}
-
-// @see Module.h
-void Node::stop() {
-
-}
-
-// @see Module.h
 string Node::getName() const {
 	return name.toString();
 }
 
-// @see Module.h
-void Node::setProperty(string key, string value) {
-
-}
-
-// @see Module.h
-const string Node::getProperty(string key) const {
-
-}
-
-// @see Module.h
-const vector<string> Node::getProperties() const {
-
-}
-
 } // namespace ariba
Index: source/ariba/Node.h
===================================================================
--- source/ariba/Node.h	(revision 7464)
+++ source/ariba/Node.h	(revision 7468)
@@ -324,23 +324,6 @@
 
 	/** @see Module.h */
-	void initialize();
-
-	/** @see Module.h */
-	void start();
-
-	/** @see Module.h */
-	void stop();
-
-	/** @see Module.h */
 	string getName() const;
 
-	/** @see Module.h */
-	void setProperty(string key, string value);
-
-	/** @see Module.h */
-	const string getProperty(string key) const;
-
-	/** @see Module.h */
-	const vector<string> getProperties() const;
 
 protected:
Index: source/ariba/SideportListener.cpp
===================================================================
--- source/ariba/SideportListener.cpp	(revision 7464)
+++ source/ariba/SideportListener.cpp	(revision 7468)
@@ -57,8 +57,6 @@
 string SideportListener::getEndpointDescription( const LinkID& link ) const {
 	if( overlay == NULL ) {
-		std::cerr << "Sideport: No overlay found." << std::endl;
 		return "";
 	}
-	std::cerr << "WTF!!!" << std::endl;
 	return overlay->getEndpointDescriptor(link).toString();
 }
@@ -66,5 +64,4 @@
 string SideportListener::getEndpointDescription( const NodeID& node ) const {
 	if( overlay == NULL ) {
-		std::cerr << "Sideport: No overlay found." << std::endl;
 		return "";
 	}
@@ -146,5 +143,5 @@
 
 	BaseCommunication::LinkDescriptor& bclink =
-		overlay->bc->queryLocalLink(link->communicationId);
+			overlay->bc->queryLocalLink(link->communicationId);
 
 	if(bclink.isUnspecified() || bclink.remoteLocator == NULL) return (Protocol)ret;
Index: source/ariba/SideportListener.h
===================================================================
--- source/ariba/SideportListener.h	(revision 7464)
+++ source/ariba/SideportListener.h	(revision 7468)
@@ -53,5 +53,5 @@
 namespace ariba {
 
-// forward declerations
+// forward declarations
 class Node;
 class AribaModule;
@@ -164,5 +164,4 @@
 	bool isRelayedNode(const NodeID& node);
 
-
 	/**
 	 * Protocols for some layer, can be combined
Index: source/ariba/SpoVNetProperties.cpp
===================================================================
--- source/ariba/SpoVNetProperties.cpp	(revision 7464)
+++ source/ariba/SpoVNetProperties.cpp	(revision 7468)
@@ -44,33 +44,12 @@
 
 SpoVNetProperties::SpoVNetProperties() :
-		name( Name::random() ), type( CHORD_OVERLAY ), idLength( 192 ),
-		initiator( NodeID::UNSPECIFIED ), hidden( false ) {
-
-	id = name.toSpoVNetId();
+		type( CHORD_OVERLAY ){
 }
 
 SpoVNetProperties::SpoVNetProperties(const SpoVNetProperties& copy) :
-		name( copy.name ), id( copy.id ),
-		type( copy.type ), idLength( copy.idLength ),
-		initiator( copy.initiator ), hidden( copy.hidden ) {
+		type( copy.type ){
 }
 
 SpoVNetProperties::~SpoVNetProperties() {
-}
-
-const Name& SpoVNetProperties::getName() const {
-	return name;
-}
-
-const SpoVNetID& SpoVNetProperties::getId() const {
-	return id;
-}
-
-const NodeID& SpoVNetProperties::getInitiator() const {
-	return initiator;
-}
-
-uint16_t SpoVNetProperties::getIdentifierLength() const {
-	return idLength;
 }
 
@@ -79,17 +58,8 @@
 }
 
-bool SpoVNetProperties::isHidden() const {
-	return hidden;
-}
-
 std::string SpoVNetProperties::toString() const {
 	std::ostringstream buf;
 	buf << "spovnet"
-		<< " name=" << name.toString()
-		<< " id=" << id.toString()
-		<< " overlay_type=" << type
-		<< " id_length=" << idLength
-		<< " initiator=" << initiator
-		<< " hidden=" << hidden;
+		<< " overlay_type=" << type;
 	return buf.str();
 }
Index: source/ariba/SpoVNetProperties.h
===================================================================
--- source/ariba/SpoVNetProperties.h	(revision 7464)
+++ source/ariba/SpoVNetProperties.h	(revision 7468)
@@ -83,16 +83,4 @@
 
 	/**
-	 * Constructs a new SpoVnet property object.
-	 *
-	 * TODO: replace with setters! for downwards compatibility
-	 */
-	/*
-	SpoVNetProperties(const Name& name, SpoVNetID id, OverlayType type,
-			uint16_t idLength, const NodeID& initiator, bool hidden = false) :
-		name(name), id(id), type(type), idLength(idLength),
-				initiator(initiator), hidden(hidden) {
-	}*/
-
-	/**
 	 * Copy constructor.
 	 */
@@ -103,29 +91,4 @@
 	 */
 	virtual ~SpoVNetProperties();
-
-	/**
-	 * Returns the canonical SpoVNet name
-	 */
-	const Name& getName() const;
-
-	/**
-	 * Returns the SpoVNet id
-	 */
-	const SpoVNetID& getId() const;
-
-	/**
-	 * Returns the node id of the initiator of the spovnet.
-	 * If the node id is unspecified, the initiator wanted to be anonymous.
-	 */
-	const NodeID& getInitiator() const;
-
-	/**
-	 * Returns the node identifier length in bites
-	 */
-	uint16_t getIdentifierLength() const;
-
-	void setIdentifierLength( uint16_t length ) {
-		this->idLength = length;
-	}
 
 	/**
@@ -139,13 +102,4 @@
 
 	/**
-	 * Returns true, if the spovnet is hidden
-	 */
-	bool isHidden() const;
-
-	void setHidden( bool is_hidden ) {
-		this->hidden = is_hidden;
-	}
-
-	/**
 	 * Returns a human readable string representation of the SpoVNet properties
 	 *
@@ -155,10 +109,5 @@
 
 private:
-	Name name;
-	SpoVNetID id;
-	uint8_t  type;
-	uint16_t idLength;
-	NodeID initiator;
-	bool hidden;
+	uint8_t type;
 };
 
Index: source/ariba/utility/system/SystemQueue.cpp
===================================================================
--- source/ariba/utility/system/SystemQueue.cpp	(revision 7464)
+++ source/ariba/utility/system/SystemQueue.cpp	(revision 7468)
@@ -95,4 +95,11 @@
 }
 
+void SystemQueue::dropAll( const SystemEventListener* mlistener){
+#ifndef UNDERLAY_OMNET
+	directScheduler.dropAll(mlistener);
+	delayScheduler.dropAll(mlistener);
+#endif
+}
+
 bool SystemQueue::isEmpty() {
 #ifndef UNDERLAY_OMNET
@@ -192,4 +199,22 @@
 }
 
+void SystemQueue::QueueThread::dropAll( const SystemEventListener* mlistener) {
+	boost::mutex::scoped_lock lock( queueMutex );
+
+	bool deleted = false;
+	do{
+		EventQueue::iterator i = eventsQueue.begin();
+		EventQueue::iterator iend = eventsQueue.end();
+
+		for( ; i != iend; i++){
+			if((*i).getListener() == mlistener){
+				eventsQueue.erase(i);
+				deleted = true;
+				break;
+			}
+		}
+	}while(deleted);
+}
+
 void SystemQueue::QueueThread::threadFunc( QueueThread* obj ) {
 
Index: source/ariba/utility/system/SystemQueue.h
===================================================================
--- source/ariba/utility/system/SystemQueue.h	(revision 7464)
+++ source/ariba/utility/system/SystemQueue.h	(revision 7468)
@@ -125,4 +125,9 @@
 
 	/**
+	 * Drop all queued events for that listener
+	 */
+	void dropAll( const SystemEventListener* mlistener);
+
+	/**
 	 * Check wheter this queue has items or not.
 	 *
@@ -182,4 +187,5 @@
 		void enter();
 		void leave();
+		void dropAll( const SystemEventListener* mlistener);
 
 	protected:
Index: source/ariba/utility/system/Timer.cpp
===================================================================
--- source/ariba/utility/system/Timer.cpp	(revision 7464)
+++ source/ariba/utility/system/Timer.cpp	(revision 7468)
@@ -100,4 +100,5 @@
 	running = false;
 	reset(); // cause the sleep to abort
+	//SystemQueue::instance().dropAll(this);
 }
 
Index: source/ariba/utility/system/Timer.h
===================================================================
--- source/ariba/utility/system/Timer.h	(revision 7464)
+++ source/ariba/utility/system/Timer.h	(revision 7468)
@@ -40,4 +40,5 @@
 #define __TIMER_H
 
+#include <stdint.h>
 #include "ariba/utility/system/SystemEventListener.h"
 #include "ariba/utility/system/SystemQueue.h"