Show MQTT version in client string

Wiebe Cazemier
1 parent de90ee61
Showing 3 changed files with 20 additions and 2 deletions
client.cpp
utils.cpp
utils.h
@@ -277,9 +277,9 @@ bool Client::writeBufIntoFd()
  
 std::string Client::repr()
 {
-    std::string s = formatString("[ClientID='%s', username='%s', fd=%d, keepalive=%ds, transport='%s', address='%s', cleanses=%d]",
+    std::string s = formatString("[ClientID='%s', username='%s', fd=%d, keepalive=%ds, transport='%s', address='%s', cleanses=%d, prot=%s]",
                                  clientid.c_str(), username.c_str(), fd, keepalive, this->transportStr.c_str(), this->address.c_str(),
-                                 cleanSession);
+                                 cleanSession, protocolVersionString(protocolVersion).c_str());
     return s;
 }
  
@@ -651,3 +651,18 @@ const std::string websocketCloseCodeToString(uint16_t code)
         return formatString("Websocket status code %d", code);
     }
 }
+
+const std::string protocolVersionString(ProtocolVersion p)
+{
+    switch (p)
+    {
+    case ProtocolVersion::None:
+        return "none";
+    case ProtocolVersion::Mqtt31:
+        return "3.1";
+    case ProtocolVersion::Mqtt311:
+        return "3.1.1";
+    default:
+        return "unknown";
+    }
+}
@@ -33,6 +33,7 @@ License along with FlashMQ. If not, see &lt;https://www.gnu.org/licenses/&gt;.
  
 #include "cirbuf.h"
 #include "bindaddr.h"
+#include "types.h"
  
 template<typename T> int check(int rc)
 {
@@ -124,5 +125,7 @@ template&lt;typename ex&gt; void checkWritableDir(const std::string &amp;path)
  
 const std::string websocketCloseCodeToString(uint16_t code);
  
+const std::string protocolVersionString(ProtocolVersion p);
+
  
 #endif // UTILS_H