Radius (#7)

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

diff --git a/projects/stargazer/plugins/other/radius/radius.cpp b/projects/stargazer/plugins/other/radius/radius.cpp
index fe989b288d42bc3c954a075fa1183724805be367..78c80b4df9e32a2d832038f2da5acf6711d7a494 100644 (file)
--- a/projects/stargazer/plugins/other/radius/radius.cpp
+++ b/projects/stargazer/plugins/other/radius/radius.cpp
@@ -1,186 +1,79 @@
-/*
- *    This program is free software; you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation; either version 2 of the License, or
- *    (at your option) any later version.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-/*
- *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
- */
-

 #include "radius.h"
 #include "radius.h"

+#include "server.h"
+#include "radproto/error.h"

 
 

-#include "stg/store.h"
-#include "stg/users.h"
-#include "stg/plugin_creator.h"
-
-#include <csignal>
-#include <cerror>
-#include <cstring>
+#include "stg/common.h"

 
 

-namespace
-{
-
-PLUGIN_CREATOR<RADIUS> creator;
+#include <boost/asio.hpp>
+#include <string>
+#include <iostream>
+#include <cstdint> //uint8_t, uint32_t

 
 

-}
+using STG::RADIUS;

 
 

-extern "C" PLUGIN * GetPlugin()
+extern "C" STG::Plugin* GetPlugin()

 {
 {

-    return creator.GetPlugin();
+    static RADIUS plugin;
+    return &plugin;

 }
 
 }
 

-RADIUS::RADIUS()
-    : m_running(false),
-      m_stopped(true),
-      m_users(NULL),
-      m_store(NULL),
-      m_logger(GetPluginLogger(GetStgLogger(), "radius"))
+std::string RADIUS::GetVersion() const

 {
 {

+    return "Radius v.1.0";

 }
 
 }
 

-int RADIUS::ParseSettings()
+RADIUS::RADIUS()
+    : m_logger(PluginLogger::get("radius")),
+      m_running(false)

 {
 {

-    try {
-        m_config = STG::Config(m_settings);
-        return 0;
-    } catch (const std::runtime_error& ex) {
-        m_logger("Failed to parse settings. %s", ex.what());
-        return -1;
-    }

 }
 
 int RADIUS::Start()
 {
 }
 
 int RADIUS::Start()
 {

-    if (m_running)
-        return 0;
-
-    int res = pthread_create(&m_thread, NULL, run, this);
-    if (res == 0)
-        return 0;
-
-    m_error = strerror(res);
-    m_logger("Failed to create thread: '" + m_error + "'.");
-    return -1;
+    m_thread = std::jthread([this](auto token){ Run(std::move(token)); });
+    return 0;

 }
 
 int RADIUS::Stop()
 {
 }
 
 int RADIUS::Stop()
 {

-    if (m_stopped)
+    if (!m_thread.joinable())

         return 0;
 
         return 0;
 

-    m_running = false;
-
-    for (size_t i = 0; i < 25 && !m_stopped; i++) {
-        struct timespec ts = {0, 200000000};
-        nanosleep(&ts, NULL);
-    }
-
-    if (m_stopped) {
-        pthread_join(m_thread, NULL);
-        return 0;
-    }
+    m_thread.request_stop();

 
 

-    m_error = "Failed to stop thread.";
-    m_logger(m_error);
-    return -1;
+    m_thread.join();
+    return 0;

 }
 }

-//-----------------------------------------------------------------------------
-void* RADIUS::run(void* d)
-{
-    sigset_t signalSet;
-    sigfillset(&signalSet);
-    pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
-
-    static_cast<RADIUS *>(d)->runImpl();

 
 

-    return NULL;
-}
-
-void RADIUS::runImpl()
-{
-    m_running = true;
-
-    while (m_running) {
-        fd_set fds;
-
-        buildFDSet(fds);
-
-        struct timeval tv;
-        tv.tv_sec = 0;
-        tv.tv_usec = 500000;
-
-        int res = select(maxFD() + 1, &fds, NULL, NULL, &tv);
-        if (res < 0)
-        {
-            m_error = std::string("'select' is failed: '") + strerror(errno) + "'.";
-            m_logger(m_error);
-            break;
-        }
-
-        if (!m_running)
-            break;
-
-        if (res > 0)
-            handleEvents(fds);
-
-        cleanupConns();
-    }
-
-    m_stopped = true;
-}
-
-int RADIUS::maxFD() const
+void RADIUS::SetRunning(bool val)

 {
 {

-    int maxFD = m_listenSocket;
-    std::deque<STG::Conn *>::const_iterator it;
-    for (it = m_conns.begin(); it != m_conns.end(); ++it)
-        if (maxFD < (*it)->sock())
-            maxFD = (*it)->sock();
-    return maxFD;
+    const std::lock_guard lock(m_mutex);
+    m_running = val;

 }
 
 }
 

-void RADIUS::buildFDSet(fd_set & fds) const
+bool RADIUS::IsRunning()

 {
 {

-    FD_ZERO(&fds);
-    FD_SET(m_listenSocket, &fds);
-    std::deque<STG::Conn *>::const_iterator it;
-    for (it = m_conns.begin(); it != m_conns.end(); ++it)
-        FD_SET((*it)->sock(), &fds);
+    const std::lock_guard lock(m_mutex);
+    return m_running;

 }
 
 }
 

-void RADIUS::cleanupConns()
+int RADIUS::Run(std::stop_token token)

 {
 {

-    std::deque<STG::Conn *>::iterator pos;
-    for (pos = m_conns.begin(); pos != m_conns.end(); ++pos)
-        if (((*pos)->isDone() && !(*pos)->isKeepAlive()) || !(*pos)->isOk()) {
-            delete *pos;
-            *pos = NULL;
-        }
-
-    pos = std::remove(m_conns.begin(), m_conns.end(), static_cast<STG::Conn *>(NULL));
-    m_conns.erase(pos, m_conns.end());
-}
+    SetRunning(true);

 
 

-void RADIUS::handleEvents(const fd_set & fds)
-{
-    if (FD_ISSET(m_listenSocket, &fds))
-        acceptConnection();
-    else
+    try

     {
     {

-        std::deque<STG::Conn *>::iterator it;
-        for (it = m_conns.begin(); it != m_conns.end(); ++it)
-            if (FD_ISSET((*it)->sock(), &fds))
-                (*it)->read();
+        boost::asio::io_service ioService;
+        Server server(ioService, "secret", 1812, "/usr/share/freeradius/dictionary");
+        ioService.run();

     }
     }

+    catch (const std::exception& e)
+    {
+        m_errorStr = "Exception in RADIUS::Run(): " + std::string(e.what());
+        m_logger("Exception in RADIUS:: Run(): %s", e.what());
+        printfd(__FILE__, "Exception in RADIUS:: Run(). Message: '%s'\n", e.what());
+    }
+
+    SetRunning(false);
+    return 0;

 }
 }