Changeset 6822

Timestamp:

Nov 4, 2009, 11:20:00 AM (14 years ago)

Author:

Christoph Mayer

Message:

-ovlvis verschoben und 3dvis hinzu

Location:

source/ariba

Files:

• Makefile.am (modified) (1 diff)
• Node.cpp (modified) (1 diff)
• overlay/BaseOverlay.cpp (modified) (66 diffs)
• overlay/BaseOverlay.h (modified) (3 diffs)
• utility/visual/DddVis.cpp (added)
• utility/visual/DddVis.h (added)
• utility/visual/OvlVis.cpp (modified) (3 diffs)
• utility/visual/OvlVis.h (modified) (5 diffs)
• utility/visual/ServerVis.cpp (added)
• utility/visual/ServerVis.h (added)

source/ariba/Makefile.am

@@ -436 +436 @@
 
 libariba_la_SOURCES += \
-  utility/visual/OvlVis.cpp
-
-nobase_libariba_la_HEADERS += \
-  utility/visual/OvlVis.h
-  
+  utility/visual/OvlVis.cpp \
+  utility/visual/ServerVis.cpp \
+  utility/visual/DddVis.cpp
+
+nobase_libariba_la_HEADERS += \
+  utility/visual/OvlVis.h \
+  utility/visual/ServerVis.h \
+  utility/visual/DddVis.h

source/ariba/Node.cpp

@@ -120 +120 @@
 
 NodeID Node::generateNodeId(const Name& name) const {
-        if (name == Name::UNSPECIFIED) return Name::random().toNodeId();
+        if (name == Name::UNSPECIFIED) return NodeID(Identifier::random());
         else return name.toNodeId();
 }

source/ariba/overlay/BaseOverlay.cpp

@@ -56 +56 @@
 
 #include "ariba/utility/visual/OvlVis.h"
+#include "ariba/utility/visual/DddVis.h"
+#include "ariba/utility/visual/ServerVis.h"
 
 namespace ariba {
 namespace overlay {
+
+#define visual                          ariba::utility::DddVis::instance()
+#define visualIdOverlay         ariba::utility::ServerVis::NETWORK_ID_BASE_OVERLAY
+#define visualIdBase            ariba::utility::ServerVis::NETWORK_ID_BASE_COMMUNICATION
 
 class ValueEntry {
 public:
         ValueEntry( const Data& value ) : ttl(0), last_update(time(NULL)),
-                last_change(time(NULL)), value(value.clone()) {
+        last_change(time(NULL)), value(value.clone()) {
         }
 
@@ -122 +128 @@
                 vector<Data> vect;
                 BOOST_FOREACH( ValueEntry& e, values )
-                        vect.push_back( e.get_value() );
+                vect.push_back( e.get_value() );
                 return vect;
         }
@@ -163 +169 @@
                                                 if (verbose)
                                                         std::cout << "DHT: Republished value. Refreshing value timestamp."
-                                                        << std::endl;
+                                                                << std::endl;
                                                 return;
                                         }
@@ -171 +177 @@
                                 if (verbose)
                                         std::cout << "DHT: Added value to "
-                                        << " key=" << key << " with value=" << value << std::endl;
+                                                << " key=" << key << " with value=" << value << std::endl;
                                 entry.values.push_back( ValueEntry( value ) );
                                 entry.values.back().set_ttl(ttl);
@@ -181 +187 @@
                 if (verbose)
                         std::cout << "DHT: New key value pair "
-                        << " key=" << key << " with value=" << value << std::endl;
+                                << " key=" << key << " with value=" << value << std::endl;
 
                 // add new entry
@@ -274 +280 @@
 LinkDescriptor* BaseOverlay::getDescriptor( const LinkID& link, bool communication ) {
         BOOST_FOREACH( LinkDescriptor* lp, links )
-                if ((communication ? lp->communicationId : lp->overlayId) == link)
-                        return lp;
+                                if ((communication ? lp->communicationId : lp->overlayId) == link)
+                                        return lp;
         return NULL;
 }
@@ -281 +287 @@
 const LinkDescriptor* BaseOverlay::getDescriptor( const LinkID& link, bool communication ) const {
         BOOST_FOREACH( const LinkDescriptor* lp, links )
-                if ((communication ? lp->communicationId : lp->overlayId) == link)
-                        return lp;
+                                if ((communication ? lp->communicationId : lp->overlayId) == link)
+                                        return lp;
         return NULL;
 }
@@ -313 +319 @@
         // search for a descriptor that is already up
         BOOST_FOREACH( LinkDescriptor* lp, links )
-                if (lp->autolink && lp->remoteNode == node && lp->service == service && lp->up && lp->keepAliveMissed == 0)
-                        return lp;
+                                if (lp->autolink && lp->remoteNode == node && lp->service == service && lp->up && lp->keepAliveMissed == 0)
+                                        return lp;
         // if not found, search for one that is about to come up...
         BOOST_FOREACH( LinkDescriptor* lp, links )
-                if (lp->autolink && lp->remoteNode == node && lp->service == service && lp->keepAliveMissed == 0 )
-                        return lp;
+        if (lp->autolink && lp->remoteNode == node && lp->service == service && lp->keepAliveMissed == 0 )
+                return lp;
         return NULL;
 }
@@ -328 +334 @@
                 if (!ld->up) continue;
                 OverlayMsg msg( OverlayMsg::typeLinkAlive,
-                        OverlayInterface::OVERLAY_SERVICE_ID, nodeId, ld->remoteNode );
+                                OverlayInterface::OVERLAY_SERVICE_ID, nodeId, ld->remoteNode );
                 if (ld->relayed) msg.setRouteRecord(true);
                 send_link( &msg, ld->overlayId );
