Changeset 3037 for source/ariba/communication

Timestamp:

Apr 22, 2009, 9:07:53 PM (15 years ago)

Author:

Christoph Mayer

Message:

-jede Menge fixes und Umstellungen
-angefangen ariba/interface los zu werden, erste dateien sind weg

Location:

source/ariba/communication

Files:

• BaseCommunication.cpp (modified) (8 diffs)
• BaseCommunication.h (modified) (1 diff)
• EndpointDescriptor.cpp (modified) (1 diff)
• EndpointDescriptor.h (modified) (2 diffs)

source/ariba/communication/BaseCommunication.cpp

@@ -55 +55 @@
 const BaseCommunication::LinkDescriptor BaseCommunication::LinkDescriptor::UNSPECIFIED;
 
-BaseCommunication::BaseCommunication(const NetworkLocator* _locallocator, const uint16_t _listenport)
-        : messageReceiver( NULL ), currentSeqnum( 0 ), listenport( _listenport ) {
+BaseCommunication::BaseCommunication()
+        : messageReceiver(NULL), network(NULL), transport(NULL){
+}
+
+BaseCommunication::~BaseCommunication(){
+}
+
+void BaseCommunication::start(const NetworkLocator* _locallocator, const uint16_t _listenport){
+
+        currentSeqnum = 0;
+        listenport = _listenport;
 
         logging_info( "starting up base communication and creating transports ..." );
@@ -139 +148 @@
 }
 
-BaseCommunication::~BaseCommunication() {
+void BaseCommunication::stop() {
 
         logging_info( "stopping base communication and transport ..." );
@@ -210 +219 @@
         // warn if this link has some queued messages attached
         if( descriptor.waitingmsg.size() > 0 ){
-                logging_warn( "dropping link " << link.toString() << 
+                logging_warn( "dropping link " << link.toString() <<
                         " that has " << descriptor.waitingmsg.size() << " waiting messages" );
         }
@@ -368 +377 @@
                 const NetworkLocator* remoteLocator = dynamic_cast<const NetworkLocator*>(message->getSourceAddress());
 
-                logging_debug( "localLocator=" << localLocator->toString() 
+                logging_debug( "localLocator=" << localLocator->toString()
                                 << " remoteLocator=" << remoteLocator->toString());
 
@@ -419 +428 @@
                 // the link is now open
                 //
-                
+
                 BOOST_FOREACH( CommunicationEvents* i, eventListener ){
                         i->onLinkUp( localLink, localLocator, remoteLocator );
@@ -444 +453 @@
 
                 linkDesc.remoteLink = spovmsg->getLocalLink();
-                linkDesc.linkup = true; 
-        
+                linkDesc.linkup = true;
+
                 logging_debug( "the link is now up with local link id " << spovmsg->getRemoteLink().toString() );
 
@@ -452 +461 @@
                 }
 
-                if( linkDesc.waitingmsg.size() > 0 ){ 
+                if( linkDesc.waitingmsg.size() > 0 ){
                         logging_info( "sending out queued messages on link " << linkDesc.localLink.toString() );
 
@@ -564 +573 @@
         for( ; i != iend; i++){
                 if( (*i).localLink != localLink) continue;
-                
+
                 BOOST_FOREACH( Message* msg, i->waitingmsg ){
                         delete msg;

source/ariba/communication/BaseCommunication.h

@@ -122 +122 @@
  */
 class BaseCommunication : public MessageReceiver, NetworkChangeInterface {
-
         use_logging_h(BaseCommunication);
-
 public:
-        /**
-         * Constructs a Base Communication instance.
-         * Listens default on port number 41402
-         */
-        BaseCommunication(const NetworkLocator* _locallocator, const uint16_t _listenport);
-
-        /**
-         * Destructs a Base Communication instance
+
+        /**
+         * Default ctor that just creates an empty
+         * non functional base communication
+         */
+        BaseCommunication();
+
+        /**
+         * Default dtor that does nothing
          */
         virtual ~BaseCommunication();
+
+        /**
+         * Startup the base communication, start modules etc.
+         */
+        void start(const NetworkLocator* _locallocator, const uint16_t _listenport);
+
+        /**
+         * stop the base communication, stop modules etc.
+         */
+        void stop();
 
         /**

source/ariba/communication/EndpointDescriptor.cpp

@@ -57 +57 @@
 
 EndpointDescriptor::EndpointDescriptor(const Locator* _locator){
+        if( _locator == NULL ) return;
+
         locator = new IPv4Locator(*dynamic_cast<IPv4Locator*>((Locator*)_locator));
         isUnspec = false;

source/ariba/communication/EndpointDescriptor.h

@@ -51 +51 @@
 using ariba::communication::IPv4Locator;
 
-// needed for friend decleration
-// in different namespace
-namespace ariba {
-namespace interface {
-        class UnderlayAbstraction;
-}}
-
 namespace ariba {
 namespace communication {
@@ -67 +60 @@
 
         friend class BaseCommunication;
-        friend class ariba::interface::UnderlayAbstraction;
 
 public: