Timerix/kerep
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed typos

Browse Source
This commit is contained in:
timerix 2024-01-02 12:16:28 +06:00
parent 6135f3030f
commit 1b93c0ca22
12 changed files with 66 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Network/README.md
View File

@ -1 +1,4 @@
# kerep network
Don't forget to call `kn_tryInit()` before doint anything with network.

27
src/Network/network.c Normal file
View File

@ -0,0 +1,27 @@
#include "network.h"
#include "stdSocketHeaders.h"
Maybe kn_tryInit(){
#if _WIN32
// Initialize Winsock
WSADATA wsaData = {0};
int startupResult = WSAStartup(MAKEWORD(2,2), &wsaData);
if (startupResult != 0) {
char* errcode = toString_hex(&startupResult, sizeof(int), 0 , 1, 1);
safethrow(cptr_concat("WSAStartup failed with error: ", errcode), ;);
}
return SUCCESS(UniNull);
#endif
}
Maybe kt_tryDispose(){
#if _WIN32
// Deinitialize Winsock
int cleanupResult = WSACleanup();
if (cleanupResult != 0) {
char* errcode = toString_hex(&cleanupResult, sizeof(int), 0, 1, 1);
safethrow(cptr_concat("WSAStartup failed with error: ", errcode), ;);
}
return SUCCESS(UniNull);
#endif
}

3
src/Network/network.h
View File

@ -11,6 +11,9 @@ extern "C" {
#include "sockets/knSocketUDP.h"
#include "sockets/knSocketChanneled.h"
Maybe kn_tryInit();
Maybe kt_tryDispose();
#if __cplusplus
}
#endif

2
src/Network/sockets/knSocketChanneled.c
View File

@ -56,4 +56,4 @@ Maybe knSocketChanneled_accept(knSocketChanneled* socket);
Maybe knSocketChanneled_send(knSocketChanneled* socket, u16 destinationIndex, u8* data, u32 dataLength);
Maybe knSocketChanneled_recieve(knSocketChanneled* socket, u16 destinationIndex, u8* buffer, u32 bufferLength);
Maybe knSocketChanneled_receive(knSocketChanneled* socket, u16 destinationIndex, u8* buffer, u32 bufferLength);

4
src/Network/sockets/knSocketChanneled.h
View File

@ -76,8 +76,8 @@ Maybe knSocketChanneled_send(knSocketChanneled* socket, u16 destinationIndex, u8
///@param buffer buffer for recieving data
///@param bufferLength 0-4294967295
///@return Maybe<u64> recieved bytes amount
Maybe knSocketChanneled_recieve(knSocketChanneled* socket, u16 destinationIndex, u8* buffer, u32 bufferLength);
///@return Maybe<u64> received bytes amount
Maybe knSocketChanneled_receive(knSocketChanneled* socket, u16 destinationIndex, u8* buffer, u32 bufferLength);
#if __cplusplus
}

5
src/Network/sockets/knSocketTCP.c
View File

@ -10,6 +10,7 @@ Maybe knSocketTCP_open(){
newSocket->socketfd=socket(AF_INET, SOCK_STREAM, 0);
if(newSocket->socketfd==-1)
safethrow("can't create TCP socket", free(newSocket));
return SUCCESS(UniHeapPtr(knSocketTCP, newSocket));
}
@ -69,5 +70,5 @@ Maybe knSocketTCP_send(knSocketTCP* socket, char* data, u32 dataLength);
///@param buffer buffer for recieving data
///@param bufferLength 0-4294967295
///@return Maybe<u64> recieved bytes amount
Maybe knSocketTCP_recieve(knSocketTCP* socket, char* buffer, u32 bufferLength);
///@return Maybe<u64> received bytes amount
Maybe knSocketTCP_receive(knSocketTCP* socket, char* buffer, u32 bufferLength);

4
src/Network/sockets/knSocketTCP.h
View File

@ -37,8 +37,8 @@ Maybe knSocketTCP_send(knSocketTCP* socket, char* data, u32 dataLength);
///@param buffer buffer for recieving data
///@param bufferLength 0-4294967295
///@return Maybe<u64> recieved bytes amount
Maybe knSocketTCP_recieve(knSocketTCP* socket, char* buffer, u32 bufferLength);
///@return Maybe<u64> received bytes amount
Maybe knSocketTCP_receive(knSocketTCP* socket, char* buffer, u32 bufferLength);
#if __cplusplus
}