@@ -416 +422 @@
                         bool found = false;
                         BOOST_FOREACH(NodeID& id, nodes)
-                                if (id  == ld->remoteNode) found = true;
+                        if (id  == ld->remoteNode) found = true;
                         if (found) continue;
                         i++;
                         nodes.push_back(ld->remoteNode);
                         if ((i%1) == 1) s << "<tr style=\"background-color=#f0f0f0;\">";
-                                else s << "<tr>";
+                        else s << "<tr>";
                         s << "<td>" << ld->overlayId.toString().substr(0,4) << "..</td>";
                         s << "<td>" << ld->remoteNode.toString().substr(0,4) << "..</td>";
@@ -455 +461 @@
         LinkDescriptor* rhsld = getDescriptor(rhs);
         if (lhsld==NULL || rhsld==NULL
-                || !lhsld->up || !rhsld->up
-                || lhsld->remoteNode != rhsld->remoteNode) return -1;
+                        || !lhsld->up || !rhsld->up
+                        || lhsld->remoteNode != rhsld->remoteNode) return -1;
 
         if ((lhsld->remoteLink^lhsld->overlayId)<(rhsld->remoteLink^lhsld->overlayId)  )
@@ -503 +509 @@
         if (destination == nodeId) {
                 logging_warn("Sent message to myself. Handling message.")
-                Message msg;
+                                Message msg;
                 msg.encapsulate(message);
                 handleMessage( &msg, NULL );
@@ -518 +524 @@
                         logging_warn("Could not send message. No relay hop found to "
                                         << destination)
-                        return -1;
+                                        return -1;
                 }
         }
@@ -528 +534 @@
                 if (next_id.isUnspecified()) {
                         logging_warn("Could not send message. No next hop found to " <<
-                                destination );
+                                        destination );
                         return -1;
                 }
@@ -568 +574 @@
         if (ldr->relayed) {
                 logging_debug("Resolving direct link for relayed link to "
-                        << ldr->remoteNode);
+                                << ldr->remoteNode);
                 ld = getRelayLinkTo( ldr->remoteNode );
                 if (ld==NULL) {
@@ -592 +598 @@
 
 seqnum_t BaseOverlay::send_node( OverlayMsg* message, const NodeID& remote,
-        const ServiceID& service) {
+                const ServiceID& service) {
         message->setSourceNode(nodeId);
         message->setDestinationNode(remote);
@@ -627 +633 @@
                 // relay link still used and alive?
                 if (ld==NULL
-                        || !ld->isDirectVital()
-                        || difftime(route.used, time(NULL)) > 8) {
+                                || !ld->isDirectVital()
+                                || difftime(route.used, time(NULL)) > 8) {
                         logging_info("Forgetting relay information to node "
                                         << route.node.toString() );
@@ -658 +664 @@
         // handle relayed messages from real links only
         if (ld == NULL
-                || ld->relayed
-                || message->getSourceNode()==nodeId ) return;
+                        || ld->relayed
+                        || message->getSourceNode()==nodeId ) return;
 
         // update usage information
@@ -691 +697 @@
                                 // route has a shorter hop count or old link is dead? yes-> replace
                                 if (route.hops > message->getNumHops()
-                                        || rld == NULL
-                                        || !rld->isDirectVital()) {
+                                                || rld == NULL
+                                                || !rld->isDirectVital()) {
                                         logging_info("Updating relay information to node "
-                                                << route.node.toString()
-                                                << " reducing to " << message->getNumHops() << " hops.");
+                                                        << route.node.toString()
+                                                        << " reducing to " << message->getNumHops() << " hops.");
                                         route.hops = message->getNumHops();
                                         route.link = ld->overlayId;
@@ -710 +716 @@
                 route.used = time(NULL);
                 logging_info("Remembering relay information to node "
-                        << route.node.toString());
+                                << route.node.toString());
                 relay_routes.push_back(route);
         }
@@ -739 +745 @@
 
 BaseOverlay::BaseOverlay() :
