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

Redo changes of PR #29 previously overwritten with commit 83278d13

This commit is contained in:
phl0 2017-08-31 09:30:30 +02:00
parent 6633a59a22
commit 5ba8e770dc
No known key found for this signature in database
GPG Key ID: 48EA1E640798CA9A
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();
if ( client->GetReflectorModule() != ' ' )
{
std::cout << " on module " << client->GetReflectorModule();
@ -110,7 +110,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();
if ( client->GetReflectorModule() != ' ' )
{
std::cout << " on module " << client->GetReflectorModule();

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"; }
int GetCodec(void) const { return CODEC_AMBEPLUS; }
bool IsNode(void) const { return true; }

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"; }
int GetCodec(void) const { return CODEC_AMBEPLUS; }
bool IsNode(void) const { return true; }
bool IsDextraDongle(void) const { return m_bDextraDongle; }

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();