AfonsoCMSousa/ACPlayer_database_api
1
1
Fork 0
generated from AfonsoCMSousa/CPP-Template
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Madjor Fix: New Player data overwrites old/connected players

Browse Source
This commit is contained in:
AfonsoCMSousa
2025-10-29 13:52:37 +00:00
parent 2d3f52a9a5
commit 15f87631e2
7 changed files with 328 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/main.cpp
+125 -50
View File
@@ -9,9 +9,12 @@
#include <sys/un.h>
#include <unistd.h>
// native webstocket
// SERVER STRUCTS
#include "server_structs.h"
#include "stack.h"
#include "telemetry.h"
#define SERVER_SOCKET_PATH "/tmp/ACplayer_socket"
@@ -27,6 +30,18 @@ void checkConn(PGconn *conn) {
}
}
void sanitize_utf8(char *str) {
if (!str)
return;
for (size_t i = 0; str[i] != '\0'; i++) {
// Replace invalid UTF-8 bytes with '?'
if ((unsigned char)str[i] > 127) {
str[i] = '?';
}
}
}
void *db_write_thread(void *arg) {
(void)arg; // Unused parameter
@@ -44,8 +59,19 @@ void *db_write_thread(void *arg) {
if (api_queue.pop(packet)) {
// Check if message was Handshake
if (packet.tracker_id == 65) {
printf("[+] Handshake packet received for server \"%s\" (%d), skipping database write.\n", packet.track_info.server_name, packet.tracker_id);
continue; // Skip database write for handshake packets
}
broadcast_telemetry(packet);
// DEBUG
printf("[W] Writing packet for Server with tracker ID: %d to database.\tQueue: %u/%d\n", packet.tracker_id, (unsigned int)api_queue.size(), STACK_SIZE);
// Time for servers table insert/UPDATE
const char *query = "INSERT INTO servers ("
"server_id, server_name, session_type, session_count, server_track, "
"server_config, server_weather_graphics, typ, session_time, session_laps, "
@@ -84,7 +110,7 @@ void *db_write_thread(void *arg) {
std::string road_temp_s = std::to_string(packet.track_info.road_temp);
std::string elapsed_time_s = std::to_string((u_int16_t)packet.track_info.elapsed_ms);
std::string connected_players_s = std::to_string(packet.connected_cars);
std::string connected_players_s = std::to_string(packet.connected_players);
const char *paramValues[15] = {server_id_str.c_str(),
server_name,
@@ -107,22 +133,31 @@ void *db_write_thread(void *arg) {
if (PQresultStatus(res) != PGRES_TUPLES_OK) {
printf("[!] Insert failed: %s", PQerrorMessage(conn));
PQclear(res);
PQfinish(conn);
break;
continue;
}
PQclear(res);
// Time for users table insert/UPDATE
if (packet.connected_cars == 0) {
PQclear(res);
continue; // No connected cars to process
}
for (int i = 0; i < packet.connected_cars; i++) {
for (int i = 0; i < MAX_PLAYERS; i++) {
if (packet.cars[i].isConnected == 0) {
if (packet.cars[i].driver_GUID[0] == '\0') {
continue; // Skip empty slots
}
printf("[D] User disconnected (%d): GUID=%s, Name=%s\n", i, packet.cars[i].driver_GUID, packet.cars[i].driver_name);
// If the car is not connected, we still need to update its status in the db
const char *disconnect_query = "UPDATE users SET is_connect = false, current_server = NULL WHERE driver_guid = $1;";
const char *disconnect_paramValues[1] = {packet.cars[i].driver_GUID};
PGresult *disconnect_res = PQexecParams(conn, disconnect_query, 1, nullptr, disconnect_paramValues, nullptr, nullptr, 0);
if (PQresultStatus(disconnect_res) != PGRES_COMMAND_OK) {
printf("[!] User disconnect update failed for GUID %s: %s", packet.cars[i].driver_GUID, PQerrorMessage(conn));
}
PQclear(disconnect_res);
continue; // Skip disconnected cars
}
u_int8_t car_id = packet.cars[i].carID;
const char *user_query = "INSERT INTO users ("
"driver_guid, driver_name, driver_team, car_model, car_skin, "
@@ -141,18 +176,23 @@ void *db_write_thread(void *arg) {
"is_loading = EXCLUDED.is_loading, "
"current_server = EXCLUDED.current_server;";
const char *driver_guid = packet.cars[i].driver_GUID;
const char *driver_name = packet.cars[i].driver_name;
const char *driver_team = packet.cars[i].driver_team;
const char *car_model = packet.cars[i].car_model;
const char *car_skin = packet.cars[i].car_skin;
const char *driver_guid = packet.cars[car_id].driver_GUID;
const char *driver_name = packet.cars[car_id].driver_name;
const char *driver_team = packet.cars[car_id].driver_team;
const char *car_model = packet.cars[car_id].car_model;
const char *car_skin = packet.cars[car_id].car_skin;
std::string cuts_alltime_s = std::to_string(packet.cars[i].total_cuts_alltime);
std::string contacts_alltime_s = std::to_string(packet.cars[i].total_contacts);
std::string laps_completed_s = std::to_string(packet.cars[i].total_laps_completed);
std::string is_connect_s = std::to_string(packet.cars[i].isConnected);
std::string is_loading_s = std::to_string(packet.cars[i].isLoading);
std::string current_server_s = server_id_str;
std::string cuts_alltime_s = std::to_string(packet.cars[car_id].total_cuts_alltime);
std::string contacts_alltime_s = std::to_string(packet.cars[car_id].total_contacts);
std::string laps_completed_s = std::to_string(packet.cars[car_id].total_laps_completed);
std::string is_connect_s = std::to_string(packet.cars[car_id].isConnected);
std::string is_loading_s = std::to_string(packet.cars[car_id].isLoading);
std::string current_server_s = std::to_string(packet.tracker_id);
// Debug output for user data being inserted/updated
printf("[D] Processing user \(%d\): GUID=%s, Name=%s, Team=%s Car Model=%s, Skin=%s, Cuts=%s, Contacts=%s, Laps=%s, IsConnect=%s, IsLoading=%s, CurrentServer=%s\n",
i, driver_guid, driver_name, driver_team, car_model, car_skin, cuts_alltime_s.c_str(), contacts_alltime_s.c_str(), laps_completed_s.c_str(),
is_connect_s.c_str(), is_loading_s.c_str(), current_server_s.c_str());
const char *user_paramValues[11] = {driver_guid,
driver_name,
@@ -165,31 +205,67 @@ void *db_write_thread(void *arg) {
is_connect_s.c_str(),
is_loading_s.c_str(),
current_server_s.c_str()};
PGresult *user_res = PQexecParams(conn, user_query, 11, nullptr, user_paramValues, nullptr, nullptr, 0);
if (PQresultStatus(user_res) != PGRES_COMMAND_OK) {
printf("[!] User insert/update failed for GUID %s: %s", driver_guid, PQerrorMessage(conn));
PQclear(user_res);
continue; // Proceed to next user
}
PQclear(user_res);
}
PQclear(res);
} else {
usleep(1000); // Sleep for 1ms if no packets are available
}
}
PQfinish(conn);
return NULL;
}
void *handle_client(void *arg) {
int client_fd = *(int *)arg;
free(arg);
api_packet api_packet_storage;
ssize_t n;
while ((n = read(client_fd, &api_packet_storage, sizeof(api_packet))) > 0) {
printf("[+] Received %zd bytes\n", n);
if (api_packet_storage.tracker_id == 65) {
printf("[+] Handshake received from server \"%s\" (%d).\n", api_packet_storage.track_info.server_name, api_packet_storage.tracker_id);
continue;
}
printf("[*] Info: Tracker id: %d (\"%s\")\tQueue: %u/%d\n", api_packet_storage.tracker_id, api_packet_storage.track_info.server_name, (unsigned int)api_queue.size(),
(int)api_queue.getCapacity());
if (!api_queue.push(api_packet_storage)) {
printf("[!] Api queue full, dropping packet from tracker id: %d\n", api_packet_storage.tracker_id);
}
usleep(1500);
}
if (n < 0)
perror("[!] Error on read");
else
printf("[+] Client disconnected\n");
close(client_fd);
return NULL;
}
int main(void) {
int server_fd, client_fd;
struct sockaddr_un addr;
socklen_t addr_len;
ssize_t n;
api_packet api_packet_storage;
// Create socket
// create socket
server_fd = socket(AF_UNIX, SOCK_STREAM, 0);
if (server_fd < 0) {
perror("socket");
@@ -198,25 +274,35 @@ int main(void) {
unlink(SERVER_SOCKET_PATH);
addr.sun_family = AF_UNIX;
strcpy(addr.sun_path, SERVER_SOCKET_PATH);
strncpy(addr.sun_path, SERVER_SOCKET_PATH, sizeof(addr.sun_path) - 1);
addr.sun_path[sizeof(addr.sun_path) - 1] = '\0'; // null-terminate just in case
if (bind(server_fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
perror("bind");
exit(1);
}
if (listen(server_fd, 5) < 0) {
perror("listen");
exit(1);
}
// Start DB write db_write_thread
// start db write db_write_thread
pthread_t db_thread;
if (pthread_create(&db_thread, NULL, db_write_thread, NULL) != 0) {
perror("pthread create");
exit(1);
}
// Detach the thread so it cleans up after itself
// detach the thread so it cleans up after itself
pthread_detach(db_thread);
pthread_t telemetry_thread;
if (pthread_create(&telemetry_thread, NULL, telemetry_server_thread, NULL) != 0) {
perror("[!] Failed to create telemetry server thread");
return EXIT_FAILURE;
}
pthread_detach(telemetry_thread);
printf("[+] Server listening on %s\n", SERVER_SOCKET_PATH);
while (1) {
@@ -228,29 +314,18 @@ int main(void) {
printf("[+] Client connected\n");
while ((n = read(client_fd, &api_packet_storage, sizeof(api_packet))) > 0) {
printf("[+] Received %zd bytes\n", n);
int *client_fd_ptr = (int *)malloc(sizeof(int));
*client_fd_ptr = client_fd;
if (api_packet_storage.tracker_id == 65) {
printf("[+] Handshake Received from server \"%s\" (%d).\n", api_packet_storage.track_info.server_name, api_packet_storage.tracker_id);
continue;
}
// Print info
printf("[*] Info: Tracker ID: %d (\"%s\")\tQueue: %u/%d\n", api_packet_storage.tracker_id, api_packet_storage.track_info.server_name, (unsigned int)api_queue.size(),
STACK_SIZE);
if (!api_queue.push(api_packet_storage)) {
printf("[!] API Queue full, dropping packet from Tracker ID: %d\n", api_packet_storage.tracker_id);
}
usleep(1500);
pthread_t client_thread;
if (pthread_create(&client_thread, NULL, handle_client, client_fd_ptr) != 0) {
perror("pthread_create");
close(client_fd);
free(client_fd_ptr);
continue;
}
if (n < 0)
perror("[!] Error on read");
else
printf("[+] Client disconnected\n");
close(client_fd);
pthread_detach(client_thread); // no need to join manually
}
return 0;