Changeset 3037 for source/ariba

Timestamp:

Apr 22, 2009, 9:07:53 PM (16 years ago)

Author:

Christoph Mayer

Message:

-jede Menge fixes und Umstellungen
-angefangen ariba/interface los zu werden, erste dateien sind weg

Location:

source/ariba

Files:

• AribaModule.cpp (modified) (6 diffs)
• AribaModule.h (modified) (2 diffs)
• LinkProperties.cpp (modified) (1 diff)
• LinkProperties.h (modified) (2 diffs)
• Makefile.am (modified) (1 diff)
• Node.cpp (modified) (8 diffs)
• Node.h (modified) (6 diffs)
• NodeListener.cpp (modified) (1 diff)
• communication/BaseCommunication.cpp (modified) (8 diffs)
• communication/BaseCommunication.h (modified) (1 diff)
• communication/EndpointDescriptor.cpp (modified) (1 diff)
• communication/EndpointDescriptor.h (modified) (2 diffs)
• interface/AribaContext.cpp (deleted)
• interface/AribaContext.h (deleted)
• interface/ServiceInterface.cpp (modified) (2 diffs)
• interface/ServiceInterface.h (modified) (2 diffs)
• interface/UnderlayAbstraction.cpp (deleted)
• interface/UnderlayAbstraction.h (deleted)
• overlay/BaseOverlay.cpp (modified) (9 diffs)
• overlay/BaseOverlay.h (modified) (7 diffs)
• overlay/OverlayEvents.cpp (modified) (2 diffs)
• overlay/OverlayEvents.h (modified) (2 diffs)
• utility/messages/Message.h (modified) (1 diff)
• utility/misc/Helper.cpp (modified) (4 diffs)
• utility/system/StartupInterface.h (modified) (1 diff)

source/ariba/AribaModule.cpp

@@ -46 +46 @@
 #include "ariba/utility/misc/Helper.h"
 #include "ariba/utility/misc/StringFormat.h"
-
-// hack includes
-#include "ariba/interface/UnderlayAbstraction.h"
+#include "ariba/communication/BaseCommunication.h"
 #include "ariba/communication/EndpointDescriptor.h"
 #include "ariba/communication/modules/network/NetworkLocator.h"
 
 using namespace ariba::utility::Helper;
-using ariba::interface::UnderlayAbstraction;
+using ariba::communication::BaseCommunication;
 using ariba::communication::EndpointDescriptor;
 
@@ -61 +59 @@
 
         // init with default values
-        this->underlay_abs = NULL;
+        this->base_comm = NULL;
         this->ip_addr = NULL;
         this->tcp_port = 41402;
@@ -132 +130 @@
         }
 
-        //std::cout << "added bootstrap info: " << getBootstrapHints() << std::endl;
+        //logging_debug( "added bootstrap info: " << getBootstrapHints() );
 }
 
@@ -154 +152 @@
 
         // init variables
-        underlay_abs = NULL;
+        base_comm = NULL;
 }
 
@@ -161 +159 @@
 
         // preconditions
-        assert(underlay_abs == NULL);
+        assert(base_comm == NULL);
         assert(!started);
 
         // create the base communication component
         started = true;
-        underlay_abs = new interface::UnderlayAbstraction();
+        base_comm = new BaseCommunication();
 }
 
@@ -173 +171 @@
 
         // preconditions
-        assert(underlay_abs != NULL);
+        assert(base_comm != NULL);
         assert(started);
 
         // delete base communication component
         started = false;
-        delete underlay_abs;
+        delete base_comm;
 }
 

source/ariba/AribaModule.h

@@ -64 +64 @@
 class NetworkLocator;
 }
-namespace interface {
-class UnderlayAbstraction;
+namespace communication {
+class BaseCommunication;
 }
 
@@ -185 +185 @@
                         const Name& spovnet) const;
 
-        // TODO: merge with old interface
-        interface::UnderlayAbstraction* underlay_abs;
+        communication::BaseCommunication* base_comm;
 
         // TODO: use "abstract" representations here!

source/ariba/LinkProperties.cpp

@@ -52 +52 @@
 }
 
