From 3329837974d41ce6c4c26acf46f016f552313e42 Mon Sep 17 00:00:00 2001 From: Timerix22 Date: Fri, 12 Apr 2024 21:42:18 +0500 Subject: [PATCH] knIPV4Endpoint_toString --- src/Network/network_types.c | 20 ++++++++++---------- src/Network/network_types.h | 4 ++-- tests/test_network.c | 8 ++++---- tests/tests.h | 26 +++++++++++++------------- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/Network/network_types.c b/src/Network/network_types.c index 1eeee8c..e1d5b2a 100644 --- a/src/Network/network_types.c +++ b/src/Network/network_types.c @@ -1,7 +1,7 @@ #include "network_types.h" -char* __knIPV4Address_toString(void* p, u32 f){ return knIPV4Address_toString(p); } -char* __knIPV4Endpoint_toString(void* p, u32 f){ return knIPV4Endpoint_toString(p); } +char* __knIPV4Address_toString(void* p, u32 f){ return knIPV4Address_toString(*(knIPV4Address*)p); } +char* __knIPV4Endpoint_toString(void* p, u32 f){ return knIPV4Endpoint_toString(*(knIPV4Endpoint*)p); } kt_define(knIPV4Address, NULL, __knIPV4Address_toString); kt_define(knIPV4Endpoint, NULL, __knIPV4Endpoint_toString); @@ -52,11 +52,11 @@ Maybe knIPV4Address_fromStr(char* addrStr, knIPV4Address* addrVal){ return MaybeNull; } -char* knIPV4Address_toString(knIPV4Address* address) { - char* a = toString_u64(address->bytes[0], 0, 0); - char* b = toString_u64(address->bytes[1], 0, 0); - char* c = toString_u64(address->bytes[2], 0, 0); - char* d = toString_u64(address->bytes[3], 0, 0); +char* knIPV4Address_toString(knIPV4Address address) { + char* a = toString_u64(address.bytes[0], 0, 0); + char* b = toString_u64(address.bytes[1], 0, 0); + char* c = toString_u64(address.bytes[2], 0, 0); + char* d = toString_u64(address.bytes[3], 0, 0); char* s = cptr_concat(a,".",b,".",c,".",d); free(a); free(b); @@ -85,9 +85,9 @@ Maybe knIPV4Endpoint_fromStr(char* endStr, knIPV4Endpoint* endVal){ return MaybeNull; } -char* knIPV4Endpoint_toString(knIPV4Endpoint* end) { - char* a = knIPV4Address_toString(&end->address); - char* p = toString_u64(end->port, 0, 0); +char* knIPV4Endpoint_toString(knIPV4Endpoint end) { + char* a = knIPV4Address_toString(end.address); + char* p = toString_u64(end.port, 0, 0); char* s = cptr_concat(a,":",p); free(a); free(p); diff --git a/src/Network/network_types.h b/src/Network/network_types.h index c56b0ff..2961c2c 100644 --- a/src/Network/network_types.h +++ b/src/Network/network_types.h @@ -28,7 +28,7 @@ kt_declare(knIPV4Address); ///@return Maybe Maybe knIPV4Address_fromStr(char* addrStr, knIPV4Address* addrPtr); -char* knIPV4Address_toString(knIPV4Address* address); +char* knIPV4Address_toString(knIPV4Address address); STRUCT(knIPV4Endpoint, @@ -44,7 +44,7 @@ STRUCT(knIPV4Endpoint, ///@return Maybe Maybe knIPV4Endpoint_fromStr(char* endStr, knIPV4Endpoint* endVal); -char* knIPV4Endpoint_toString(knIPV4Endpoint* end); +char* knIPV4Endpoint_toString(knIPV4Endpoint end); typedef enum knShutdownType { diff --git a/tests/test_network.c b/tests/test_network.c index b158e83..2796418 100644 --- a/tests/test_network.c +++ b/tests/test_network.c @@ -49,7 +49,7 @@ void* tcp_client_connect_async(void* _data){ tryLast(knSocketTCP_connect(data->socket_client, data->serverEnd), _m8531,;); kprintf_safe("\e[92mclient socket connected to server\n"); - char* adrstr = knIPV4Endpoint_toString(&data->socket_client->localEndpoint); + char* adrstr = knIPV4Endpoint_toString(data->socket_client->localEndpoint); kprintf("\e[92mclient socket was implicitely bound to %s\n\e[94m", adrstr); free(adrstr); @@ -167,7 +167,7 @@ void test_udp(){ tryLast(knSocketUDP_sendTo(socket_client, client_msg, sizeof(client_msg), serverEnd), _mu75q2, ;); kprintf("\e[92mmessage sent to server\n\e[94m"); - char* adrstr = knIPV4Endpoint_toString(&socket_client->localEndpoint); + char* adrstr = knIPV4Endpoint_toString(socket_client->localEndpoint); kprintf("\e[92mclient socket was implicitely bound to %s\n\e[94m", adrstr); free(adrstr); } @@ -185,7 +185,7 @@ void test_udp(){ const char server_msg[] = "pong"; tryLast(knSocketUDP_sendTo(socket_server, server_msg, sizeof(server_msg), clientEnd), _mu75q2, ;); - char* adrstr = knIPV4Endpoint_toString(&clientEnd); + char* adrstr = knIPV4Endpoint_toString(clientEnd); kprintf("\e[92mmessage sent to client (%s)\n\e[94m", adrstr); free(adrstr); fflush(stdout); @@ -200,7 +200,7 @@ void test_udp(){ fputc('\n', stdout); if(!cptr_equals(received_server_msg, "pong")) throw("received_server_msg != \"pong\""); - char* adrstr = knIPV4Endpoint_toString(&serverEnd); + char* adrstr = knIPV4Endpoint_toString(serverEnd); kprintf("\e[92mmessage received by client (%s)\n", adrstr); free(adrstr); fflush(stdout); diff --git a/tests/tests.h b/tests/tests.h index 00f455a..859c5cc 100644 --- a/tests/tests.h +++ b/tests/tests.h @@ -24,19 +24,19 @@ void test_network(); inline void test_all(){ kprintf("\e[97mkerep tests are starting!\n"); optime(__func__, 1, - // test_cptr(); - // test_type_system(); - // test_string(); - // test_safethrow(); - // test_searchtree(); - // test_autoarr(); - // test_autoarrVsVector(); - // test_rng_algorithms(); - // test_kprint_colors(); - // test_kprint(); - // test_hash_functions(); - // test_hashtable(); - // test_dtsod(); + test_cptr(); + test_type_system(); + test_string(); + test_safethrow(); + test_searchtree(); + test_autoarr(); + test_autoarrVsVector(); + test_rng_algorithms(); + test_kprint_colors(); + test_kprint(); + test_hash_functions(); + test_hashtable(); + test_dtsod(); test_network(); kprintf("\e[96m--------------------------------------\e[0m\n"); );