Changeset 3374

Timestamp:

May 7, 2009, 4:51:31 PM (16 years ago)

Author:

Christoph Mayer

Message:

-Integration of Branch 20090424-mayer-sideport

Location:

source/ariba

Files:

• AribaModule.cpp (modified) (3 diffs)
• AribaModule.h (modified) (5 diffs)
• CommunicationListener.cpp (modified) (2 diffs)
• CommunicationListener.h (modified) (2 diffs)
• Makefile.am (modified) (2 diffs)
• Node.cpp (modified) (1 diff)
• Node.h (modified) (1 diff)
• SideportListener.cpp (added)
• SideportListener.h (added)
• ariba.h (modified) (1 diff)
• overlay/BaseOverlay.cpp (modified) (13 diffs)
• overlay/BaseOverlay.h (modified) (5 diffs)

source/ariba/AribaModule.cpp

@@ -44 +44 @@
 
 // ariba includes
+#include "ariba/SideportListener.h"
 #include "ariba/utility/misc/Helper.h"
 #include "ariba/utility/misc/StringFormat.h"
@@ -56 +57 @@
 namespace ariba {
 
-AribaModule::AribaModule() {
+AribaModule::AribaModule()
+        : base_comm(NULL), sideport_sniffer(NULL),
+                ip_addr(NULL), started(false) {
 
         // init with default values
-        this->base_comm = NULL;
-        this->ip_addr = NULL;
+
         this->tcp_port = 41402;
         this->udp_port = 41402;
-        this->started = false;
 }
 
@@ -145 +146 @@
 }
 
+void AribaModule::registerSideportListener(SideportListener* sideport){
+        sideport_sniffer = sideport;
+}
+
 // @see Module.h
 void AribaModule::initialize() {

source/ariba/AribaModule.h

@@ -44 +44 @@
 #include <boost/foreach.hpp>
 
-// usings
 using std::vector;
 using std::string;
@@ -50 +49 @@
 // forward declaration
 namespace ariba {
-class AribaModule;
+        class AribaModule;
+        class SideportListener;
 }
 
@@ -59 +59 @@
 namespace ariba {
 
-// forward declarations of old interface
 namespace communication {
 class EndpointDescriptor;
@@ -119 +118 @@
         void addBootstrapHints(string bootinfo);
 
+        /**
+         * Register a sideport for sniffing on communication events
+         * and get advanced information. The sniffer is attached to
+         * every node that is created on the module. Only one such
+         * sniffer can be active system-wide, a new call to this
+         * register function will only attach the sniffer to nodes
+         * created after the registration call.
+         *
+         * @param sideport The SideportListener to integrate
+         */
+        void registerSideportListener(SideportListener* sideport);
+
         // --- module implementation ---
 
@@ -185 +196 @@
 
         communication::BaseCommunication* base_comm;
+        SideportListener* sideport_sniffer;
 
         // TODO: use "abstract" representations here!

source/ariba/CommunicationListener.cpp

@@ -41 +41 @@
 namespace ariba {
 
+CommunicationListener CommunicationListener::DEFAULT;
+
 CommunicationListener::CommunicationListener() {
 }
@@ -68 +70 @@
 }
 
+bool CommunicationListener::onEnableSideportListener() {
+        return true;
+}
+
 // --- extended message functionality ---
 //void CommunicationListener::onLinkQoSChanged(const LinkID& l, const NodeID& r,

source/ariba/CommunicationListener.h

@@ -56 +56 @@
  */
 class CommunicationListener {
+
         friend class ariba::overlay::BaseOverlay;
+        friend class Node;
+
+        static CommunicationListener DEFAULT;
+
 protected:
+
         CommunicationListener();
         virtual ~CommunicationListener();
@@ -78 +84 @@
                         const LinkID& lnk = LinkID::UNSPECIFIED);
 
+        // --- sniffing related method ---
+        virtual bool onEnableSideportListener();
+
         // --- extended message functionality ---
         // virtual void onLinkQoSChanged(const LinkID& lnk, const NodeID& remote,

source/ariba/Makefile.am

@@ -73 +73 @@
   Node.cpp \
   NodeListener.cpp \
+  SideportListener.cpp \
   SpoVNetProperties.cpp
 
@@ -87 +88 @@
   Node.h \
   NodeListener.h \
+  SideportListener.h \
   SpoVNetProperties.h
 

source/ariba/Node.cpp

@@ -146 +146 @@
 
 bool Node::bind(CommunicationListener* listener, const ServiceID& sid) {
-        return base_overlay->bind(listener, sid);
+        // bind the listener
+        bool ret = base_overlay->bind(listener, sid);
+
+        // 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);
+        }
+
+        return ret;
 }
 

source/ariba/Node.h

@@ -57 +57 @@
 #include "CommunicationListener.h"
 #include "DataMessage.h"
+#include "SideportListener.h"
 
 using std::vector;

source/ariba/ariba.h

@@ -54 +54 @@
 #include "Node.h"
 #include "NodeListener.h"
+#include "SideportListener.h"
 #include "SpoVNetProperties.h"
 

source/ariba/overlay/BaseOverlay.cpp

@@ -42 +42 @@
 #include "ariba/NodeListener.h"
 #include "ariba/CommunicationListener.h"
+#include "ariba/SideportListener.h"
 
 namespace ariba {
@@ -49 +50 @@
 
 BaseOverlay::BaseOverlay()
-        : bc(NULL), overlayInterface(NULL),
-                nodeId(NodeID::UNSPECIFIED), spovnetId(SpoVNetID::UNSPECIFIED),
-                initiatorLink(LinkID::UNSPECIFIED), state(BaseOverlayStateInvalid){
+        : bc(NULL), overlayInterface(NULL), nodeId(NodeID::UNSPECIFIED),
+                spovnetId(SpoVNetID::UNSPECIFIED), initiatorLink(LinkID::UNSPECIFIED),
+                state(BaseOverlayStateInvalid), sideport(&SideportListener::DEFAULT){
 }
 
@@ -230 +231 @@
 
         CommunicationListener* receiver = communicationListeners.get( service );
+        assert( receiver != NULL );
+
         LinkItem item (link, NodeID::UNSPECIFIED, service, receiver);
         linkMapping.insert( make_pair(link, item) );
@@ -251 +254 @@
         bc->dropLink( link );
 
-        if( item.interface != NULL )
-                item.interface->onLinkDown( link, item.node );
+        item.interface->onLinkDown( link, item.node );
+        sideport->onLinkDown(link, this->nodeId, item.node, this->spovnetId );
 }
 
@@ -352 +355 @@
         communicationListeners.registerItem( listener, sid );
         return true;
+}
+
+bool BaseOverlay::registerSidePort(SideportListener* _sideport){
+        sideport = _sideport;
+        _sideport->configure( this );
+}
+
+bool BaseOverlay::unregisterSidePort(SideportListener* _sideport){
+        sideport = &SideportListener::DEFAULT;
 }
 
@@ -442 +454 @@
         if( i == linkMapping.end() ){
 
-                LinkItem item (id, NodeID::UNSPECIFIED, ServiceID::UNSPECIFIED, NULL );
+                LinkItem item (id, NodeID::UNSPECIFIED, ServiceID::UNSPECIFIED, &CommunicationListener::DEFAULT );
                 linkMapping.insert( make_pair(id, item) );
 
@@ -487 +499 @@
         }
 
-        if( i->second.interface != NULL )
-                i->second.interface->onLinkDown( id, i->second.node );
+        i->second.interface->onLinkDown( id, i->second.node );
+        sideport->onLinkDown( id, this->nodeId, i->second.node, this->spovnetId );
 
         linkMapping.erase( i );
@@ -504 +516 @@
         if( i == linkMapping.end() ) return;
 
-        if( i->second.interface != NULL ){
-                i->second.interface->onLinkChanged( id, i->second.node );
-                // call onLinkQoSChanged?
-        }
+        i->second.interface->onLinkChanged( id, i->second.node );
+        sideport->onLinkChanged( id, this->nodeId, i->second.node, this->spovnetId );
+
+        // TODO call onLinkQoSChanged?
 
         i->second.markused();
@@ -523 +535 @@
         if( i == linkMapping.end() ) return;
 
-        if( i->second.interface != NULL )
-                i->second.interface->onLinkFail( id, i->second.node );
+        i->second.interface->onLinkFail( id, i->second.node );
+        sideport->onLinkFail( id, this->nodeId, i->second.node, this->spovnetId );
 
         i->second.markused();
@@ -541 +553 @@
 
         // TODO: convert QoSParameterSet to the LinkProperties properties
-        if( i->second.interface != NULL ){
-                // TODO: currently not in the interface: i->second.interface->onLinkQoSChanged( id, i->second.node, LinkProperties::DEFAULT );
-        }
+        // TODO: currently not in the interface: i->second.interface->onLinkQoSChanged( id, i->second.node, LinkProperties::DEFAULT );
 
         i->second.markused();
@@ -799 +809 @@
 
                 CommunicationListener* iface = communicationListeners.get( service );
-                if( iface == NULL ){
+                if( iface == NULL || iface == &CommunicationListener::DEFAULT ){
                         logging_warn( "linkup event for service that has been registered with a NULL interface" );
                         return true;
@@ -812 +822 @@
 
                 if( iface->onLinkRequest(sourcenode) ){
+
+                        // call the notification functions
                         iface->onLinkUp( link, sourcenode );
+                        sideport->onLinkUp( link, nodeId, sourcenode, this->spovnetId );
+
                 } else {
                         // prevent onLinkDown calls to the service
-                        i->second.interface = NULL;
+                        i->second.interface = &CommunicationListener::DEFAULT;
                         // drop the link
                         dropLink( link );
@@ -950 +964 @@
 }
 
+vector<LinkID> BaseOverlay::getLinkIDs( const NodeID& nid ) const {
+
+        vector<LinkID> linkvector;
+
+        BOOST_FOREACH( LinkPair item, linkMapping ){
+                if( item.second.node == nid || nid == NodeID::UNSPECIFIED ){
+                        linkvector.push_back( item.second.link );
+                }
+        }
+
+        return linkvector;
+}
+
 void BaseOverlay::incomingRouteMessage(Message* msg){
         // gets handled as normal data message

source/ariba/overlay/BaseOverlay.h

@@ -70 +70 @@
         class NodeListener;
         class CommunicationListener;
+        class SideportListener;
         namespace utility {
                 class OvlVis;
@@ -220 +221 @@
 
         /**
+         * TODO
+         */
+        bool registerSidePort(SideportListener* _sideport);
+
+        /**
+         * TODO
+         */
+        bool unregisterSidePort(SideportListener* _sideport);
+
+        /**
          * Returns the own nodeID or the NodeID of the specified link
          *
@@ -226 +237 @@
          */
         const NodeID& getNodeID( const LinkID& lid = LinkID::UNSPECIFIED ) const ;
+
+        /**
+         * Return all Links for the specified remote nodeid, or all links when
+         * the node id given is set to unspecified
+         *
+         * @param nid The node id to request links for, or unspecified for all links
+         * @return a vector that contains all the link ids requested
+         */
+        vector<LinkID> getLinkIDs( const NodeID& nid = NodeID::UNSPECIFIED ) const;
 
         /**
@@ -342 +362 @@
 
         /**
+         * TODO
+         */
+        SideportListener* sideport;
+
+        /**
          * The abstract overlay interface that implements
          * the overlay specific functionality.
@@ -387 +412 @@
                 static const LinkItem UNSPECIFIED;
 
+                LinkItem()
+                        : link(LinkID::UNSPECIFIED), node(NodeID::UNSPECIFIED),
+                                service(ServiceID::UNSPECIFIED), interface(&CommunicationListener::DEFAULT),
+                                autolink(false), lastuse(0){
+                }
+
                 LinkItem( const LinkID& _link, const NodeID& _node,
                                 const ServiceID& _service, CommunicationListener* _interface )
                         : link( _link ), node( _node ), service( _service ), interface( _interface ),
                                 autolink( false ), lastuse( time(NULL) ) {
+
+                        assert( _interface != NULL );
                 }