moonpower/azahar-UWP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add 'Set Up System Files' option (#642)

Browse Source 
* Add 'Set Up System Files' option

* Fix CIA installation and HLE module loading when no console unique data provided.
This commit is contained in:
PabloMK7
2025-03-10 11:48:11 +01:00
committed by GitHub
parent 6262ddafa6
commit e3a21c8ef1
34 changed files with 1006 additions and 450 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/network/artic_base/artic_base_client.cpp
View File

@@ -1,4 +1,4 @@
// Copyright 2024 Citra Emulator Project
// Copyright Citra Emulator Project / Azahar Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
@@ -43,8 +43,6 @@
#define closesocket(x) close(x)
#endif
// #define DISABLE_PING_TIMEOUT
namespace Network::ArticBase {
using namespace std::chrono_literals;
@@ -229,7 +227,7 @@ bool Client::Connect() {
hints.ai_socktype = SOCK_STREAM;
hints.ai_family = AF_INET;
LOG_INFO(Network, "Starting Artic Base Client");
LOG_INFO(Network, "Starting Artic Client");
if (getaddrinfo(address.data(), NULL, &hints, &addrinfo) != 0) {
LOG_ERROR(Network, "Failed to get server address");
@@ -273,8 +271,8 @@ bool Client::Connect() {
shutdown(main_socket, SHUT_RDWR);
closesocket(main_socket);
LOG_ERROR(Network, "Incompatible server version: {}", version_value);
SignalCommunicationError("\nIncompatible Artic Base Server version.\nCheck for updates "
"to Artic Base Server or Azahar.");
SignalCommunicationError("\nIncompatible Artic Server version.\nCheck for updates "
"to the Artic Server or Azahar.");
return false;
}
} else {
@@ -485,15 +483,15 @@ void Client::PingFunction() {
while (ping_run) {
std::chrono::time_point<std::chrono::steady_clock> last = last_sent_request;
if (std::chrono::steady_clock::now() - last > std::chrono::seconds(7)) {
#ifdef DISABLE_PING_TIMEOUT
client->last_sent_request = std::chrono::steady_clock::now();
#else
auto ping_reply = SendSimpleRequest("PING");
if (!ping_reply.has_value()) {
SignalCommunicationError();
break;
if (ping_enabled) {
auto ping_reply = SendSimpleRequest("PING");
if (!ping_reply.has_value()) {
SignalCommunicationError();
break;
}
} else {
last_sent_request = std::chrono::steady_clock::now();
}
#endif // DISABLE_PING_TIMEOUT
}
std::unique_lock lk(ping_cv_mutex);

7
src/network/artic_base/artic_base_client.h
View File

@@ -1,4 +1,4 @@
// Copyright 2024 Citra Emulator Project
// Copyright Citra Emulator Project / Azahar Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
@@ -161,6 +161,10 @@ public:
return last_sockaddr_in;
}
void SetPingEnabled(bool enable) {
ping_enabled = enable;
}
private:
static constexpr const int SERVER_VERSION = 2;
@@ -190,6 +194,7 @@ private:
std::condition_variable ping_cv;
std::mutex ping_cv_mutex;
std::atomic<bool> ping_run = true;
bool ping_enabled = true;
void StopImpl(bool from_error);