This commit is contained in:
2025-04-26 16:17:19 +09:00
parent c660c41657
commit d13a9ca474
12 changed files with 199 additions and 87 deletions

View File

@@ -1,12 +0,0 @@
[2025-04-24 21:34:04.752] [Chattering Logger] [info] thread?
[2025-04-24 21:34:04.752] [Chattering Logger] [info] Waiting for connection...
[2025-04-24 21:34:24.926] [Chattering Logger] [info] thread?
[2025-04-24 21:34:24.926] [Chattering Logger] [info] Waiting for connection...
[2025-04-24 21:34:39.658] [Chattering Logger] [info] thread?
[2025-04-24 21:34:39.658] [Chattering Logger] [info] Waiting for connection...
[2025-04-24 21:34:48.422] [Chattering Logger] [info] Waiting for connection...
[2025-04-24 21:34:48.422] [Chattering Logger] [info] thread?
[2025-04-24 21:34:49.422] [Chattering Logger] [info] thread?
[2025-04-24 21:35:32.526] [Chattering Logger] [info] thread?
[2025-04-24 21:35:33.526] [Chattering Logger] [info] thread?
[2025-04-24 21:35:33.526] [Chattering Logger] [info] Waiting for connection...

View File

@@ -1,8 +0,0 @@
{
"IP Version" : 6,
"Listen Port" : 9010,
"LogLevel" : 1,
"LogfileCount" : 5,
"LogfileName" : "Chattering.log",
"LogfileSize" : 4294967295
}

View File

@@ -2,34 +2,27 @@
#include "Socket/Log.hpp"
#include "Utils/ConfigManager.hpp"
#include "Utils/Thread.hpp"
#include "Utils/StringTokenizer.hpp"
#include "precomp.hpp"
void _TCPClient(Chattr::TCPSocket sock, Chattr::Address addr);
int main() {
auto config = Chattr::ConfigManager::load();
Chattr::log::setDefaultLogger(config.logLevel, config.logFileName, config.logfileSize, config.logfileCount);
struct Chattr::TCPSocket sock;
struct Chattr::Address serveraddr;
if (config.ipVersion == 4) {
sock.init(AF_INET);
struct Chattr::Address serveraddr;
serveraddr.addr_in.sin_family = AF_INET;
serveraddr.addr_in.sin_addr.s_addr = htonl(INADDR_ANY);
serveraddr.addr_in.sin_port = htons(config.listenPort);
sock.bind(&serveraddr.addr_in);
serveraddr.set(AF_INET, INADDR_ANY, config.listenPort);
}
else {
else if (config.ipVersion == 6) {
sock.init(AF_INET6);
struct Chattr::Address serveraddr;
serveraddr.addr_in6.sin6_family = AF_INET6;
serveraddr.addr_in6.sin6_addr = in6addr_any;
serveraddr.addr_in6.sin6_port = htons(config.listenPort);
sock.bind(&serveraddr.addr_in6);
serveraddr.set(AF_INET6, in6addr_any, config.listenPort);
}
sock.bind(&serveraddr.addr, serveraddr.length);
sock.listen(SOMAXCONN);
struct Chattr::TCPSocket clientSock;
struct Chattr::Address clientAddr;
@@ -39,12 +32,15 @@ int main() {
else
clientAddr.length = sizeof(sockaddr_in6);
Chattr::Thread t1([]() {
spdlog::info("thread?");
sleep(1);
spdlog::info("thread?");
});
while (true) {
spdlog::info("Waiting for connection...");
sock.accept(clientSock, clientAddr);
Chattr::Thread thread_(_TCPClient, std::move(clientSock), clientAddr);
}
}
void _TCPClient(Chattr::TCPSocket sock, Chattr::Address addr) {
spdlog::info("Connection accepted! from: {}, {}", sock, (std::string)addr);
spdlog::info("Waiting for connection...");
// sock.accept(clientSock, clientAddr);
}