From 9e3a7d5238d1b1c7a00e457f67a8108108909f01 Mon Sep 17 00:00:00 2001 From: littleblack111 Date: Tue, 20 May 2025 19:00:37 +0800 Subject: Revert "internal: use smart pointer for everything, no more naked pointer" This reverts commit 72cf95bc9b1eb338457a0815eb1fe4f70b42ebb3. segfault/IOT instruct on client exit... --- src/session.cpp | 6 +++--- src/session.hpp | 18 +++++++++--------- src/sessionManager.cpp | 29 +++++++++++++++-------------- src/sessionManager.hpp | 10 +++++----- 4 files changed, 32 insertions(+), 31 deletions(-) diff --git a/src/session.cpp b/src/session.cpp index 8167a91..2814c41 100644 --- a/src/session.cpp +++ b/src/session.cpp @@ -151,7 +151,7 @@ void CSession::run() { } else log(LOG, "Client {} exited without even registering", m_ip); - g_pSessionManager->kick(std::move(self)); + g_pSessionManager->kick(self); } bool CSession::isMuted() const { @@ -266,6 +266,6 @@ const std::string &CSession::getIp() const { return m_ip; } -void CSession::setSelf(std::unique_ptr>> self) { - this->self = std::move(self); +void CSession::setSelf(std::pair> *self) { + this->self = self; } diff --git a/src/session.hpp b/src/session.hpp index c3aecc1..1669964 100644 --- a/src/session.hpp +++ b/src/session.hpp @@ -24,7 +24,7 @@ class CSession { const std::string &getName() const; const std::string &getIp() const; - void setSelf(std::unique_ptr>> self); + void setSelf(std::pair> *self); std::unique_ptr read(); std::unique_ptr read(const std::string &msg, bool bypassDeaf = false); @@ -52,14 +52,14 @@ class CSession { WRITE }; - std::unique_ptr>> self; - Hyprutils::OS::CFileDescriptor m_sockfd; - sockaddr_in m_addr; - socklen_t m_addrLen = sizeof(m_addr); - std::string m_name; - std::string m_ip; - int m_port; - bool m_isAdmin = false; + std::pair> *self; + Hyprutils::OS::CFileDescriptor m_sockfd; + sockaddr_in m_addr; + socklen_t m_addrLen = sizeof(m_addr); + std::string m_name; + std::string m_ip; + int m_port; + bool m_isAdmin = false; bool m_isReading = false; bool m_bMuted = false; diff --git a/src/sessionManager.cpp b/src/sessionManager.cpp index 6d9df28..b81aeaf 100644 --- a/src/sessionManager.cpp +++ b/src/sessionManager.cpp @@ -12,7 +12,7 @@ void CSessionManager::shutdownSessions() { return; for (auto &session : m_vSessions) - kick(std::unique_ptr>>(&session), false, "Server shutting down"); + kick(&session, false, "Server shutting down"); } CSessionManager::CSessionManager() { @@ -35,10 +35,11 @@ CSessionManager::~CSessionManager() { log(SYS, "SessionManager: bye"); } -void CSessionManager::newSession() { +std::pair> *CSessionManager::newSession() { std::shared_ptr session = std::make_shared(); - auto instance = std::unique_ptr>>(&m_vSessions.emplace_back(std::jthread(&CSession::run, session.get()), session)); - instance->second->setSelf(std::move(instance)); + const auto instance = &m_vSessions.emplace_back(std::jthread(&CSession::run, session.get()), session); + instance->second->setSelf(instance); + return instance; } void CSessionManager::run() { @@ -65,7 +66,7 @@ bool CSessionManager::nameExists(const std::string &name) { if (it != m_vSessions.end()) { if (!it->second->isValid()) { - kick(it->second, true, "Connection lost"); + kick(it->second.get(), true, "Connection lost"); return false; } return true; @@ -73,28 +74,28 @@ bool CSessionManager::nameExists(const std::string &name) { return false; } -std::shared_ptr CSessionManager::getByName(const std::string &name) const { +CSession *CSessionManager::getByName(const std::string &name) const { auto it = std::ranges::find_if(m_vSessions, [&name](const auto &s) { return s.second->getName() == name; }); - return it != m_vSessions.end() ? it->second : nullptr; + return it != m_vSessions.end() ? it->second.get() : nullptr; } -std::shared_ptr CSessionManager::getByIp(const std::string &ip) const { +CSession *CSessionManager::getByIp(const std::string &ip) const { auto it = std::ranges::find_if(m_vSessions, [&ip](const auto &s) { log(LOG, s.second->m_ip); return s.second->m_ip == ip; }); - return it != m_vSessions.end() ? it->second : nullptr; + return it != m_vSessions.end() ? it->second.get() : nullptr; } std::vector> CSessionManager::getSessions() const { return m_vSessions | std::views::transform([](const auto &s) { return s.second; }) | std::ranges::to(); } -void CSessionManager::kick(std::shared_ptr session, const bool kill, const std::string &reason) { +void CSessionManager::kick(CSession *session, const bool kill, const std::string &reason) { for (auto &_session : m_vSessions) - if (_session.second == session) - kick(std::unique_ptr>>(&_session), kill, reason); + if (_session.second.get() == session) + kick(&_session, kill, reason); } -void CSessionManager::kick(std::unique_ptr>> session, const bool kill, const std::string &reason) { - auto it = std::ranges::find_if(m_vSessions, [&session](const auto &s) { return s.second.get() == session->second.get(); }); +void CSessionManager::kick(std::pair> *session, const bool kill, const std::string &reason) { + auto it = std::ranges::find_if(m_vSessions, [session](const auto &s) { return s.second.get() == session->second.get(); }); if (it != m_vSessions.end()) { if (!reason.empty()) { diff --git a/src/sessionManager.hpp b/src/sessionManager.hpp index e969bd9..8e02a7d 100644 --- a/src/sessionManager.hpp +++ b/src/sessionManager.hpp @@ -12,19 +12,19 @@ class CSessionManager { CSessionManager(); ~CSessionManager(); - void newSession(); + std::pair> *newSession(); void run(); void broadcast(const std::string &msg) const; - void kick(std::shared_ptr session, const bool kill = false, const std::string &reason = ""); - void kick(std::unique_ptr>> session, const bool kill = false, const std::string &reason = ""); + void kick(CSession *session, const bool kill = false, const std::string &reason = ""); + void kick(std::pair> *session, const bool kill = false, const std::string &reason = ""); void addSession(const CSession &session); bool nameExists(const std::string &name); void shutdownSessions(); - std::shared_ptr getByName(const std::string &name) const; - std::shared_ptr getByIp(const std::string &ip) const; + CSession *getByName(const std::string &name) const; + CSession *getByIp(const std::string &ip) const; std::vector> getSessions() const; private: -- cgit v1.2.3