CPeers::m_Peers is a list

src/cdextraprotocol.cpp

@@ -339,9 +339,9 @@ void CDextraProtocol::HandleKeepalives(void)
 
     // iterate on peers
     CPeers *peers = g_Reflector.GetPeers();
-    int index = -1;
+    auto pit = peers->begin();
     CPeer *peer = NULL;
-    while ( (peer = peers->FindNextPeer(PROTOCOL_DEXTRA, &index)) != NULL )
+    while ( (peer = peers->FindNextPeer(PROTOCOL_DEXTRA, pit)) != NULL )
     {
         // keepalives are sent between clients
 
@@ -379,9 +379,9 @@ void CDextraProtocol::HandlePeerLinks(void)
 
     // check if all our connected peers are still listed by gatekeeper
     // if not, disconnect
-    int index = -1;
+    auto pit = peers->begin();
     CPeer *peer = NULL;
-    while ( (peer = peers->FindNextPeer(PROTOCOL_DEXTRA, &index)) != NULL )
+    while ( (peer = peers->FindNextPeer(PROTOCOL_DEXTRA, pit)) != NULL )
     {
         if ( list->FindListItem(peer->GetCallsign()) == NULL )
         {

src/cpeers.cpp

@@ -32,10 +32,7 @@
 // constructor
 
 
-CPeers::CPeers()
+CPeers::CPeers() {}
-{
-    m_Peers.reserve(100);
-}
 
 ////////////////////////////////////////////////////////////////////////////////////////
 // destructors
@@ -43,14 +40,9 @@ CPeers::CPeers()
 CPeers::~CPeers()
 {
     m_Mutex.lock();
-    {
+    for (auto it=begin(); it!=end(); it++ )
-        for ( int i = 0; i < m_Peers.size(); i++ )
+		delete *it;
-        {
+    m_Peers.clear();
-            delete m_Peers[i];
-        }
-        m_Peers.clear();
-
-    }
     m_Mutex.unlock();
 }
 
@@ -60,93 +52,68 @@ CPeers::~CPeers()
 void CPeers::AddPeer(CPeer *peer)
 {
     // first check if peer already exists
-    bool found = false;
+    for ( auto it=begin(); it!=end(); it++ )
-    for ( int i = 0; (i < m_Peers.size()) && !found; i++ )
     {
-        found = (*peer == *m_Peers[i]);
+        if (*peer == *(*it))
         // if found, just do nothing
         // so *peer keep pointing on a valid object
         // on function return
-        if ( found )
         {
             // delete new one
             delete peer;
-            //std::cout << "Adding existing peer " << peer->GetCallsign() << " at " << peer->GetIp() << std::endl;
+            return;
         }
     }
 
     // if not, append to the vector
-    if ( !found )
+	m_Peers.push_back(peer);
-    {
+	std::cout << "New peer " << peer->GetCallsign() << " at " << peer->GetIp()
-        // grow vector capacity if needed
+				<< " added with protocol " << peer->GetProtocolName()  << std::endl;
-        if ( m_Peers.capacity() == m_Peers.size() )
+	// and append all peer's client to reflector client list
-        {
+	// it is double lock safe to lock Clients list after Peers list
-            m_Peers.reserve(m_Peers.capacity()+10);
+	CClients *clients = g_Reflector.GetClients();
-        }
+	for ( auto cit=peer->cbegin(); cit!=peer->cend(); cit++ )
-        // append peer to reflector peer list
+	{
-        m_Peers.push_back(peer);
+		clients->AddClient(*cit);
-        std::cout << "New peer " << peer->GetCallsign() << " at " << peer->GetIp()
+	}
-                  << " added with protocol " << peer->GetProtocolName()  << std::endl;
+	g_Reflector.ReleaseClients();
-        // and append all peer's client to reflector client list
+
-        // it is double lock safe to lock Clients list after Peers list
+	// notify
-        CClients *clients = g_Reflector.GetClients();
+	g_Reflector.OnPeersChanged();
-        for ( auto cit=peer->cbegin(); cit!=peer->cend(); cit++ )
-        {
-            clients->AddClient(*cit);
-        }
-        g_Reflector.ReleaseClients();
-
-        // notify
-        g_Reflector.OnPeersChanged();
-    }
 }
 
 void CPeers::RemovePeer(CPeer *peer)
 {
     // look for the client
-    bool found = false;
+    for ( auto pit=begin(); pit!=end(); /*increment done in body */ )
-    for ( int i = 0; (i < m_Peers.size()) && !found; i++ )
     {
         // compare object pointers
-        if ( (m_Peers[i]) ==  peer )
+        if (( *pit == peer ) && ( !(*pit)->IsAMaster() ))
-        {
+		{
-            // found it !
+			// remove all clients from reflector client list
-            if ( !m_Peers[i]->IsAMaster() )
+			// it is double lock safe to lock Clients list after Peers list
-            {
+			CClients *clients = g_Reflector.GetClients();
-                // remove all clients from reflector client list
+			for ( auto cit=peer->begin(); cit!=peer->end(); cit++ )
-                // it is double lock safe to lock Clients list after Peers list
+			{
-                CClients *clients = g_Reflector.GetClients();
+				// this also delete the client object
-                for ( auto cit=peer->begin(); cit!=peer->end(); cit++ )
+				clients->RemoveClient(*cit);
-                {
+			}
-                    // this also delete the client object
+			// so clear it then
-                    clients->RemoveClient(*cit);
+			(*pit)->ClearClients();
-                }
+			g_Reflector.ReleaseClients();
-                // so clear it then
+
-                m_Peers[i]->ClearClients();
+			// remove it
-                g_Reflector.ReleaseClients();
+			std::cout << "Peer " << (*pit)->GetCallsign() << " at " << (*pit)->GetIp()
-
+						<< " removed" << std::endl;
-                // remove it
+			delete *pit;
-                std::cout << "Peer " << m_Peers[i]->GetCallsign() << " at " << m_Peers[i]->GetIp()
+			pit = m_Peers.erase(pit);
-                         << " removed" << std::endl;
+			// notify
-                delete m_Peers[i];
+			g_Reflector.OnPeersChanged();
-                m_Peers.erase(m_Peers.begin()+i);
+		}
-                found = true;
+		else
-                // notify
+		{
-                g_Reflector.OnPeersChanged();
+			pit++;
-            }
+		}
-        }
-    }
-}
-
-CPeer *CPeers::GetPeer(int i)
-{
-    if ( (i >= 0) && (i < m_Peers.size()) )
-    {
-        return m_Peers[i];
-    }
-    else
-    {
-        return NULL;
     }
 }
 
@@ -155,76 +122,59 @@ CPeer *CPeers::GetPeer(int i)
 
 CPeer *CPeers::FindPeer(const CIp &Ip, int Protocol)
 {
-    CPeer *peer = NULL;
+    for ( auto it=begin(); it!=end(); it++ )
-
-    // find peer
-    for ( int i = 0; (i < m_Peers.size()) && (peer == NULL); i++ )
     {
-        if ( (m_Peers[i]->GetIp() == Ip)  && (m_Peers[i]->GetProtocol() == Protocol))
+        if ( ((*it)->GetIp() == Ip)  && ((*it)->GetProtocol() == Protocol))
         {
-            peer = m_Peers[i];
+            return *it;
         }
     }
 
-    // done
+    return NULL;
-    return peer;
 }
 
 CPeer *CPeers::FindPeer(const CCallsign &Callsign, const CIp &Ip, int Protocol)
 {
-    CPeer *peer = NULL;
+    for ( auto it=begin(); it!=end(); it++ )
-
-    // find peer
-    for ( int i = 0; (i < m_Peers.size()) && (peer == NULL); i++ )
     {
-        if ( m_Peers[i]->GetCallsign().HasSameCallsign(Callsign) &&
+        if ( (*it)->GetCallsign().HasSameCallsign(Callsign) &&
-            (m_Peers[i]->GetIp() == Ip)  &&
+            ((*it)->GetIp() == Ip)  &&
-            (m_Peers[i]->GetProtocol() == Protocol) )
+            ((*it)->GetProtocol() == Protocol) )
         {
-            peer = m_Peers[i];
+            return *it;
         }
     }
 
-    // done
+    return NULL;
-    return peer;
 }
 
 CPeer *CPeers::FindPeer(const CCallsign &Callsign, int Protocol)
 {
-    CPeer *peer = NULL;
+    for ( auto it=begin(); it!=end(); it++ )
-
-    // find peer
-    for ( int i = 0; (i < m_Peers.size()) && (peer == NULL); i++ )
     {
-        if ( (m_Peers[i]->GetProtocol() == Protocol) &&
+        if ( ((*it)->GetProtocol() == Protocol) &&
-            m_Peers[i]->GetCallsign().HasSameCallsign(Callsign) )
+            (*it)->GetCallsign().HasSameCallsign(Callsign) )
         {
-            peer = m_Peers[i];
+            return *it;
         }
     }
 
-    // done
+    return NULL;
-    return peer;
 }
 
 
 ////////////////////////////////////////////////////////////////////////////////////////
 // iterate on peers
 
-CPeer *CPeers::FindNextPeer(int Protocol, int *index)
+CPeer *CPeers::FindNextPeer(int Protocol, std::list<CPeer *>::iterator &it)
 {
-    CPeer *peer = NULL;
+    while ( it!=end() )
-
-    // find next peer
-    bool found = false;
-    for ( int i = *index+1; (i < m_Peers.size()) && !found; i++ )
     {
-        if ( m_Peers[i]->GetProtocol() == Protocol )
+        if ( (*it)->GetProtocol() == Protocol )
         {
-            found = true;
+            return *it++;
-            peer = m_Peers[i];
-            *index = i;
         }
+		it++;
     }
-    return peer;
+    return NULL;
 }

src/cpeers.h

@@ -4,6 +4,7 @@
 //
 //  Created by Jean-Luc Deltombe (LX3JL) on 10/12/2016.
 //  Copyright © 2016 Jean-Luc Deltombe (LX3JL). All rights reserved.
+//  Copyright © 2020 Thomas A. Early, N7TAE
 //
 // ----------------------------------------------------------------------------
 //    This file is part of xlxd.
@@ -40,32 +41,37 @@ class CPeers
 public:
     // constructors
     CPeers();
-    
+
     // destructors
     virtual ~CPeers();
-    
+
     // locks
     void Lock(void)                     { m_Mutex.lock(); }
     void Unlock(void)                   { m_Mutex.unlock(); }
-    
+
     // manage peers
     int     GetSize(void) const         { return (int)m_Peers.size(); }
     void    AddPeer(CPeer *);
     void    RemovePeer(CPeer *);
-    CPeer   *GetPeer(int);
+
-    
+	// pass-thru
+	std::list<CPeer *>::iterator begin()              { return m_Peers.begin(); }
+	std::list<CPeer *>::iterator end()                { return m_Peers.end(); }
+	std::list<CPeer *>::const_iterator cbegin() const { return m_Peers.cbegin(); }
+	std::list<CPeer *>::const_iterator cend() const   { return m_Peers.cend(); }
+
     // find peers
     CPeer *FindPeer(const CIp &, int);
     CPeer *FindPeer(const CCallsign &, const CIp &, int);
     CPeer *FindPeer(const CCallsign &, int);
 
     // iterate on peers
-    CPeer *FindNextPeer(int, int*);
+    CPeer *FindNextPeer(int, std::list<CPeer *>::iterator &);
 
 protected:
     // data
-    std::mutex               m_Mutex;
+    std::mutex         m_Mutex;
-    std::vector<CPeer *>     m_Peers;
+    std::list<CPeer *> m_Peers;
 };
 
 

src/creflector.cpp

@@ -4,6 +4,7 @@
 //
 //  Created by Jean-Luc Deltombe (LX3JL) on 31/10/2015.
 //  Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
+//  Copyright © 2020 Thomas A. Early, N7TAE
 //
 // ----------------------------------------------------------------------------
 //    This file is part of xlxd.
@@ -617,9 +618,9 @@ void CReflector::WriteXmlFile(std::ofstream &xmlFile)
     // lock
     CPeers *peers = GetPeers();
     // iterate on peers
-    for ( int i = 0; i < peers->GetSize(); i++ )
+    for ( auto pit=peers->cbegin(); pit!=peers->cend(); pit++ )
     {
-        peers->GetPeer(i)->WriteXml(xmlFile);
+        (*pit)->WriteXml(xmlFile);
     }
     // unlock
     ReleasePeers();
@@ -630,11 +631,11 @@ void CReflector::WriteXmlFile(std::ofstream &xmlFile)
     // lock
     CClients *clients = GetClients();
     // iterate on clients
-    for ( auto it=clients->cbegin(); it!=clients->cend(); it++ )
+    for ( auto cit=clients->cbegin(); cit!=clients->cend(); cit++ )
     {
-        if ( (*it)->IsNode() )
+        if ( (*cit)->IsNode() )
         {
-            (*it)->WriteXml(xmlFile);
+            (*cit)->WriteXml(xmlFile);
         }
     }
     // unlock

src/cxlxprotocol.cpp

@@ -323,9 +323,9 @@ void CXlxProtocol::HandleKeepalives(void)
 
     // iterate on peers
     CPeers *peers = g_Reflector.GetPeers();
-    int index = -1;
+    auto pit = peers->begin();
     CPeer *peer = NULL;
-    while ( (peer = peers->FindNextPeer(PROTOCOL_XLX, &index)) != NULL )
+    while ( (peer = peers->FindNextPeer(PROTOCOL_XLX, pit)) != NULL )
     {
         // send keepalive
         m_Socket.Send(keepalive, peer->GetIp());
@@ -365,9 +365,9 @@ void CXlxProtocol::HandlePeerLinks(void)
 
     // check if all our connected peers are still listed by gatekeeper
     // if not, disconnect
-    int index = -1;
+    auto pit = peers->begin();
     CPeer *peer = NULL;
-    while ( (peer = peers->FindNextPeer(PROTOCOL_XLX, &index)) != NULL )
+    while ( (peer = peers->FindNextPeer(PROTOCOL_XLX, pit)) != NULL )
     {
         if ( list->FindListItem(peer->GetCallsign()) == NULL )
         {