summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorlittleblack111 <littleblack11111@gmail.com>2025-06-15 14:19:35 +0800
committerlittleblack111 <littleblack11111@gmail.com>2025-06-16 22:22:10 +0800
commit82b6612418908654a61b7947550b796ce4ed57d6 (patch)
tree436dcba871bfad2dcc2bc90a51e59fde86dc33f8 /src
parent08688972ae56b474e2e2fd954c5caaeb1233a1be (diff)
fix(cmake): linking
Diffstat (limited to 'src')
-rw-r--r--src/misc/FileDescriptor.cpp2
-rw-r--r--src/misc/FileDescriptor.hpp5
-rw-r--r--src/server/client.cpp5
-rw-r--r--src/server/clients.cpp4
-rw-r--r--src/server/server.cpp7
5 files changed, 18 insertions, 5 deletions
diff --git a/src/misc/FileDescriptor.cpp b/src/misc/FileDescriptor.cpp
index 92505f5..59fa688 100644
--- a/src/misc/FileDescriptor.cpp
+++ b/src/misc/FileDescriptor.cpp
@@ -5,6 +5,8 @@
#include <unistd.h>
#include <utility>
+using namespace LibSock;
+
CFileDescriptor::CFileDescriptor(int const fd)
: m_fd(fd) {}
diff --git a/src/misc/FileDescriptor.hpp b/src/misc/FileDescriptor.hpp
index 75aeb73..dd9f8fe 100644
--- a/src/misc/FileDescriptor.hpp
+++ b/src/misc/FileDescriptor.hpp
@@ -1,6 +1,9 @@
#pragma once
#include <fcntl.h>
+
+namespace LibSock {
+
class CFileDescriptor {
public:
CFileDescriptor() = default;
@@ -33,3 +36,5 @@ class CFileDescriptor {
private:
int m_fd = -1;
};
+
+} // namespace LibSock
diff --git a/src/server/client.cpp b/src/server/client.cpp
index f99cb97..9efad18 100644
--- a/src/server/client.cpp
+++ b/src/server/client.cpp
@@ -1,5 +1,6 @@
#include "libsock/server/client.hpp"
-#include "../misc/memory.hpp"
+#include "libsock/types.hpp"
+#include "misc/FileDescriptor.hpp"
// #include "chatManager.hpp"
#include "libsock/server/server.hpp"
// #include "sessionManager.hpp"
@@ -14,7 +15,7 @@
using namespace LibSock::Client;
Client::Client(bool track, bool oneShot) : m_track(track), m_oneShot(oneShot) {
- m_sockfd = std::make_shared<CFileDescriptor>(
+ m_sockfd = std::make_shared<LibSock::CFileDescriptor>(
accept(LibSock::Server::pServer->getSocket()->get(),
reinterpret_cast<sockaddr *>(&m_addr),
&m_addrLen)); // if this is in the init list, it will run before
diff --git a/src/server/clients.cpp b/src/server/clients.cpp
index 0327ea3..e42579c 100644
--- a/src/server/clients.cpp
+++ b/src/server/clients.cpp
@@ -99,6 +99,10 @@ std::vector<SP<Client>> Clients::getClients() const {
return m_vClients | std::views::transform([](const auto &s) { return s.second; }) | std::ranges::to<std::vector>();
}
+std::vector<SData> Clients::getDatas() const {
+ return m_vDatas;
+}
+
void Clients::kick(WP<Client> clientWeak, const bool kill, const std::string &reason) {
auto client = clientWeak.lock();
if (!client)
diff --git a/src/server/server.cpp b/src/server/server.cpp
index 0692a74..2e07809 100644
--- a/src/server/server.cpp
+++ b/src/server/server.cpp
@@ -1,5 +1,6 @@
#include "libsock/server/server.hpp"
-#include "misc/memory.hpp"
+#include "libsock/types.hpp"
+#include "misc/FileDescriptor.hpp"
#include <cstring>
#include <mutex>
#include <sys/socket.h>
@@ -8,7 +9,7 @@ using namespace LibSock::Server;
Server::Server(uint16_t port, bool reuseaddr, bool keepalive)
: m_sockfd(
- std::make_shared<CFileDescriptor>(socket(AF_INET, SOCK_STREAM, 0))) {
+ std::make_shared<LibSock::CFileDescriptor>(socket(AF_INET, SOCK_STREAM, 0))) {
std::lock_guard<std::mutex> lk(m_mutex);
if (!m_sockfd->isValid() || m_sockfd->get() < 0)
throw std::runtime_error("Failed to create socket");
@@ -35,4 +36,4 @@ Server::Server(uint16_t port, bool reuseaddr, bool keepalive)
Server::~Server() { m_sockfd.reset(); }
-std::shared_ptr<CFileDescriptor> Server::getSocket() const { return m_sockfd; }
+std::shared_ptr<LibSock::CFileDescriptor> Server::getSocket() const { return m_sockfd; }