diff --git a/Common/Net/Resolve.cpp b/Common/Net/Resolve.cpp index f3a34381ee..9f53823905 100644 --- a/Common/Net/Resolve.cpp +++ b/Common/Net/Resolve.cpp @@ -111,31 +111,6 @@ void DNSResolveFree(addrinfo *res) freeaddrinfo(res); } -bool GetDefaultOutboundSockaddr(sockaddr_in& destSockaddrIn, socklen_t& destSocklen) { - auto fd = socket(AF_INET, SOCK_STREAM, 0); - if (fd < 0) { - ERROR_LOG(Log::sceNet, "getSockAddrFromDefaultSocket: Failed to open socket (%s)", strerror(socket_errno)); - return false; - } - sockaddr_in connectingTo; - memset(&connectingTo, 0, sizeof(connectingTo)); - connectingTo.sin_family = AF_INET; - connectingTo.sin_port = htons(53); - connectingTo.sin_addr.s_addr = 0x08080808; - if (connect(fd, (sockaddr*)&connectingTo, sizeof(connectingTo)) < 0) { - ERROR_LOG(Log::sceNet, "getSockAddrFromDefaultSocket: Failed to connect to Google (%s)", strerror(socket_errno)); - closesocket(fd); - return false; - } - if (getsockname(fd, (sockaddr*)&destSockaddrIn, &destSocklen) < 0) { - ERROR_LOG(Log::sceNet, "getSockAddrFromDefaultSocket: Failed to execute getsockname (%s)", strerror(socket_errno)); - closesocket(fd); - return false; - } - closesocket(fd); - return true; -} - bool GetIPList(std::vector &IP4s) { char ipstr[INET6_ADDRSTRLEN]; // We use IPv6 length since it's longer than IPv4 // getifaddrs first appeared in glibc 2.3, On Android officially supported since __ANDROID_API__ >= 24 diff --git a/Common/Net/Resolve.h b/Common/Net/Resolve.h index 1f9b067531..63edecfbfe 100644 --- a/Common/Net/Resolve.h +++ b/Common/Net/Resolve.h @@ -4,8 +4,6 @@ #include struct addrinfo; -typedef int socklen_t; -struct sockaddr_in; namespace net { @@ -22,7 +20,7 @@ enum class DNSType { bool DNSResolve(const std::string &host, const std::string &service, addrinfo **res, std::string &error, DNSType type = DNSType::ANY); void DNSResolveFree(addrinfo *res); bool GetIPList(std::vector& IP4s); -bool GetDefaultOutboundSockaddr(sockaddr_in& destSockaddrIn, socklen_t& destSocklen); int inet_pton(int af, const char* src, void* dst); + } // namespace net