perf: Use stack allocation for strerror rendering.

iphydf · iphydf · commit f1991aaa0297 · 2025-01-30T21:20:25.000Z
diff --git a/auto_tests/TCP_test.c b/auto_tests/TCP_test.c
@@ -111,13 +111,13 @@ static void test_basic(void)
     free(handshake_plain);
 
     // Sending the handshake
-    ck_assert_msg(net_send(ns, mem, logger, sock, handshake, TCP_CLIENT_HANDSHAKE_SIZE - 1,
+    ck_assert_msg(net_send(ns, logger, sock, handshake, TCP_CLIENT_HANDSHAKE_SIZE - 1,
                            &localhost, nullptr) == TCP_CLIENT_HANDSHAKE_SIZE - 1,
                   "An attempt to send the initial handshake minus last byte failed.");
 
     do_tcp_server_delay(tcp_s, mono_time, 50);
 
-    ck_assert_msg(net_send(ns, mem, logger, sock, handshake + (TCP_CLIENT_HANDSHAKE_SIZE - 1), 1, &localhost, nullptr) == 1,
+    ck_assert_msg(net_send(ns, logger, sock, handshake + (TCP_CLIENT_HANDSHAKE_SIZE - 1), 1, &localhost, nullptr) == 1,
                   "The attempt to send the last byte of handshake failed.");
 
     free(handshake);
@@ -127,7 +127,7 @@ static void test_basic(void)
     // Receiving server response and decrypting it
     uint8_t response[TCP_SERVER_HANDSHAKE_SIZE];
     uint8_t response_plain[TCP_HANDSHAKE_PLAIN_SIZE];
-    ck_assert_msg(net_recv(ns, mem, logger, sock, response, TCP_SERVER_HANDSHAKE_SIZE, &localhost) == TCP_SERVER_HANDSHAKE_SIZE,
+    ck_assert_msg(net_recv(ns, logger, sock, response, TCP_SERVER_HANDSHAKE_SIZE, &localhost) == TCP_SERVER_HANDSHAKE_SIZE,
                   "Could/did not receive a server response to the initial handshake.");
     ret = decrypt_data(mem, self_public_key, f_secret_key, response, response + CRYPTO_NONCE_SIZE,
                        TCP_SERVER_HANDSHAKE_SIZE - CRYPTO_NONCE_SIZE, response_plain);
@@ -156,7 +156,7 @@ static void test_basic(void)
             msg_length = sizeof(r_req) - i;
         }
 
-        ck_assert_msg(net_send(ns, mem, logger, sock, r_req + i, msg_length, &localhost, nullptr) == msg_length,
+        ck_assert_msg(net_send(ns, logger, sock, r_req + i, msg_length, &localhost, nullptr) == msg_length,
                       "Failed to send request after completing the handshake.");
         i += msg_length;
 
@@ -169,7 +169,7 @@ static void test_basic(void)
     const size_t max_packet_size = 4096;
     uint8_t *packet_resp = (uint8_t *)malloc(max_packet_size);
     ck_assert(packet_resp != nullptr);
-    int recv_data_len = net_recv(ns, mem, logger, sock, packet_resp, 2 + 2 + CRYPTO_PUBLIC_KEY_SIZE + CRYPTO_MAC_SIZE, &localhost);
+    int recv_data_len = net_recv(ns, logger, sock, packet_resp, 2 + 2 + CRYPTO_PUBLIC_KEY_SIZE + CRYPTO_MAC_SIZE, &localhost);
     ck_assert_msg(recv_data_len == 2 + 2 + CRYPTO_PUBLIC_KEY_SIZE + CRYPTO_MAC_SIZE,
                   "Failed to receive server response to request. %d", recv_data_len);
     memcpy(&size, packet_resp, 2);
@@ -241,20 +241,20 @@ static struct sec_TCP_con *new_tcp_con(const Logger *logger, const Memory *mem,
     ck_assert_msg(ret == TCP_CLIENT_HANDSHAKE_SIZE - (CRYPTO_PUBLIC_KEY_SIZE + CRYPTO_NONCE_SIZE),
                   "Failed to encrypt the outgoing handshake.");
 
-    ck_assert_msg(net_send(ns, mem, logger, sock, handshake, TCP_CLIENT_HANDSHAKE_SIZE - 1,
+    ck_assert_msg(net_send(ns, logger, sock, handshake, TCP_CLIENT_HANDSHAKE_SIZE - 1,
                            &localhost, nullptr) == TCP_CLIENT_HANDSHAKE_SIZE - 1,
                   "Failed to send the first portion of the handshake to the TCP relay server.");
 
     do_tcp_server_delay(tcp_s, mono_time, 50);
 
-    ck_assert_msg(net_send(ns, mem, logger, sock, handshake + (TCP_CLIENT_HANDSHAKE_SIZE - 1), 1, &localhost, nullptr) == 1,
+    ck_assert_msg(net_send(ns, logger, sock, handshake + (TCP_CLIENT_HANDSHAKE_SIZE - 1), 1, &localhost, nullptr) == 1,
                   "Failed to send last byte of handshake.");
 
     do_tcp_server_delay(tcp_s, mono_time, 50);
 
     uint8_t response[TCP_SERVER_HANDSHAKE_SIZE];
     uint8_t response_plain[TCP_HANDSHAKE_PLAIN_SIZE];
-    ck_assert_msg(net_recv(sec_c->ns, mem, logger, sock, response, TCP_SERVER_HANDSHAKE_SIZE, &localhost) == TCP_SERVER_HANDSHAKE_SIZE,
+    ck_assert_msg(net_recv(sec_c->ns, logger, sock, response, TCP_SERVER_HANDSHAKE_SIZE, &localhost) == TCP_SERVER_HANDSHAKE_SIZE,
                   "Failed to receive server handshake response.");
     ret = decrypt_data(mem, tcp_server_public_key(tcp_s), f_secret_key, response, response + CRYPTO_NONCE_SIZE,
                        TCP_SERVER_HANDSHAKE_SIZE - CRYPTO_NONCE_SIZE, response_plain);
@@ -291,7 +291,7 @@ static int write_packet_tcp_test_connection(const Logger *logger, const Memory *
     localhost.ip = get_loopback();
     localhost.port = 0;
 
-    ck_assert_msg(net_send(con->ns, mem, logger, con->sock, packet, packet_size, &localhost, nullptr) == packet_size,
+    ck_assert_msg(net_send(con->ns, logger, con->sock, packet, packet_size, &localhost, nullptr) == packet_size,
                   "Failed to send a packet.");
     return 0;
 }
@@ -302,7 +302,7 @@ static int read_packet_sec_tcp(const Logger *logger, struct sec_TCP_con *con, ui
     localhost.ip = get_loopback();
     localhost.port = 0;
 
-    int rlen = net_recv(con->ns, con->mem, logger, con->sock, data, length, &localhost);
+    int rlen = net_recv(con->ns, logger, con->sock, data, length, &localhost);
     ck_assert_msg(rlen == length, "Did not receive packet of correct length. Wanted %i, instead got %i", length, rlen);
     rlen = decrypt_data_symmetric(con->mem, con->shared_key, con->recv_nonce, data + 2, length - 2, data);
     ck_assert_msg(rlen != -1, "Failed to decrypt a received packet from the Relay server.");
diff --git a/auto_tests/network_test.c b/auto_tests/network_test.c
@@ -32,10 +32,8 @@ static void test_addr_resolv_localhost(void)
     bool res = addr_resolve_or_parse_ip(ns, mem, localhost, &ip, nullptr, true);
 
     int error = net_error();
-    char *strerror = net_new_strerror(mem, error);
-    ck_assert(strerror != nullptr);
-    ck_assert_msg(res, "Resolver failed: %d, %s", error, strerror);
-    net_kill_strerror(mem, strerror);
+    Net_Strerror error_str;
+    ck_assert_msg(res, "Resolver failed: %d, %s", error, net_strerror(error, &error_str));
 
     Ip_Ntoa ip_str;
     ck_assert_msg(net_family_is_ipv4(ip.family), "Expected family TOX_AF_INET, got %u.", ip.family.value);
@@ -56,10 +54,7 @@ static void test_addr_resolv_localhost(void)
     }
 
     error = net_error();
-    strerror = net_new_strerror(mem, error);
-    ck_assert(strerror != nullptr);
-    ck_assert_msg(res, "Resolver failed: %d, %s", error, strerror);
-    net_kill_strerror(mem, strerror);
+    ck_assert_msg(res, "Resolver failed: %d, %s", error, net_strerror(error, &error_str));
 
     ck_assert_msg(net_family_is_ipv6(ip.family), "Expected family TOX_AF_INET6 (%d), got %u.", TOX_AF_INET6,
                   ip.family.value);
@@ -80,10 +75,7 @@ static void test_addr_resolv_localhost(void)
     ip_reset(&extra);
     res = addr_resolve_or_parse_ip(ns, mem, localhost, &ip, &extra, true);
     error = net_error();
-    strerror = net_new_strerror(mem, error);
-    ck_assert(strerror != nullptr);
-    ck_assert_msg(res, "Resolver failed: %d, %s", error, strerror);
-    net_kill_strerror(mem, strerror);
+    ck_assert_msg(res, "Resolver failed: %d, %s", error, net_strerror(error, &error_str));
 
 #if USE_IPV6
     ck_assert_msg(net_family_is_ipv6(ip.family), "Expected family TOX_AF_INET6 (%d), got %u.", TOX_AF_INET6,
diff --git a/other/docker/cppcheck/toxcore.cfg b/other/docker/cppcheck/toxcore.cfg
@@ -92,10 +92,6 @@
     <alloc init="true">new_networking_no_udp</alloc>
     <dealloc arg="1">kill_networking</dealloc>
   </resource>
-  <resource>
-    <alloc init="true">net_new_strerror</alloc>
-    <dealloc arg="1">net_kill_strerror</dealloc>
-  </resource>
   <resource>
     <alloc init="true">new_onion</alloc>
     <dealloc arg="1">kill_onion</dealloc>
diff --git a/toxav/rtp.c b/toxav/rtp.c
@@ -17,6 +17,7 @@
 #include "../toxcore/logger.h"
 #include "../toxcore/mono_time.h"
 #include "../toxcore/net_crypto.h"
+#include "../toxcore/network.h"
 #include "../toxcore/tox_private.h"
 #include "../toxcore/util.h"
 
@@ -778,11 +779,10 @@ void rtp_stop_receiving(Tox *tox)
 static void rtp_report_error_maybe(const Logger *log, const Memory *mem, Tox_Err_Friend_Custom_Packet error, uint16_t rdata_size)
 {
     if (error != TOX_ERR_FRIEND_CUSTOM_PACKET_OK) {
-        char *netstrerror = net_new_strerror(mem, net_error());
+        Net_Strerror error_str;
         const char *toxerror = tox_err_friend_custom_packet_to_string(error);
         LOGGER_WARNING(log, "RTP send failed (len: %u)! tox error: %s net error: %s",
-                       rdata_size, toxerror, netstrerror);
-        net_kill_strerror(mem, netstrerror);
+                       rdata_size, toxerror, net_strerror(net_error(), &error_str));
     }
 }
 
diff --git a/toxav/toxav.c b/toxav/toxav.c
@@ -996,9 +996,8 @@ static Toxav_Err_Send_Frame send_frames(const ToxAV *av, ToxAVCall *call)
                             is_keyframe);
 
         if (res < 0) {
-            char *netstrerror = net_new_strerror(av->mem, net_error());
-            LOGGER_WARNING(av->log, "Could not send video frame: %s", netstrerror);
-            net_kill_strerror(av->mem, netstrerror);
+            Net_Strerror error_str;
+            LOGGER_WARNING(av->log, "Could not send video frame: %s", net_strerror(net_error(), &error_str));
             return TOXAV_ERR_SEND_FRAME_RTP_FAILED;
         }
     }
diff --git a/toxcore/TCP_common.c b/toxcore/TCP_common.c
@@ -35,7 +35,7 @@ int send_pending_data_nonpriority(const Logger *logger, TCP_Connection *con)
     }
 
     const uint16_t left = con->last_packet_length - con->last_packet_sent;
-    const int len = net_send(con->ns, con->mem, logger, con->sock, con->last_packet + con->last_packet_sent, left, &con->ip_port,
+    const int len = net_send(con->ns, logger, con->sock, con->last_packet + con->last_packet_sent, left, &con->ip_port,
                              con->net_profile);
 
     if (len <= 0) {
@@ -67,7 +67,7 @@ int send_pending_data(const Logger *logger, TCP_Connection *con)
 
     while (p != nullptr) {
         const uint16_t left = p->size - p->sent;
-        const int len = net_send(con->ns, con->mem, logger, con->sock, p->data + p->sent, left, &con->ip_port, con->net_profile);
+        const int len = net_send(con->ns, logger, con->sock, p->data + p->sent, left, &con->ip_port, con->net_profile);
 
         if (len != left) {
             if (len > 0) {
@@ -165,7 +165,7 @@ int write_packet_tcp_secure_connection(const Logger *logger, TCP_Connection *con
     }
 
     if (priority) {
-        len = sendpriority ? net_send(con->ns, con->mem, logger, con->sock, packet, packet_size, &con->ip_port,
+        len = sendpriority ? net_send(con->ns, logger, con->sock, packet, packet_size, &con->ip_port,
                                       con->net_profile) : 0;
 
         if (len <= 0) {
@@ -181,7 +181,7 @@ int write_packet_tcp_secure_connection(const Logger *logger, TCP_Connection *con
         return add_priority(con, packet, packet_size, len) ? 1 : 0;
     }
 
-    len = net_send(con->ns, con->mem, logger, con->sock, packet, packet_size, &con->ip_port, con->net_profile);
+    len = net_send(con->ns, logger, con->sock, packet, packet_size, &con->ip_port, con->net_profile);
 
     if (len <= 0) {
         return 0;
@@ -218,7 +218,7 @@ int read_tcp_packet(
         return -1;
     }
 
-    const int len = net_recv(ns, mem, logger, sock, data, length, ip_port);
+    const int len = net_recv(ns, logger, sock, data, length, ip_port);
 
     if (len != length) {
         LOGGER_ERROR(logger, "FAIL recv packet");
@@ -236,13 +236,13 @@ int read_tcp_packet(
  * return -1 on failure.
  */
 non_null()
-static uint16_t read_tcp_length(const Logger *logger, const Memory *mem, const Network *ns, Socket sock, const IP_Port *ip_port)
+static uint16_t read_tcp_length(const Logger *logger, const Network *ns, Socket sock, const IP_Port *ip_port)
 {
     const uint16_t count = net_socket_data_recv_buffer(ns, sock);
 
     if (count >= sizeof(uint16_t)) {
         uint8_t length_buf[sizeof(uint16_t)];
-        const int len = net_recv(ns, mem, logger, sock, length_buf, sizeof(length_buf), ip_port);
+        const int len = net_recv(ns, logger, sock, length_buf, sizeof(length_buf), ip_port);
 
         if (len != sizeof(uint16_t)) {
             LOGGER_ERROR(logger, "FAIL recv packet");
@@ -275,7 +275,7 @@ int read_packet_tcp_secure_connection(
     uint16_t max_len, const IP_Port *ip_port)
 {
     if (*next_packet_length == 0) {
-        const uint16_t len = read_tcp_length(logger, mem, ns, sock, ip_port);
+        const uint16_t len = read_tcp_length(logger, ns, sock, ip_port);
 
         if (len == (uint16_t) -1) {
             return -1;
diff --git a/toxcore/TCP_server.c b/toxcore/TCP_server.c
@@ -362,7 +362,7 @@ static int handle_tcp_handshake(const Logger *logger, TCP_Secure_Connection *con
 
     const IP_Port ipp = {{{0}}};
 
-    if (TCP_SERVER_HANDSHAKE_SIZE != net_send(con->con.ns, con->con.mem, logger, con->con.sock, response, TCP_SERVER_HANDSHAKE_SIZE, &ipp, con->con.net_profile)) {
+    if (TCP_SERVER_HANDSHAKE_SIZE != net_send(con->con.ns, logger, con->con.sock, response, TCP_SERVER_HANDSHAKE_SIZE, &ipp, con->con.net_profile)) {
         crypto_memzero(shared_key, sizeof(shared_key));
         return -1;
     }
@@ -942,10 +942,9 @@ static Socket new_listening_tcp_socket(const Logger *logger, const Memory *mem,
     ok = ok && bind_to_port(ns, sock, family, port) && (net_listen(ns, sock, TCP_MAX_BACKLOG) == 0);
 
     if (!ok) {
-        char *const error = net_new_strerror(mem, net_error());
+        Net_Strerror error_str;
         LOGGER_WARNING(logger, "could not bind to TCP port %d (family = %d): %s",
-                       port, family.value, error != nullptr ? error : "(null)");
-        net_kill_strerror(mem, error);
+                       port, family.value, net_strerror(net_error(), &error_str));
         kill_sock(ns, sock);
         return net_invalid_socket();
     }
diff --git a/toxcore/network.c b/toxcore/network.c
diff --git a/toxcore/network.h b/toxcore/network.h

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`#include "../toxcore/logger.h"`
`18`	`18`	`#include "../toxcore/mono_time.h"`
`19`	`19`	`#include "../toxcore/net_crypto.h"`
	`20`	`+#include "../toxcore/network.h"`
`20`	`21`	`#include "../toxcore/tox_private.h"`
`21`	`22`	`#include "../toxcore/util.h"`
`22`	`23`
`@@ -778,11 +779,10 @@ void rtp_stop_receiving(Tox *tox)`
`778`	`779`	`static void rtp_report_error_maybe(const Logger log, const Memory mem, Tox_Err_Friend_Custom_Packet error, uint16_t rdata_size)`
`779`	`780`	`{`
`780`	`781`	`if (error != TOX_ERR_FRIEND_CUSTOM_PACKET_OK) {`
`781`		`- char *netstrerror = net_new_strerror(mem, net_error());`
	`782`	`+ Net_Strerror error_str;`
`782`	`783`	`const char *toxerror = tox_err_friend_custom_packet_to_string(error);`
`783`	`784`	`LOGGER_WARNING(log, "RTP send failed (len: %u)! tox error: %s net error: %s",`
`784`		`- rdata_size, toxerror, netstrerror);`
`785`		`- net_kill_strerror(mem, netstrerror);`
	`785`	`+ rdata_size, toxerror, net_strerror(net_error(), &error_str));`
`786`	`786`	`}`
`787`	`787`	`}`
`788`	`788`
Original file line number	Diff line number	Diff line change
`@@ -996,9 +996,8 @@ static Toxav_Err_Send_Frame send_frames(const ToxAV av, ToxAVCall call)`
`996`	`996`	`is_keyframe);`
`997`	`997`
`998`	`998`	`if (res < 0) {`
`999`		`- char *netstrerror = net_new_strerror(av->mem, net_error());`
`1000`		`- LOGGER_WARNING(av->log, "Could not send video frame: %s", netstrerror);`
`1001`		`- net_kill_strerror(av->mem, netstrerror);`
	`999`	`+ Net_Strerror error_str;`
	`1000`	`+ LOGGER_WARNING(av->log, "Could not send video frame: %s", net_strerror(net_error(), &error_str));`
`1002`	`1001`	`return TOXAV_ERR_SEND_FRAME_RTP_FAILED;`
`1003`	`1002`	`}`
`1004`	`1003`	`}`