+string LinkProperties::toString() const {
+        std::ostringstream buf;
+        buf << "[reliable=" << (reliable ? "yes" : "no") << "]";
+        return buf.str();
+}
+
 } // namespace ariba

source/ariba/LinkProperties.h

@@ -40 +40 @@
 #define LINKPROPERTIES_H_
 
+#include <string>
+#include <iostream>
+#include <sstream>
+
+using std::string;
+
 namespace ariba {
 // forward declaration
@@ -52 +58 @@
         ~LinkProperties();
 
+        string toString() const;
         static const LinkProperties DEFAULT;
 

source/ariba/Makefile.am

@@ -256 +256 @@
 
 libariba_la_SOURCES += \
-  interface/UnderlayAbstraction.cpp \
-  interface/AribaContext.cpp \
   interface/ServiceInterface.cpp
 

source/ariba/Node.cpp

@@ -41 +41 @@
 #include "ariba/overlay/BaseOverlay.h"
 #include "ariba/utility/types/OverlayParameterSet.h"
-#include "ariba/interface/AribaContext.h"
 #include "ariba/interface/ServiceInterface.h"
-#include "ariba/interface/UnderlayAbstraction.h"
 #include "ariba/communication/EndpointDescriptor.h"
 
 using ariba::communication::EndpointDescriptor;
-using ariba::interface::UnderlayAbstraction;
 
 namespace ariba {
@@ -64 +61 @@
                 nodeListener(NULL), commListener(listener) {
         }
-        
+
         ~ServiceInterfaceWrapper() {
         }
 
 protected:
-        void onOverlayCreate(const SpoVNetID& id) {
-
-        }
-
-        void onOverlayDestroy(const SpoVNetID& id) {
-
-        }
 
         bool isJoinAllowed(const NodeID& nodeid, const SpoVNetID& spovnetid) {
@@ -95 +85 @@
         void onJoinFail(const SpoVNetID& spovnetid) {
                 if (nodeListener != NULL) nodeListener->onJoinFailed(spovnetid);
+        }
+
+        void onLeaveSuccess( const SpoVNetID& spovnetid ){
+                if (nodeListener != NULL) nodeListener->onLeaveCompleted(spovnetid);
+        }
+
+        void onLeaveFail( const SpoVNetID& spovnetid ){
+                if (nodeListener != NULL) nodeListener->onLeaveFailed(spovnetid);
         }
 
@@ -131 +129 @@
 
 Node::Node(AribaModule& ariba_mod, const Name& node_name) :
-        ariba_mod(ariba_mod), name(node_name), context(NULL) {
+        ariba_mod(ariba_mod), name(node_name), base_overlay(NULL) {
 }
 
@@ -137 +135 @@
 }
 
+//TODO: Implement error handling: no bootstrap node available
 void Node::join(const Name& vnetname) {
         spovnetId = vnetname.toSpoVNetId();
         nodeId = generateNodeId(name);
-        this->context = ariba_mod.underlay_abs->joinSpoVNet(spovnetId,
-                                *ariba_mod.getBootstrapNode(vnetname), nodeId, 
-                                ariba_mod.ip_addr, ariba_mod.tcp_port);
-}
-
-//TODO: Implement error handling: no bootstrap node available
+
+        //logging("joining spovnet on"
+        //              << " [spovnetid=]" << spovnetId.toString()
+        //              << " [nodeid=]" << nodeId.toString() );
+
+        //logging_info("starting base communication...");
+        ariba_mod.base_comm->start(ariba_mod.ip_addr, ariba_mod.tcp_port);
+
+        //logging_info("starting base overlay...");
+        base_overlay = new BaseOverlay( *ariba_mod.base_comm, nodeId );
+
+        const communication::EndpointDescriptor* ep =
+                        ariba_mod.getBootstrapNode(vnetname);
+        if( ep == NULL ) return;
+
+        base_overlay->joinSpoVNet( spovnetId, *ep);
+}
+
 void Node::initiate(const Name& vnetname, const SpoVNetProperties& parm) {
         utility::OverlayParameterSet ovrpset =
-                        (utility::OverlayParameterSet::_OverlayStructure) 
+                        (utility::OverlayParameterSet::_OverlayStructure)
                         parm.getBaseOverlayType();
 
@@ -154 +165 @@
         nodeId = generateNodeId(name);
 
-        this->context = ariba_mod.underlay_abs->createSpoVNet(
-                                spovnetId, nodeId, ariba_mod.ip_addr,
-                                ariba_mod.tcp_port);
+        //logging("joining spovnet on"
+        //                      << " [spovnetid=]" << spovnetId.toString()
+        //                      << " [nodeid=]" << nodeId.toString() );
+
+        //logging_info("starting base communication...");
+        ariba_mod.base_comm->start(ariba_mod.ip_addr, ariba_mod.tcp_port);
+
+        //logging_info("starting base overlay...");
+        base_overlay = new BaseOverlay( *ariba_mod.base_comm, nodeId );
+        base_overlay->createSpoVNet( spovnetId );
 
         ariba_mod.addBootstrapNode(vnetname,
-                new EndpointDescriptor(this->context->
-                getBaseCommunication().getEndpointDescriptor()));
+                new EndpointDescriptor(ariba_mod.base_comm->getEndpointDescriptor()));
 }
 
 void Node::leave() {
-        ariba_mod.underlay_abs->leaveSpoVNet( context );
-        context = NULL;
+        base_overlay->leaveSpoVNet();
+        ariba_mod.base_comm->stop();
+
+        delete base_overlay;
+        base_overlay = NULL;
 }
 
@@ -177 +197 @@
 
 const NodeID& Node::getNodeId(const LinkID& lid) const {
-        return nodeId;
+        if( lid == LinkID::UNSPECIFIED ) return nodeId;
+        else return base_overlay->getNodeID( lid );
 }
 
@@ -185 +206 @@
 }
 
