TheCloneArmy/mcrcon
1
0
Fork 0
mirror of https://github.com/Tiiffi/mcrcon.git synced 2025-10-27 11:21:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add workaround to prevent server-side bug.

Browse Source 
https://bugs.mojang.com/browse/MC-154617
This commit is contained in:
Tiiffi
2019-12-21 23:12:39 +02:00
parent 3c071c0c45
commit 876201fe5a
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,5 +1,9 @@
#### Version history: #### Version history:
###### 0.7.1
- Add workaround to prevent server-side bug.
https://bugs.mojang.com/browse/MC-154617
###### 0.7.0 ###### 0.7.0
- Add -w option for rcon command throttling - Add -w option for rcon command throttling
* Thanks HorlogeSkynet @ Github * Thanks HorlogeSkynet @ Github

19
mcrcon.c
View File

@ -47,7 +47,7 @@
#include <netdb.h> #include <netdb.h>
#endif #endif
#define VERSION "0.7.0" #define VERSION "0.7.1"
#define IN_NAME "mcrcon" #define IN_NAME "mcrcon"
#define VER_STR IN_NAME" "VERSION" (built: "__DATE__" "__TIME__")" #define VER_STR IN_NAME" "VERSION" (built: "__DATE__" "__TIME__")"
@ -171,7 +171,8 @@ int main(int argc, char *argv[])
// default getopt error handler enabled // default getopt error handler enabled
opterr = 1; opterr = 1;
for (int opt = getopt(argc, argv, "vrtcshw:H:p:P:i"); opt != -1;) int opt;
while ((opt = getopt(argc, argv, "vrtcshw:H:p:P:i")) != -1)
{ {
switch (opt) { switch (opt) {
case 'H': host = optarg; break; case 'H': host = optarg; break;
@ -652,6 +653,7 @@ int run_terminal_mode(int sock)
puts("Logged in. Type 'quit' or 'exit' to quit."); puts("Logged in. Type 'quit' or 'exit' to quit.");
while (global_connection_alive) { while (global_connection_alive) {
putchar('>');
int len = get_line(command, DATA_BUFFSIZE); int len = get_line(command, DATA_BUFFSIZE);
if ((strcmp(command, "exit") && strcmp(command, "quit")) == 0) if ((strcmp(command, "exit") && strcmp(command, "quit")) == 0)
@ -663,6 +665,17 @@ int run_terminal_mode(int sock)
if(len > 0 && global_connection_alive) if(len > 0 && global_connection_alive)
ret += rcon_command(sock, command); ret += rcon_command(sock, command);
/* Special case for "stop" command to prevent server-side bug.
* https://bugs.mojang.com/browse/MC-154617
*
* NOTE: This is hacky workaround which should be handled better to
* ensure compatibility with other servers using source RCON.
* NOTE: strcasecmp() is POSIX function.
*/
if (strcasecmp(command, "stop") == 0) {
break;
}
command[0] = len = 0; command[0] = len = 0;
} }
@ -672,8 +685,6 @@ int run_terminal_mode(int sock)
// gets line from stdin and deals with rubbish left in the input buffer // gets line from stdin and deals with rubbish left in the input buffer
int get_line(char *buffer, int bsize) int get_line(char *buffer, int bsize)
{ {
fputs(">", stdout);
char *ret = fgets(buffer, bsize, stdin); char *ret = fgets(buffer, bsize, stdin);
if (ret == NULL) if (ret == NULL)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);