Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 112019d

Browse files
past-duepull[bot]
past-due
authored and
pull[bot]
committedDec 6, 2023
Support cmd interface with unix socket
Use command-line option: --enablecmdinterface=unixsocket:path
1 parent 7e8be8d commit 112019d

File tree

5 files changed

+653
-136
lines changed

5 files changed

+653
-136
lines changed
 

‎src/clparse.cpp

+37-20
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
#include "wrappers.h"
4646
#include "multilobbycommands.h"
4747
#include "gamehistorylogger.h"
48+
#include "stdinreader.h"
4849

4950
#include <cwchar>
5051

@@ -89,7 +90,6 @@ static bool wz_autoratingEnable = false;
8990
static bool wz_cli_headless = false;
9091
static bool wz_streamer_spectator_mode = false;
9192
static bool wz_lobby_slashcommands = false;
92-
static WZ_Command_Interface wz_cmd_interface = WZ_Command_Interface::None;
9393
static int wz_min_autostart_players = -1;
9494

9595
#if defined(WZ_OS_WIN)
@@ -435,7 +435,7 @@ static const struct poptOption *getOptionsTable()
435435
{ "enablelobbyslashcmd", POPT_ARG_NONE, CLI_LOBBY_SLASHCOMMANDS, N_("Enable lobby slash commands (for connecting clients)"), nullptr},
436436
{ "addlobbyadminhash", POPT_ARG_STRING, CLI_ADD_LOBBY_ADMINHASH, N_("Add a lobby admin identity hash (for slash commands)"), _("hash string")},
437437
{ "addlobbyadminpublickey", POPT_ARG_STRING, CLI_ADD_LOBBY_ADMINPUBLICKEY, N_("Add a lobby admin public key (for slash commands)"), N_("b64-pub-key")},
438-
{ "enablecmdinterface", POPT_ARG_STRING, CLI_COMMAND_INTERFACE, N_("Enable command interface"), N_("(stdin)")},
438+
{ "enablecmdinterface", POPT_ARG_STRING, CLI_COMMAND_INTERFACE, N_("Enable command interface"), N_("(stdin, unixsocket:path)")},
439439
{ "startplayers", POPT_ARG_STRING, CLI_STARTPLAYERS, N_("Minimum required players to auto-start game"), N_("startplayers")},
440440
{ "gamelog-output", POPT_ARG_STRING, CLI_GAMELOG_OUTPUTMODES, N_("Game history log output mode(s)"), "(log,cmdinterface)"},
441441
{ "gamelog-outputkey", POPT_ARG_STRING, CLI_GAMELOG_OUTPUTKEY, N_("Game history log output key"), "[playerindex, playerposition]"},
@@ -1101,20 +1101,42 @@ bool ParseCommandLine(int argc, const char * const *argv)
11011101
break;
11021102

11031103
case CLI_COMMAND_INTERFACE:
1104-
token = poptGetOptArg(poptCon);
1105-
if (token == nullptr || strlen(token) == 0)
1106-
{
1107-
// use default, which is currently "stdin"
1108-
token = "stdin";
1109-
}
1110-
if (strcmp(token, "stdin") == 0)
1111-
{
1112-
// enable stdin
1113-
wz_cmd_interface = WZ_Command_Interface::StdIn_Interface;
1114-
}
1115-
else
11161104
{
1117-
qFatal("Unsupported / invalid enablecmdinterface value");
1105+
token = poptGetOptArg(poptCon);
1106+
if (token == nullptr || strlen(token) == 0)
1107+
{
1108+
// use default, which is currently "stdin"
1109+
token = "stdin";
1110+
}
1111+
WZ_Command_Interface mode = WZ_Command_Interface::None;
1112+
std::string value;
1113+
if (strcmp(token, "stdin") == 0)
1114+
{
1115+
mode = WZ_Command_Interface::StdIn_Interface;
1116+
}
1117+
else if (strncmp(token, "unixsocket", strlen("unixsocket")) == 0)
1118+
{
1119+
mode = WZ_Command_Interface::Unix_Socket;
1120+
// expected form is "unixsocket:path" - parse for the path
1121+
if (strlen(token) > strlen("unixsocket"))
1122+
{
1123+
size_t delimeterIdx = strlen("unixsocket");
1124+
if (token[delimeterIdx] == ':' && token[delimeterIdx+1] != '\0')
1125+
{
1126+
// grab the rest of the string as the path value
1127+
value = &token[delimeterIdx+1];
1128+
}
1129+
else
1130+
{
1131+
qFatal("Invalid enablecmdinterface unixsocket value (expecting unixsocket:path)");
1132+
}
1133+
}
1134+
}
1135+
else
1136+
{
1137+
qFatal("Unsupported / invalid enablecmdinterface value");
1138+
}
1139+
configSetCmdInterface(mode, value);
11181140
}
11191141
break;
11201142
case CLI_STARTPLAYERS:
@@ -1287,11 +1309,6 @@ bool lobby_slashcommands_enabled()
12871309
return wz_lobby_slashcommands;
12881310
}
12891311

1290-
WZ_Command_Interface wz_command_interface()
1291-
{
1292-
return wz_cmd_interface;
1293-
}
1294-
12951312
int min_autostart_player_count()
12961313
{
12971314
return wz_min_autostart_players;

‎src/clparse.h

-7
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,6 @@ bool getAutoratingEnable();
3939
bool streamer_spectator_mode();
4040
bool lobby_slashcommands_enabled();
4141

42-
enum class WZ_Command_Interface
43-
{
44-
None,
45-
StdIn_Interface,
46-
};
47-
WZ_Command_Interface wz_command_interface();
48-
4942
int min_autostart_player_count();
5043

5144
#endif // __INCLUDED_SRC_CLPARSE_H__

‎src/main.cpp

+3-7
Original file line numberDiff line numberDiff line change
@@ -1685,19 +1685,15 @@ static bool initializeCrashHandlingContext(optional<video_backend> gfxbackend)
16851685

16861686
static void wzCmdInterfaceInit()
16871687
{
1688-
switch (wz_command_interface())
1688+
if (wz_command_interface_enabled())
16891689
{
1690-
case WZ_Command_Interface::None:
1691-
return;
1692-
case WZ_Command_Interface::StdIn_Interface:
1693-
stdInThreadInit();
1694-
break;
1690+
cmdInterfaceThreadInit();
16951691
}
16961692
}
16971693

16981694
static void wzCmdInterfaceShutdown()
16991695
{
1700-
stdInThreadShutdown();
1696+
cmdInterfaceThreadShutdown();
17011697
}
17021698

17031699
static void cleanupOldLogFiles()

‎src/stdinreader.cpp

+599-99
Large diffs are not rendered by default.

‎src/stdinreader.h

+14-3
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,22 @@
1919

2020
#pragma once
2121

22-
void stdInThreadInit();
23-
void stdInThreadShutdown();
24-
22+
#include <string>
2523
#include "lib/framework/wzglobal.h"
2624

25+
enum class WZ_Command_Interface
26+
{
27+
None,
28+
StdIn_Interface,
29+
Unix_Socket,
30+
};
31+
32+
// used from clparse:
33+
void configSetCmdInterface(WZ_Command_Interface mode, std::string value);
34+
35+
void cmdInterfaceThreadInit();
36+
void cmdInterfaceThreadShutdown();
37+
2738
bool wz_command_interface_enabled();
2839

2940
#if defined(WZ_CC_MINGW)

0 commit comments

Comments
 (0)
Please sign in to comment.