From 5ba8e770dc01c40520f1c46b6c273674dab2075b Mon Sep 17 00:00:00 2001
From: phl0 <florian@florian-wolters.de>
Date: Thu, 31 Aug 2017 09:30:30 +0200
Subject: [PATCH] Redo changes of PR #29 previously overwritten with commit
 83278d13

---
 src/cclients.cpp    | 4 ++--
 src/cdextraclient.h | 2 +-
 src/cdplusclient.h  | 2 +-
 src/cpeers.cpp      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/cclients.cpp b/src/cclients.cpp
index 3818865..837802a 100644
--- a/src/cclients.cpp
+++ b/src/cclients.cpp
@@ -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();
diff --git a/src/cdextraclient.h b/src/cdextraclient.h
index 132ff37..453c5f4 100644
--- a/src/cdextraclient.h
+++ b/src/cdextraclient.h
@@ -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; }
     
diff --git a/src/cdplusclient.h b/src/cdplusclient.h
index f4b165f..d615e12 100644
--- a/src/cdplusclient.h
+++ b/src/cdplusclient.h
@@ -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; }
diff --git a/src/cpeers.cpp b/src/cpeers.cpp
index 3a27282..35c5547 100644
--- a/src/cpeers.cpp
+++ b/src/cpeers.cpp
@@ -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();