+vector<NodeID> Node::getNeighborNodes() const {
+        return base_overlay->getOverlayNeighbors();
+}
+
 LinkID Node::establishLink(const NodeID& nid, const ServiceID& sid,
                 const LinkProperties& req, const DataMessage& msg) {
-        return context->getOverlay().establishLink(nid, sid);
+        return base_overlay->establishLink(nid, sid);
 }
 
 void Node::dropLink(const LinkID& lnk) {
-        context->getOverlay().dropLink(lnk);
+        base_overlay->dropLink(lnk);
 }
 
 seqnum_t Node::sendMessage(const DataMessage& msg, const NodeID& nid,
                 const ServiceID& sid, const LinkProperties& req) {
-        return context->getOverlay().sendMessage((Message*) msg, nid, sid);
+        return base_overlay->sendMessage((Message*) msg, nid, sid);
 }
 
 seqnum_t Node::sendMessage(const DataMessage& msg, const LinkID& lnk) {
-        return context->getOverlay().sendMessage((Message*) msg, lnk);
+        return base_overlay->sendMessage((Message*) msg, lnk);
 }
 
 void Node::sendBroadcastMessage(const DataMessage& msg, const ServiceID& sid) {
-        return context->getOverlay().broadcastMessage((Message*)msg, sid);
+        return base_overlay->broadcastMessage((Message*)msg, sid);
 }
 
 void Node::bind(NodeListener* listener) {
-        context->getOverlay().bind(new ServiceInterfaceWrapper(listener),
+        base_overlay->bind(new ServiceInterfaceWrapper(listener),
                         Node::anonymousService);
 }
 
 void Node::unbind(NodeListener* listener) {
-        delete context->getOverlay().unbind(Node::anonymousService);
+        delete base_overlay->unbind(Node::anonymousService);
 }
 
 void Node::bind(CommunicationListener* listener, const ServiceID& sid) {
-        context->getOverlay().bind(new ServiceInterfaceWrapper(listener), sid);
+        base_overlay->bind(new ServiceInterfaceWrapper(listener), sid);
 }
 
 void Node::unbind(CommunicationListener* listener, const ServiceID& sid) {
-        delete context->getOverlay().unbind(sid);
+        delete base_overlay->unbind(sid);
 }
 

source/ariba/Node.h

@@ -45 +45 @@
 }
 
+#include <vector>
 #include "Module.h"
 #include "Identifiers.h"
@@ -54 +55 @@
 #include "DataMessage.h"
 
