Changeset 5614

Timestamp:

Aug 3, 2009, 11:35:20 AM (15 years ago)

Author:

mies

Message:

added termination of transports when no link is up anymore to an end-point

Location:

source/ariba

Files:

• communication/BaseCommunication.cpp (modified) (4 diffs)
• communication/BaseCommunication.h (modified) (2 diffs)
• utility/system/StartupWrapper.cpp (modified) (1 diff)
• utility/transport/rfcomm/rfcomm.cpp (modified) (1 diff)
• utility/transport/rfcomm/rfcomm.hpp (modified) (1 diff)
• utility/transport/tcpip/tcpip.cpp (modified) (1 diff)
• utility/transport/tcpip/tcpip.hpp (modified) (1 diff)
• utility/transport/transport_peer.cpp (modified) (1 diff)
• utility/transport/transport_peer.hpp (modified) (1 diff)
• utility/transport/transport_protocol.hpp (modified) (1 diff)

source/ariba/communication/BaseCommunication.cpp

@@ -56 +56 @@
 use_logging_cpp(BaseCommunication);
 
+/// adds an endpoint to the list
+void BaseCommunication::add_endpoint( const address_v* endpoint ) {
+        BOOST_FOREACH( endpoint_reference& ref, remote_endpoints ) {
+                if (*ref.endpoint == *endpoint) {
+                        ref.count++;
+                        return;
+                }
+        }
+        endpoint_reference ref;
+        ref.endpoint = endpoint;
+        ref.count = 0;
+        remote_endpoints.push_back(ref);
+}
+
+/// removes an endpoint from the list
+void BaseCommunication::remove_endpoint( const address_v* endpoint ) {
+        for (vector<endpoint_reference>::iterator i = remote_endpoints.begin();
+                i != remote_endpoints.end(); i++) {
+                if (*i->endpoint == *endpoint) {
+                        i->count--;
+                        if (i->count==0) {
+                                logging_info("No more links to " << i->endpoint->to_string() << ": terminating transports!");
+                                transport->terminate(i->endpoint);
+                                remote_endpoints.erase(i);
+                        }
+                        return;
+                }
+        }
+}
+
 BaseCommunication::BaseCommunication() {
         this->transport = NULL;
@@ -254 +284 @@
 }
 
-/// called when a message is received form transport_peer
+/// called when a message is received from transport_peer
 void BaseCommunication::receive_message(transport_protocol* transport,
         const address_vf local, const address_vf remote, const uint8_t* data,
@@ -482 +512 @@
 /// add a newly allocated link to the set of links
 void BaseCommunication::addLink( LinkDescriptor* link ) {
+        add_endpoint(link->remoteLocator);
         linkSet.push_back( link );
 }
@@ -489 +520 @@
         for(LinkSet::iterator i=linkSet.begin(); i != linkSet.end(); i++){
                 if( (*i)->localLink != localLink) continue;
+                remove_endpoint((*i)->remoteLocator);
                 delete *i;
                 linkSet.erase( i );

source/ariba/communication/BaseCommunication.h

@@ -288 +288 @@
         NetworkChangeDetection networkMonitor;
 #endif
+        /// list of all remote addresses of links to end-points
+        class endpoint_reference {
+        public:
+                int count; ///< the number of open links to this end-point
+                const address_v* endpoint; ///< the end-point itself
+        };
+        vector<endpoint_reference> remote_endpoints;
+
+        /// adds an end-point to the list
+        void add_endpoint( const address_v* endpoint );
+
+        /// removes an end-point from the list
+        void remove_endpoint( const address_v* endpoint );
 
         /// event listener
@@ -306 +319 @@
         void send( Message* message, const LinkDescriptor& descriptor );
 
+
+
         /// state of the base communication
         bool started;

source/ariba/utility/system/StartupWrapper.cpp

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

source/ariba/utility/transport/rfcomm/rfcomm.cpp

@@ -182 +182 @@
 }
 
-void rfcomm::terminate(const address_v* local, const address_v* remote) {
+void rfcomm::terminate( const address_v* remote) {
         // get end-point
         rfcomm_endpoint endpoint = *remote;

source/ariba/utility/transport/rfcomm/rfcomm.hpp

@@ -36 +36 @@
         virtual void send( const address_v* remote, const uint8_t* data, size_t size );
         virtual void send( const endpoint_set& endpoints, const uint8_t* data, size_t size );
-        virtual void terminate( const address_v* local, const address_v* remote );
+        virtual void terminate( const address_v* remote );
         virtual void register_listener( transport_listener* listener );
 

source/ariba/utility/transport/tcpip/tcpip.cpp

@@ -135 +135 @@
 }
 
-void tcpip::terminate(const address_v* local, const address_v* remote) {
+void tcpip::terminate( const address_v* remote) {
         tcpip_endpoint endpoint = *remote;
         appladdress peer = convert(endpoint);

source/ariba/utility/transport/tcpip/tcpip.hpp

@@ -31 +31 @@
         virtual void send( const address_v* remote, const uint8_t* data, size_t size );
         virtual void send( const endpoint_set& endpoints, const uint8_t* data, size_t size );
-        virtual void terminate( const address_v* local, const address_v* remote );
+        virtual void terminate( const address_v* remote );
         virtual void register_listener( transport_listener* listener );
 

source/ariba/utility/transport/transport_peer.cpp

@@ -56 +56 @@
 }
 
-void transport_peer::terminate( const address_v* local, const address_v* remote ) {
+void transport_peer::terminate( const address_v* remote ) {
         if (remote->instanceof<tcpip_endpoint>() && tcp!=NULL)
-                tcp->terminate(local,remote);
+                tcp->terminate(remote);
         if (remote->instanceof<rfcomm_endpoint>() && rfc!=NULL)
-                rfc->terminate(local,remote);
+                rfc->terminate(remote);
 }
 

source/ariba/utility/transport/transport_peer.hpp

@@ -29 +29 @@
         virtual void send( const address_v* remote, const uint8_t* data, size_t size );
         virtual void send( const endpoint_set& endpoints, const uint8_t* data, size_t size );
-        virtual void terminate( const address_v* local, const address_v* remote );
+        virtual void terminate( const address_v* remote );
         virtual void register_listener( transport_listener* listener );
 

source/ariba/utility/transport/transport_protocol.hpp

@@ -22 +22 @@
         virtual void send( const address_v* remote, const uint8_t* data, size_t size ) = 0;
         virtual void send( const endpoint_set& endpoints, const uint8_t* data, size_t size ) = 0;
-        virtual void terminate( const address_v* local, const address_v* remote ) = 0;
+        virtual void terminate( const address_v* remote ) = 0;
         virtual void register_listener( transport_listener* listener ) = 0;
 };