From fe2809ce58863892f69c2c656dae001b7ce46f2d Mon Sep 17 00:00:00 2001 From: seajee Date: Sun, 3 Aug 2025 00:42:36 +0200 Subject: [PATCH] 1.6.0 --- examples/chat_client.c | 2 +- examples/chat_server.c | 2 +- examples/hello_client.c | 2 +- examples/hello_client_v6.c | 2 +- examples/hello_server.c | 2 +- examples/hello_server_v6.c | 2 +- examples/http_request.c | 2 +- examples/udp_client.c | 2 +- examples/udp_server.c | 2 +- sock.h | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/examples/chat_client.c b/examples/chat_client.c index eb6fb23..5b91582 100644 --- a/examples/chat_client.c +++ b/examples/chat_client.c @@ -33,7 +33,7 @@ int main(int argc, char **argv) address = argv[1]; } - Sock *client = sock(SOCK_IPV4, SOCK_TCP); + Sock *client = sock_create(SOCK_IPV4, SOCK_TCP); if (client == NULL) { fprintf(stderr, "ERROR: Could not create socket\n"); return EXIT_FAILURE; diff --git a/examples/chat_server.c b/examples/chat_server.c index 502d474..d09294e 100644 --- a/examples/chat_server.c +++ b/examples/chat_server.c @@ -122,7 +122,7 @@ disconnect: int main(void) { - Sock *server = sock(SOCK_IPV4, SOCK_TCP); + Sock *server = sock_create(SOCK_IPV4, SOCK_TCP); if (server == NULL) { fprintf(stderr, "ERROR: Could not create socket\n"); return EXIT_FAILURE; diff --git a/examples/hello_client.c b/examples/hello_client.c index aa2df2b..e4efcac 100644 --- a/examples/hello_client.c +++ b/examples/hello_client.c @@ -8,7 +8,7 @@ int main(void) { char *err = "None"; - Sock *socket = sock(SOCK_IPV4, SOCK_TCP); + Sock *socket = sock_create(SOCK_IPV4, SOCK_TCP); if (socket == NULL) { err = "create"; goto defer; } SockAddr addr = sock_addr("127.0.0.1", 6969); diff --git a/examples/hello_client_v6.c b/examples/hello_client_v6.c index ce9e6cb..137b314 100644 --- a/examples/hello_client_v6.c +++ b/examples/hello_client_v6.c @@ -8,7 +8,7 @@ int main(void) { bool err = false; - Sock *s = sock(SOCK_IPV6, SOCK_TCP); + Sock *s = sock_create(SOCK_IPV6, SOCK_TCP); if (s == NULL) { err = "create"; goto defer; } SockAddr addr = sock_addr("::1", 6969); diff --git a/examples/hello_server.c b/examples/hello_server.c index 58fde88..2aaedf2 100644 --- a/examples/hello_server.c +++ b/examples/hello_server.c @@ -8,7 +8,7 @@ int main(void) { char *err = "None"; - Sock *server = sock(SOCK_IPV4, SOCK_TCP); + Sock *server = sock_create(SOCK_IPV4, SOCK_TCP); if (server == NULL) { err = "create"; goto defer; } SockAddr addr = sock_addr("0.0.0.0", 6969); diff --git a/examples/hello_server_v6.c b/examples/hello_server_v6.c index e479358..8bd4329 100644 --- a/examples/hello_server_v6.c +++ b/examples/hello_server_v6.c @@ -7,7 +7,7 @@ int main(void) { bool err = false; - Sock *server = sock(SOCK_IPV6, SOCK_TCP); + Sock *server = sock_create(SOCK_IPV6, SOCK_TCP); if (server == NULL) { err = true; goto close; } SockAddr addr = sock_addr("::", 6969); diff --git a/examples/http_request.c b/examples/http_request.c index 30f20b6..d440947 100644 --- a/examples/http_request.c +++ b/examples/http_request.c @@ -13,7 +13,7 @@ int main(void) printf("%s:%d\n", addr.str, addr.port); - Sock *s = sock(addr.type, SOCK_TCP); + Sock *s = sock_create(addr.type, SOCK_TCP); if (s == NULL) { fprintf(stderr, "sock_create: "); sock_log_error(s); diff --git a/examples/udp_client.c b/examples/udp_client.c index 27f4154..21ca31b 100644 --- a/examples/udp_client.c +++ b/examples/udp_client.c @@ -6,7 +6,7 @@ int main(void) { - Sock *client = sock(SOCK_IPV4, SOCK_UDP); + Sock *client = sock_create(SOCK_IPV4, SOCK_UDP); if (client == NULL) { perror("sock_create"); return 1; diff --git a/examples/udp_server.c b/examples/udp_server.c index 0a5d3bc..6713a20 100644 --- a/examples/udp_server.c +++ b/examples/udp_server.c @@ -8,7 +8,7 @@ int main(void) { - Sock *server = sock(SOCK_IPV4, SOCK_UDP); + Sock *server = sock_create(SOCK_IPV4, SOCK_UDP); if (server == NULL) { perror("sock_create"); return 1; diff --git a/sock.h b/sock.h index a62e805..aa85b63 100644 --- a/sock.h +++ b/sock.h @@ -59,7 +59,7 @@ typedef struct { } SockThreadData; // Create a socket with the corresponding domain and type -Sock *sock(SockAddrType domain, SockType type); +Sock *sock_create(SockAddrType domain, SockType type); // Create a SockAddr structure from primitives SockAddr sock_addr(const char *addr, int port); @@ -112,7 +112,7 @@ void *sock__accept_thread(void *data); extern "C" { // Prevent name mangling #endif // __cplusplus -Sock *sock(SockAddrType domain, SockType type) +Sock *sock_create(SockAddrType domain, SockType type) { Sock *sock = (Sock*)malloc(sizeof(*sock)); if (sock == NULL) {