+using std::vector;
+
 namespace ariba {
 
 // forward declaration
 namespace interface {
-class AribaContext;
 class ServiceInterface;
+}
+
+namespace overlay {
+class BaseOverlay;
 }
 
@@ -66 +72 @@
  *
  * @author Sebastian Mies <mies@tm.uka.de>
+ * @author Christoph Mayer <mayer@tm.uka.de>
  */
 class Node: public Module {
@@ -181 +188 @@
          */
         const Name getNodeName(const LinkID& lid = LinkID::UNSPECIFIED) const;
+
+        /**
+         * Get a list of neighboring nodes in the overlay structure.
+         * The number and identities of nodes depends highly on the
+         * used overlay structure.
+         *
+         * @return a list of NodeIDs that are neighbors in the overlay structure
+         * @see sendBroadcastMessage
+         */
+        vector<NodeID> getNeighborNodes() const;
 
         //--- communication ---
@@ -241 +258 @@
          * @param msg The message to be send
          * @param sid The id of the service that should receive the message
+         * @see getNeighborNodes
          */
         void sendBroadcastMessage(const DataMessage& msg, const ServiceID& sid);
@@ -317 +335 @@
 
         // member variables
-        Name name;              //< node name
-        AribaModule& ariba_mod; //< ariba module
-        SpoVNetID spovnetId;    //< current spovnet id
-        NodeID nodeId;          //< current node id
+        Name name;                             //< node name
+        AribaModule& ariba_mod;                //< ariba module
+        SpoVNetID spovnetId;                   //< current spovnet id
+        NodeID nodeId;                             //< current node id
+        overlay::BaseOverlay* base_overlay;    //< the base overlay
 
         // delegates
-        interface::AribaContext* context;
         static ServiceID anonymousService;
 };

source/ariba/NodeListener.cpp

@@ -42 +42 @@
 namespace ariba {
 
-// dummy
 NodeListener::NodeListener() {
 }
 
-// dummy
 NodeListener::~NodeListener() {
 }
 
-// dummy
 void NodeListener::onJoinCompleted(const SpoVNetID& vid ) {
 }
 
-// dummy
 void NodeListener::onJoinFailed(const SpoVNetID& vid ) {
 }
 
-// dummy
 void NodeListener::onLeaveCompleted(const SpoVNetID& vid ) {
 }
 
-// dummy
 void NodeListener::onLeaveFailed(const SpoVNetID& vid ) {
 }

source/ariba/communication/BaseCommunication.cpp

@@ -55 +55 @@
 const BaseCommunication::LinkDescriptor BaseCommunication::LinkDescriptor::UNSPECIFIED;
 
-BaseCommunication::BaseCommunication(const NetworkLocator* _locallocator, const uint16_t _listenport)
-        : messageReceiver( NULL ), currentSeqnum( 0 ), listenport( _listenport ) {
+BaseCommunication::BaseCommunication()
+        : messageReceiver(NULL), network(NULL), transport(NULL){
+}
+
+BaseCommunication::~BaseCommunication(){
+}
+
+void BaseCommunication::start(const NetworkLocator* _locallocator, const uint16_t _listenport){
+
+        currentSeqnum = 0;
+        listenport = _listenport;
 
         logging_info( "starting up base communication and creating transports ..." );
@@ -139 +148 @@
 }
 
-BaseCommunication::~BaseCommunication() {
+void BaseCommunication::stop() {
 
         logging_info( "stopping base communication and transport ..." );
@@ -210 +219 @@
         // warn if this link has some queued messages attached
         if( descriptor.waitingmsg.size() > 0 ){
-                logging_warn( "dropping link " << link.toString() << 
+                logging_warn( "dropping link " << link.toString() <<
                         " that has " << descriptor.waitingmsg.size() << " waiting messages" );
         }
@@ -368 +377 @@
                 const NetworkLocator* remoteLocator = dynamic_cast<const NetworkLocator*>(message->getSourceAddress());
 
-                logging_debug( "localLocator=" << localLocator->toString() 
+                logging_debug( "localLocator=" << localLocator->toString()
                                 << " remoteLocator=" << remoteLocator->toString());
 
@@ -419 +428 @@
                 // the link is now open
                 //
-                
+
                 BOOST_FOREACH( CommunicationEvents* i, eventListener ){
                         i->onLinkUp( localLink, localLocator, remoteLocator );
@@ -444 +453 @@
 
                 linkDesc.remoteLink = spovmsg->getLocalLink();
-                linkDesc.linkup = true; 
-        
+                linkDesc.linkup = true;
+
                 logging_debug( "the link is now up with local link id " << spovmsg->getRemoteLink().toString() );
 
@@ -452 +461 @@
                 }
 
-                if( linkDesc.waitingmsg.size() > 0 ){ 
+                if( linkDesc.waitingmsg.size() > 0 ){
                         logging_info( "sending out queued messages on link " << linkDesc.localLink.toString() );
 
@@ -564 +573 @@
         for( ; i != iend; i++){
                 if( (*i).localLink != localLink) continue;
-                
+
                 BOOST_FOREACH( Message* msg, i->waitingmsg ){
                         delete msg;

source/ariba/communication/BaseCommunication.h

@@ -122 +122 @@
  */
 class BaseCommunication : public MessageReceiver, NetworkChangeInterface {
-
         use_logging_h(BaseCommunication);
-
 public:
-        /**
-         * Constructs a Base Communication instance.
-         * Listens default on port number 41402
-         */
-        BaseCommunication(const NetworkLocator* _locallocator, const uint16_t _listenport);
-
-        /**
-         * Destructs a Base Communication instance
+
+        /**
+         * Default ctor that just creates an empty
+         * non functional base communication
+         */
+        BaseCommunication();
+
+        /**
+         * Default dtor that does nothing
          */
         virtual ~BaseCommunication();
+
+        /**
+         * Startup the base communication, start modules etc.
+         */
+        void start(const NetworkLocator* _locallocator, const uint16_t _listenport);
+
+        /**
+         * stop the base communication, stop modules etc.
+         */
+        void stop();
 
         /**

source/ariba/communication/EndpointDescriptor.cpp

@@ -57 +57 @@
 
 EndpointDescriptor::EndpointDescriptor(const Locator* _locator){
+        if( _locator == NULL ) return;
+
         locator = new IPv4Locator(*dynamic_cast<IPv4Locator*>((Locator*)_locator));
         isUnspec = false;

source/ariba/communication/EndpointDescriptor.h

@@ -51 +51 @@
 using ariba::communication::IPv4Locator;
 
-// needed for friend decleration
-// in different namespace
-namespace ariba {
-namespace interface {
-        class UnderlayAbstraction;
-}}
-
 namespace ariba {
 namespace communication {
@@ -67 +60 @@
 
         friend class BaseCommunication;
-        friend class ariba::interface::UnderlayAbstraction;
 
 public:

source/ariba/interface/ServiceInterface.cpp

@@ -48 +48 @@
 }
 
-void ServiceInterface::onOverlayCreate( const SpoVNetID& id ){
-}
-
-void ServiceInterface::onOverlayDestroy( const SpoVNetID& id ){
-}
-
 bool ServiceInterface::isJoinAllowed( const NodeID& nodeid, const SpoVNetID& spovnetid ){
         // default: allow all nodes to join
@@ -71 +65 @@
 }
 
+void ServiceInterface::onLeaveSuccess( const SpoVNetID& spovnetid ){
+}
+
+void ServiceInterface::onLeaveFail( const SpoVNetID& spovnetid ){
+}
+        
 void ServiceInterface::onLinkUp( const LinkID& link, const NodeID& local, const NodeID& remote ){
 }

source/ariba/interface/ServiceInterface.h

@@ -74 +74 @@
 
 protected:
-        virtual void onOverlayCreate( const SpoVNetID& id );
-        virtual void onOverlayDestroy( const SpoVNetID& id );
-
         virtual bool isJoinAllowed( const NodeID& nodeid, const SpoVNetID& spovnetid );
         virtual void onNodeJoin( const NodeID& nodeid, const SpoVNetID& spovnetid );
@@ -83 +80 @@
         virtual void onJoinSuccess( const SpoVNetID& spovnetid );
         virtual void onJoinFail( const SpoVNetID& spovnetid );
+        virtual void onLeaveSuccess( const SpoVNetID& spovnetid );
+        virtual void onLeaveFail( const SpoVNetID& spovnetid );
 
         virtual void onLinkUp( const LinkID& link, const NodeID& local, const NodeID& remote );

source/ariba/overlay/BaseOverlay.cpp

@@ -107 +107 @@
 
         logging_info( "leaving spovnet " << spovnetId );
+        bool ret = ( state != this->BaseOverlayStateInvalid );
 
         logging_debug( "dropping all auto-links ..." );
-        
+
         BOOST_FOREACH( LinkPair item, linkMapping ){
-                if( item.second.autolink ) 
+                if( item.second.autolink )
                         dropLink( item.first );
         }
@@ -135 +136 @@
         // inform all registered services of the event
         BOOST_FOREACH( ServiceInterface* i, listenerMux.getOneList() ){
-                i->onOverlayDestroy( spovnetId );
+                if( ret ) i->onLeaveSuccess( spovnetId );
+                else      i->onLeaveFail( spovnetId );
         }
 }
@@ -159 +161 @@
 
         //
-        // create the overlay
-        //
-
-        overlayInterface->createOverlay();
-        BOOST_FOREACH( ServiceInterface* i, listenerMux.getOneList() ){
-                i->onOverlayCreate( spovnetId );
-        }
-
-        //
         // bootstrap against ourselfs
         //
@@ -286 +279 @@
                                 node.toString() << " for service " << service.toString() <<
                                 ". creating auto link ...");
-                
+
                 const LinkID link = establishLink( node, service );
                 LinkMapping::iterator i = linkMapping.find( link );
@@ -328 +321 @@
         ServiceInterface* iface = listenerMux.get( sid );
         listenerMux.unregisterItem( sid );
-        
+
         return NULL; //iface;
 }
@@ -385 +378 @@
                                 " on link " << id.toString() );
 
-                OverlayMsg overMsg( 
-                        OverlayMsg::OverlayMessageTypeUpdate, 
-                        i->second.service, 
-                        nodeId 
+                OverlayMsg overMsg(
+                        OverlayMsg::OverlayMessageTypeUpdate,
+                        i->second.service,
+                        nodeId
                         );
 
@@ -655 +648 @@
 
                 overlayInterface->createOverlay();
-
-                // inform all registered services of the event
-                BOOST_FOREACH( ServiceInterface* i, listenerMux.getOneList() ){
-                        i->onOverlayCreate( spovnetId );
-                }
-
                 overlayInterface->joinOverlay( replyMsg->getBootstrapEndpoint() );
 
@@ -765 +752 @@
                         // inform all registered services of the event
                         BOOST_FOREACH( ServiceInterface* i, listenerMux.getOneList() ){
-                                i->onOverlayDestroy( spovnetId );
+                                i->onLeaveFail( spovnetId );
                         }
 
@@ -815 +802 @@
                 sendMessage( message, *i, service ); // TODO: sollte auto links aufbauen fÃŒr sowas
         }
+}
+
+vector<NodeID> BaseOverlay::getOverlayNeighbors() const {
+        // the known nodes _can_ also include our
+        // node, so we remove ourselfs
+
+        vector<NodeID> nodes = overlayInterface->getKnownNodes();
+        vector<NodeID>::iterator i = find( nodes.begin(), nodes.end(), this->nodeId );
+        if( i != nodes.end() ) nodes.erase( i );
+
+        return nodes;
 }
 

source/ariba/overlay/BaseOverlay.h

@@ -44 +44 @@
 #include <algorithm>
 #include <ctime>
+#include <list>
+#include <vector>
 #include <boost/foreach.hpp>
 
@@ -66 +68 @@
 #include "ariba/overlay/messages/JoinReply.h"
 
+using std::vector;
+using std::list;
 using std::cout;
 using std::map;
 using std::make_pair;
 using std::pair;
+using std::find;
 
 using ariba::communication::EndpointDescriptor;
@@ -103 +108 @@
 // in different namespace
 namespace ariba {
-namespace interface {
-        class UnderlayAbstraction;
-}}
+        class Node;
+}
 
 namespace ariba {
@@ -117 +121 @@
 
         use_logging_h( BaseOverlay );
-        friend class ariba::interface::UnderlayAbstraction;
+        friend class ariba::Node;
 
 public:
@@ -166 +170 @@
                 const ServiceID& service
         );
+
+        /**
+         * Get a list of overlay neighboring nodes.
+         */
+        vector<NodeID> getOverlayNeighbors() const;
 
         /**
@@ -324 +333 @@
                 static const LinkItem UNSPECIFIED;
 
-                LinkItem( const LinkID& _link, const NodeID& _node, 
+                LinkItem( const LinkID& _link, const NodeID& _node,
                                 const ServiceID& _service, ServiceInterface* _interface )
-                        : link( _link ), node( _node ), service( _service ), interface( _interface ), 
+                        : link( _link ), node( _node ), service( _service ), interface( _interface ),
                                 autolink( false ), lastuse( time(NULL) ) {
                 }
@@ -350 +359 @@
         typedef pair<const LinkID,LinkItem> LinkPair;
         LinkMapping linkMapping;
-        
+
         // nodes with pending joines. TODO: should be cleaned every some seconds
         // add timestamps to each, and check on occasion

source/ariba/overlay/OverlayEvents.cpp

@@ -48 +48 @@
 }
 
-void OverlayEvents::onOverlayCreate( const SpoVNetID& id ){
-}
-
-void OverlayEvents::onOverlayDestroy( const SpoVNetID& id ){
-}
-
 bool OverlayEvents::isJoinAllowed( const NodeID& nodeid, const SpoVNetID& spovnetid ){
         // default: allow all nodes to join
@@ -71 +65 @@
 }
 
+void OverlayEvents::onLeaveSuccess( const SpoVNetID& spovnetid ){
+}
+
+void OverlayEvents::onLeaveFail( const SpoVNetID& spovnetid ){
+}
+
 void OverlayEvents::onLinkUp( const LinkID& link, const NodeID& local, const NodeID& remote ){
 }

source/ariba/overlay/OverlayEvents.h

@@ -58 +58 @@
 
 protected:
-
-        virtual void onOverlayCreate( const SpoVNetID& id );
-        virtual void onOverlayDestroy( const SpoVNetID& id );
-
         /// for initiator about remote nodes
         virtual bool isJoinAllowed( const NodeID& nodeid, const SpoVNetID& spovnetid );
@@ -70 +66 @@
         virtual void onJoinSuccess( const SpoVNetID& spovnetid );
         virtual void onJoinFail( const SpoVNetID& spovnetid );
+        virtual void onLeaveSuccess( const SpoVNetID& spovnetid );
+        virtual void onLeaveFail( const SpoVNetID& spovnetid );
 
         virtual void onLinkUp( const LinkID& link, const NodeID& local, const NodeID& remote );

source/ariba/utility/messages/Message.h

@@ -235 +235 @@
                 }
                 return NULL;
+        }
+        
+        /**
+         * The same as decapsulate, but this function
+         * is used in the samples to make the semantics easier
+         * to understand. The semantics is shown to be: you get 
+         * a message and convert it to your type. Not as: you 
+         * get a message and have to extract your message from it.
+         */  
+        template<class T>
+        inline T* convert() {
+                return decapsulate<T>();        
         }
 

source/ariba/utility/misc/Helper.cpp

@@ -49 +49 @@
         _ultoa_s (val, buf, 16, 10);
 #else
-        sprintf (buf, "%u", val);
+        sprintf (buf, "%lu", val);
 #endif
 
@@ -62 +62 @@
         _ltoa_s (val, buf, 16, 10);
 #else
-        sprintf (buf, "%i", val);
+        sprintf (buf, "%li", val);
 #endif
 
@@ -75 +75 @@
         _ultoa_s (val, buf, 16, 16);
 #else
-        sprintf (buf, "%x", val);
+        sprintf (buf, "%lx", val);
 #endif
 
@@ -93 +93 @@
         _ltoa_s (val, buf, 16, 16);
 #else
-        sprintf (buf, "%x", val);
+        sprintf (buf, "%lx", val);
 #endif
 

source/ariba/utility/system/StartupInterface.h

@@ -45 +45 @@
 
 namespace ariba {
-namespace interface {
-        class UnderlayAbstraction;
-}}
-
-using ariba::interface::UnderlayAbstraction;
-
-namespace ariba {
 namespace utility {