리눅스랑 코드 동기화

impl/Session/Session.cpp

@@ -1,28 +1,60 @@
-#include "Session/Session.hpp"
-
-namespace Chattr {
-
-Session::Session(Chattr::TCPSocket __sock) {
-	init(std::move(__sock));
-}
-
-Session::~Session() {
-	destruct();
-}
-
-void Session::init(Chattr::TCPSocket __sock) {
-	
-}
-
-void Session::destruct() {
-}
-
-int Session::send() {
-	return -1;
-}
-
-int Session::recv() {
-	return -1;
-}
-
-}
+//#include "Session/Session.hpp"
+//#include "Socket/Log.hpp"
+//#include "precomp.hpp"
+//#include <thread>
+//
+//namespace Chattr {
+//
+//Session::Session(Chattr::TCPSocket __sock) {
+//	init(std::move(__sock));
+//}
+//
+//Session::~Session() {
+//	destruct();
+//}
+//
+//void Session::init(Chattr::TCPSocket __sock) {
+//	sock_ = std::move(__sock);
+//}
+//
+//void Session::destruct() {
+//}
+//
+//TCPSocket Session::reconnect(Chattr::TCPSocket __sock, int maxTry) {
+//	int retVal = 0;
+//	int backoffTime = 2;
+//
+//	__sock.destruct();
+//
+//	spdlog::info("Lost connection.");
+//	while (maxTry--) {
+//		backoffTime *= backoffTime;
+//		spdlog::info("Attempt to reconnect in {}s...", backoffTime);
+//		std::this_thread::sleep_for(std::chrono::seconds(backoffTime));
+//		TCPSocket sock;
+//
+//		retVal = sock.init(__sock.domain);
+//		if (retVal == INVALID_SOCKET || retVal == SOCKET_ERROR) {
+//			log::error("init()");
+//			continue;
+//		}
+//		retVal = sock.connect(__sock.remoteAddr);
+//		if (retVal == INVALID_SOCKET || retVal == SOCKET_ERROR) {
+//			log::error("connect()");
+//			continue;
+//		}
+//
+//		return sock;
+//	}
+//	return TCPSocket();
+//}
+//
+//int Session::recv(void* __restrict __buf, size_t __n, int __flags) {
+//	return -1;
+//}
+//
+//int Session::send(const void* __buf, size_t __n, int __flags) {
+//	return -1;
+//}
+//
+//}

impl/Session/SessionManager.cpp

@@ -0,0 +1,2 @@
+// #include "Session/SessionManager.hpp"
+#include "precomp.hpp"

impl/Socket/Log.cpp

@@ -55,11 +55,11 @@ void error(gsl::czstring msg) {
         (LPSTR)&msgbuf,
         0,
         NULL);
-    spdlog::critical("[{}] {}", msg, msgbuf);
+    spdlog::error("[{}] {}", msg, msgbuf);
     LocalFree(msgbuf);
 #elif __linux__
     gsl::czstring msgbuf = strerror(errno);
-    spdlog::critical("[{}] {}", msg, msgbuf);
+    spdlog::error("[{}] {}", msg, msgbuf);
 #else
 #error "이 플랫폼은 지원되지 않습니다."
 #endif

impl/Socket/Socket.cpp

@@ -12,17 +12,16 @@ Socket::~Socket() {
     destruct();
 }
 
