diff --git a/src/generic_functions.c b/src/generic_functions.c index d6f1902..3f3e596 100644 --- a/src/generic_functions.c +++ b/src/generic_functions.c @@ -20,20 +20,20 @@ static inline void append_data(uint8_t** const append_pointer, const void* const (*append_pointer) += data_size; } -void swiftnet_client_append_to_packet(const void* const data, const uint32_t data_size, struct SwiftNetPacketBuffer* const packet) { +void swiftnet_client_append_to_buffer(const void* const data, const uint32_t data_size, struct SwiftNetPacketBuffer* const buffer) { #ifdef SWIFT_NET_ERROR validate_append_to_packet_args(data, data_size); #endif - append_data(&packet->packet_append_pointer, data, data_size); + append_data(&buffer->packet_append_pointer, data, data_size); } -void swiftnet_server_append_to_packet(const void* const data, const uint32_t data_size, struct SwiftNetPacketBuffer* const packet) { +void swiftnet_server_append_to_buffer(const void* const data, const uint32_t data_size, struct SwiftNetPacketBuffer* const buffer) { #ifdef SWIFT_NET_ERROR validate_append_to_packet_args(data, data_size); #endif - append_data(&packet->packet_append_pointer, data, data_size); + append_data(&buffer->packet_append_pointer, data, data_size); } // Set the handler for incoming packets/messages on the server or client diff --git a/src/swift_net.h b/src/swift_net.h index cb9776d..9952496 100644 --- a/src/swift_net.h +++ b/src/swift_net.h @@ -312,18 +312,18 @@ extern void swiftnet_client_set_message_handler( ); // Append data to a packet buffer. -extern void swiftnet_client_append_to_packet( +extern void swiftnet_client_append_to_buffer( const void* const data, const uint32_t data_size, - struct SwiftNetPacketBuffer* const packet + struct SwiftNetPacketBuffer* const buffer ); // Append data to a packet buffer. -extern void swiftnet_server_append_to_packet( +extern void swiftnet_server_append_to_buffer( const void* const data, const uint32_t data_size, - struct SwiftNetPacketBuffer* const packet + struct SwiftNetPacketBuffer* const buffer ); // Clean up and free resources for a client connection. diff --git a/tests/integration_tests/src/making_request.c b/tests/integration_tests/src/making_request.c index f1d3955..46d4b46 100644 --- a/tests/integration_tests/src/making_request.c +++ b/tests/integration_tests/src/making_request.c @@ -88,7 +88,7 @@ static void on_client_packet(struct SwiftNetClientPacketData* packet, void* cons struct SwiftNetPacketBuffer send_buffer = swiftnet_client_create_packet_buffer(response_data_len); - swiftnet_client_append_to_packet(response_data, response_data_len, &send_buffer); + swiftnet_client_append_to_buffer(response_data, response_data_len, &send_buffer); swiftnet_client_make_response(atomic_load_explicit(&g_client_conn, memory_order_acquire), packet, &send_buffer); @@ -135,7 +135,7 @@ static void on_server_packet(struct SwiftNetServerPacketData* packet, void* cons struct SwiftNetPacketBuffer send_buffer = swiftnet_server_create_packet_buffer(response_data_len); - swiftnet_server_append_to_packet(response_data, response_data_len, &send_buffer); + swiftnet_server_append_to_buffer(response_data, response_data_len, &send_buffer); swiftnet_server_make_response(atomic_load_explicit(&g_server, memory_order_acquire), packet, &send_buffer); @@ -176,7 +176,7 @@ static void on_server_packet(struct SwiftNetServerPacketData* packet, void* cons struct SwiftNetPacketBuffer buffer = swiftnet_server_create_packet_buffer(request_data_len); - swiftnet_server_append_to_packet(request_data, request_data_len, &buffer); + swiftnet_server_append_to_buffer(request_data, request_data_len, &buffer); struct SwiftNetServerPacketData* response = swiftnet_server_make_request(atomic_load_explicit(&g_server, memory_order_acquire), &buffer, packet->metadata.sender, 1000); @@ -277,7 +277,7 @@ int test_making_request(const union Args* args_ptr) { if (args.receiver == Server) { struct SwiftNetPacketBuffer buffer = swiftnet_client_create_packet_buffer(args.request_data_len); - swiftnet_client_append_to_packet(req_data, args.request_data_len, &buffer); + swiftnet_client_append_to_buffer(req_data, args.request_data_len, &buffer); struct SwiftNetClientPacketData* const response = swiftnet_client_make_request(client_conn, &buffer, 1000); @@ -332,7 +332,7 @@ int test_making_request(const union Args* args_ptr) { } else { struct SwiftNetPacketBuffer buffer = swiftnet_client_create_packet_buffer(sizeof(g_make_request_code)); - swiftnet_client_append_to_packet(&g_make_request_code, sizeof(g_make_request_code), &buffer); + swiftnet_client_append_to_buffer(&g_make_request_code, sizeof(g_make_request_code), &buffer); swiftnet_client_send_packet(client_conn, &buffer); diff --git a/tests/integration_tests/src/sending_packet.c b/tests/integration_tests/src/sending_packet.c index 09ca173..c6c7b88 100644 --- a/tests/integration_tests/src/sending_packet.c +++ b/tests/integration_tests/src/sending_packet.c @@ -121,7 +121,7 @@ static void on_server_packet(struct SwiftNetServerPacketData* packet, void* cons uint8_t* send_data = atomic_load_explicit(&g_client_data, memory_order_acquire); struct SwiftNetPacketBuffer buf = swiftnet_server_create_packet_buffer(size); - swiftnet_server_append_to_packet(send_data, size, &buf); + swiftnet_server_append_to_buffer(send_data, size, &buf); swiftnet_server_send_packet(atomic_load_explicit(&g_server, memory_order_acquire), &buf, packet->metadata.sender); swiftnet_server_destroy_packet_buffer(&buf); @@ -181,7 +181,7 @@ int test_sending_packet(const union Args* args_ptr) { } struct SwiftNetPacketBuffer buf = swiftnet_client_create_packet_buffer(args.server_data_len); - swiftnet_client_append_to_packet(atomic_load_explicit(&g_server_data, memory_order_acquire), args.server_data_len, &buf); + swiftnet_client_append_to_buffer(atomic_load_explicit(&g_server_data, memory_order_acquire), args.server_data_len, &buf); swiftnet_client_send_packet(client_conn, &buf); swiftnet_client_destroy_packet_buffer(&buf); diff --git a/tests/performance_tests/src/main.c b/tests/performance_tests/src/main.c index b64f6a4..8d581e6 100644 --- a/tests/performance_tests/src/main.c +++ b/tests/performance_tests/src/main.c @@ -57,7 +57,7 @@ void send_large_packets(const bool loopback) { random_data[i] = rand(); } - swiftnet_client_append_to_packet(random_data, PACKET_SIZE, &buffer); + swiftnet_client_append_to_buffer(random_data, PACKET_SIZE, &buffer); clock_gettime(CLOCK_MONOTONIC, &start);;