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

windows-compitable 수정

Browse Source
This commit is contained in:
HappyTanuki
2025-04-28 11:31:49 +09:00
parent 41c75b9dca
commit 4cb1d22fe6
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Server/src/server.cpp
View File

@@ -33,7 +33,7 @@ int main() {
sock.listen(SOMAXCONN); sock.listen(SOMAXCONN);
#ifdef _WIN32 #ifdef _WIN32
DWORD pid = GetCurrentProcessPid(); DWORD pid = GetCurrentProcessId();
#elif __linux__ #elif __linux__
pid_t pid = getpid(); pid_t pid = getpid();
#endif #endif

4
impl/Socket/Socket.cpp
View File

@@ -81,14 +81,14 @@ void Socket::bind(sockaddr_in6 *__addr, socklen_t __len) {
} }
int Socket::recvfrom(void *__restrict __buf, size_t __n, int __flags, struct Address& __addr) { int Socket::recvfrom(void *__restrict __buf, size_t __n, int __flags, struct Address& __addr) {
int retVal = ::recvfrom(sock_, __buf, __n, __flags, &__addr.addr, &__addr.length); int retVal = ::recvfrom(sock_, (char*)__buf, __n, __flags, &__addr.addr, &__addr.length);
if (retVal == SOCKET_ERROR) if (retVal == SOCKET_ERROR)
log::error("recvfrom()"); log::error("recvfrom()");
return retVal; return retVal;
} }
int Socket::sendto(const void *__buf, size_t __n, int __flags, struct Address __addr) { int Socket::sendto(const void *__buf, size_t __n, int __flags, struct Address __addr) {
int retVal = ::sendto(sock_, __buf, __n, __flags, &__addr.addr, __addr.length); int retVal = ::sendto(sock_, (char*)__buf, __n, __flags, &__addr.addr, __addr.length);
if (retVal == SOCKET_ERROR) if (retVal == SOCKET_ERROR)
log::error("sendto()"); log::error("sendto()");
return retVal; return retVal;

4
impl/Socket/TCPSocket.cpp
View File

@@ -28,14 +28,14 @@ void TCPSocket::connect(Chattr::Address& serveraddr) {
} }
int TCPSocket::recv(void *__restrict __buf, size_t __n, int __flags) { int TCPSocket::recv(void *__restrict __buf, size_t __n, int __flags) {
int retVal = ::recv(sock_, __buf, __n, __flags); int retVal = ::recv(sock_, (char *)__buf, __n, __flags);
if (retVal == SOCKET_ERROR) if (retVal == SOCKET_ERROR)
log::error("recv()"); log::error("recv()");
return retVal; return retVal;
} }
int TCPSocket::send(const void *__buf, size_t __n, int __flags) { int TCPSocket::send(const void *__buf, size_t __n, int __flags) {
int retVal = ::send(sock_, __buf, __n, __flags); int retVal = ::send(sock_, (char*)__buf, __n, __flags);
if (retVal == SOCKET_ERROR) if (retVal == SOCKET_ERROR)
log::error("send()"); log::error("send()");
return retVal; return retVal;