-        bc(NULL), overlayInterface(NULL), nodeId(NodeID::UNSPECIFIED),
-        spovnetId(SpoVNetID::UNSPECIFIED), state(BaseOverlayStateInvalid),
-        sideport(&SideportListener::DEFAULT), started(false), counter(0) {
+                        bc(NULL), overlayInterface(NULL), nodeId(NodeID::UNSPECIFIED),
+                        spovnetId(SpoVNetID::UNSPECIFIED), state(BaseOverlayStateInvalid),
+                        sideport(&SideportListener::DEFAULT), started(false), counter(0) {
         dht = new DHT();
         localDHT = new DHT();
@@ -818 +824 @@
                 state = BaseOverlayStateCompleted;
                 BOOST_FOREACH( NodeListener* i, nodeListeners )
-                        i->onJoinCompleted( spovnetId );
+                i->onJoinCompleted( spovnetId );
 
                 //ovl.visChangeNodeIcon ( ovlId, nodeId, OvlVis::ICON_ID_CAMERA );
@@ -853 +859 @@
         BOOST_FOREACH( LinkDescriptor* ld, links ) {
                 if( ld->service != OverlayInterface::OVERLAY_SERVICE_ID )
-                servicelinks.push_back( ld->overlayId );
+                        servicelinks.push_back( ld->overlayId );
         }
 
         // drop all service links
         BOOST_FOREACH( LinkID lnk, servicelinks )
-                dropLink( lnk );
+        dropLink( lnk );
 
         // let the node leave the spovnet overlay interface
@@ -867 +873 @@
         // drop still open bootstrap links
         BOOST_FOREACH( LinkID lnk, bootstrapLinks )
-                bc->dropLink( lnk );
+        bc->dropLink( lnk );
 
         // change to inalid state
         state = BaseOverlayStateInvalid;
         //ovl.visShutdown( ovlId, nodeId, string("") );
+
+        visual.visShutdown(visualIdOverlay, nodeId, "");
+        visual.visShutdown(visualIdBase, nodeId, "");
 
         // inform all registered services of the event
@@ -898 +907 @@
 
                 BOOST_FOREACH( NodeListener* i, nodeListeners )
-                        i->onJoinFailed( spovnetId );
+                i->onJoinFailed( spovnetId );
 
                 return;
         }
+
+        visual.configure("127.0.0.1", 50005);
+        //visual.configure("141.3.161.8", 50005);
+        visual.visCreate(visualIdBase, nodeId, "", "");
+        visual.visCreate(visualIdOverlay, nodeId, "", "");
 }
 
@@ -907 +921 @@
 
 const LinkID BaseOverlay::establishLink( const EndpointDescriptor& remoteEp,
-        const NodeID& remoteId, const ServiceID& service ) {
+                const NodeID& remoteId, const ServiceID& service ) {
 
         // establish link via overlay
@@ -914 +928 @@
         else
 
-        // establish link directly if only ep is known
-        if (remoteId.isUnspecified())
-                return establishDirectLink(remoteEp, service );
+                // establish link directly if only ep is known
+                if (remoteId.isUnspecified())
+                        return establishDirectLink(remoteEp, service );
 
 }
@@ -922 +936 @@
 /// call base communication's establish link and add link mapping
 const LinkID BaseOverlay::establishDirectLink( const EndpointDescriptor& ep,
-        const ServiceID& service ) {
+                const ServiceID& service ) {
 
         /// find a service listener
@@ -941 +955 @@
         /// establish link and add mapping
         logging_info("Establishing direct link " << ld->communicationId.toString()
-                << " using " << ep.toString());
+                        << " using " << ep.toString());
 
         return ld->communicationId;
@@ -948 +962 @@
 /// establishes a link between two arbitrary nodes
 const LinkID BaseOverlay::establishLink( const NodeID& remote,
-        const ServiceID& service ) {
+                const ServiceID& service ) {
 
         // do not establish a link to myself!
@@ -967 +981 @@
         // debug message
         logging_info(
-                "Sending link request with"
-                << " link=" << ld->overlayId.toString()
-                << " node=" << ld->remoteNode.toString()
-                << " serv=" << ld->service.toString()
+                        "Sending link request with"
+                        << " link=" << ld->overlayId.toString()
+                        << " node=" << ld->remoteNode.toString()
+                        << " serv=" << ld->service.toString()
         );
 
@@ -1023 +1037 @@
         if( ld == NULL ) {
                 logging_error("Could not send message. "
-                        << "Link not found id=" << link.toString());
+                                << "Link not found id=" << link.toString());
                 return -1;
         }