5
src/Network/sockets/knSocketUDP.c
View File

@ -9,6 +9,7 @@ Maybe knSocketUDP_open(){
newSocket->socketfd=socket(AF_INET, SOCK_DGRAM, 0);
if(newSocket->socketfd==-1)
safethrow("can't create UDP socket", free(newSocket));
return SUCCESS(UniHeapPtr(knSocketUDP, newSocket));
}
@ -25,5 +26,5 @@ Maybe knSocketUDP_sendto(knSocketUDP* socket, char* data, u32 dataLength, knIPV4
///@param buffer buffer for recieving data
///@param bufferLength 0-4294967295
///@return Maybe<u64> recieved bytes amount
Maybe knSocketUDP_recieve(knSocketUDP* socket, char* buffer, u32 bufferLength);
///@return Maybe<u64> received bytes amount
Maybe knSocketUDP_receive(knSocketUDP* socket, char* buffer, u32 bufferLength);

4
src/Network/sockets/knSocketUDP.h
View File

@ -31,8 +31,8 @@ Maybe knSocketUDP_sendto(knSocketUDP* socket, char* data, u32 dataLength, knIPV4
///@param buffer buffer for recieving data
///@param bufferLength 0-4294967295
///@return Maybe<u64> recieved bytes amount
Maybe knSocketUDP_recieve(knSocketUDP* socket, char* buffer, u32 bufferLength);
///@return Maybe<u64> received bytes amount
Maybe knSocketUDP_receive(knSocketUDP* socket, char* buffer, u32 bufferLength);
#if __cplusplus

4
src/kprint/kprint.c
View File

@ -39,8 +39,8 @@ Maybe __next_toString(kp_fmt f, void* object){
}
Maybe check_argsN(u8 n){
if(n%2 != 0) safethrow("kprint recieved non-even number of arguments",;);
if(n > 32) safethrow("kprint recieved >32 number of arguments",;);
if(n%2 != 0) safethrow("kprint received non-even number of arguments",;);
if(n > 32) safethrow("kprint received >32 number of arguments",;);
return MaybeNull;
}

3
tests/main.cpp
View File

@ -6,7 +6,8 @@ i32 main(){
kt_beginInit();
kt_initKerepTypes();
kt_endInit();
test_all();
// test_all();
test_network();
kt_free();
kprintf("\e[37m\n");
return 0;

19
tests/test_network.c
View File

@ -22,24 +22,33 @@ void __test_knIPV4Address_fromStr(char* addrStr, u8 a, u8 b, u8 c, u8 d){
void test_network(){
optime(__func__,1,({
kprintf("\e[96m------------[test_network]------------\n");
tryLast(kn_tryInit(), _mjj64g, ;);
kprintf("\e[92m\nkerepNetwork initialized");
PRINT_SIZEOF(knIPV4Address);
PRINT_SIZEOF(knPort);
PRINT_SIZEOF(knIPV4Endpoint);
PRINT_SIZEOF(knSocketTCP);
PRINT_SIZEOF(knSocketUDP);
PRINT_SIZEOF(knPackage);
PRINT_SIZEOF(knChannel);
PRINT_SIZEOF(knSocketTCP);
test_knIPV4Address_fromStr(127,0,0,1);
test_knIPV4Address_fromStr(34,255,45,0);
test_knIPV4Address_fromStr(3,3,3,128);
/*
knSocketTCP* s;
tryLast(knSocket_open(knSocketProtocol_TCP), maybeS)
tryLast(knSocketTCP_open(), maybeS, ;);
s=maybeS.value.VoidPtr;
kprintf("\e[92mTCP socket created\n");
tryLast(knSocket_close(s);,_);
knIPV4Endpoint localEnd = knIPV4Endpoint_create(knIPV4Address_fromBytes(127,0,0,1), 4444);
tryLast(knSocketTCP_listen(s, localEnd), _m81775, ;)
tryLast(knSocketTCP_close(s), _m676, ;);
kprintf("\e[92mTCP socket closed\n");
*/
tryLast(kt_tryDispose(), _m88ag, ;);
kprintf("\e[92mkerepNetwork disposed\n");
}));
}