mirror/Sunshine
1
0
Fork 0
mirror of https://github.com/LizardByte/Sunshine.git synced 2025-03-30 07:20:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove use shutdown signal inside init function

Browse Source
This commit is contained in:
loki 2021-06-09 22:01:18 +02:00
parent 1afd1b7c94
commit e53f65c305
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sunshine/httpcommon.cpp
View File

@ -36,7 +36,7 @@ bool user_creds_exist(const std::string &file);
std::string unique_id;
net::net_e origin_pin_allowed;
void init(std::shared_ptr<safe::signal_t> shutdown_event) {
int init() {
bool clean_slate = config::sunshine.flags[config::flag::FRESH_STATE];
origin_pin_allowed = net::from_enum_string(config::nvhttp.origin_pin_allowed);
if(clean_slate) {
@ -48,20 +48,19 @@ void init(std::shared_ptr<safe::signal_t> shutdown_event) {
if(!fs::exists(config::nvhttp.pkey) || !fs::exists(config::nvhttp.cert)) {
if(create_creds(config::nvhttp.pkey, config::nvhttp.cert)) {
shutdown_event->raise(true);
return;
return -1;
}
}
if(!user_creds_exist(config::sunshine.credentials_file)) {
if(save_user_creds(config::sunshine.credentials_file, "sunshine"s, crypto::rand_alphabet(16), true)) {
shutdown_event->raise(true);
return;
return -1;
}
}
if(reload_user_creds(config::sunshine.credentials_file)) {
shutdown_event->raise(true);
return;
return -1;
}
return 0;
}
int save_user_creds(const std::string &file, const std::string &username, const std::string &password, bool run_our_mouth) {

2
sunshine/httpcommon.h
View File

@ -3,7 +3,7 @@
namespace http {
void init(std::shared_ptr<safe::signal_t> shutdown_event);
int init();
int create_creds(const std::string &pkey, const std::string &cert);
int save_user_creds(
const std::string &file,

5
sunshine/main.cpp
View File

@ -196,7 +196,10 @@ int main(int argc, char *argv[]) {
if(video::init()) {
return 2;
}
http::init(shutdown_event);
if(http::init()) {
return 3;
}
task_pool.start(1);
std::thread httpThread { nvhttp::start, shutdown_event };