Skip to content

Rebase of ANR2ME's sceHttp implementation #19813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hrydgard merged 11 commits into from
Jan 5, 2025
Merged

Rebase of ANR2ME's sceHttp implementation #19813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0012818
Implement sceHttp library
anr2me Aug 28, 2023
07f3249
Implement sceNetInetInetAddr which seems to be used too by many games…
anr2me Aug 28, 2023
e6aa667
Fixes some issue with sceUriParse
anr2me Sep 3, 2023
b5dcc86
Fixes an issue where sceHttp inited states didn't get reset when chan…
anr2me Sep 3, 2023
4c0bb64
Removing test code to set breakpoints.
anr2me Sep 3, 2023
f500726
Changing httpCode to statusLine
anr2me Sep 3, 2023
aeb6c7b
Making sure getAllResponseHeaders not to crash.
anr2me Sep 3, 2023
263c374
Updated getResponseContentLength
anr2me Sep 3, 2023
c86c6e5
Fixes Invalid URL issue during sceHttpSendRequest on LittleBigPlanet
anr2me Sep 3, 2023
4f87361
Added sceParseHttpResponseHeader implementation.
anr2me Sep 5, 2023
70042e0
Add comment
hrydgard Jan 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions Common/Net/HTTPClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ int Client::SendRequestWithData(const char *method, const RequestParams &req, co
return 0;
}

int Client::ReadResponseHeaders(net::Buffer *readbuf, std::vector<std::string> &responseHeaders, net::RequestProgress *progress) {
int Client::ReadResponseHeaders(net::Buffer *readbuf, std::vector<std::string> &responseHeaders, net::RequestProgress *progress, std::string *statusLine) {
// Snarf all the data we can into RAM. A little unsafe but hey.
static constexpr float CANCEL_INTERVAL = 0.25f;
bool ready = false;
Expand Down Expand Up @@ -421,6 +421,9 @@ int Client::ReadResponseHeaders(net::Buffer *readbuf, std::vector<std::string> &
return -1;
}

if (statusLine)
*statusLine = line;

while (true) {
int sz = readbuf->TakeLineCRLF(&line);
if (!sz || sz < 0)
Expand Down Expand Up @@ -553,7 +556,7 @@ int HTTPRequest::Perform(const std::string &url) {
}

if (!client.Connect(2, 20.0, &cancelled_)) {
ERROR_LOG(Log::HTTP, "Failed connecting to server or cancelled.");
ERROR_LOG(Log::HTTP, "Failed connecting to server or cancelled (=%d).", cancelled_);
return -1;
}

Expand Down
7 changes: 6 additions & 1 deletion Common/Net/HTTPClient.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class Client : public net::Connection {

int SendRequest(const char *method, const RequestParams &req, const char *otherHeaders, net::RequestProgress *progress);
int SendRequestWithData(const char *method, const RequestParams &req, const std::string &data, const char *otherHeaders, net::RequestProgress *progress);
int ReadResponseHeaders(net::Buffer *readbuf, std::vector<std::string> &responseHeaders, net::RequestProgress *progress);
int ReadResponseHeaders(net::Buffer *readbuf, std::vector<std::string> &responseHeaders, net::RequestProgress *progress, std::string *statusLine = nullptr);
// If your response contains a response, you must read it.
int ReadResponseEntity(net::Buffer *readbuf, const std::vector<std::string> &responseHeaders, Buffer *output, net::RequestProgress *progress);

Expand All @@ -83,7 +83,12 @@ class Client : public net::Connection {
userAgent_ = value;
}

void SetHttpVersion(const char *version) {
httpVersion_ = version;
}

protected:
std::string httpVersion_;
std::string userAgent_;
double dataTimeout_ = 900.0;
};
Expand Down
15 changes: 15 additions & 0 deletions Core/HLE/FunctionWrappers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,16 @@ template<int func(u32, u32, u32, u32, u32)> void WrapI_UUUUU() {
RETURN(retval);
}

template<int func(u32, const char*, u32, u32, int)> void WrapI_UCUUI() {
int retval = func(PARAM(0), Memory::GetCharPointer(PARAM(1)), PARAM(2), PARAM(3), PARAM(4));
RETURN(retval);
}

template<int func(u32, int, const char*, u32, u32)> void WrapI_UICUU() {
int retval = func(PARAM(0), PARAM(1), Memory::GetCharPointer(PARAM(2)), PARAM(3), PARAM(4));
RETURN(retval);
}

template<int func()> void WrapI_V() {
int retval = func();
RETURN(retval);
Expand Down Expand Up @@ -785,6 +795,11 @@ template<u32 func(u32, u32, u32, u32, u32, u32, u32)> void WrapU_UUUUUUU() {
RETURN(retval);
}

template<int func(u32, u32, u32, u32, u32, u32, u32)> void WrapI_UUUUUUU() {
int retval = func(PARAM(0), PARAM(1), PARAM(2), PARAM(3), PARAM(4), PARAM(5), PARAM(6));
RETURN(retval);
}

template<int func(int, u32, u32, u32, u32, u32, u32)> void WrapI_IUUUUUU() {
int retval = func(PARAM(0), PARAM(1), PARAM(2), PARAM(3), PARAM(4), PARAM(5), PARAM(6));
RETURN(retval);
Expand Down
Loading