botchain/firmware
1
0
Fork 0
mirror of https://github.com/BotChain-Robots/firmware.git synced 2026-07-08 17:47:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix messages combining by sending size first

Browse Source
This commit is contained in:
Johnathon Slightham
2025-07-13 20:47:52 -04:00
parent e0d0737f36
commit 78a17af883
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
components/rpc/TCPServer.cpp
View File

@@ -32,7 +32,7 @@ TCPServer::TCPServer(const int port, const std::shared_ptr<PtrQueue<std::vector<
this->m_rx_queue = rx_queue; this->m_rx_queue = rx_queue;
this->m_server_sock = 0; this->m_server_sock = 0;
xTaskCreate(tcp_server_task, "tcp_accept_server", 2048, this, 5, &this->m_task); xTaskCreate(tcp_server_task, "tcp_accept_server", 3072, this, 5, &this->m_task);
xTaskCreate(socket_monitor_thread, "tcp_rx", 4096, this, 5, &this->m_rx_task); xTaskCreate(socket_monitor_thread, "tcp_rx", 4096, this, 5, &this->m_rx_task);
} }
@@ -148,7 +148,15 @@ TCPServer::~TCPServer() {
auto buffer = std::make_unique<std::vector<uint8_t>>(); auto buffer = std::make_unique<std::vector<uint8_t>>();
buffer->resize(MAX_RX_BUFFER_SIZE); buffer->resize(MAX_RX_BUFFER_SIZE);
int len = recv(sock, buffer->data(), MAX_RX_BUFFER_SIZE, 0); // temp: for the null terminator uint32_t msg_size = 0;
recv(sock, &msg_size, 4, MSG_WAITALL);
if (msg_size < 1 || msg_size > 512) {
continue;
}
printf("Message size: %ld\n", msg_size);
int len = recv(sock, buffer->data(), msg_size, MSG_WAITALL);
if (len < 0) { if (len < 0) {
printf("Error occurred during receiving: errno %d\n", errno); printf("Error occurred during receiving: errno %d\n", errno);
to_remove.emplace_back(sock); to_remove.emplace_back(sock);
@@ -203,7 +211,7 @@ bool TCPServer::authenticate_client(int sock) {
return 0; return 0;
} }
int TCPServer::send_msg(char *buffer, size_t length) const { int TCPServer::send_msg(char *buffer, uint32_t length) const {
// todo: should we assign a unique rank to each pc? // todo: should we assign a unique rank to each pc?
if (!is_network_connected()) { if (!is_network_connected()) {
@@ -212,6 +220,7 @@ int TCPServer::send_msg(char *buffer, size_t length) const {
for (const auto client_sock : m_clients) { for (const auto client_sock : m_clients) {
std::cout << "sending tcp" << std::endl; std::cout << "sending tcp" << std::endl;
send(client_sock, &length, 4, 0);
send(client_sock, buffer, length, 0); send(client_sock, buffer, length, 0);
} }

2
components/rpc/include/TCPServer.h
View File

@@ -19,7 +19,7 @@ class TCPServer : IRPCServer {
public: public:
TCPServer(int port, const std::shared_ptr<PtrQueue<std::vector<uint8_t>>>& rx_queue); TCPServer(int port, const std::shared_ptr<PtrQueue<std::vector<uint8_t>>>& rx_queue);
~TCPServer(); ~TCPServer();
int send_msg(char* buffer, size_t length) const; int send_msg(char* buffer, uint32_t length) const;
private: private:
bool authenticate_client(int client_sock); bool authenticate_client(int client_sock);