Changeset 12060 for source/ariba/SideportListener.cpp

Timestamp:

Jun 19, 2013, 11:05:49 AM (11 years ago)

Author:

hock@…

Message:

Reintegrate branch: 20130111-hock-message_classes

improvements:

• new message classes (reboost, zero-copy)
• "fast path" for direct links (skip overlay layer)
• link-properties accessible from the application
• SystemQueue can call boost::bind functions
• protlib compatibility removed (32bit overhead saved in every message)
• addressing2
• AddressDiscovery discoveres only addresses on which we're actually listening
• ariba serialization usage reduced (sill used in OverlayMsg)
• Node::connect, easier and cleaner interface to start-up ariba from the application
• ariba configs via JSON, XML, etc (boost::property_tree)
• keep-alive overhead greatly reduced
• (relayed) overlay links can actually be closed now
• lost messages are detected in most cases
• notification to the application when link is transformed into direct-link
• overlay routing: send message to second best hop if it would be dropped otherwise
• SequenceNumbers (only mechanisms, so for: upward compatibility)
• various small fixes

regressions:

• bluetooth is not yet working again
• bootstrap modules deactivated
• liblog4xx is not working (use cout-logging)

This patch brings great performance and stability improvements at cost of backward compatibility.
Also bluetooth and the bootstrap modules have not been ported to the new interfaces, yet.

File:

• source/ariba/SideportListener.cpp (modified) (3 diffs)

source/ariba/SideportListener.cpp

@@ -41 +41 @@
 #include "ariba/overlay/BaseOverlay.h"
 #include "ariba/overlay/LinkDescriptor.h"
-#include "ariba/utility/addressing/endpoint_set.hpp"
+#include "ariba/utility/addressing2/tcpip_endpoint.hpp"
 
 using ariba::overlay::LinkDescriptor;
@@ -130 +130 @@
         if( overlay == NULL ) return (Protocol)ret;
 
-        using namespace ariba::addressing;
-
         LinkDescriptor* link = NULL;
         BOOST_FOREACH( LinkDescriptor* lnk, overlay->links ){
@@ -147 +145 @@
         if(bclink.isUnspecified() || bclink.remoteLocator == NULL) return (Protocol)ret;
 
-        const address_v* locator = bclink.remoteLocator;
+        addressing2::EndpointPtr locator = bclink.remoteLocator;
 
-        if( locator->instanceof<tcpip_endpoint>() ){
-                tcpip_endpoint tcpip = *locator;
-
-                if( tcpip.address().is_v4() || tcpip.address().is_v4_mapped() ){
+        if( locator->get_category() == addressing2::endpoint_category::TCPIP )
+        {
+        boost::shared_ptr<addressing2::tcpip_endpoint> endp =
+                boost::dynamic_pointer_cast<addressing2::tcpip_endpoint>(locator);
+            
+                if( endp->to_asio().address().is_v4() )
+                {
                         ret = SideportListener::ipv4;
-                }else if( tcpip.address().is_v6() ){
+                }else {
                         ret = SideportListener::ipv6;
                 }
 
-        }else if( locator->instanceof<rfcomm_endpoint>() ){
+        }else if( locator->get_category() == addressing2::endpoint_category::BLUETOOTH ){
                 ret = SideportListener::rfcomm;
         }