Changeset 12438

Timestamp:

Oct 2, 2013, 12:01:09 PM (11 years ago)

Author:

hock@…

Message:

new callbacks in ariba::NodeListener:

• onOverlayConnected
• onOverlayDisconnected

Files:

• etc/pingpong/settings_node2.cnf (modified) (1 diff)
• source/ariba/NodeListener.cpp (modified) (1 diff)
• source/ariba/NodeListener.h (modified) (2 diffs)
• source/ariba/overlay/BaseOverlay.cpp (modified) (4 diffs)
• source/ariba/overlay/BaseOverlay.h (modified) (1 diff)

etc/pingpong/settings_node2.cnf

@@ -12 +12 @@
                 {"category": "TCPIP", "addr": "127.0.0.1", "port": 5003 }
             ],
-            
-            "broadcast": false,
-            "mdns": false,
-            "sdp": false
         }
     }

source/ariba/NodeListener.cpp

@@ -60 +60 @@
 }
 
+void NodeListener::onOverlayConnected(const SpoVNetID& vid) {
+}
+
+void NodeListener::onOverlayDisconnected(const SpoVNetID& vid){
+}
+
 } // namespace ariba

source/ariba/NodeListener.h

@@ -57 +57 @@
  * @author Sebastian Mies <mies@tm.uka.de>
  * @author Christoph Mayer <mayer@tm.uka.de>
+ * @author Mario Hock <mario.hock@student.kit.edu>
  */
 class NodeListener {
@@ -97 +98 @@
          */
         virtual void onLeaveFailed( const SpoVNetID& vid );
+    
+    /**
+     * This event method is called, when the number of neighbours gets above one.
+     * 
+     * Usually this means, the node is now connected to an existing spovnet, or
+     * another node connected to this node and a "two-elemnt" spovnet just formed up.
+     * 
+     * NOTE: This method can be called again, after »onOverlayDisconnected« has
+     * been called.
+     *
+     * @param vid The spovnet id
+     */
+    virtual void onOverlayConnected( const SpoVNetID& vid );
+    
+    /**
+     * This event method is called, when the number of neighbours drops to zero.
+     * 
+     * Usually this means, the note has lost connection to the spovnet, or the 
+     * spovnet ceased to exist, since all other nodes are gone.
+     * 
+     * NOTE: This method will only be called after »onOverlayConnected« has been
+     * called.
+     * 
+     * @param vid The spovnet id
+     */
+    virtual void onOverlayDisconnected( const SpoVNetID& vid );
 };
 

source/ariba/overlay/BaseOverlay.cpp

@@ -795 +795 @@
 
 BaseOverlay::BaseOverlay() :
-                        started(false),state(BaseOverlayStateInvalid),
+                        started(false),
+                        connected(false),
+                        state(BaseOverlayStateInvalid),
                         bc(NULL),
                         nodeId(NodeID::UNSPECIFIED), spovnetId(SpoVNetID::UNSPECIFIED),
@@ -1245 +1247 @@
         }
         
-        // TODO AKTUELL: sequence numbers
+        // TODO XXX ----> coordinate with QUIC-efforts !!
+        // TODO aktuell: sequence numbers
         // TODO seqnum on fast path ?
         ld->last_sent_seqnum.increment();
@@ -1620 +1623 @@
         // erase mapping
         eraseDescriptor(ld->overlayId);
+    
+    
+    // notify the application if this is the last link to a different node
+    if ( connected )
+    {
+        bool active_links = false;
+        
+        // look for links that are still active
+        foreach( LinkDescriptor* ld, links )
+        {
+            if ( isLinkDirectVital(ld) )
+            {
+                active_links = true;
+                break;
+            }
+        }
+
+        if ( ! active_links )
+        {
+            connected = false;
+            
+            foreach( NodeListener* i, nodeListeners )
+                i->onOverlayDisconnected( spovnetId );
+        }
+    }
+
 }
 
@@ -2093 +2122 @@
         sideport->onLinkUp( ld->overlayId, nodeId, ld->remoteNode, this->spovnetId );
 
+    
+    // notify the application if this is the first link to a different node
+    if ( not connected )
+    {
+        connected = true;
+        
+        foreach( NodeListener* i, nodeListeners )
+            i->onOverlayConnected( spovnetId );
+    }
+    
         return true;
 }

source/ariba/overlay/BaseOverlay.h

@@ -425 +425 @@
         /// is the base overlay started yet
         bool started;
+    
+    /// »true« if we have neighbours, »false« otherwise
+    bool connected;
 
         /// The state of the BaseOverlay