Radius (#9)

[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 e517c959ec81882907a96ff349a812c261ca8542..8e5b37a895edc3f5b2cdb195087faf5787276721 100644 (file)
--- a/projects/stargazer/plugins/other/radius/radius.cpp
+++ b/projects/stargazer/plugins/other/radius/radius.cpp
@@ -1,11 +1,7 @@
 #include "radius.h"
 #include "radius.h"

-#include "server.h"

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

-

 #include "stg/common.h"
 
 #include "stg/common.h"
 

-#include <boost/asio.hpp>
-#include <string>

 #include <iterator>
 #include <iostream>
 
 #include <iterator>
 #include <iostream>
 


@@ -67,27 +63,6 @@ RADIUS::RADIUS()
 {
 }
 
 {
 }
 

-int RADIUS::Run(std::stop_token token)
-{
-    SetRunning(true);
-
-    try
-    {
-        boost::asio::io_service ioService;
-        Server server(ioService, m_radSettings.GetSecret(), m_radSettings.GetPort(), m_radSettings.GetDictionaries());
-        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;
-}
-

 int RADIUS::ParseSettings()
 {
     auto ret = m_radSettings.ParseSettings(m_settings);
 int RADIUS::ParseSettings()
 {
     auto ret = m_radSettings.ParseSettings(m_settings);


@@ -115,6 +90,9 @@ int RADIUS::Stop()
 
     m_thread.request_stop();
 
 
     m_thread.request_stop();
 

+    if (m_server)
+        m_server->stop();
+

     m_thread.join();
     return 0;
 }
     m_thread.join();
     return 0;
 }


@@ -130,3 +108,24 @@ void RADIUS::SetRunning(bool val)
     const std::lock_guard lock(m_mutex);
     m_running = val;
 }
     const std::lock_guard lock(m_mutex);
     m_running = val;
 }

+
+int RADIUS::Run(std::stop_token token)
+{
+    SetRunning(true);
+
+    try
+    {
+        if (!m_server)
+           m_server = std::make_unique<Server>(m_ioService, m_radSettings.GetSecret(), m_radSettings.GetPort(), m_radSettings.GetDictionaries(), std::move(token), m_logger);
+        m_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;
+}