network types registered

src/Network/network_types.c

@@ -1,7 +1,11 @@
 #include "network_types.h"
 
-ktid_define(knIPV4Address);
-ktid_define(knIPV4Endpoint);
+char* __knIPV4Address_toString(void* p, u32 f){ return knIPV4Address_toString(p); }
+char* __knIPV4Endpoint_toString(void* p, u32 f){ return knIPV4Endpoint_toString(p); }
+
+kt_define(knIPV4Address, NULL, __knIPV4Address_toString);
+kt_define(knIPV4Endpoint, NULL, __knIPV4Endpoint_toString);
+
 
 Maybe knIPV4Address_fromStr(char* addrStr){
     char* addrStr_src=addrStr;

src/Network/network_types.h

@@ -12,7 +12,7 @@ typedef union knIPV4Address {
     u32 UintBigEndian;
     char bytes[4];
 } knIPV4Address;
-ktid_declare(knIPV4Address);
+kt_declare(knIPV4Address);
 
 #define knIPV4Address_fromBytes(A, B, C, D) ((knIPV4Address){.bytes={A,B,C,D}})
 #define knIPV4Address_fromU32(N) ((knIPV4Address){.UintBigEndian=N})
@@ -27,11 +27,10 @@ Maybe knIPV4Address_fromStr(char* addrStr);
 char* knIPV4Address_toString(knIPV4Address* address);
 
 
-typedef struct knIPV4Endpoint {
+STRUCT(knIPV4Endpoint,
     knIPV4Address address;
     knPort port;
-} knIPV4Endpoint;
-ktid_declare(knIPV4Endpoint);
+)
 
 #define knIPV4Endpoint_create(ADDR, PORT) ((knIPV4Endpoint){ADDR, PORT})
 

src/Network/sockets/knSocketChanneled.c

@@ -1,9 +1,11 @@
 #include "../network_internal.h"
 
-ktid_define(knPackage);
-ktid_define(knPackageQueueElem);
-ktid_define(knChannel);
-ktid_define(knSocketChanneled);
+void __knSocketChanneled_close(void* p){ knSocketChanneled_close(p); }
+
+kt_define(knPackage, NULL, NULL);
+kt_define(knPackageQueueElem, NULL, NULL);
+kt_define(knChannel, NULL, NULL);
+kt_define(knSocketChanneled, __knSocketChanneled_close, NULL);
 
 Maybe knSocketChanneled_open(){
     knSocketChanneled* newSocket=malloc(sizeof(knSocketChanneled));
@@ -15,17 +17,9 @@ Maybe knSocketChanneled_open(){
 }
 
 Maybe knSocketChanneled_close(knSocketChanneled* socket){
-    int result=
-#if KN_USE_WINSOCK
-    closesocket
-#else
-    close
-#endif
-    (socket->socketfd);
-    if(result==-1) {
-        safethrow("can't close socket",;);
-    }
-    else return MaybeNull;
+    try(__kn_StdSocket_close(socket->socketfd), _m762, ;);
+    free(socket);
+    return MaybeNull;
 }
 
 knChannel* __createChannel(){

src/Network/sockets/knSocketChanneled.h

@@ -15,39 +15,33 @@ typedef enum __attribute__((__packed__)) knPacVersion {
 
 static const char knPacHeader[5]={'k','n','p','a','c'};
 
-typedef struct knPackage {
-    char header[5];             // knpac
-    knPacVersion version;       // protocol version
-    u16 data_size;           // size of data block in bytes (1-KNPAC_MAX_DATA_SIZE)
-    u32 channel_id;          // id of knChannel in socket
-    u32 package_num;         // number in sequence of sent packages
-    u64 data_hash;           // hash64 of data
-    u8* data;                // ptr to data
-} knPackage;
-ktid_declare(knPackage);
+STRUCT(knPackage,
+    char header[5];          /* knpac */
+    knPacVersion version;    /* protocol version */
+    u16 data_size;           /* size of data block in bytes (1-KNPAC_MAX_DATA_SIZE) */
+    u32 channel_id;          /* id of knChannel in socket */
+    u32 package_num;         /* number in sequence of sent packages */
+    u64 data_hash;           /* hash64 of data */
+    u8* data;                /* ptr to data */
+)
 
-typedef struct knPackageQueueElem knPackageQueueElem;
-struct knPackageQueueElem {
+STRUCT(knPackageQueueElem,
     knPackage package;
     knPackageQueueElem* previousElem;
     knPackageQueueElem* nextElem;
-};
-ktid_declare(knPackageQueueElem);
+)
 
-typedef struct knChannel {
+STRUCT(knChannel,
     knPackageQueueElem* queueStart;
-} knChannel;
-ktid_declare(knChannel);
+)
 
-typedef struct knSocketChanneled{
+STRUCT(knSocketChanneled,
     i64 socketfd;
     knIPV4Endpoint localEndpoint;
     knIPV4Endpoint remoteEndpoint;
     u16 channelsAmount;
     knChannel** channels;
-} knSocketChanneled;
-ktid_declare(knSocketChanneled);
-
+)
 
 ///@return Maybe<knSocketChanneled*> new socket
 Maybe knSocketChanneled_open();

src/Network/sockets/knSocketTCP.c

@@ -1,6 +1,8 @@
 #include "../network_internal.h"
 
-ktid_define(knSocketTCP);
+void __knSocketTCP_close(void* p){ knSocketTCP_close(p); }
+
+kt_define(knSocketTCP, __knSocketTCP_close, NULL);
 
 Maybe knSocketTCP_open(bool allowReuse){
     knSocketTCP* newSocket=malloc(sizeof(knSocketTCP));

src/Network/sockets/knSocketTCP.h

@@ -6,13 +6,12 @@ extern "C" {
 
 #include "../network_types.h"
 
-typedef struct knSocketTCP {
+STRUCT(knSocketTCP,
     i64 socketfd;
     knIPV4Endpoint localEndpoint;
     knIPV4Endpoint remoteEndpoint;
-    // TODO socket status enum
-} knSocketTCP;
-ktid_declare(knSocketTCP);
+    /* TODO socket status enum */
+)
 
 ///@note EXAMPLE 1: socket = open(false); bind(socket, localhost:8080); close(socket); - the socket on port 8080 still unavaliable for several minutes
 ///@note EXAMPLE 2: socket = open(true); bind(socket, localhost:8080); close(socket); - the socket on port 8080 can be opened again

src/Network/sockets/knSocketUDP.c

@@ -1,6 +1,8 @@
 #include "../network_internal.h"
 
-ktid_define(knSocketUDP);
+void __knSocketUDP_close(void* p){ knSocketUDP_close(p); }
+
+kt_define(knSocketUDP, __knSocketUDP_close, NULL);
 
 Maybe knSocketUDP_open(bool allowReuse){
     knSocketUDP* newSocket=malloc(sizeof(knSocketUDP));

src/Network/sockets/knSocketUDP.h

@@ -6,12 +6,11 @@ extern "C" {
 
 #include "../network_types.h"
 
-typedef struct knSocketUDP {
+STRUCT(knSocketUDP,
     i64 socketfd;
     knIPV4Endpoint localEndpoint;
-    // TODO socket status enum
-} knSocketUDP;
-ktid_declare(knSocketUDP);
+    /* TODO socket status enum */
+)
 
 ///@note EXAMPLE 1: socket = open(false); bind(socket, localhost:8080); close(socket); - the socket on port 8080 still unavaliable for several minutes
 ///@note EXAMPLE 2: socket = open(true); bind(socket, localhost:8080); close(socket); - the socket on port 8080 can be opened again

src/base/type_system/init.c

@@ -5,6 +5,7 @@
 #include "../../Hashtable/Hashtable.h"
 #include "../../String/StringBuilder.h"
 #include "../../Filesystem/filesystem.h"
+#include "../../Network/network.h"
 #include "base_toString.h"
 
 void kt_initKerepTypes(){
@@ -84,4 +85,11 @@ void kt_initKerepTypes(){
 
     // File
     kt_register(FileHandle);
+
+    // Network
+    kt_register(knIPV4Address);
+    kt_register(knIPV4Endpoint);
+    kt_register(knSocketTCP);
+    kt_register(knSocketUDP);
+    kt_register(knSocketChanneled);
 }

tests/main.cpp

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