mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-01 22:20:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

(CLI) -C/--connect command-line fix

Browse Source
This commit is contained in:
twinaphex 2021-11-05 22:25:06 +01:00
parent c912619653
commit ae43a7e7cb
2 changed files with 51 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
retroarch.c
View File

@ -5755,8 +5755,42 @@ bool command_event(enum event_command cmd, void *data)
case CMD_EVENT_NETPLAY_INIT: case CMD_EVENT_NETPLAY_INIT:
{ {
char *hostname = (char*)data; char *hostname = (char*)data;
const char *netplay_server = settings->paths.netplay_server; const char *netplay_server = NULL;
unsigned netplay_port = settings->uints.netplay_port; unsigned netplay_port = 0;
if (p_rarch->connect_host && !hostname)
{
struct string_list *addr_port = string_split(p_rarch->connect_host, "|");
if (addr_port && addr_port->size == 2)
{
char *tmp_netplay_server = addr_port->elems[0].data;
char *tmp_netplay_port = addr_port->elems[1].data;
if ( !string_is_empty(tmp_netplay_server)
&& !string_is_empty(tmp_netplay_port))
{
netplay_port = strtoul(tmp_netplay_port, NULL, 10);
if (netplay_port && netplay_port <= 0xFFFF)
{
netplay_server = strdup(tmp_netplay_server);
// This way we free netplay_server aswell when done.
free(p_rarch->connect_host);
p_rarch->connect_host = strdup(netplay_server);
}
}
}
string_list_free(addr_port);
}
if (!netplay_server || !netplay_port)
{
netplay_server = settings->paths.netplay_server;
netplay_port = settings->uints.netplay_port;
}
command_event(CMD_EVENT_NETPLAY_DEINIT, NULL); command_event(CMD_EVENT_NETPLAY_DEINIT, NULL);
@ -5767,9 +5801,22 @@ bool command_event(enum event_command cmd, void *data)
: netplay_server, netplay_port)) : netplay_server, netplay_port))
{ {
command_event(CMD_EVENT_NETPLAY_DEINIT, NULL); command_event(CMD_EVENT_NETPLAY_DEINIT, NULL);
if (p_rarch->connect_host)
{
free(p_rarch->connect_host);
p_rarch->connect_host = NULL;
}
return false; return false;
} }
if (p_rarch->connect_host)
{
free(p_rarch->connect_host);
p_rarch->connect_host = NULL;
}
/* Disable rewind & SRAM autosave if it was enabled /* Disable rewind & SRAM autosave if it was enabled
* TODO/FIXME: Add a setting for these tweaks */ * TODO/FIXME: Add a setting for these tweaks */
#ifdef HAVE_REWIND #ifdef HAVE_REWIND
@ -14155,11 +14202,8 @@ static bool retroarch_parse_input_and_config(
case 'C': case 'C':
retroarch_override_setting_set( retroarch_override_setting_set(
RARCH_OVERRIDE_SETTING_NETPLAY_MODE, NULL); RARCH_OVERRIDE_SETTING_NETPLAY_MODE, NULL);
retroarch_override_setting_set(
RARCH_OVERRIDE_SETTING_NETPLAY_IP_ADDRESS, NULL);
netplay_driver_ctl(RARCH_NETPLAY_CTL_ENABLE_CLIENT, NULL); netplay_driver_ctl(RARCH_NETPLAY_CTL_ENABLE_CLIENT, NULL);
configuration_set_string(settings, p_rarch->connect_host = strdup(optarg);
settings->paths.netplay_server, optarg);
break; break;
case RA_OPT_STATELESS: case RA_OPT_STATELESS:

2
retroarch_data.h
View File

@ -404,7 +404,7 @@ struct rarch_state
const wifi_driver_t *wifi_driver; const wifi_driver_t *wifi_driver;
void *wifi_data; void *wifi_data;
char *connect_host; /* Netplay hostname passed from CLI */
struct retro_perf_counter *perf_counters_rarch[MAX_COUNTERS]; struct retro_perf_counter *perf_counters_rarch[MAX_COUNTERS];