EXTERNAL/bareiron
1
0
Fork 1
mirror of https://github.com/p2r3/bareiron.git synced 2025-10-01 23:25:09 +02:00
Code Issues Activity

handle server list ping

Browse Source
This commit is contained in:
p2r3
2025-08-27 14:50:17 +03:00
parent 71737380d5
commit b46f5927a2
5 changed files with 56 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/main.c
View File

@@ -32,9 +32,8 @@
#include "registries.h"
#include "procedures.h"
void handlePacket (int client_fd, int length, int packet_id) {
void handlePacket (int client_fd, int length, int packet_id, int state) {
int state = getClientState(client_fd);
uint64_t bytes_received_start = total_bytes_received;
switch (packet_id) {
@@ -42,7 +41,9 @@ void handlePacket (int client_fd, int length, int packet_id) {
case 0x00:
if (state == STATE_NONE) {
if (cs_handshake(client_fd)) break;
} else if (state == STATE_LOGIN) {
} else if (state == STATE_STATUS) {
if (sc_statusResponse(client_fd)) break;
} if (state == STATE_LOGIN) {
uint8_t uuid[16];
char name[16];
if (cs_loginStart(client_fd, uuid, name)) break;
@@ -55,6 +56,19 @@ void handlePacket (int client_fd, int length, int packet_id) {
}
break;
case 0x01:
// Handle status ping
if (state == STATE_STATUS) {
// No need for a packet handler, just echo back the long verbatim
writeByte(client_fd, 9);
writeByte(client_fd, 0x01);
writeUint64(client_fd, readUint64(client_fd));
// Close connection after this
recv_count = 0;
return;
}
break;
case 0x02:
if (state == STATE_CONFIGURATION) cs_pluginMessage(client_fd);
break;
@@ -526,7 +540,7 @@ int main () {
int client_fd = clients[client_index];
// Check if at least 2 bytes are available for reading
ssize_t recv_count = recv(client_fd, &recv_buffer, 2, MSG_PEEK);
recv_count = recv(client_fd, &recv_buffer, 2, MSG_PEEK);
if (recv_count < 2) {
if (recv_count == 0 || (recv_count < 0 && errno != EAGAIN && errno != EWOULDBLOCK)) {
disconnectClient(&clients[client_index], 1);
@@ -546,8 +560,15 @@ int main () {
disconnectClient(&clients[client_index], 3);
continue;
}
// Get client connection state
int state = getClientState(client_fd);
// Disconnect on legacy server list ping
if (state == STATE_NONE && length == 254 && packet_id == 122) {
disconnectClient(&clients[client_index], 5);
continue;
}
// Handle packet data
handlePacket(client_fd, length - sizeVarInt(packet_id), packet_id);
handlePacket(client_fd, length - sizeVarInt(packet_id), packet_id, state);
if (recv_count == 0 || (recv_count == -1 && errno != EAGAIN && errno != EWOULDBLOCK)) {
disconnectClient(&clients[client_index], 4);
continue;