preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-09-04 11:45:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow passing in a custom resolver to HTTPRequest and Connection. This inverts the bad dependency.

Browse Source
This commit is contained in:
Henrik Rydgård
2025-08-06 00:16:34 +02:00
parent 820d83b2c0
commit 05b82d6ce4
16 changed files with 87 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Common/Net/HTTPClient.cpp
+9 -5
View File
@@ -63,7 +63,11 @@ bool Connection::Resolve(const char *host, int port, DNSType type) {
char port_str[16];
snprintf(port_str, sizeof(port_str), "%d", port);
std::string processedHostname = ProcessHostnameWithInfraDNS(std::string(host));
std::string processedHostname(host);
if (customResolve_) {
processedHostname = customResolve_(host);
}
std::string err;
if (!net::DNSResolve(processedHostname.c_str(), port_str, &resolved_, err, type)) {
@@ -211,7 +215,7 @@ namespace http {
constexpr const char *DEFAULT_USERAGENT = "PPSSPP";
constexpr const char *HTTP_VERSION = "1.1";
Client::Client() {
Client::Client(net::ResolveFunc func) : Connection(func) {
userAgent_ = DEFAULT_USERAGENT;
httpVersion_ = HTTP_VERSION;
}
@@ -488,8 +492,8 @@ int Client::ReadResponseEntity(net::Buffer *readbuf, const std::vector<std::stri
return 0;
}
HTTPRequest::HTTPRequest(RequestMethod method, std::string_view url, std::string_view postData, std::string_view postMime, const Path &outfile, RequestFlags flags, std::string_view name)
: Request(method, url, name, &cancelled_, flags), postData_(postData), postMime_(postMime) {
HTTPRequest::HTTPRequest(RequestMethod method, std::string_view url, std::string_view postData, std::string_view postMime, const Path &outfile, RequestFlags flags, net::ResolveFunc customResolve, std::string_view name)
: Request(method, url, name, &cancelled_, flags), postData_(postData), postMime_(postMime), customResolve_(customResolve) {
outfile_ = outfile;
}
@@ -525,7 +529,7 @@ int HTTPRequest::Perform(const std::string &url) {
return -1;
}
http::Client client;
http::Client client(customResolve_);
if (!userAgent_.empty()) {
client.SetUserAgent(userAgent_);
}