izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve speed quitting apps

Browse Source
This commit is contained in:
loki
2021-07-07 17:00:12 +02:00
parent f09aea81fe
commit 9cf7c14a26
1 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
sunshine/nvhttp.cpp
View File

@@ -365,8 +365,11 @@ void not_found(std::shared_ptr<typename SimpleWeb::ServerBase<T>::Response> resp
pt::write_xml(data, tree); pt::write_xml(data, tree);
response->write(data.str()); response->write(data.str());
*response << "HTTP/1.1 404 NOT FOUND\r\n" *response
<< "HTTP/1.1 404 NOT FOUND\r\n"
<< data.str(); << data.str();
response->close_connection_after_response = true;
} }
template<class T> template<class T>
@@ -375,6 +378,14 @@ void pair(std::shared_ptr<safe::queue_t<crypto::x509_t>> &add_cert, std::shared_
pt::ptree tree; pt::ptree tree;
auto fg = util::fail_guard([&]() {
std::ostringstream data;
pt::write_xml(data, tree);
response->write(data.str());
response->close_connection_after_response = true;
});
auto args = request->parse_query_string(); auto args = request->parse_query_string();
if(args.find("uniqueid"s) == std::end(args)) { if(args.find("uniqueid"s) == std::end(args)) {
tree.put("root.<xmlattr>.status_code", 400); tree.put("root.<xmlattr>.status_code", 400);
@@ -398,11 +409,7 @@ void pair(std::shared_ptr<safe::queue_t<crypto::x509_t>> &add_cert, std::shared_
ptr->second.async_insert_pin.salt = std::move(args.at("salt"s)); ptr->second.async_insert_pin.salt = std::move(args.at("salt"s));
if(config::sunshine.flags[config::flag::CONST_PIN]) { if(config::sunshine.flags[config::flag::PIN_STDIN]) {
std::string pin("6174");
getservercert(ptr->second, tree, pin);
}
else if(config::sunshine.flags[config::flag::PIN_STDIN]) {
std::string pin; std::string pin;
std::cout << "Please insert pin: "sv; std::cout << "Please insert pin: "sv;
@@ -413,6 +420,7 @@ void pair(std::shared_ptr<safe::queue_t<crypto::x509_t>> &add_cert, std::shared_
else { else {
ptr->second.async_insert_pin.response = std::move(response); ptr->second.async_insert_pin.response = std::move(response);
fg.disable();
return; return;
} }
} }
@@ -433,11 +441,6 @@ void pair(std::shared_ptr<safe::queue_t<crypto::x509_t>> &add_cert, std::shared_
else { else {
tree.put("root.<xmlattr>.status_code", 404); tree.put("root.<xmlattr>.status_code", 404);
} }
std::ostringstream data;
pt::write_xml(data, tree);
response->write(data.str());
} }
bool pin(std::string pin) { bool pin(std::string pin) {
@@ -474,6 +477,8 @@ template<class T>
void pin(std::shared_ptr<typename SimpleWeb::ServerBase<T>::Response> response, std::shared_ptr<typename SimpleWeb::ServerBase<T>::Request> request) { void pin(std::shared_ptr<typename SimpleWeb::ServerBase<T>::Response> response, std::shared_ptr<typename SimpleWeb::ServerBase<T>::Request> request) {
print_req<T>(request); print_req<T>(request);
response->close_connection_after_response = true;
auto address = request->remote_endpoint_address(); auto address = request->remote_endpoint_address();
auto ip_type = net::from_address(address); auto ip_type = net::from_address(address);
if(ip_type > http::origin_pin_allowed) { if(ip_type > http::origin_pin_allowed) {
@@ -572,6 +577,7 @@ void serverinfo(std::shared_ptr<typename SimpleWeb::ServerBase<T>::Response> res
pt::write_xml(data, tree); pt::write_xml(data, tree);
response->write(data.str()); response->write(data.str());
response->close_connection_after_response = true;
} }
void applist(resp_https_t response, req_https_t request) { void applist(resp_https_t response, req_https_t request) {
@@ -584,6 +590,7 @@ void applist(resp_https_t response, req_https_t request) {
pt::write_xml(data, tree); pt::write_xml(data, tree);
response->write(data.str()); response->write(data.str());
response->close_connection_after_response = true;
}); });
auto args = request->parse_query_string(); auto args = request->parse_query_string();
@@ -627,6 +634,7 @@ void launch(bool &host_audio, resp_https_t response, req_https_t request) {
pt::write_xml(data, tree); pt::write_xml(data, tree);
response->write(data.str()); response->write(data.str());
response->close_connection_after_response = true;
}); });
if(stream::session_count() == config::stream.channels) { if(stream::session_count() == config::stream.channels) {
@@ -686,6 +694,7 @@ void resume(bool &host_audio, resp_https_t response, req_https_t request) {
pt::write_xml(data, tree); pt::write_xml(data, tree);
response->write(data.str()); response->write(data.str());
response->close_connection_after_response = true;
}); });
// It is possible that due a race condition that this if-statement gives a false negative, // It is possible that due a race condition that this if-statement gives a false negative,
@@ -732,6 +741,7 @@ void cancel(resp_https_t response, req_https_t request) {
pt::write_xml(data, tree); pt::write_xml(data, tree);
response->write(data.str()); response->write(data.str());
response->close_connection_after_response = true;
}); });
// It is possible that due a race condition that this if-statement gives a false positive, // It is possible that due a race condition that this if-statement gives a false positive,
@@ -756,6 +766,7 @@ void appasset(resp_https_t response, req_https_t request) {
std::ifstream in(SUNSHINE_ASSETS_DIR "/box.png"); std::ifstream in(SUNSHINE_ASSETS_DIR "/box.png");
response->write(SimpleWeb::StatusCode::success_ok, in); response->write(SimpleWeb::StatusCode::success_ok, in);
response->close_connection_after_response = true;
} }
void start() { void start() {