Changeset 3071 for source

Timestamp:

Apr 24, 2009, 4:34:53 PM (16 years ago)

Author:

Christoph Mayer

Message:

-some further fixed in the protocols and cleaning the interfaces for stuff we have no functionality yet

Location:

source/ariba

Files:

• CommunicationListener.cpp (modified) (2 diffs)
• CommunicationListener.h (modified) (2 diffs)
• Node.cpp (modified) (1 diff)
• Node.h (modified) (1 diff)
• overlay/BaseOverlay.cpp (modified) (6 diffs)
• overlay/BaseOverlay.h (modified) (1 diff)
• utility/system/StartupWrapper.cpp (modified) (1 diff)

source/ariba/CommunicationListener.cpp

@@ -59 +59 @@
 }
 
-void CommunicationListener::onLinkQoSChanged(const LinkID& l, const NodeID& r,
-                const LinkProperties& p) {
-}
-
 bool CommunicationListener::onLinkRequest(const NodeID& remote,
                 const DataMessage& msg) {
@@ -73 +69 @@
 
 // --- 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) {

source/ariba/CommunicationListener.h

@@ -71 +71 @@
         virtual void onLinkFail(const LinkID& lnk, const NodeID& remote);
 
-        virtual void onLinkQoSChanged(const LinkID& lnk, const NodeID& remote,
-                        const LinkProperties& prop);
-
-        virtual bool onLinkRequest(const NodeID& remote, const DataMessage& msg);
+        virtual bool onLinkRequest(const NodeID& remote, const DataMessage& msg = DataMessage::UNSPECIFIED);
 
         // --- general receive method ---
@@ -80 +77 @@
         virtual void onMessage(const DataMessage& msg, const NodeID& remote,
                         const LinkID& lnk = LinkID::UNSPECIFIED);
+
+        // --- extended message functionality ---
+        // virtual void onLinkQoSChanged(const LinkID& lnk, const NodeID& remote,
+        //                      const LinkProperties& prop);
 
         // --- extended message functionality ---

source/ariba/Node.cpp

@@ -57 +57 @@
 }
 
-//TODO: Implement error handling: no bootstrap node available
 void Node::join(const Name& vnetname) {
         spovnetId = vnetname.toSpoVNetId();

source/ariba/Node.h

@@ -58 +58 @@
 #include "DataMessage.h"
 
+using std::vector;
 using ariba::overlay::BaseOverlay;
-using std::vector;
 
 namespace ariba {

source/ariba/overlay/BaseOverlay.cpp

@@ -98 +98 @@
 
         ovl.visShowNodeBubble ( ovlId, nodeId, "joining..." );
-        logging_info( "starting to join spovnet " << id.toString() << "...");
+        logging_info( "starting to join spovnet " << id.toString() <<
+                        " with nodeid " << nodeId.toString());
 
         //
@@ -145 +146 @@
         logging_debug( "leaving overlay" );
         // first, leave the overlay interface
-        overlayInterface->leaveOverlay();
+        if( overlayInterface != NULL )
+                overlayInterface->leaveOverlay();
 
         // --> leave spovnet
@@ -177 +179 @@
         //
 
-        logging_info("creating spovnet " + id.toString());
+        logging_info( "creating spovnet " + id.toString() << " with nodeid " << nodeId.toString() );
 
         spovnetId = id;
@@ -502 +504 @@
         if( i == linkMapping.end() ) return;
 
-        if( i->second.interface != NULL )
+        if( i->second.interface != NULL ){
                 i->second.interface->onLinkChanged( id, i->second.node );
+                // call onLinkQoSChanged?
+        }
 
         i->second.markused();
@@ -537 +541 @@
 
         // TODO: convert QoSParameterSet to the LinkProperties properties
-        if( i->second.interface != NULL )
-                i->second.interface->onLinkQoSChanged( id, i->second.node, LinkProperties::DEFAULT );
+        if( i->second.interface != NULL ){
+                // TODO: currently not in the interface: i->second.interface->onLinkQoSChanged( id, i->second.node, LinkProperties::DEFAULT );
+        }
 
         i->second.markused();
+}
+
+bool BaseOverlay::onLinkRequest( const LinkID& id, const NetworkLocator* local, const NetworkLocator* remote ){
+
+        // also see in the receiveMessage function. there the higher layer service
+        // is asked whether to accept link requests, but there a basic link association is
+        // already built up, so we know the node id
+        logging_debug("received link request from " << remote->toString() << ", accepting");
+        return true;
 }
 
@@ -791 +805 @@
 
                 i->second.interface = iface;
-                iface->onLinkUp( link, sourcenode );
                 i->second.markused();
 
-                return true ;
+                //
+                // ask the service whether it wants to accept this link
+                //
+
+                if( iface->onLinkRequest(sourcenode) ){
+                        iface->onLinkUp( link, sourcenode );
+                } else {
+                        // prevent onLinkDown calls to the service
+                        i->second.interface = NULL;
+                        // drop the link
+                        dropLink( link );
+                }
+
+                return true;
 
         } // else if( overlayMsg->isType(OverlayMsg::OverlayMessageTypeUpdate) )

source/ariba/overlay/BaseOverlay.h

@@ -250 +250 @@
 
         /**
-         * TODO
+         * @see ariba::communication::CommunicationEvents.h
          */
         virtual void onLinkUp( const LinkID& id, const NetworkLocator* local, const NetworkLocator* remote );
 
         /**
-         * TODO
+         * @see ariba::communication::CommunicationEvents.h
          */
         virtual void onLinkDown( const LinkID& id, const NetworkLocator* local, const NetworkLocator* remote );
 
+        /**
+         * @see ariba::communication::CommunicationEvents.h
+         */
         virtual void onLinkChanged( const LinkID& id, const NetworkLocator* oldlocal, const NetworkLocator* newlocal, const NetworkLocator* oldremote, const NetworkLocator* newremote );
 
         /**
-         * TODO
+         * @see ariba::communication::CommunicationEvents.h
          */
         virtual void onLinkFail( const LinkID& id, const NetworkLocator* local, const NetworkLocator* remote );
 
         /**
-         * TODO
+         * @see ariba::communication::CommunicationEvents.h
          */
         virtual void onLinkQoSChanged( const LinkID& id, const NetworkLocator* local, const NetworkLocator* remote, const QoSParameterSet& qos );
+
+        /**
+         * @see ariba::communication::CommunicationEvents.h
+         */
+        virtual bool onLinkRequest( const LinkID& id, const NetworkLocator* local, const NetworkLocator* remote );
 
         //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

source/ariba/utility/system/StartupWrapper.cpp

@@ -103 +103 @@
         {
                 log4cxx::LoggerPtr logger(log4cxx::Logger::getRootLogger());
-                logger->setLevel(log4cxx::Level::getInfo());
+                logger->setLevel(log4cxx::Level::getDebug());
         }