mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-09-03 19:25:18 +02:00
Henrik Rydgård
2096df52f5
naett has been a submodule pinned at v0.3.3; upstream has had no commits since April 2024, and we want to carry local changes (next up: a libcurl-backed HTTPS path for Linux). It's ~1500 lines of MIT C, smaller than several things we already vendor, so bring it in-tree and drop the submodule. Also drop the generated single-file amalgam (naett.c) that every build system was compiling, and build src/*.c directly instead - otherwise the file you edit isn't the file that gets compiled, which is a trap for anyone patching this. example/ and testrig/ (a whole Android Studio project) are gone with it. Two changes were needed to make the sources build on their own, both noted in ext/naett/README-ppsspp.md along with the upstream commit: - naett_internal.h now includes naett.h, which the amalgam pulled in first. - naett_linux.c now includes stdio.h/stdlib.h. It calls exit/calloc/realloc/ free/fprintf without ever including either, and only got away with it because naett_core.c sat above it in the concatenation. No functional change - Linux still has HTTPS_NOT_AVAILABLE set, so it doesn't build naett at all yet. Rename naett to naett-lib
41 lines
900 B
C++
41 lines
900 B
C++
#pragma once
|
|
|
|
#include <thread>
|
|
#include <string_view>
|
|
|
|
#include "Common/Net/HTTPRequest.h"
|
|
|
|
#ifndef HTTPS_NOT_AVAILABLE
|
|
|
|
#include "ext/naett-lib/naett.h"
|
|
|
|
namespace http {
|
|
|
|
// Really an asynchronous request.
|
|
class HTTPSRequest : public Request {
|
|
public:
|
|
HTTPSRequest(RequestMethod method, std::string_view url, std::string_view postData, std::string_view postMime, const Path &outfile, RequestFlags flags = RequestFlags::ProgressBar | RequestFlags::ProgressBarDelayed, std::string_view name = "");
|
|
~HTTPSRequest();
|
|
|
|
void Start() override;
|
|
void Join() override;
|
|
|
|
// Also acts as a Poll.
|
|
bool Done() override;
|
|
bool Failed() const override { return failed_; }
|
|
|
|
private:
|
|
std::string postData_;
|
|
std::string postMime_;
|
|
bool completed_ = false;
|
|
bool failed_ = false;
|
|
|
|
// Naett state
|
|
naettReq *req_ = nullptr;
|
|
naettRes *res_ = nullptr;
|
|
};
|
|
|
|
} // namespace http
|
|
|
|
#endif // HTTPS_NOT_AVAILABLE
|