@@ -1050 +1064 @@
 
 seqnum_t BaseOverlay::sendMessage(const Message* message,
-        const NodeID& node, const ServiceID& service) {
+                const NodeID& node, const ServiceID& service) {
 
         // find link for node and service
@@ -1060 +1074 @@
                 // debug output
                 logging_info( "No link to send message to node "
-                        << node.toString() << " found for service "
-                        << service.toString() << ". Creating auto link ..."
+                                << node.toString() << " found for service "
+                                << service.toString() << ". Creating auto link ..."
                 );
 
@@ -1183 +1197 @@
         // already bound? yes-> warning
         NodeListenerVector::iterator i =
-                find( nodeListeners.begin(), nodeListeners.end(), listener );
+                        find( nodeListeners.begin(), nodeListeners.end(), listener );
         if( i != nodeListeners.end() ) {
                 logging_warn("Node listener " << listener << " is already bound!" );
@@ -1212 +1226 @@
 
 void BaseOverlay::onLinkUp(const LinkID& id,
-        const address_v* local, const address_v* remote) {
+                const address_v* local, const address_v* remote) {
         logging_debug( "Link up with base communication link id=" << id );
 
@@ -1221 +1235 @@
         if( std::find(bootstrapLinks.begin(), bootstrapLinks.end(), id) != bootstrapLinks.end() ){
                 logging_info(
-                        "Join has been initiated by me and the link is now up. " <<
-                        "Sending out join request for SpoVNet " << spovnetId.toString()
+                                "Join has been initiated by me and the link is now up. " <<
+                                "Sending out join request for SpoVNet " << spovnetId.toString()
                 );
 
                 // send join request message
                 OverlayMsg overlayMsg( OverlayMsg::typeJoinRequest,
-                        OverlayInterface::OVERLAY_SERVICE_ID, nodeId );
+                                OverlayInterface::OVERLAY_SERVICE_ID, nodeId );
                 JoinRequest joinRequest( spovnetId, nodeId );
                 overlayMsg.encapsulate( &joinRequest );
@@ -1249 +1263 @@
                 // -> wait for update message!
 
-        // link mapping found? -> send update message with node-id and service id
+                // link mapping found? -> send update message with node-id and service id
         } else {
                 logging_info( "onLinkUp descriptor (initiated locally):" << ld );
@@ -1271 +1285 @@
                         // note: necessary to validate the link on the remote side!
                         logging_info( "Sending out update" <<
-                                " for service " << ld->service.toString() <<
-                                " with local node id " << nodeId.toString() <<
-                                " on link " << ld->overlayId.toString() );
+                                        " for service " << ld->service.toString() <<
+                                        " with local node id " << nodeId.toString() <<
+                                        " on link " << ld->overlayId.toString() );
 
                         // compile and send update message
@@ -1285 +1299 @@
 
 void BaseOverlay::onLinkDown(const LinkID& id,
-        const address_v* local, const address_v* remote) {
+                const address_v* local, const address_v* remote) {
 
         // erase bootstrap links
@@ -1318 +1332 @@
 
 void BaseOverlay::onLinkChanged(const LinkID& id,
-        const address_v* oldlocal, const address_v* newlocal,
-        const address_v* oldremote, const address_v* newremote) {
+                const address_v* oldlocal, const address_v* newlocal,
+                const address_v* oldremote, const address_v* newremote) {
 
         // get descriptor for link
@@ -1335 +1349 @@
 
 void BaseOverlay::onLinkFail(const LinkID& id,
-        const address_v* local, const address_v* remote) {
+                const address_v* local, const address_v* remote) {
         logging_debug( "Link fail with base communication link id=" << id );
 
@@ -1353 +1367 @@
 
 void BaseOverlay::onLinkQoSChanged(const LinkID& id, const address_v* local,
-        const address_v* remote, const QoSParameterSet& qos) {
+                const address_v* remote, const QoSParameterSet& qos) {
         logging_debug( "Link quality changed with base communication link id=" << id );
 
@@ -1363 +1377 @@
 
 bool BaseOverlay::onLinkRequest( const LinkID& id, const address_v* local,
-        const address_v* remote ) {
+                const address_v* remote ) {
         logging_debug("Accepting link request from " << remote->to_string() );
         return true;
@@ -1389 +1403 @@
         if( joinReq->getSpoVNetID() != spovnetId ) {
                 logging_error(
-                        "Received join request for spovnet we don't handle " <<
-                        joinReq->getSpoVNetID().toString() );
+                                "Received join request for spovnet we don't handle " <<
+                                joinReq->getSpoVNetID().toString() );
                 return false;
         }
@@ -1405 +1419 @@
         assert( overlayInterface != NULL );
         logging_debug( "Using bootstrap end-point "
-                << getEndpointDescriptor().toString() )
+                        << getEndpointDescriptor().toString() )
         OverlayParameterSet parameters = overlayInterface->getParameters();
         OverlayMsg retmsg( OverlayMsg::typeJoinReply,
-                OverlayInterface::OVERLAY_SERVICE_ID, nodeId );
+                        OverlayInterface::OVERLAY_SERVICE_ID, nodeId );
         JoinReply replyMsg( spovnetId, parameters,
                         allow, getEndpointDescriptor() );
@@ -1448 +1462 @@
                 // inform all registered services of the event
                 BOOST_FOREACH( NodeListener* i, nodeListeners )
-                        i->onJoinFailed( spovnetId );
+                i->onJoinFailed( spovnetId );
 
                 delete replyMsg;
@@ -1459 +1473 @@
 
         logging_debug( "Using bootstrap end-point "
-                << replyMsg->getBootstrapEndpoint().toString() );
+                        << replyMsg->getBootstrapEndpoint().toString() );
 
         // create overlay structure from spovnet parameter set
@@ -1468 +1482 @@
 
                 overlayInterface = OverlayFactory::create(
-                        *this, replyMsg->getParam(), nodeId, this );
+                                *this, replyMsg->getParam(), nodeId, this );
 
                 // overlay structure supported? no-> fail!
@@ -1503 +1517 @@
                 // inform all registered services of the event
                 BOOST_FOREACH( NodeListener* i, nodeListeners )
-                        i->onJoinCompleted( spovnetId );
+                i->onJoinCompleted( spovnetId );
 
                 delete replyMsg;
@@ -1526 +1540 @@
         const ServiceID& service = overlayMsg->getService();
         logging_debug( "Received data for service " << service.toString()
-                << " on link " << overlayMsg->getDestinationLink().toString() );
+                        << " on link " << overlayMsg->getDestinationLink().toString() );
 
         // delegate data message
         getListener(service)->onMessage(
-                overlayMsg,
-                overlayMsg->getSourceNode(),
-                overlayMsg->getDestinationLink()
+                        overlayMsg,
+                        overlayMsg->getSourceNode(),
+                        overlayMsg->getDestinationLink()
         );
 
@@ -1550 +1564 @@
         // update our link mapping information for this link
         bool changed =
-                ( ld->remoteNode != overlayMsg->getSourceNode() )
-                || ( ld->service != overlayMsg->getService() );
+                        ( ld->remoteNode != overlayMsg->getSourceNode() )
+                        || ( ld->service != overlayMsg->getService() );
 
         // set parameters
@@ -1591 +1605 @@
 
                 logging_debug("Link id=" << ld->overlayId.toString() <<
-                        " has been denied by service " << ld->service.toString() << ", dropping link");
+                                " has been denied by service " << ld->service.toString() << ", dropping link");
 
                 // prevent onLinkDown calls to the service
