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

Use fixed width integer types in rcon packet structure

Browse Source
This commit is contained in:
Tiiffi
2024-11-10 16:25:19 +02:00
parent 6b563df23d
commit 4488127350
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mcrcon.c
View File

@ -63,9 +63,9 @@
// rcon packet structure // rcon packet structure
typedef struct _rc_packet { typedef struct _rc_packet {
int size; int32_t size;
int id; int32_t id;
int cmd; int32_t cmd;
char data[DATA_BUFFSIZE]; char data[DATA_BUFFSIZE];
// ignoring string2 for now // ignoring string2 for now
} rc_packet; } rc_packet;
@ -402,7 +402,7 @@ int net_send_packet(int sd, rc_packet *packet)
int bytesleft; // bytes left to send int bytesleft; // bytes left to send
int ret = -1; int ret = -1;
bytesleft = len = packet->size + sizeof(int); bytesleft = len = packet->size + sizeof(int32_t);
while (total < len) { while (total < len) {
ret = send(sd, (char *) packet + total, bytesleft, 0); ret = send(sd, (char *) packet + total, bytesleft, 0);
@ -416,12 +416,12 @@ int net_send_packet(int sd, rc_packet *packet)
rc_packet *net_recv_packet(int sd) rc_packet *net_recv_packet(int sd)
{ {
int psize; int32_t psize;
static rc_packet packet = {0, 0, 0, { 0x00 }}; static rc_packet packet = {0, 0, 0, { 0x00 }};
// packet.size = packet.id = packet.cmd = 0; // packet.size = packet.id = packet.cmd = 0;
int ret = recv(sd, (char *) &psize, sizeof(int), 0); int ret = recv(sd, (char *) &psize, sizeof(psize), 0);
if (ret == 0) { if (ret == 0) {
fprintf(stderr, "Connection lost.\n"); fprintf(stderr, "Connection lost.\n");
@ -429,7 +429,7 @@ rc_packet *net_recv_packet(int sd)
return NULL; return NULL;
} }
if (ret != sizeof(int)) { if (ret != sizeof(psize)) {
fprintf(stderr, "Error: recv() failed. Invalid packet size (%d).\n", ret); fprintf(stderr, "Error: recv() failed. Invalid packet size (%d).\n", ret);
global_connection_alive = 0; global_connection_alive = 0;
return NULL; return NULL;
@ -450,7 +450,7 @@ rc_packet *net_recv_packet(int sd)
int received = 0; int received = 0;
while (received < psize) { while (received < psize) {
ret = recv(sd, (char *) &packet + sizeof(int) + received, psize - received, 0); ret = recv(sd, (char *) &packet + sizeof(int32_t) + received, psize - received, 0);
if (ret == 0) { if (ret == 0) {
fprintf(stderr, "Connection lost.\n"); fprintf(stderr, "Connection lost.\n");
global_connection_alive = 0; global_connection_alive = 0;
@ -583,7 +583,7 @@ rc_packet *packet_build(int id, int cmd, char *s1)
return NULL; return NULL;
} }
packet.size = sizeof(int) * 2 + len + 2; packet.size = sizeof packet.size * 2 + len + 2;
packet.id = id; packet.id = id;
packet.cmd = cmd; packet.cmd = cmd;
strncpy(packet.data, s1, DATA_BUFFSIZE - 1); strncpy(packet.data, s1, DATA_BUFFSIZE - 1);