summaryrefslogtreecommitdiff
path: root/src/yuzu_cmd/yuzu.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/yuzu_cmd/yuzu.cpp')
-rw-r--r--src/yuzu_cmd/yuzu.cpp163
1 files changed, 160 insertions, 3 deletions
diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp
index cb301e78b..003890c07 100644
--- a/src/yuzu_cmd/yuzu.cpp
+++ b/src/yuzu_cmd/yuzu.cpp
@@ -1,10 +1,10 @@
1// Copyright 2014 Citra Emulator Project 1// SPDX-FileCopyrightText: 2014 Citra Emulator Project
2// Licensed under GPLv2 or any later version 2// SPDX-License-Identifier: GPL-2.0-or-later
3// Refer to the license.txt file included.
4 3
5#include <chrono> 4#include <chrono>
6#include <iostream> 5#include <iostream>
7#include <memory> 6#include <memory>
7#include <regex>
8#include <string> 8#include <string>
9#include <thread> 9#include <thread>
10 10
@@ -29,6 +29,7 @@
29#include "core/loader/loader.h" 29#include "core/loader/loader.h"
30#include "core/telemetry_session.h" 30#include "core/telemetry_session.h"
31#include "input_common/main.h" 31#include "input_common/main.h"
32#include "network/network.h"
32#include "video_core/renderer_base.h" 33#include "video_core/renderer_base.h"
33#include "yuzu_cmd/config.h" 34#include "yuzu_cmd/config.h"
34#include "yuzu_cmd/emu_window/emu_window_sdl2.h" 35#include "yuzu_cmd/emu_window/emu_window_sdl2.h"
@@ -60,6 +61,8 @@ __declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1;
60static void PrintHelp(const char* argv0) { 61static void PrintHelp(const char* argv0) {
61 std::cout << "Usage: " << argv0 62 std::cout << "Usage: " << argv0
62 << " [options] <filename>\n" 63 << " [options] <filename>\n"
64 "-m, --multiplayer=nick:password@address:port"
65 " Nickname, password, address and port for multiplayer\n"
63 "-f, --fullscreen Start in fullscreen mode\n" 66 "-f, --fullscreen Start in fullscreen mode\n"
64 "-h, --help Display this help and exit\n" 67 "-h, --help Display this help and exit\n"
65 "-v, --version Output version information and exit\n" 68 "-v, --version Output version information and exit\n"
@@ -71,6 +74,107 @@ static void PrintVersion() {
71 std::cout << "yuzu " << Common::g_scm_branch << " " << Common::g_scm_desc << std::endl; 74 std::cout << "yuzu " << Common::g_scm_branch << " " << Common::g_scm_desc << std::endl;
72} 75}
73 76
77static void OnStateChanged(const Network::RoomMember::State& state) {
78 switch (state) {
79 case Network::RoomMember::State::Idle:
80 LOG_DEBUG(Network, "Network is idle");
81 break;
82 case Network::RoomMember::State::Joining:
83 LOG_DEBUG(Network, "Connection sequence to room started");
84 break;
85 case Network::RoomMember::State::Joined:
86 LOG_DEBUG(Network, "Successfully joined to the room");
87 break;
88 case Network::RoomMember::State::Moderator:
89 LOG_DEBUG(Network, "Successfully joined the room as a moderator");
90 break;
91 default:
92 break;
93 }
94}
95
96static void OnNetworkError(const Network::RoomMember::Error& error) {
97 switch (error) {
98 case Network::RoomMember::Error::LostConnection:
99 LOG_DEBUG(Network, "Lost connection to the room");
100 break;
101 case Network::RoomMember::Error::CouldNotConnect:
102 LOG_ERROR(Network, "Error: Could not connect");
103 exit(1);
104 break;
105 case Network::RoomMember::Error::NameCollision:
106 LOG_ERROR(
107 Network,
108 "You tried to use the same nickname as another user that is connected to the Room");
109 exit(1);
110 break;
111 case Network::RoomMember::Error::MacCollision:
112 LOG_ERROR(Network, "You tried to use the same MAC-Address as another user that is "
113 "connected to the Room");
114 exit(1);
115 break;
116 case Network::RoomMember::Error::ConsoleIdCollision:
117 LOG_ERROR(Network, "Your Console ID conflicted with someone else in the Room");
118 exit(1);
119 break;
120 case Network::RoomMember::Error::WrongPassword:
121 LOG_ERROR(Network, "Room replied with: Wrong password");
122 exit(1);
123 break;
124 case Network::RoomMember::Error::WrongVersion:
125 LOG_ERROR(Network,
126 "You are using a different version than the room you are trying to connect to");
127 exit(1);
128 break;
129 case Network::RoomMember::Error::RoomIsFull:
130 LOG_ERROR(Network, "The room is full");
131 exit(1);
132 break;
133 case Network::RoomMember::Error::HostKicked:
134 LOG_ERROR(Network, "You have been kicked by the host");
135 break;
136 case Network::RoomMember::Error::HostBanned:
137 LOG_ERROR(Network, "You have been banned by the host");
138 break;
139 case Network::RoomMember::Error::UnknownError:
140 LOG_ERROR(Network, "UnknownError");
141 break;
142 case Network::RoomMember::Error::PermissionDenied:
143 LOG_ERROR(Network, "PermissionDenied");
144 break;
145 case Network::RoomMember::Error::NoSuchUser:
146 LOG_ERROR(Network, "NoSuchUser");
147 break;
148 }
149}
150
151static void OnMessageReceived(const Network::ChatEntry& msg) {
152 std::cout << std::endl << msg.nickname << ": " << msg.message << std::endl << std::endl;
153}
154
155static void OnStatusMessageReceived(const Network::StatusMessageEntry& msg) {
156 std::string message;
157 switch (msg.type) {
158 case Network::IdMemberJoin:
159 message = fmt::format("{} has joined", msg.nickname);
160 break;
161 case Network::IdMemberLeave:
162 message = fmt::format("{} has left", msg.nickname);
163 break;
164 case Network::IdMemberKicked:
165 message = fmt::format("{} has been kicked", msg.nickname);
166 break;
167 case Network::IdMemberBanned:
168 message = fmt::format("{} has been banned", msg.nickname);
169 break;
170 case Network::IdAddressUnbanned:
171 message = fmt::format("{} has been unbanned", msg.nickname);
172 break;
173 }
174 if (!message.empty())
175 std::cout << std::endl << "* " << message << std::endl << std::endl;
176}
177
74/// Application entry point 178/// Application entry point
75int main(int argc, char** argv) { 179int main(int argc, char** argv) {
76 Common::Log::Initialize(); 180 Common::Log::Initialize();
@@ -92,10 +196,16 @@ int main(int argc, char** argv) {
92 std::optional<std::string> config_path; 196 std::optional<std::string> config_path;
93 std::string program_args; 197 std::string program_args;
94 198
199 bool use_multiplayer = false;
95 bool fullscreen = false; 200 bool fullscreen = false;
201 std::string nickname{};
202 std::string password{};
203 std::string address{};
204 u16 port = Network::DefaultRoomPort;
96 205
97 static struct option long_options[] = { 206 static struct option long_options[] = {
98 // clang-format off 207 // clang-format off
208 {"multiplayer", required_argument, 0, 'm'},
99 {"fullscreen", no_argument, 0, 'f'}, 209 {"fullscreen", no_argument, 0, 'f'},
100 {"help", no_argument, 0, 'h'}, 210 {"help", no_argument, 0, 'h'},
101 {"version", no_argument, 0, 'v'}, 211 {"version", no_argument, 0, 'v'},
@@ -109,6 +219,38 @@ int main(int argc, char** argv) {
109 int arg = getopt_long(argc, argv, "g:fhvp::c:", long_options, &option_index); 219 int arg = getopt_long(argc, argv, "g:fhvp::c:", long_options, &option_index);
110 if (arg != -1) { 220 if (arg != -1) {
111 switch (static_cast<char>(arg)) { 221 switch (static_cast<char>(arg)) {
222 case 'm': {
223 use_multiplayer = true;
224 const std::string str_arg(optarg);
225 // regex to check if the format is nickname:password@ip:port
226 // with optional :password
227 const std::regex re("^([^:]+)(?::(.+))?@([^:]+)(?::([0-9]+))?$");
228 if (!std::regex_match(str_arg, re)) {
229 std::cout << "Wrong format for option --multiplayer\n";
230 PrintHelp(argv[0]);
231 return 0;
232 }
233
234 std::smatch match;
235 std::regex_search(str_arg, match, re);
236 ASSERT(match.size() == 5);
237 nickname = match[1];
238 password = match[2];
239 address = match[3];
240 if (!match[4].str().empty())
241 port = std::stoi(match[4]);
242 std::regex nickname_re("^[a-zA-Z0-9._\\- ]+$");
243 if (!std::regex_match(nickname, nickname_re)) {
244 std::cout
245 << "Nickname is not valid. Must be 4 to 20 alphanumeric characters.\n";
246 return 0;
247 }
248 if (address.empty()) {
249 std::cout << "Address to room must not be empty.\n";
250 return 0;
251 }
252 break;
253 }
112 case 'f': 254 case 'f':
113 fullscreen = true; 255 fullscreen = true;
114 LOG_INFO(Frontend, "Starting in fullscreen mode..."); 256 LOG_INFO(Frontend, "Starting in fullscreen mode...");
@@ -215,6 +357,21 @@ int main(int argc, char** argv) {
215 357
216 system.TelemetrySession().AddField(Common::Telemetry::FieldType::App, "Frontend", "SDL"); 358 system.TelemetrySession().AddField(Common::Telemetry::FieldType::App, "Frontend", "SDL");
217 359
360 if (use_multiplayer) {
361 if (auto member = system.GetRoomNetwork().GetRoomMember().lock()) {
362 member->BindOnChatMessageRecieved(OnMessageReceived);
363 member->BindOnStatusMessageReceived(OnStatusMessageReceived);
364 member->BindOnStateChanged(OnStateChanged);
365 member->BindOnError(OnNetworkError);
366 LOG_DEBUG(Network, "Start connection to {}:{} with nickname {}", address, port,
367 nickname);
368 member->Join(nickname, "", address.c_str(), port, 0, Network::NoPreferredMac, password);
369 } else {
370 LOG_ERROR(Network, "Could not access RoomMember");
371 return 0;
372 }
373 }
374
218 // Core is loaded, start the GPU (makes the GPU contexts current to this thread) 375 // Core is loaded, start the GPU (makes the GPU contexts current to this thread)
219 system.GPU().Start(); 376 system.GPU().Start();
220 system.GetCpuManager().OnGpuReady(); 377 system.GetCpuManager().OnGpuReady();