HappyTanuki/NP_Midterm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

리눅스랑 코드 동기화

Browse Source
This commit is contained in:
HappyTanuki
2025-05-01 16:33:52 +09:00
parent d3161edb36
commit 4fb5bdd4cb
14 changed files with 279 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
impl/Socket/Log.cpp
View File

@@ -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

40
impl/Socket/Socket.cpp
View File

@@ -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) {

20
impl/Socket/TCPSocket.cpp
View File

@@ -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) {