summaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
authorlittleblack111 <littleblack11111@gmail.com>2025-06-21 20:19:27 +0800
committerlittleblack111 <littleblack11111@gmail.com>2025-06-22 11:13:20 +0800
commit2c466d30464b566c471a89c5528d768be7729445 (patch)
tree642f0184094576d45ddafcc669f68c913a77f04f /src/server
parentb9e7dc8ab73feef48c995b2b68c09e8a77940fc2 (diff)
style: remove uncessary comments and fixed clangd format
fix(server/client:read): correctly set good = false and cb when failed
Diffstat (limited to 'src/server')
-rw-r--r--src/server/client.cpp18
-rw-r--r--src/server/server.cpp16
2 files changed, 9 insertions, 25 deletions
diff --git a/src/server/client.cpp b/src/server/client.cpp
index 333f734..d89aea0 100644
--- a/src/server/client.cpp
+++ b/src/server/client.cpp
@@ -37,9 +37,6 @@ Client::Client(SP<Server> server, SP<Clients> clients, bool track, bool oneShot)
}
Client::~Client() {
-#ifdef DEBUG
- onDisconnect();
-#endif
m_sockfd.reset();
}
@@ -58,17 +55,15 @@ void Client::recvLoop() {
}
bool SRecvData::isEmpty() const {
- return data.empty() ||
- std::ranges::all_of(data, [](char c) { return std::isspace(c); });
+ return data.empty() || std::ranges::all_of(data, [](char c) { return std::isspace(c); });
}
void SRecvData::sanitize() {
if (!data.empty() && data.back() == '\n')
data.pop_back();
- data.erase(std::remove(data.begin(), data.end(), asciiEscape),
- data.end()); // don't accept ASCII code, might mess up terminal
- // // NOLINT
+ data.erase(std::remove(data.begin(), data.end(), asciiEscape), data.end()); // don't accept ASCII code, might mess up terminal
+ // // NOLINT
if (const auto start = data.find_first_not_of(" \t\r\n");
start != std::string::npos) {
@@ -93,9 +88,6 @@ UP<SRecvData> Client::read(std::optional<std::function<std::any(const SRecvData
recvData->good = true;
}
-#ifdef DEBUG
- onRecv(*recvData);
-#endif
m_szReading.reset();
return recvData;
}
@@ -121,9 +113,7 @@ bool Client::isValid() {
int err = 0;
socklen_t size = sizeof(err);
- return getsockopt(m_sockfd->get(), SOL_SOCKET, SO_ERROR, &err, &size) >=
- 0 &&
- err == 0;
+ return getsockopt(m_sockfd->get(), SOL_SOCKET, SO_ERROR, &err, &size) >= 0 && err == 0;
}
bool Client::write(const std::string &msg, std::optional<std::function<std::any(const SRecvData &)>> cb) {
diff --git a/src/server/server.cpp b/src/server/server.cpp
index a368efc..c14a39e 100644
--- a/src/server/server.cpp
+++ b/src/server/server.cpp
@@ -12,33 +12,27 @@ namespace LibSock {
namespace Server {
Server::Server(uint16_t port, bool reuseaddr, bool keepalive)
- : m_sockfd(
- std::make_shared<LibSock::CFileDescriptor>(socket(AF_INET, SOCK_STREAM, 0))
- )
+ : m_sockfd(std::make_shared<LibSock::CFileDescriptor>(socket(AF_INET, SOCK_STREAM, 0)))
, m_port(port) {
if (pServer)
throw std::runtime_error("server:server Server already exist");
- std::lock_guard<std::mutex>
- lk(m_mutex);
+ std::lock_guard<std::mutex> lk(m_mutex);
if (!m_sockfd->isValid() || m_sockfd->get() < 0)
throw std::runtime_error("server:server Failed to create socket");
constexpr int opt = 1;
constexpr int size = sizeof(opt);
- if (keepalive &&
- setsockopt(m_sockfd->get(), SOL_SOCKET, SO_REUSEADDR, &opt, size) < 0)
+ if (keepalive && setsockopt(m_sockfd->get(), SOL_SOCKET, SO_REUSEADDR, &opt, size) < 0)
throw std::runtime_error("server:server setsockopt(SO_REUSEADDR) failed");
- if (reuseaddr &&
- setsockopt(m_sockfd->get(), SOL_SOCKET, SO_KEEPALIVE, &opt, size) < 0)
+ if (reuseaddr && setsockopt(m_sockfd->get(), SOL_SOCKET, SO_KEEPALIVE, &opt, size) < 0)
throw std::runtime_error("server:server setsockopt(SO_KEEPALIVE) failed");
memset(&m_addr, 0, sizeof(m_addr));
m_addr.sin_family = AF_INET;
m_addr.sin_port = htons(m_port);
m_addr.sin_addr.s_addr = INADDR_ANY;
- if (bind(m_sockfd->get(), reinterpret_cast<sockaddr *>(&m_addr), sizeof(m_addr)) ||
- listen(m_sockfd->get(), 5))
+ if (bind(m_sockfd->get(), reinterpret_cast<sockaddr *>(&m_addr), sizeof(m_addr)) || listen(m_sockfd->get(), 5))
throw std::runtime_error("server:server Failed to bind or listen on socket");
}