ShaYmez
/
xlxd
mirror of https://github.com/ShaYmez/xlxd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #29 from phl0/dev 

Use protocol names instead of numbers in logs
This commit is contained in:
LX3JL 2017-03-31 12:09:39 +02:00 committed by GitHub
parent f4394c41fe 3e515303a1
commit 76dc7d1ecf
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cclients.cpp
View File

@ -85,7 +85,7 @@ void CClients::AddClient(CClient *client)
// and append
m_Clients.push_back(client);
std::cout << "New client " << client->GetCallsign() << " at " << client->GetIp()
<< " added with protocol " << client->GetProtocol()
<< " added with protocol " << client->GetProtocolName()
<< " on module " << client->GetReflectorModule() << std::endl;
// notify
g_Reflector.OnClientsChanged();
@ -106,7 +106,7 @@ void CClients::RemoveClient(CClient *client)
{
// remove it
std::cout << "Client " << m_Clients[i]->GetCallsign() << " at " << m_Clients[i]->GetIp()
<< " removed with protocol " << client->GetProtocol()
<< " removed with protocol " << client->GetProtocolName()
<< " on module " << client->GetReflectorModule() << std::endl;
delete m_Clients[i];
m_Clients.erase(m_Clients.begin()+i);

2
src/cdextraclient.h
View File

@ -48,7 +48,7 @@ public:
// identity
int GetProtocol(void) const { return PROTOCOL_DEXTRA; }
int GetProtocolRevision(void) const { return m_ProtRev; }
const char *GetProtocolName(void) const { return "Dextra"; }
const char *GetProtocolName(void) const { return "DExtra"; }
bool IsNode(void) const { return true; }
// status

2
src/cdplusclient.h
View File

@ -47,7 +47,7 @@ public:
// identity
int GetProtocol(void) const { return PROTOCOL_DPLUS; }
const char *GetProtocolName(void) const { return "Dplus"; }
const char *GetProtocolName(void) const { return "DPlus"; }
bool IsNode(void) const { return true; }
bool IsDextraDongle(void) const { return m_bDextraDongle; }
void SetDextraDongle(void) { m_bDextraDongle = true; }

2
src/cpeers.cpp
View File

@ -85,7 +85,7 @@ void CPeers::AddPeer(CPeer *peer)
// append peer to reflector peer list
m_Peers.push_back(peer);
std::cout << "New peer " << peer->GetCallsign() << " at " << peer->GetIp()
<< " added with protocol " << peer->GetProtocol() << std::endl;
<< " added with protocol " << peer->GetProtocolName() << std::endl;
// and append all peer's client to reflector client list
// it is double lock safe to lock Clients list after Peers list
CClients *clients = g_Reflector.GetClients();