-void Socket::init(int domain, int type, int protocol) {
-    if (domain == AF_INET)
-        bindAddr.length = sizeof(sockaddr_in);
-    else if (domain == AF_INET6)
-        bindAddr.length = sizeof(sockaddr_in6);
+int Socket::init(int domain, int type, int protocol) {
+    this->domain = domain;
         
     sock_ = ::socket(domain, type, protocol);
 	if (sock_ == INVALID_SOCKET)
 		log::critical("socket()");
     
     valid_ = true;
+
+    return 0;
 }
 
 void Socket::destruct() {
@@ -33,6 +32,7 @@ void Socket::destruct() {
 #elif __linux__
 	::close(sock_);
 #endif
+    valid_ = false;
 }
 
 Socket::operator SOCKET() {
@@ -44,7 +44,7 @@ Socket::operator SOCKET() {
     return INVALID_SOCKET;
 }
 
-void Socket::set(const SOCKET __sock) {
+void Socket::set(const SOCKET __sock, int __domain) {
     if (__sock == INVALID_SOCKET)
 		log::critical("socket()");
 
@@ -54,32 +54,12 @@ void Socket::set(const SOCKET __sock) {
     valid_ = true;
 };
 
-void Socket::bind(sockaddr *__addr) {
-    bind((struct sockaddr *)__addr, sizeof(sockaddr));
-}
-
-void Socket::bind(sockaddr *__addr, socklen_t __len) {
-    bindAddr.length = __len;
-    std::memcpy(&bindAddr, __addr, __len);
-    int retVal = ::bind(sock_, __addr, __len);
+int Socket::bind(Address __addr) {
+    bindAddr = __addr;
+    int retVal = ::bind(sock_, &__addr.addr, __addr.length);
     if (retVal == INVALID_SOCKET)
         log::critical("bind()");
-}
-
-void Socket::bind(sockaddr_in *__addr) {
-    bind((struct sockaddr *)__addr, sizeof(sockaddr_in));
-}
-
-void Socket::bind(sockaddr_in *__addr, socklen_t __len) {
-    bind((struct sockaddr *)__addr, __len);
-}
-
-void Socket::bind(sockaddr_in6 *__addr) {
-    bind((struct sockaddr *)__addr, sizeof(sockaddr_in6));
-}
-
-void Socket::bind(sockaddr_in6 *__addr, socklen_t __len) {
-    bind((struct sockaddr *)__addr, __len);
+    return retVal;
 }
 
 int Socket::recvfrom(void *__restrict __buf, size_t __n, int __flags, struct Address& __addr) {

impl/Socket/TCPSocket.cpp

@@ -4,27 +4,29 @@
 
 namespace Chattr {
 
-void TCPSocket::init(int domain) {
-    init(domain, SOCK_STREAM, 0);
-    valid_ = true;
+int TCPSocket::init(int domain) {
+    return init(domain, SOCK_STREAM, 0);
 }
 
-void TCPSocket::listen(int __n) {
+int TCPSocket::listen(int __n) {
     int retVal = ::listen(sock_, __n);
     if (retVal == INVALID_SOCKET)
-        log::critical("listen()");
+        log::error("listen()");
+    return retVal;
 }
 
 void TCPSocket::accept(TCPSocket& newSock, Address& __addr) {
-    newSock.set(::accept(sock_, &__addr.addr, &__addr.length));
+    newSock.set(::accept(sock_, &__addr.addr, &__addr.length), domain);
     if (newSock == INVALID_SOCKET)
-        log::critical("accept()");
+        log::error("accept()");
 }
 
-void TCPSocket::connect(Chattr::Address& serveraddr) {
+int TCPSocket::connect(Address& serveraddr) {
     int retVal = ::connect(sock_, (struct sockaddr *)&serveraddr.addr, serveraddr.length);
+    remoteAddr = serveraddr;
     if (retVal == INVALID_SOCKET)
-        log::critical("connect()");
+        log::error("connect()");
+    return retVal;
 }
 
 int TCPSocket::recv(void *__restrict __buf, size_t __n, int __flags) {

impl/Utils/StringTokenizer.cpp

@@ -11,7 +11,7 @@ void StringTokenizer::set(gsl::czstring string, std::uint32_t size) {
 	bool token = false;
 	bool quote = false, doubleQuote = false;
 
-	for (int i = 0; i < size; i++) {
+	for (std::uint32_t i = 0; i < size; i++) {
 		if (string[i] == ' ' && token != true)
 			continue;