@@ -1668 +1682 @@
         if (ldn == NULL) {
                 logging_error( "No link request pending for "
-                        << overlayMsg->getDestinationLink().toString() );
+                                << overlayMsg->getDestinationLink().toString() );
                 return false;
         }
@@ -1681 +1695 @@
         // debug message
         logging_debug( "Link request reply received. Establishing link"
-                << " for service " << overlayMsg->getService().toString()
-                << " with local id=" << overlayMsg->getDestinationLink()
-                << " and remote link id=" << overlayMsg->getSourceLink()
-                << " to " << overlayMsg->getSourceEndpoint().toString()
+                        << " for service " << overlayMsg->getService().toString()
+                        << " with local id=" << overlayMsg->getDestinationLink()
+                        << " and remote link id=" << overlayMsg->getSourceLink()
+                        << " to " << overlayMsg->getSourceEndpoint().toString()
         );
 
@@ -1702 +1716 @@
         if( ldn->messageQueue.size() > 0 ) {
                 logging_info( "Sending out queued messages on link " <<
-                        ldn->overlayId.toString() );
+                                ldn->overlayId.toString() );
                 BOOST_FOREACH( Message* msg, ldn->messageQueue ) {
                         sendMessage( msg, ldn->overlayId );
@@ -1715 +1729 @@
         // try to replace relay link with direct link
         ldn->communicationId =
-                bc->establishLink( overlayMsg->getSourceEndpoint() );
+                        bc->establishLink( overlayMsg->getSourceEndpoint() );
 
         return true;
@@ -1725 +1739 @@
         if ( rld != NULL ) {
                 logging_debug("Keep-Alive for " <<
-                        overlayMsg->getDestinationLink() );
+                                overlayMsg->getDestinationLink() );
                 if (overlayMsg->isRouteRecord())
                         rld->routeRecord = overlayMsg->getRouteRecord();
@@ -1765 +1779 @@
 /// handles an incoming message
 bool BaseOverlay::handleMessage( const Message* message, LinkDescriptor* ld,
-        const LinkID bcLink ) {
+                const LinkID bcLink ) {
         logging_debug( "Handling message: " << message->toString());
 
         // decapsulate overlay message
         OverlayMsg* overlayMsg =
-                const_cast<Message*>(message)->decapsulate<OverlayMsg>();
+                        const_cast<Message*>(message)->decapsulate<OverlayMsg>();
         if( overlayMsg == NULL ) return false;
 
@@ -1788 +1802 @@
         // handle signaling messages (do not route!)
         if (overlayMsg->getType()>=OverlayMsg::typeSignalingStart &&
-                overlayMsg->getType()<=OverlayMsg::typeSignalingEnd ) {
+                        overlayMsg->getType()<=OverlayMsg::typeSignalingEnd ) {
                 overlayInterface->onMessage(overlayMsg, NodeID::UNSPECIFIED, LinkID::UNSPECIFIED);
                 delete overlayMsg;
@@ -1796 +1810 @@
         // message for reached destination? no-> route message
         if (!overlayMsg->getDestinationNode().isUnspecified() &&
-                 overlayMsg->getDestinationNode() != nodeId ) {
+                        overlayMsg->getDestinationNode() != nodeId ) {
                 logging_debug("Routing message "
-                        << " from " << overlayMsg->getSourceNode()
-                        << " to " << overlayMsg->getDestinationNode()
+                                << " from " << overlayMsg->getSourceNode()
+                                << " to " << overlayMsg->getDestinationNode()
                 );
                 route( overlayMsg );
@@ -1818 +1832 @@
         switch ( overlayMsg->getType() ) {
 
-                // data transport messages
-                case OverlayMsg::typeData:
-                        ret = handleData(overlayMsg, ld);                       break;
+        // data transport messages
+        case OverlayMsg::typeData:
+                ret = handleData(overlayMsg, ld);                       break;
 
                 // overlay setup messages
-                case OverlayMsg::typeJoinRequest:
-                        ret = handleJoinRequest(overlayMsg, bcLink );   break;
-                case OverlayMsg::typeJoinReply:
-                        ret = handleJoinReply(overlayMsg, bcLink );     break;
+        case OverlayMsg::typeJoinRequest:
+                ret = handleJoinRequest(overlayMsg, bcLink );   break;
+        case OverlayMsg::typeJoinReply:
+                ret = handleJoinReply(overlayMsg, bcLink );     break;
 
                 // link specific messages
-                case OverlayMsg::typeLinkRequest:
-                        ret = handleLinkRequest(overlayMsg, ld );       break;
-                case OverlayMsg::typeLinkReply:
-                        ret = handleLinkReply(overlayMsg, ld );         break;
-                case OverlayMsg::typeLinkUpdate:
-                        ret = handleLinkUpdate(overlayMsg, ld );        break;
-                case OverlayMsg::typeLinkAlive:
-                        ret = handleLinkAlive(overlayMsg, ld );         break;
-                case OverlayMsg::typeLinkDirect:
-                        ret = handleLinkDirect(overlayMsg, ld );        break;
+        case OverlayMsg::typeLinkRequest:
+                ret = handleLinkRequest(overlayMsg, ld );       break;
+        case OverlayMsg::typeLinkReply:
+                ret = handleLinkReply(overlayMsg, ld );         break;
+        case OverlayMsg::typeLinkUpdate:
+                ret = handleLinkUpdate(overlayMsg, ld );        break;
+        case OverlayMsg::typeLinkAlive:
+                ret = handleLinkAlive(overlayMsg, ld );         break;
+        case OverlayMsg::typeLinkDirect:
+                ret = handleLinkDirect(overlayMsg, ld );        break;
 
                 // handle unknown message type
-                default: {
-                        logging_error( "received message in invalid state! don't know " <<
+        default: {
+                logging_error( "received message in invalid state! don't know " <<
                                 "what to do with this message of type " << overlayMsg->getType() );
-                        ret = false;
-                        break;
-                }
+                ret = false;
+                break;
+        }
         }
 
@@ -1910 +1924 @@
         stabilizeLinks();
         stabilizeDHT();
-}
-
+        updateVisual();
+}
+
+void BaseOverlay::updateVisual(){
+
+        //
+        // update base overlay structure
+        //
+
+        static NodeID pre = NodeID::UNSPECIFIED;
+        static NodeID suc = NodeID::UNSPECIFIED;
+
+        vector<NodeID> nodes = this->getOverlayNeighbors(false);
+
+        if(nodes.size() == 0){
+
+                if(pre != NodeID::UNSPECIFIED){
+                        visual.visDisconnect(visualIdOverlay, this->nodeId, pre, "");
+                        pre = NodeID::UNSPECIFIED;
+                }
+                if(suc != NodeID::UNSPECIFIED){
+                        visual.visDisconnect(visualIdOverlay, this->nodeId, suc, "");
+                        suc = NodeID::UNSPECIFIED;
+                }
+
+        } // if(nodes.size() == 0)
+
+        if(nodes.size() == 1){
+                // only one node, make this pre and succ
+                // and then go into the node.size()==2 case
+                //nodes.push_back(nodes.at(0));
+
+                if(pre != nodes.at(0)){
+                        pre = nodes.at(0);
+                        if(pre != NodeID::UNSPECIFIED)
+                                visual.visConnect(visualIdOverlay, this->nodeId, pre, "");
+                }
+        }
+
+        if(nodes.size() == 2){
+
+                // old finger
+                if(nodes.at(0) != pre){
+                        if(pre != NodeID::UNSPECIFIED)
+                                visual.visDisconnect(visualIdOverlay, this->nodeId, pre, "");
+                        pre = NodeID::UNSPECIFIED;
+                }
+                if(nodes.at(1) != suc){
+                        if(suc != NodeID::UNSPECIFIED)
+                                visual.visDisconnect(visualIdOverlay, this->nodeId, suc, "");
+                        suc = NodeID::UNSPECIFIED;
+                }
+
+                // connect with fingers
+                if(pre == NodeID::UNSPECIFIED){
+                        pre = nodes.at(0);
+                        if(pre != NodeID::UNSPECIFIED)
+                                visual.visConnect(visualIdOverlay, this->nodeId, pre, "");
+                }
+                if(suc == NodeID::UNSPECIFIED){
+                        suc = nodes.at(1);
+                        if(suc != NodeID::UNSPECIFIED)
+                                visual.visConnect(visualIdOverlay, this->nodeId, suc, "");
+                }
+
+        } //if(nodes.size() == 2)
+
+//      {
+//              logging_error("================================");
+//              logging_error("my nodeid " << nodeId.get(MAX_KEYLENGTH-16, 16));
+//              logging_error("================================");
+//              if(nodes.size()>= 1){
+//                      logging_error("real pre " << nodes.at(0).toString());
+//                      logging_error("real pre " << nodes.at(0).get(MAX_KEYLENGTH-16, 16));
+//              }
+//              if(nodes.size()>= 2){
+//                      logging_error("real suc " << nodes.at(1).toString());
+//                      logging_error("real suc " << nodes.at(1).get(MAX_KEYLENGTH-16, 16));
+//              }
+//              logging_error("================================");
+//              if(pre == NodeID::UNSPECIFIED){
+//                      logging_error("pre: unspecified");
+//              }else{
+//                      unsigned int prei = pre.get(MAX_KEYLENGTH-16, 16);
+//                      logging_error("pre: " << prei);
+//              }
+//              if(suc == NodeID::UNSPECIFIED){
+//                      logging_error("suc: unspecified");
+//              }else{
+//                      unsigned int suci = suc.get(MAX_KEYLENGTH-16, 16);
+//                      logging_error("suc: " << suci);
+//              }
+//              logging_error("================================");
+//      }
+
+        //
+        // update base communication links
+        //
+
+        static set<NodeID> linkset;
+        set<NodeID> remotenodes;
+        BOOST_FOREACH( LinkDescriptor* ld, links ) {
+                if (!ld->isVital() || ld->service != OverlayInterface::OVERLAY_SERVICE_ID)
+                        continue;
+
+                if (ld->routeRecord.size()>1 && ld->relayed) {
+                        for (size_t i=1; i<ld->routeRecord.size(); i++)
+                                remotenodes.insert( ld->routeRecord[ld->routeRecord.size()-i-1] );
+                } else {
+                        remotenodes.insert(ld->remoteNode);
+                }
+        }
+
+        // which links are old and need deletion?
+        BOOST_FOREACH(NodeID n, linkset){
+                if(remotenodes.find(n) == remotenodes.end()){
+                        visual.visDisconnect(visualIdBase, this->nodeId, n, "");
+                        linkset.erase(n);
+                }
+        }
+
+        // which links are new and need creation?
+        BOOST_FOREACH(NodeID n, remotenodes){
+                if(linkset.find(n) == linkset.end()){
+                        visual.visConnect(visualIdBase, this->nodeId, n, "");
+                        linkset.insert(n);
+                }
+        }
+
+}
 
 // ----------------------------------------------------------------------------
@@ -1954 +2096 @@
         if (!overlayInterface->isClosestNodeTo(msg->getDestinationNode())) {
                 logging_debug("Routing DHT message to closest node "
-                        << " from " << msg->getSourceNode()
-                        << " to " << msg->getDestinationNode()
+                                << " from " << msg->getSourceNode()
+                                << " to " << msg->getDestinationNode()
                 );
                 route( msg );
@@ -1966 +2108 @@
         case OverlayMsg::typeDHTPut: {
                 BOOST_FOREACH( Data value, dhtMsg->getValues() )
-                        dht->put(dhtMsg->getKey(), value, dhtMsg->getTTL() );
+                                        dht->put(dhtMsg->getKey(), value, dhtMsg->getTTL() );
                 break;
         }
@@ -1987 +2129 @@
                 if (dhtMsg->hasValues()) {
                         BOOST_FOREACH( Data value, dhtMsg->getValues() )
-                                        dht->remove(dhtMsg->getKey(), value );
+                                                        dht->remove(dhtMsg->getKey(), value );
                 } else
                         dht->remove( dhtMsg->getKey() );

source/ariba/overlay/BaseOverlay.h

@@ -70 +70 @@
   class CommunicationListener;
   class SideportListener;
-  namespace utility {
-    class OvlVis;
-  }
 }
 
@@ -110 +107 @@
 using ariba::utility::seqnum_t;
 using ariba::utility::Timer;
-using ariba::utility::OvlVis;
-
-//#define ovl OvlVis::instance()
-//#define ovlId OvlVis::NETWORK_ID_BASE_OVERLAY
 
 namespace ariba {
@@ -519 +512 @@
         typedef vector<NodeID> JoiningNodes;
         JoiningNodes joiningNodes;
+
+        void updateVisual();
 };
 

source/ariba/utility/visual/OvlVis.cpp

@@ -42 +42 @@
 namespace utility {
 
-//*****************************************************
-//*****************************************************
-//*****************************************************
-
 use_logging_cpp(OvlVis);
 
-OvlVis::OvlVis() : socket(io_service), socketOpened(false) {
-
-        if( ! Configuration::haveConfig() ) return;
-        if( ! Configuration::instance().exists("DEMO_OvlVisIP") )   return;
-        if( ! Configuration::instance().exists("DEMO_OvlVisPort") ) return;
-
-        string serverIP = Configuration::instance().read<string>("DEMO_OvlVisIP");
-        string serverPort = Configuration::instance().read<string>("DEMO_OvlVisPort");
-        if( serverIP.length() == 0 || serverPort.length() == 0) return;
-
-        logging_debug( "connecting to ovlvis " + serverIP + " on " + serverPort );
-
-        tcp::resolver resolver(io_service);
-        tcp::resolver::query query(
-                serverIP,
-                serverPort,
-                tcp::resolver::query::passive |
-                tcp::resolver::query::address_configured |
-                tcp::resolver::query::numeric_service);
-
-        tcp::resolver::iterator endpoint_iterator = resolver.resolve(query);
-        tcp::resolver::iterator end;
-
-        boost::system::error_code error = boost::asio::error::host_not_found;
-        while (error && endpoint_iterator != end){
-                socket.close();
-                socket.connect(*endpoint_iterator++, error);
-        }
-
-        if (error){
-                logging_warn( "OvlVis could not connect to GUI" );
-        } else {
-                socketOpened = true;
-        }
+OvlVis::OvlVis() {
 }
 
 OvlVis::~OvlVis(){
-
-        socket.close();
-
 }
 
@@ -115 +75 @@
 //      }
 
-}
-
-void OvlVis::sendSocket(const string msg){
-        if( socket.is_open() && socketOpened )
-                socket.send( boost::asio::buffer(msg) );
 }
 
@@ -665 +620 @@
 }
 
-//*****************************************************
-//*****************************************************
-//*****************************************************
-
 }} // namespace ariba, common

source/ariba/utility/visual/OvlVis.h

@@ -45 +45 @@
 #include <map>
 #include <boost/utility.hpp>
-#include <boost/asio.hpp>
-#include "ariba/utility/types/NodeID.h"
-#include "ariba/utility/logging/Logging.h"
 #include "ariba/utility/system/Timer.h"
 #include "ariba/utility/misc/Helper.h"
 #include "ariba/utility/misc/KeyMapping.hpp"
-#include "ariba/utility/configuration/Configuration.h"
+#include "ariba/utility/visual/ServerVis.h"
 
 using std::string;
@@ -59 +56 @@
 using std::cout;
 using std::ostringstream;
-using boost::asio::ip::tcp;
-using ariba::utility::NodeID;
-using ariba::utility::Configuration;
 using ariba::utility::KeyMapping;
 using ariba::utility::Timer;
@@ -68 +62 @@
 namespace utility {
 
-class OvlVis : private boost::noncopyable {
+class OvlVis : public ServerVis, private boost::noncopyable {
         use_logging_h(OvlVis);
 public:
         static OvlVis& instance() { static OvlVis the_inst; return the_inst; }
 
-        typedef enum _NETWORK_ID {
-                NETWORK_ID_BASE_COMMUNICATION   = 1,
-                                NETWORK_ID_BASE_OVERLAY = 2,
-                                NETWORK_ID_EONSON               = 3,
-                                NETWORK_ID_MCPO                 = 4,
-                                NETWORK_ID_CLIO                 = 5,
-                                NETWORK_ID_VIDEOSTREAM  = 6,
-                                NETWORK_ID_GAME                 = 7,
-                                NETWORK_ID_SECURITY     = 8,
-        } NETWORK_ID;
-
         //****************************************************************
         // Node creation, node connections, status, node deletion, ...
@@ -162 +145 @@
                         unsigned char b
         );
-
-        typedef enum _NODE_COLORS {
-                NODE_COLORS_GREY,
-                NODE_COLORS_GREEN,
-                NODE_COLORS_RED,
-        } NODE_COLORS;
 
         /**
@@ -385 +362 @@
 protected:
         OvlVis();
-        ~OvlVis();
+        virtual ~OvlVis();
 
 private:
         void sendMessage( const string msg, NETWORK_ID nid );
-        void sendSocket( const string msg );
-
-        /**
-         * boost asio stuff for connecting to ovlvis
-         */
-        boost::asio::io_service io_service;
-        tcp::socket socket;
-        volatile bool socketOpened;
 
         typedef pair<NodeID, NodeID> NodePair;