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

Merge pull request #14 from Tiiffi/refactoring/networking

Browse Source 
Refactoring/networking
This commit is contained in:
Tiiffi
2016-11-15 22:21:13 +02:00
committed by GitHub
parent 7e10b01691 951f39cdbd
commit 29f1f9c400
8 changed files with 783 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -2,6 +2,8 @@
*.o
*.dev
*.win
*.txt
*.layout
*.project
mcrcon
todo

64
CHANGELOG.md Normal file
View File

@ -0,0 +1,64 @@
####Version history:
######0.0.5
- IPv6 support!
* Thanks to 'Tanja84dk' for addressing the real need of IPv6.
- Fixed bug causing crash / segmentation fault (invalid write) when receiving malformed rcon packet.
- Program makes use of C99 feature (variable-length arrays) so "-std=gnu99" flag on
GCC-compiler must be used to avoid unecessary warnings.
- Rcon receive buffer is now bigger (2024 bytes -> 10240 bytes).
* Thanks to 'gman_ftw' @ Bukkit forums.
- Fixed invalid error message when receiving empty rcon packet (10 bytes).
* Thanks to 'pkmnfrk' @ bukkit forums.
- Terminal mode now closes automatically when rcon socket is closed by server
or if packet size cannot be retrieved correctly.
- Client now tries to clean the incoming socket data if last package was out of spec.
######0.0.4
- Reverted back to default getopts options error handler (opterr = 1).
Custom error handler requires rewriting.
- Some cosmetic changes in program output strings.
- Program usage(); function now waits for enter before exiting on Windows.
######0.0.3
- Colors are now supported on Windows too!
- Terminal mode is now triggered with "-t" flag. "-i" flag still works for
backwards compatibility.
- Bug fixes (Packet size check always evaluating false and color validity
check always evaluating true).
######0.0.2
- License changed from 'ISC License' to 'zlib/libpng License'.
- Bug fixes & code cleanups
- Interactive mode (-i flag). Client acts as interactive terminal.
- Program return value is now the number of rcon commmands sent successfully.
If connecting or authentication fails, the return value is -1.
- Colors are now enabled by default. Now '-c' flag disables the color support.
######0.0.1
- Added experimental support for bukkit colors.
Should work with any sh compatible shell.
- Packet string data limited to max 2048 (DATA_BUFFSIZE) bytes.
No idea how Minecraft handles multiple rcon packets.
If someone knows, please mail me so I can implement it.
####TODO:
- Make the receive buffer dynamic??
- Change some of the packet size issues to fatal errors.
- Code cleanups.
- Check global variables (remove if possible).
- Add some protocol checks (proper packet id check etc..).
- Preprocessor (#ifdef / #ifndef) cleanups.
- Follow valve rcon protocol standard strictly?
- Multiple packet support if minecraft supports it?!
- Investigate if player chat messages gets sent through rcon.
If they are, the messaging system requires rewriting.
- Name resolving should be integrated to connection creation function.
- Dont try to cleanup the socket if not authenticated
- Better sockets error reporting
- Better error function (VA_ARGS support)

21
INSTALL Normal file
View File

@ -0,0 +1,21 @@
Compiling and installing
------------------------
Only dependency is C library with POSIX getopt support.
Compiling with GCC or CLANG:
cc -std=gnu99 -Wpedantic -Wall -Wextra -Os -s -o mcrcon mcrcon.c
Or you can just run "make":
make - compiles mcrcon
make install - installs compiled binaries and manpage to the system
make uninstall - removes binaries and manpage from the system
file install locations:
/usr/share/bin/mcrcon
/usr/share/man/man1/mcrcon.1
On Window remember to link with winsockets by adding "-lws2_32" to your compiler command line.
Makefile should take care of this automatically but "install" and "uninstall" rules are disabled on windows.

2
LICENSE
View File

@ -1,4 +1,4 @@
Copyright (c) 2012-2015, Tiiffi <tiiffi --> gmail_dot_com>
Copyright (c) 2012-2016, Tiiffi <tiiffi_at_gmail_dot_com>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages

34
Makefile
View File

@ -1,8 +1,36 @@
# Cross comple, eg.
# if you want to cross compile
# export PATH=$PATH:/path/to/compiler/bin
# export CROSS_COMPILE=arm-none-linux-gnueabi-
# make
all:
$(CROSS_COMPILE)gcc -std=gnu99 -pedantic -Wall -Wextra -O2 -s -o mcrcon mcrcon.c
ifeq ($(OS), Windows_NT)
LINKER = -lws2_32
EXENAME = mcrcon.exe
RM = cmd /C del /F
else
LINKER =
EXENAME = mcrcon
RM = rm -f
endif
CC = gcc
CFLAGS = -std=gnu99 -Wall -Wextra -Wpedantic -Os -s
all:
$(CROSS_COMPILE)$(CC) $(CFLAGS) -o $(EXENAME) mcrcon.c $(LINKER)
ifneq ($(OS), Windows_NT)
install:
cp $(EXENAME) /usr/local/bin/$(EXENAME)
chmod 0755 /usr/local/bin/$(EXENAME)
cp mcrcon.1 /usr/local/share/man/man1/mcrcon.1
chmod 0644 /usr/local/share/man/man1/mcrcon.1
@echo "\nmcrcon installed. Run 'make uninstall' if you want to uninstall.\n"
uninstall:
rm -f /usr/local/bin/$(EXENAME)
rm -f /usr/local/share/man/man1/mcrcon.1
@echo "\nmcrcon uninstalled.\n"
endif
clean:
$(RM) $(EXENAME)

123
README.md
View File

@ -1,116 +1,59 @@
####Compiling:
###Installing:
Raw command:
```gcc -std=gnu11 -pedantic -Wall -Wextra -O2 -s -o mcrcon mcrcon.c```
from sources:
```
git clone https://github.com/Tiiffi/mcrcon.git
cd mcrcon/
make
sudo make install
```
Check **INSTALL** for more details.
or just run **make**.
You can also download precompiled binaries: https://github.com/Tiiffi/mcrcon/releases/latest
On windows, remember to link with winsockets.
Add ```-lws2_32``` to compiler command line on Mingw GCC.
Binaries are provided for Linux and Windows.
---
####Usage:
Usage: mcrcon [OPTIONS]... [COMMANDS]...
Sends rcon commands to minecraft server.
###Usage:
mcrcon [OPTIONS]... [COMMANDS]...
Sends rcon commands to Minecraft server.
```
Option:
-h Prints usage.
-s Silent mode. Do not print data received from rcon.
-t Terminal mode. Acts as interactive terminal.
-p Rcon password. Default: "".
-H Host address or ip.
-P Port. Default: 25575.
-c Do not print colors. Disables bukkit color printing.
-r Print everything in raw mode.
Good for debugging and custom handling of the output.
-h Print usage
-H Server address
-P Port (default is 25575)
-p Rcon password
-t Interactive terminal mode
-s Silent mode (do not print received packets)
-c Disable colors
-r Output raw packets (debugging and custom handling)
-v Output version information
```
Invidual commands must be separated with spaces.
Commands with arguments must be enclosed in quotes.
Example:
```mcrcon -c -H 192.168.1.42 -P 9999 -p password cmd1 "cmd2 with spaces"```
```mcrcon -H my.minecraft.server -p password "say Server is restarting!" save-all stop```
#####Enable rcon
Remember to enable rcon by changing/adding these lines to ```server.properties``` file.
---
###Enable rcon on server
Remember to enable rcon by adding following lines to ```server.properties``` file.
```
enable-rcon=true
rcon.port=25575
rcon.password=your_rcon_pasword
rcon.port=9999
```
---
####Contact:
* WWW: http://sourceforge.net/projects/mcrcon/
* WWW: https://github.com/Tiiffi/mcrcon/
* MAIL: tiiffi_at_gmail_dot_com
* IRC: tiiffi @ quakenet
* BUG REPORTS: https://github.com/Tiiffi/mcrcon/issues/
---
####Version history:
######0.0.5
- IPv6 support!
* Thanks to 'Tanja84dk' for addressing the real need of IPv6.
- Fixed bug causing crash / segmentation fault (invalid write) when receiving malformed rcon packet.
- Program makes use of C99 feature (variable-length arrays) so "-std=gnu99" flag on
GCC-compiler must be used to avoid unecessary warnings.
- Rcon receive buffer is now bigger (2024 bytes -> 10240 bytes).
* Thanks to 'gman_ftw' @ Bukkit forums.
- Fixed invalid error message when receiving empty rcon packet (10 bytes).
* Thanks to 'pkmnfrk' @ bukkit forums.
- Terminal mode now closes automatically when rcon socket is closed by server
or if packet size cannot be retrieved correctly.
- Client now tries to clean the incoming socket data if last package was out of spec.
######0.0.4
- Reverted back to default getopts options error handler (opterr = 1).
Custom error handler requires rewriting.
- Some cosmetic changes in program output strings.
- Program usage(); function now waits for enter before exiting on Windows.
######0.0.3
- Colors are now supported on Windows too!
- Terminal mode is now triggered with "-t" flag. "-i" flag still works for
backwards compatibility.
- Bug fixes (Packet size check always evaluating false and color validity
check always evaluating true).
######0.0.2
- License changed from 'ISC License' to 'zlib/libpng License'.
- Bug fixes & code cleanups
- Interactive mode (-i flag). Client acts as interactive terminal.
- Program return value is now the number of rcon commmands sent successfully.
If connecting or authentication fails, the return value is -1.
- Colors are now enabled by default. Now '-c' flag disables the color support.
######0.0.1
- Added experimental support for bukkit colors.
Should work with any sh compatible shell.
- Packet string data limited to max 2048 (DATA_BUFFSIZE) bytes.
No idea how Minecraft handles multiple rcon packets.
If someone knows, please mail me so I can implement it.
####TODO:
- Make the receive buffer dynamic??
- Change some of the packet size issues to fatal errors.
- Code cleanups.
- Check global variables (remove if possible).
- Add some protocol checks (proper packet id check etc..).
- Preprocessor (#ifdef / #ifndef) cleanups.
- Follow valve rcon protocol standard strictly?
- Multiple packet support if minecraft supports it?!
- Investigate if player chat messages gets sent through rcon.
If they are, the messaging system requires rewriting.
- Name resolving should be integrated to connection creation function.
- Dont try to cleanup the socket if not authenticated
- Better sockets error reporting
- Better error function (VA_ARGS support)

53
mcrcon.1 Normal file
View File

@ -0,0 +1,53 @@
.\" Process this file with
.\" groff -man -Tascii mcrcon.1
.\"
.TH MCRCON 1 "November 2016" "Version 0.0.6"
.SH NAME
mcrcon \- sends rcon commands to a Minecraft server
.SH SYNOPSIS
.B mcrcon [
options
.B ] [
commands
.B ]
.SH DESCRIPTION
mcrcon is Minecraft rcon client / terminal with bukkit coloring support.\n\n\n
It is well suited for remote administration and server maintenance scripts.
.SH OPTIONS
.IP -h
Print usage
.IP -H
Server address
.IP -P
Port (default is 25575)
.IP -p
Rcon password
.IP -t
Interactive terminal mode
.IP -s
Silent mode (do not print received packets)
.IP -c
Disable colors
.IP -r
Output raw packets (for debugging and custom handling)
.IP -v
Output version information
.PP
Commands with arguments must be enclosed in quotes.
.SH EXAMPLES
Make rcon connection in terminal mode using default port
.RS
\fBmcrcon\fR -H my.minecraft.server -p password
.RE
.PP
Send "weather clear" command to server using custom port 1337
.RS
\fBmcrcon\fR -H my.minecraft.server -P 1337 -p password "weather clear"
.RE
.PP
Send three commands to server (say, save-all and stop)
.RS
\fBmcrcon\fR -H my.minecraft.server -p password "say Server is restarting!" save-all stop
.RE
.SH BUGS
Bugs can be reported to \fBtiiffi_at_gmail_dot_com\fR or \fBhttps://github.com/Tiiffi/mcrcon/issues/\fR

497
mcrcon.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012-2015, Tiiffi <tiiffi -> gmail_dot_com>
* Copyright (c) 2012-2016, Tiiffi <tiiffi -> gmail_dot_com>
*
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
@ -23,13 +23,17 @@
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
#include <unistd.h>
#include <signal.h>
#include <errno.h>
#include <unistd.h>
#ifdef _WIN32
/* for name resolving on windows */
#define _WIN32_WINNT 0x0501
// for name resolving on windows
// enable this if you get compiler whine about getaddrinfo on windows
//#define _WIN32_WINNT 0x0501
#include <ws2tcpip.h>
#include <winsock2.h>
@ -42,79 +46,89 @@
#include <netdb.h>
#endif
/* absolute value macro
#define absolute(x) (x < 0) ? (0 - x) : x
*/
#define VERSION "0.0.6"
#define IN_NAME "mcrcon"
#define VER_STR IN_NAME" "VERSION" (built: "__DATE__" "__TIME__")"
#define RCON_EXEC_COMMAND 2
#define RCON_AUTHENTICATE 3
#define RCON_RESPONSEVALUE 0
#define RCON_AUTH_RESPONSE 2
#define RCON_PID 42
#define RCON_PID 0xBADC0DE
/* Safe value I think. This should me made dynamic for more stable performance! */
#define DATA_BUFFSIZE 10240
#define VERSION "0.0.5"
#define IN_NAME "mcrcon"
#define VER_STR IN_NAME" "VERSION
/* rcon packet structure */
// rcon packet structure
typedef struct _rc_packet {
int size;
int id;
int cmd;
char data[DATA_BUFFSIZE];
/* ignoring string2 atm.. */
// ignoring string2 atm.
} rc_packet;
/* functions */
void usage(void);
void error(char *errstring);
#ifndef _WIN32
void print_color(int color);
#endif
/* =================================== */
/* FUNCTION DEFINITIONS */
/* =================================== */
struct addrinfo *net_resolve(char *host, char *port);
void net_close_socket(int sd);
int net_open_socket(char *host, char *port);
int net_send_packet(int sd, rc_packet *packet);
rc_packet* net_recv_packet(int sd);
// endianness related functions
bool is_bigendian(void);
int32_t reverse_int32(int32_t n);
// Network related functions
#ifdef _WIN32
void net_init_WSA(void);
#endif
void net_close(int sd);
int net_connect(const char *host, const char *port);
int net_send(int sd, const uint8_t *buffer, size_t size);
int net_send_packet(int sd, rc_packet *packet);
rc_packet* net_recv_packet(int sd);
int net_clean_incoming(int sd, int size);
// Misc stuff
void usage(void);
#ifndef _WIN32
void print_color(int color);
#endif
int get_line(char *buffer, int len);
int run_terminal_mode(int rsock);
int run_commands(int argc, char *argv[]);
// Rcon protocol related functions
rc_packet* packet_build(int id, int cmd, char *s1);
uint8_t *packet_build_malloc(size_t *size, int32_t id, int32_t cmd, char *string);
void packet_print(rc_packet *packet);
int rcon_auth(int rsock, char *passwd);
int rcon_command(int rsock, char *command);
int get_line(char *buffer, int len);
int run_terminal_mode(int rsock);
int run_commands(int argc, char *argv[]);
/* some globals */
int raw_output = 0;
int silent_mode = 0;
int print_colors = 1;
int connection_alive = 1;
int rsock; /* rcon socket */
// =============================================
// GLOBAL VARIABLES
// =============================================
static int raw_output = 0;
static int silent_mode = 0;
static int print_colors = 1;
static int connection_alive = 1;
static int rsock;
#ifdef _WIN32
/* console coloring on windows */
// console coloring on windows
HANDLE console_handle;
#endif
/* safety stuff (windows is still misbehaving) */
void exit_proc(void) {
if(rsock != -1) net_close_socket(rsock);
// safety stuff (windows is still misbehaving)
void exit_proc(void)
{
if (rsock != -1)
net_close(rsock);
}
/* Check windows & linux behaviour !!! */
void sighandler(/*int sig*/) {
// Check windows & linux behaviour !!!
void sighandler(/*int sig*/)
{
connection_alive = 0;
#ifndef _WIN32
exit(-1);
@ -127,13 +141,16 @@ int main(int argc, char *argv[])
int terminal_mode = 0;
char *host = NULL;
char *pass = "";
char *pass = NULL;
char *port = "25575";
if(argc < 2) usage();
if(argc < 2)
usage();
opterr = 1; /* default error handler enabled */
while((opt = getopt(argc, argv, "rtcshH:p:P:i")) != -1)
// default getopt error handler enabled
opterr = 1;
while ((opt = getopt(argc, argv, "vrtcshH:p:P:i")) != -1)
{
switch (opt)
{
@ -149,33 +166,39 @@ int main(int argc, char *argv[])
case 'I':
case 'i': terminal_mode = 1; break;
case 'r': raw_output = 1; break;
case 'v':
puts(VER_STR"\nhttps://github.com/Tiiffi/mcrcon");
exit(0);
break;
case 'h':
case '?':
case '?': usage(); break;
/*
if(optopt == 'P' || optopt == 'H' || optopt == 'p')
fprintf (stderr, "Option -%c requires an argument.\n\n", optopt);
else fprintf (stderr, "Unknown option -%c\n\n", optopt);
*/
/* else fprintf (stderr, "Unknown option -%c\n\n", optopt); */
usage();
break;
default: abort();
default: exit(-1);
}
}
if(host == NULL) {
fputs("Host not defined. Check -H flag.\n\n", stdout);
usage();
if (host == NULL)
{
fputs("Host not defined (-H flag). Try 'mcrcon -h' or 'man mcrcon' for more information.\n\n", stdout);
return 0;
}
if(optind == argc && terminal_mode == 0) {
fputs("No commands specified.\n\n", stdout);
usage();
if (pass == NULL)
{
fputs("Password not defined (-p flag). Try 'mcrcon -h' 'man mcrcon' for more information.\n\n", stdout);
return 0;
}
/* safety features to prevent "IO: Connection reset" bug on the server side */
if(optind == argc && terminal_mode == 0)
terminal_mode = 1;
// safety features to prevent "IO: Connection reset" bug on the server side
atexit(&exit_proc);
signal(SIGABRT, &sighandler);
signal(SIGTERM, &sighandler);
@ -187,10 +210,10 @@ int main(int argc, char *argv[])
if (console_handle == INVALID_HANDLE_VALUE) console_handle = NULL;
#endif
/* open socket */
rsock = net_open_socket(host, port);
// open socket
rsock = net_connect(host, port);
/* auth & commands */
// auth & commands
if (rcon_auth(rsock, pass))
{
if (terminal_mode)
@ -198,14 +221,13 @@ int main(int argc, char *argv[])
else
ret = run_commands(argc, argv);
}
else /* auth failed */
else // auth failed
{
ret = -1;
fprintf(stdout, "Authentication failed!\n");
}
/* cleanup */
net_close_socket(rsock);
net_close(rsock);
rsock = -1;
return ret;
@ -214,78 +236,53 @@ int main(int argc, char *argv[])
void usage(void)
{
fputs(
"Usage: "IN_NAME" [OPTIONS]... [COMMANDS]...\n"
"Sends rcon commands to minecraft server.\n\n"
"Usage: "IN_NAME" [OPTIONS]... [COMMANDS]...\n\n"
"Sends rcon commands to Minecraft server.\n\n"
"Option:\n"
" -h\t\tPrints usage.\n"
" -s\t\tSilent mode. Do not print data received from rcon.\n"
" -t\t\tTerminal mode. Acts as interactive terminal.\n"
" -p\t\tRcon password. Default: \"\".\n"
" -H\t\tHost address or ip.\n"
" -P\t\tPort. Default: 25575.\n"
" -c\t\tDo not print colors. Disables bukkit color printing.\n"
" -r\t\tPrint everything in raw mode.\n\t\tGood for debugging and custom handling of the output.\n"
,stdout);
" -h\t\tPrint usage\n"
" -H\t\tServer address\n"
" -P\t\tPort (default is 25575)\n"
" -p\t\tRcon password\n"
" -t\t\tInteractive terminal mode\n"
" -s\t\tSilent mode (do not print received packets)\n"
" -c\t\tDisable colors\n"
" -r\t\tOutput raw packets (debugging and custom handling)\n"
" -v\t\tOutput version information\n"
,stdout
);
puts("\nInvidual commands must be separated with spaces.\n");
puts("Example:\n "IN_NAME" -c -H 192.168.1.42 -P 9999 -p password cmd1 \"cmd2 with spaces\"\n");
puts("minecraft rcon ("IN_NAME") "VERSION".\nReport bugs to tiiffi_at_gmail_dot_com.\n");
puts("\nCommands with arguments must be enclosed in quotes.\n");
puts("Example:\n\t"IN_NAME" -H my.minecraft.server -p password \"say Server is restarting!\" save-all stop\n");
puts(VER_STR"\nReport bugs to tiiffi_at_gmail_dot_com or https://github.com/Tiiffi/mcrcon/issues/\n");
#ifdef _WIN32
puts("Press enter to exit.");
getchar();
#endif
exit(0);
}
void error(char *errstring)
{
fputs(errstring, stderr);
exit(-1);
exit(0);
}
#ifdef _WIN32
void net_init_WSA(void)
{
WSADATA wsadata;
int err;
err = WSAStartup(MAKEWORD(1, 1), &wsadata);
// Request winsock 2.2 for now.
// Should be compatible down to Win XP.
WORD version = MAKEWORD(2, 2);
int err = WSAStartup(version, &wsadata);
if (err != 0)
{
fprintf(stderr, "WSAStartup failed. Errno: %d.\n", err);
fprintf(stderr, "WSAStartup failed. Error: %d.\n", err);
exit(-1);
}
}
#endif
struct addrinfo *net_resolve(char *host, char *port)
{
/* !!! This function should be integrated to open_socket function for cleaner code !!! */
//struct in_addr6 serveraddr;
struct addrinfo hints, *result;
int ret;
memset(&hints, 0, sizeof(hints));
hints.ai_family = AF_UNSPEC;
hints.ai_socktype = SOCK_STREAM;
hints.ai_protocol = IPPROTO_TCP;
/* hints.ai_flags = AI_NUMERICSERV; // Windows retardism */
ret = getaddrinfo(host, port, &hints, &result);
if(ret != 0)
{
if(ret == EAI_SERVICE) fprintf(stderr, "Invalid port (%s).\n", port);
fprintf(stderr, "Error: Unable to resolve hostname (%s).\n", host);
exit(-1);
}
return result;
}
/* socket close and cleanup */
void net_close_socket(int sd)
void net_close(int sd)
{
#ifdef _WIN32
closesocket(sd);
@ -296,36 +293,87 @@ void net_close_socket(int sd)
}
/* Opens and connects socket */
int net_open_socket(char *host, char *port)
/* http://man7.org/linux/man-pages/man3/getaddrinfo.3.html */
/* https://bugs.chromium.org/p/chromium/issues/detail?id=44489 */
int net_connect(const char *host, const char *port)
{
int sd;
struct addrinfo *serverinfo;
struct addrinfo hints = {0};
struct addrinfo *server_info, *p;
serverinfo = net_resolve(host, port);
hints.ai_family = AF_UNSPEC;
hints.ai_socktype = SOCK_STREAM;
hints.ai_protocol = IPPROTO_TCP;
sd = socket(serverinfo->ai_family, serverinfo->ai_socktype, serverinfo->ai_protocol);
if(sd < 0)
{
#ifdef _WIN32
WSACleanup();
net_init_WSA();
#endif
freeaddrinfo(serverinfo);
error("Error: cannot create socket.\n");
}
if(connect(sd, serverinfo->ai_addr, serverinfo->ai_addrlen) != 0)
// Get host address info
int ret = getaddrinfo(host, port, &hints, &server_info);
if (ret != 0)
{
net_close_socket(sd);
fprintf(stderr, "Error: connection failed (%s).\n", host);
freeaddrinfo(serverinfo);
exit(-1);
fprintf(stderr, "Name resolution failed.\n");
#ifdef _WIN32
fprintf(stderr, "Error %d: %s", ret, gai_strerror(ret));
#else
fprintf(stderr, "Error %d: %s\n", ret, gai_strerror(ret));
#endif
exit(EXIT_FAILURE);
}
freeaddrinfo(serverinfo);
// Go through the hosts and try to connect
for (p = server_info; p != NULL; p = p->ai_next)
{
sd = socket(p->ai_family, p->ai_socktype, p->ai_protocol);
if (sd == -1)
continue;
ret = connect(sd, p->ai_addr, p->ai_addrlen);
if (ret == -1)
{
net_close(sd);
continue;
}
// Get out of the loop when connect is successful
break;
}
if (p == NULL)
{
/* TODO (Tiiffi): Check why windows does not report errors */
fprintf(stderr, "Connection failed.\n");
#ifndef _WIN32
fprintf(stderr, "Error %d: %s\n", errno, strerror(errno));
#endif
freeaddrinfo(server_info);
exit(EXIT_FAILURE);
}
freeaddrinfo(server_info);
return sd;
}
int net_send(int sd, const uint8_t *buff, size_t size)
{
size_t sent = 0;
size_t left = size;
while (sent < size)
{
int result = send(sd, (const char *) buff + sent, left, 0);
if (result == -1) return -1;
sent += result;
left -= sent;
}
return 0;
}
int net_send_packet(int sd, rc_packet *packet)
{
int len;
@ -356,34 +404,42 @@ rc_packet *net_recv_packet(int sd)
int ret = recv(sd, (char *) &psize, sizeof(int), 0);
if(ret == 0) {
if (ret == 0)
{
fprintf(stderr, "Connection lost.\n");
connection_alive = 0;
return NULL;
}
if(ret != sizeof(int)) {
if (ret != sizeof(int))
{
fprintf(stderr, "Error: recv() failed. Invalid packet size (%d).\n", ret);
connection_alive = 0;
return NULL;
}
if(psize < 10 || psize > DATA_BUFFSIZE) {
if (psize < 10 || psize > DATA_BUFFSIZE)
{
fprintf(stderr, "Warning: invalid packet size (%d). Must over 10 and less than %d.\n", psize, DATA_BUFFSIZE);
if(psize > DATA_BUFFSIZE || psize < 0) psize = DATA_BUFFSIZE;
net_clean_incoming(sd, psize);
return NULL;
}
packet.size = psize;
ret = recv(sd, (char *) &packet + sizeof(int), psize, 0);
if(ret == 0) {
if (ret == 0)
{
fprintf(stderr, "Connection lost.\n");
connection_alive = 0;
return NULL;
}
if(ret != psize) {
if(ret != psize)
{
fprintf(stderr, "Warning: recv() return value (%d) does not match expected packet size (%d).\n", ret, psize);
net_clean_incoming(sd, DATA_BUFFSIZE); /* Should be enough. Needs some checking */
return NULL;
@ -398,7 +454,8 @@ int net_clean_incoming(int sd, int size)
int ret = recv(sd, tmp, size, 0);
if(ret == 0) {
if(ret == 0)
{
fprintf(stderr, "Connection lost.\n");
connection_alive = 0;
}
@ -410,7 +467,8 @@ void print_color(int color)
{
/* sh compatible color array */
#ifndef _WIN32
char *colors[] = {
char *colors[] =
{
"\033[0;30m", /* 00 BLACK 0x30 */
"\033[0;34m", /* 01 BLUE 0x31 */
"\033[0;32m", /* 02 GREEN 0x32 */
@ -429,7 +487,8 @@ void print_color(int color)
"\033[1;37m", /* 15 WHITE 0x66 */
};
if(color == 0) {
if(color == 0)
{
fputs("\033[0m", stdout); /* CANCEL COLOR */
}
else
@ -450,7 +509,8 @@ void print_color(int color)
/* this hacky mess might use some optimizing */
void packet_print(rc_packet *packet)
{
if (raw_output == 1) {
if (raw_output == 1)
{
for(int i = 0; packet->data[i] != 0; ++i) putchar(packet->data[i]);
return;
}
@ -468,8 +528,10 @@ void packet_print(rc_packet *packet)
/* colors enabled so try to handle the bukkit colors for terminal */
if (print_colors == 1) {
for(i = 0; (unsigned char) packet->data[i] != 0; ++i) {
if((unsigned char) packet->data[i] == 0xa7) {
for (i = 0; (unsigned char) packet->data[i] != 0; ++i)
{
if ((unsigned char) packet->data[i] == 0xa7)
{
++i;
print_color(packet->data[i]);
continue;
@ -484,11 +546,14 @@ void packet_print(rc_packet *packet)
/* strip colors */
else
{
for(i = 0; (unsigned char) packet->data[i] != 0; ++i) {
if((unsigned char) packet->data[i] == 0xa7) {
for (i = 0; (unsigned char) packet->data[i] != 0; ++i)
{
if ((unsigned char) packet->data[i] == 0xa7)
{
++i;
continue;
}
putchar(packet->data[i]);
}
}
@ -504,7 +569,8 @@ rc_packet *packet_build(int id, int cmd, char *s1)
/* size + id + cmd + s1 + s2 NULL terminator */
int s1_len = strlen(s1);
if(s1_len > DATA_BUFFSIZE) {
if (s1_len > DATA_BUFFSIZE)
{
fprintf(stderr, "Warning: Command string too long (%d). Maximum allowed: %d.\n", s1_len, DATA_BUFFSIZE);
return NULL;
}
@ -517,18 +583,81 @@ rc_packet *packet_build(int id, int cmd, char *s1)
return &packet;
}
// TODO(Tiiffi): String length limit?
uint8_t *packet_build_malloc(size_t *size, int32_t id, int32_t cmd, char *string)
{
size_t string_length = strlen(string);
*size = 3 * sizeof(int32_t) + string_length + 2;
uint8_t *packet = malloc(*size);
if (packet == NULL) return NULL;
int32_t *p = (int32_t *) packet;
p[0] = (int32_t) *size - sizeof(int32_t);
p[1] = id;
p[2] = cmd;
memcpy(&p[3], string, string_length);
packet[12 + string_length] = 0;
packet[13 + string_length] = 0;
return packet;
}
/* rcon packet structure */
#define MAX_PACKET_SIZE (size_t) 1460 // including size member
#define MIN_PACKET_SIZE (size_t) 10
#define MAX_STRING_SIZE (size_t) (MAX_PACKET_SIZE - 2 - 3 * sizeof(int32_t))
#define SIZEOF_PACKET(x) (size_t) (x.size + sizeof(int32_t))
struct rcon_packet
{
int32_t size;
int32_t id;
int32_t cmd;
uint8_t data[MAX_STRING_SIZE];
};
struct rcon_packet packet_build_new(int32_t id, int32_t cmd, char *string)
{
struct rcon_packet packet;
size_t string_length = strlen(string);
if (string_length > MAX_STRING_SIZE)
{
string_length = MAX_STRING_SIZE;
fprintf(stderr,
"Warning: command string is too long. Truncating to "
"%u characters.\n", (unsigned) MAX_STRING_SIZE
);
}
packet.size = 2 * sizeof(int32_t) + string_length + 2;
packet.id = id;
packet.cmd = cmd;
memcpy(packet.data, string, string_length);
packet.data[string_length] = 0;
packet.data[string_length + 1] = 0;
return packet;
}
int rcon_auth(int rsock, char *passwd)
{
int ret;
rc_packet *packet = packet_build(RCON_PID, RCON_AUTHENTICATE, passwd);
if(packet == NULL) return 0;
if (packet == NULL)
return 0;
ret = net_send_packet(rsock, packet);
if(!ret) return 0; /* send failed */
if (!ret)
return 0; /* send failed */
packet = net_recv_packet(rsock);
if(packet == NULL) return 0;
if (packet == NULL)
return 0;
/* return 1 if authentication OK */
return packet->id == -1 ? 0 : 1;
@ -536,23 +665,33 @@ int rcon_auth(int rsock, char *passwd)
int rcon_command(int rsock, char *command)
{
int ret;
int ret; (void) ret;
rc_packet *packet = packet_build(RCON_PID, RCON_EXEC_COMMAND, command);
if(packet == NULL) {
size_t size;
uint8_t *p = packet_build_malloc(&size, RCON_PID, RCON_EXEC_COMMAND, command);
if (p == NULL)
{
connection_alive = 0;
return 0;
}
ret = net_send_packet(rsock, packet);
if(!ret) return 0; /* send failed */
net_send(rsock, p, size);
free(p);
//ret = net_send_packet(rsock, packet);
//if(!ret) return 0; /* send failed */
rc_packet *packet;
packet = net_recv_packet(rsock);
if(packet == NULL) return 0;
if (packet == NULL)
return 0;
if(packet->id != RCON_PID) return 0; /* wrong packet id */
if (packet->id != RCON_PID)
return 0; /* wrong packet id */
if(!silent_mode) {
if (!silent_mode)
{
/*
if(packet->size == 10) {
printf("Unknown command \"%s\". Type \"help\" or \"?\" for help.\n", command);
@ -571,7 +710,8 @@ int run_commands(int argc, char *argv[])
{
int i, ok = 1, ret = 0;
for(i = optind; i < argc && ok; i++) {
for (i = optind; i < argc && ok; i++)
{
ok = rcon_command(rsock, argv[i]);
ret += ok;
}
@ -587,12 +727,14 @@ int run_terminal_mode(int rsock)
puts("Logged in. Type \"Q\" to quit!");
while(connection_alive) {
while (connection_alive)
{
int len = get_line(command, DATA_BUFFSIZE);
if(command[0] == 'Q' && command[1] == 0) break;
if(command[0] == 'Q' && command[1] == 0)
break;
if(len > 0 && connection_alive) ret += rcon_command(rsock, command);
if(len > 0 && connection_alive)
ret += rcon_command(rsock, command);
command[0] = len = 0;
}
@ -600,24 +742,47 @@ int run_terminal_mode(int rsock)
return ret;
}
/* gets line from stdin and deals with rubbish left in input buffer */
// gets line from stdin and deals with rubbish left in the input buffer
int get_line(char *buffer, int bsize)
{
int ch, len;
fputs("> ", stdout);
fgets(buffer, bsize, stdin);
fputs("/", stdout);
(void) fgets(buffer, bsize, stdin);
if(buffer[0] == 0) connection_alive = 0;
if (buffer[0] == 0)
connection_alive = 0;
/* remove unwanted characters from the buffer */
// remove unwanted characters from the buffer
buffer[strcspn(buffer, "\r\n")] = '\0';
len = strlen(buffer);
/* clean input buffer if needed */
// clean input buffer if needed
if (len == bsize - 1)
while ((ch = getchar()) != '\n' && ch != EOF);
return len;
}
// http://www.ibm.com/developerworks/aix/library/au-endianc/
bool is_bigendian(void)
{
const int32_t n = 1;
if (*(uint8_t *) &n == 0 ) return true;
return false;
}
int32_t reverse_int32(int32_t n)
{
int32_t tmp;
uint8_t *t = (uint8_t *) &tmp;
uint8_t *p = (uint8_t *) &n;
t[0] = p[3];
t[1] = p[2];
t[2] = p[1];
t[3] = p[0];
return tmp;
}