Merge remote-tracking branch 'github/master'

[stg.git] / projects / stargazer / plugins / configuration / sgconfig / conn.h

diff --git a/projects/stargazer/plugins/configuration/sgconfig/conn.h b/projects/stargazer/plugins/configuration/sgconfig/conn.h
index c96be90b8eac0be0d6d089700c960cb6df9b14b3..c2997559c4a4eb03b549ffc382192455965dfd4d 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/conn.h
+++ b/projects/stargazer/plugins/configuration/sgconfig/conn.h
@@ -39,9 +39,9 @@ namespace STG
 
 struct Settings;
 struct Admins;
 
 struct Settings;
 struct Admins;

-struct Users;
-struct Tariffs;
-struct Admin;
+class Users;
+class Tariffs;
+class Admin;

 class PluginLogger;
 
 class DECRYPT_STREAM;
 class PluginLogger;
 
 class DECRYPT_STREAM;


@@ -60,7 +60,7 @@ class Conn
         ~Conn();
 
         int Sock() const { return m_sock; }
         ~Conn();
 
         int Sock() const { return m_sock; }

-        uint32_t IP() const { return *(uint32_t *)(&m_addr.sin_addr); }
+        uint32_t IP() const { return *reinterpret_cast<const uint32_t *>(&m_addr.sin_addr); }

         uint16_t Port() const { return ntohs(m_addr.sin_port); }
 
         std::string endpoint() const { return inet_ntostring(IP()) + ":" + std::to_string(Port()); }
         uint16_t Port() const { return ntohs(m_addr.sin_port); }
 
         std::string endpoint() const { return inet_ntostring(IP()) + ":" + std::to_string(Port()); }