X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/9a3ec37da47b35901d0ad25a257398895c37bfb1..418ecfb85b58d140aa9c786d837b27d79d3187ce:/projects/stargazer/plugins/other/radius/radius.cpp?ds=inline diff --git a/projects/stargazer/plugins/other/radius/radius.cpp b/projects/stargazer/plugins/other/radius/radius.cpp index daa8634c..376e4278 100644 --- a/projects/stargazer/plugins/other/radius/radius.cpp +++ b/projects/stargazer/plugins/other/radius/radius.cpp @@ -23,6 +23,7 @@ #include "stg/store.h" #include "stg/users.h" #include "stg/plugin_creator.h" +#include "stg/common.h" #include #include @@ -53,7 +54,7 @@ extern "C" PLUGIN * GetPlugin() } RADIUS::RADIUS() - : m_config(m_settings), + : m_config(), m_running(false), m_stopped(true), m_users(NULL), @@ -105,6 +106,9 @@ int RADIUS::Stop() return 0; } + if (m_config.connectionType == Config::UNIX) + unlink(m_config.bindAddress.c_str()); + m_error = "Failed to stop thread."; m_logger(m_error); return -1; @@ -134,8 +138,6 @@ bool RADIUS::reconnect() { shutdown(m_listenSocket, SHUT_RDWR); close(m_listenSocket); - if (m_config.connectionType == Config::UNIX) - unlink(m_config.bindAddress.c_str()); } if (m_config.connectionType == Config::UNIX) m_listenSocket = createUNIX(); @@ -165,6 +167,7 @@ int RADIUS::createUNIX() const memset(&addr, 0, sizeof(addr)); addr.sun_family = AF_UNIX; strncpy(addr.sun_path, m_config.bindAddress.c_str(), m_config.bindAddress.length()); + unlink(m_config.bindAddress.c_str()); if (bind(fd, reinterpret_cast(&addr), sizeof(addr)) == -1) { shutdown(fd, SHUT_RDWR); @@ -173,6 +176,9 @@ int RADIUS::createUNIX() const m_logger(m_error); return 0; } + chown(m_config.bindAddress.c_str(), m_config.sockUID, m_config.sockGID); + if (m_config.sockMode != static_cast(-1)) + chmod(m_config.bindAddress.c_str(), m_config.sockMode); return fd; } @@ -193,7 +199,7 @@ int RADIUS::createTCP() const int res = getaddrinfo(m_config.bindAddress.c_str(), m_config.portStr.c_str(), &hints, &ais); if (res != 0) { - m_error = "Error resolvin address '" + m_config.bindAddress + "': " + gai_strerror(res); + m_error = "Error resolving address '" + m_config.bindAddress + "': " + gai_strerror(res); m_logger(m_error); return 0; } @@ -230,6 +236,7 @@ int RADIUS::createTCP() const void RADIUS::runImpl() { m_running = true; + m_stopped = false; while (m_running) { fd_set fds; @@ -243,6 +250,8 @@ void RADIUS::runImpl() int res = select(maxFD() + 1, &fds, NULL, NULL, &tv); if (res < 0) { + if (errno == EINTR) + continue; m_error = std::string("'select' is failed: '") + strerror(errno) + "'."; m_logger(m_error); break; @@ -332,6 +341,7 @@ void RADIUS::acceptUNIX() m_logger(m_error); return; } + printfd(__FILE__, "New UNIX connection: '%s'\n", addr.sun_path); m_conns.push_back(new Conn(*m_users, m_logger, m_config, res, addr.sun_path)); } @@ -348,5 +358,6 @@ void RADIUS::acceptTCP() return; } std::string remote = inet_ntostring(addr.sin_addr.s_addr) + ":" + x2str(ntohs(addr.sin_port)); + printfd(__FILE__, "New TCP connection: '%s'\n", remote.c_str()); m_conns.push_back(new Conn(*m_users, m_logger, m_config, res, remote)); }