implemented main function

src/network/endpoint.c

@@ -19,11 +19,19 @@ EndpointIPv4 EndpointIPv4_fromSockaddr(struct sockaddr_in saddr){
 }
 
 //TODO Endpoint functions
-AddressIPv4 AddressIPv4_fromStr(cstr);
+AddressIPv4 AddressIPv4_fromStr(cstr s);
 
 str AddressIPv4_toStr(AddressIPv4 address);
 
-EndpointIPv4 EndpointIPv4_fromStr(cstr s);
+EndpointIPv4 EndpointIPv4_fromStr(cstr s){
+    u32 a, b, c, d, p;
+    sscanf(s, "%u.%u.%u.%u:%u", &a, &b, &c, &d, &p);
+    EndpointIPv4 e = (EndpointIPv4){ 
+        .address = AddressIPv4_fromBytes(a, b, c, d),
+        .port = p
+    };
+    return e;
+}
 
 str EndpointIPv4_toStr(EndpointIPv4 end);
 

src/network/endpoint.h

@@ -16,9 +16,9 @@ typedef union AddressIPv4 {
 #define AddressIPv4_INVALID  AddressIPv4_fromBytes(255,255,255,255)
 #define AddressIPv4_is_invalid(ADDR) (ADDR.UintBigEndian == (u32)~0)
 
-#define AddressIPv4_fromBytes(A, B, C, D) ((AddressIPv4){.bytes={A,B,C,D}})
-#define AddressIPv4_fromU32(N) ((AddressIPv4){.UintBigEndian=N})
-AddressIPv4 AddressIPv4_fromStr(cstr);
+#define AddressIPv4_fromBytes(A, B, C, D) ((AddressIPv4){ .bytes = {A,B,C,D} })
+#define AddressIPv4_fromU32(N) ((AddressIPv4){ .UintBigEndian = N })
+AddressIPv4 AddressIPv4_fromStr(cstr s);
 str AddressIPv4_toStr(AddressIPv4 address);
 
 

src/network/internal.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "tlibc/errors.h"
 
 #if !defined(KN_USE_WINSOCK)
     #if defined(_WIN64) || defined(_WIN32)
@@ -10,6 +11,9 @@
 
 #if KN_USE_WINSOCK
     #include <winsock2.h>
+    // There you can see what error codes mean.
+    #include <winerror.h>
+    #define RESULT_ERROR_SOCKET() RESULT_ERROR(sprintf_malloc(64, "Winsock error %i", WSAGetLastError()), true)
 #else
     #include <sys/types.h>
     #include <sys/socket.h>
@@ -17,4 +21,6 @@
     #include <arpa/inet.h>
     #include <netdb.h>
     #include <unistd.h>
+
+    #define RESULT_ERROR_SOCKET() RESULT_ERROR(strerror(errno), false)
 #endif

src/network/socket.c

@@ -5,7 +5,7 @@
 Result(Socket) socket_open_TCP(){
     Socket s = socket(AF_INET, SOCK_STREAM, 0);
     if(s == -1){
-        return RESULT_ERROR_ERRNO();
+        return RESULT_ERROR_SOCKET();
     }
 
     return RESULT_VALUE(i, s);
@@ -21,20 +21,20 @@ void socket_close(Socket s){
 
 Result(void) socket_shutdown(Socket s, SocketShutdownType direction){
     if(shutdown(s, (int)direction) == -1)
-        return RESULT_ERROR_ERRNO();
+        return RESULT_ERROR_SOCKET();
     return RESULT_VOID;
 }
 
 Result(void) socket_bind(Socket s, EndpointIPv4 local_end){
     struct sockaddr_in sockaddr = EndpointIPv4_toSockaddr(local_end);
     if(bind(s, (void*)&sockaddr, sizeof(sockaddr)) != 0)
-        return RESULT_ERROR_ERRNO();
+        return RESULT_ERROR_SOCKET();
     return RESULT_VOID;
 }
 
 Result(void) socket_listen(Socket s, i32 backlog){
     if(listen(s, backlog) != 0)
-        return RESULT_ERROR_ERRNO();
+        return RESULT_ERROR_SOCKET();
     return RESULT_VOID;
 }
 
@@ -43,7 +43,7 @@ Result(Socket) socket_accept(Socket main_socket, NULLABLE(EndpointIPv4*) remote_
     i32 sockaddr_size = sizeof(remote_addr);
     Socket user_connection = accept(main_socket, (void*)&remote_addr, (void*)&sockaddr_size);
     if(user_connection == -1)
-        return RESULT_ERROR_ERRNO();
+        return RESULT_ERROR_SOCKET();
     
     //TODO: add IPV6 support (struct sockaddr_in6)
     assert(sockaddr_size == sizeof(remote_addr));
@@ -55,14 +55,14 @@ Result(Socket) socket_accept(Socket main_socket, NULLABLE(EndpointIPv4*) remote_
 Result(void) socket_connect(Socket s, EndpointIPv4 remote_end){
     struct sockaddr_in sockaddr = EndpointIPv4_toSockaddr(remote_end);
     if(connect(s, (void*)&sockaddr, sizeof(sockaddr)) != 0)
-        return RESULT_ERROR_ERRNO();
+        return RESULT_ERROR_SOCKET();
     return RESULT_VOID;
 }
 
 Result(void) socket_send(Socket s, Array(u8) buffer){
     i32 r = send(s, buffer.data, buffer.size, 0);
     if(r < 0)
-        return RESULT_ERROR_ERRNO();
+        return RESULT_ERROR_SOCKET();
     return RESULT_VOID;
 }
 
@@ -70,25 +70,24 @@ Result(void) socket_sendto(Socket s, Array(u8) buffer, EndpointIPv4 dst){
     struct sockaddr_in sockaddr = EndpointIPv4_toSockaddr(dst);    
     i32 r = sendto(s, buffer.data, buffer.size, 0, (void*)&sockaddr, sizeof(sockaddr));
     if(r < 0)
-        return RESULT_ERROR_ERRNO();
+        return RESULT_ERROR_SOCKET();
     return RESULT_VOID;
 }
 
 Result(i32) socket_recv(Socket s, Array(u8) buffer){
     i32 r = recv(s, buffer.data, buffer.size, 0);
     if(r < 0)
-        return RESULT_ERROR_ERRNO();
+        return RESULT_ERROR_SOCKET();
     return RESULT_VALUE(i, r);
 }
 
-
 Result(i32) socket_recvfrom(Socket s, Array(u8) buffer, NULLABLE(EndpointIPv4*) remote_end){
     struct sockaddr_in remote_addr = {0};
     i32 sockaddr_size = sizeof(remote_addr);
     i32 r = recvfrom(s, buffer.data, buffer.size, 0, 
         (struct sockaddr*)&remote_addr, (void*)&sockaddr_size);
     if(r < 0)
-        return RESULT_ERROR_ERRNO();
+        return RESULT_ERROR_SOCKET();
     
     //TODO: add IPV6 support (struct sockaddr_in6)
     assert(sockaddr_size == sizeof(remote_addr));
@@ -96,4 +95,4 @@ Result(i32) socket_recvfrom(Socket s, Array(u8) buffer, NULLABLE(EndpointIPv4*)
     if(remote_end)
         *remote_end = EndpointIPv4_fromSockaddr(remote_addr);
     return RESULT_VALUE(i, r);
-}
+}