Public interfaces: part 4

[stg.git] / stargazer / plugins / other / radius / conn.cpp

diff --git a/stargazer/plugins/other/radius/conn.cpp b/stargazer/plugins/other/radius/conn.cpp
index a209409ba95e36f1e490d03217c0211b70ea3733..4b2f0dcfb32f272beba134cf1895fb43c36fe3d2 100644 (file)
--- a/stargazer/plugins/other/radius/conn.cpp
+++ b/stargazer/plugins/other/radius/conn.cpp
@@ -41,6 +41,11 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
 #include <sys/types.h>
 #include <sys/socket.h>
 

+#ifndef MSG_NOSIGNAL
+// On OSX this flag does not exist.
+#define MSG_NOSIGNAL 0
+#endif
+

 using STG::Conn;
 using STG::Config;
 using STG::JSON::Parser;
 using STG::Conn;
 using STG::Config;
 using STG::JSON::Parser;


@@ -226,7 +231,7 @@ std::string toString(Config::ReturnCode code)
 class Conn::Impl
 {
     public:
 class Conn::Impl
 {
     public:

-        Impl(USERS& users, PLUGIN_LOGGER& logger, RADIUS& plugin, const Config& config, int fd, const std::string& remote);
+        Impl(Users& users, PluginLogger& logger, RADIUS& plugin, const Config& config, int fd, const std::string& remote);

         ~Impl();
 
         int sock() const { return m_sock; }
         ~Impl();
 
         int sock() const { return m_sock; }


@@ -237,8 +242,8 @@ class Conn::Impl
         bool isOk() const { return m_ok; }
 
     private:
         bool isOk() const { return m_ok; }
 
     private:

-        USERS& m_users;
-        PLUGIN_LOGGER& m_logger;
+        Users& m_users;
+        PluginLogger& m_logger;

         RADIUS& m_plugin;
         const Config& m_config;
         int m_sock;
         RADIUS& m_plugin;
         const Config& m_config;
         int m_sock;


@@ -273,7 +278,7 @@ class Conn::Impl
         void processPing();
         void processPong();
         void processData();
         void processPing();
         void processPong();
         void processData();

-        bool answer(const USER& user);
+        bool answer(const User& user);

         bool answerNo();
         bool sendPing();
         bool sendPong();
         bool answerNo();
         bool sendPing();
         bool sendPong();


@@ -281,7 +286,7 @@ class Conn::Impl
         static bool write(void* data, const char* buf, size_t size);
 };
 
         static bool write(void* data, const char* buf, size_t size);
 };
 

-Conn::Conn(USERS& users, PLUGIN_LOGGER& logger, RADIUS& plugin, const Config& config, int fd, const std::string& remote)
+Conn::Conn(Users& users, PluginLogger& logger, RADIUS& plugin, const Config& config, int fd, const std::string& remote)

     : m_impl(new Impl(users, logger, plugin, config, fd, remote))
 {
 }
     : m_impl(new Impl(users, logger, plugin, config, fd, remote))
 {
 }


@@ -310,7 +315,7 @@ bool Conn::isOk() const
     return m_impl->isOk();
 }
 
     return m_impl->isOk();
 }
 

-Conn::Impl::Impl(USERS& users, PLUGIN_LOGGER& logger, RADIUS& plugin, const Config& config, int fd, const std::string& remote)
+Conn::Impl::Impl(Users& users, PluginLogger& logger, RADIUS& plugin, const Config& config, int fd, const std::string& remote)

     : m_users(users),
       m_logger(logger),
       m_plugin(plugin),
     : m_users(users),
       m_logger(logger),
       m_plugin(plugin),


@@ -417,7 +422,7 @@ void Conn::Impl::processData()
     printfd(__FILE__, "Got data.\n");
     int handle = m_users.OpenSearch();
 
     printfd(__FILE__, "Got data.\n");
     int handle = m_users.OpenSearch();
 

-    USER_PTR user = NULL;
+    User* user = NULL;

     bool matched = false;
     while (m_users.SearchNext(handle, &user) == 0)
     {
     bool matched = false;
     while (m_users.SearchNext(handle, &user) == 0)
     {


@@ -456,7 +461,7 @@ void Conn::Impl::processData()
     m_users.CloseSearch(handle);
 }
 
     m_users.CloseSearch(handle);
 }
 

-bool Conn::Impl::answer(const USER& user)
+bool Conn::Impl::answer(const User& user)

 {
     printfd(__FILE__, "Got match. Sending answer...\n");
     MapGen replyData;
 {
     printfd(__FILE__, "Got match. Sending answer...\n");
     MapGen replyData;