일단은 멀티로 접속이 됨..

This commit is contained in:
2025-06-19 02:42:49 +09:00
parent 1b79d946c3
commit fc8217a608
25 changed files with 584 additions and 574 deletions

View File

@@ -4,50 +4,6 @@
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) {
@@ -58,19 +14,18 @@ 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);
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);
}
family = type;
}
void Address::setType(int type) {
@@ -87,12 +42,12 @@ Address::operator std::string() {
if (!port) return std::string();
if (length == sizeof(addr_in)) {
if (family == AF_INET) {
char addrStr[INET_ADDRSTRLEN];
::inet_ntop(AF_INET, &addr_in.sin_addr, addrStr, sizeof(addrStr));
return std::format("{}:{}", addrStr, port.value());
} else if (length == sizeof(addr_in6)) {
} else if (family == AF_INET6) {
char addrStr[INET6_ADDRSTRLEN];
::inet_ntop(AF_INET6, &addr_in6.sin6_addr, addrStr, sizeof(addrStr));