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

todo: iocp recv안되는 문제 해결하기

Browse Source
This commit is contained in:
HappyTanuki
2025-06-04 02:33:00 +09:00
parent 3f052a5f7f
commit c0e0279e5c
15 changed files with 363 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

127
impl/socket/address.cpp
View File

@@ -1,13 +1,53 @@
#include "socket/address.h"
#include <openssl/bio.h>
#include <openssl/err.h>
#include <openssl/ssl.h>
#include <format>
namespace Network {
//void Address::set(int type, gsl::czstring presentationAddr,
// std::uint16_t port) {
// zeroFill();
// setType(type);
//
// if (type == AF_INET) {
// ::inet_pton(AF_INET, presentationAddr, &addr_in.sin_addr);
// addr_in.sin_port = htons(port);
// } else if (type == AF_INET6) {
// ::inet_pton(AF_INET6, presentationAddr, &addr_in6.sin6_addr);
// addr_in6.sin6_port = htons(port);
// }
//
// BIO_ADDRINFO* res;
// if (!BIO_lookup_ex(presentationAddr, std::to_string(port).c_str(),
// BIO_LOOKUP_CLIENT, type, SOCK_DGRAM, 0, &res)) {
// ::BIO_ADDRINFO_free(res);
// throw std::runtime_error("can't resolve address");
// }
//
// int sock = -1;
// for (const BIO_ADDRINFO* ai = res; ai != nullptr;
// ai = ::BIO_ADDRINFO_next(ai)) {
// sock = ::BIO_socket(BIO_ADDRINFO_family(ai), type, 0, 0);
// if (sock == -1)
// continue;
// else {
// auto bio_addr = ::BIO_ADDRINFO_address(ai);
// BIO_ADDR_rawaddress(bio_addr, &addr, (unsigned long long*)&length);
// bio_addr_info = ::BIO_ADDR_dup(bio_addr);
//
// break;
// }
// }
//
// if (sock != -1)
// ::close(sock);
//
// ::BIO_ADDRINFO_free(res);
//
// addr_in.sin_family = type;
// addr_in.sin_port = htons(port);
//}
Address::Address() { zeroFill(); }
Address::Address(int type, gsl::czstring presentationAddr, std::uint16_t port) {
@@ -19,56 +59,22 @@ void Address::zeroFill() { memset(&addr_in6, 0, sizeof(addr_in6)); }
void Address::set(int type, gsl::czstring presentationAddr,
std::uint16_t port) {
zeroFill();
setType(type);
BIO_ADDRINFO* res;
if (!BIO_lookup_ex(presentationAddr, std::to_string(port).c_str(),
BIO_LOOKUP_CLIENT, type, SOCK_DGRAM, 0, &res)) {
throw std::runtime_error("can't resolve address");
if (type == AF_INET) {
addr_in.sin_family = AF_INET;
::inet_pton(AF_INET, presentationAddr, &addr_in.sin_addr);
addr_in.sin_port = htons(port);
length = sizeof(sockaddr_in);
} else if (type == AF_INET6) {
addr_in6.sin6_family = AF_INET6;
::inet_pton(AF_INET6, presentationAddr, &addr_in6.sin6_addr);
addr_in6.sin6_port = htons(port);
length = sizeof(sockaddr_in6);
}
int sock = -1;
for (const BIO_ADDRINFO* ai = res; ai != nullptr;
ai = ::BIO_ADDRINFO_next(ai)) {
sock = BIO_socket(BIO_ADDRINFO_family(ai), SOCK_DGRAM, 0, 0);
if (sock == -1) continue;
}
::close(sock);
addr_in.sin_family = type;
::inet_pton(type, presentationAddr, &addr_in.sin_addr);
addr_in.sin_port = htons(port);
}
void Address::set(int type, in_addr_t addr, std::uint16_t port) {
zeroFill();
setType(type);
addr_in.sin_family = type;
addr_in.sin_addr.s_addr = htonl(addr);
addr_in.sin_port = htons(port);
}
void Address::set(int type, in_addr addr, std::uint16_t port) {
zeroFill();
setType(type);
addr_in.sin_family = type;
addr_in.sin_addr = addr;
addr_in.sin_port = htons(port);
}
void Address::set(int type, in6_addr addr, std::uint16_t port) {
zeroFill();
setType(type);
addr_in6.sin6_family = type;
addr_in6.sin6_addr = addr;
addr_in6.sin6_port = htons(port);
}
void Address::setType(int type) {
family = type;
zeroFill();
if (type == AF_INET)
length = sizeof(sockaddr_in);
@@ -77,20 +83,29 @@ void Address::setType(int type) {
}
Address::operator std::string() {
char addrStr[INET6_ADDRSTRLEN];
std::optional<std::uint16_t> port = getPort();
if (family != AF_INET && family != AF_INET6 || !getPort())
return std::string();
if (!port) return std::string();
::inet_ntop(family, &addr, addrStr, sizeof(addrStr));
if (length == sizeof(addr_in)) {
char addrStr[INET_ADDRSTRLEN];
::inet_ntop(AF_INET, &addr_in.sin_addr, addrStr, sizeof(addrStr));
return std::format("{}:{}", addrStr, getPort());
return std::format("{}:{}", addrStr, port.value());
} else if (length == sizeof(addr_in6)) {
char addrStr[INET6_ADDRSTRLEN];
::inet_ntop(AF_INET6, &addr_in6.sin6_addr, addrStr, sizeof(addrStr));
return std::format("{}:{}", addrStr, port.value());
}
return std::string();
}
std::uint16_t Address::getPort() const {
if (family == AF_INET)
if (length == sizeof(addr_in))
return ntohs(addr_in.sin_port);
else if (family == AF_INET6)
else if (length == sizeof(addr_in6))
return ntohs(addr_in6.sin6_port);
else
return 0;