Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ int main(int argc, const char* argv[])
tcs_lib_init();

TcsSocket client_socket = TCS_SOCKET_INVALID;
tcs_socket_preset(&client_socket, TCS_PRESET_TCP_IP4);
tcs_socket(&client_socket, TCS_AF_IP4, TCS_SOCK_STREAM, TCS_PROTOCOL_IP_TCP);
tcs_connect_str(client_socket, "example.com", 80);

uint8_t send_buffer[] = "GET / HTTP/1.1\nHost: example.com\n\n";
Expand Down
2 changes: 1 addition & 1 deletion examples/tcp_client.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ int main(void)

TcsSocket client_socket = TCS_SOCKET_INVALID;

if (tcs_tcp_client_str(&client_socket, "localhost", 1212, 1000) != TCS_SUCCESS)
if (tcs_socket_tcp_str(&client_socket, NULL, "localhost:1212", 1000) != TCS_SUCCESS)
return show_error("Could not create a socket");

char msg[] = "hello world\n";
Expand Down
5 changes: 4 additions & 1 deletion examples/tcp_server.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,12 @@ int main(void)
TcsSocket listen_socket = TCS_SOCKET_INVALID;
TcsSocket child_socket = TCS_SOCKET_INVALID;

if (tcs_tcp_server_str(&listen_socket, "localhost", 1212) != TCS_SUCCESS)
if (tcs_socket_tcp_str(&listen_socket, "localhost:1212", NULL, 0) != TCS_SUCCESS)
return show_error("Could not create server socket");

if (tcs_listen(listen_socket, TCS_BACKLOG_MAX) != TCS_SUCCESS)
return show_error("Could not listen on socket");

if (tcs_accept(listen_socket, &child_socket, NULL) != TCS_SUCCESS)
return show_error("Could not accept socket");

Expand Down
10 changes: 3 additions & 7 deletions examples/udp_client.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,21 +38,17 @@ int main(void)
return show_error("Could not init tinycsocket");

TcsSocket socket = TCS_SOCKET_INVALID;
if (tcs_socket_preset(&socket, TCS_PRESET_UDP_IP4) != TCS_SUCCESS)
if (tcs_socket_udp_str(&socket, NULL, "localhost:1212") != TCS_SUCCESS)
return show_error("Could not create socket");

struct TcsAddress remote_info;
if (tcs_address_resolve("localhost", TCS_AF_IP4, &remote_info, 1, NULL) != TCS_SUCCESS)
return show_error("Could not resolve localhost");

char msg[] = "hello world\n";
if (tcs_send_to(socket, (const uint8_t*)msg, sizeof(msg), TCS_FLAG_NONE, &remote_info, NULL) != TCS_SUCCESS)
if (tcs_send(socket, (const uint8_t*)msg, sizeof(msg), TCS_FLAG_NONE, NULL) != TCS_SUCCESS)
return show_error("Could not send message");

uint8_t recv_buffer[1024];
size_t recv_size = sizeof(recv_buffer) - 1;
size_t bytes_received = 0;
if (tcs_receive_from(socket, recv_buffer, recv_size, TCS_FLAG_NONE, NULL, &bytes_received) != TCS_SUCCESS)
if (tcs_receive(socket, recv_buffer, recv_size, TCS_FLAG_NONE, &bytes_received) != TCS_SUCCESS)
return show_error("Could not receive data");

// Makes sure it is a NULL terminated string, this is why we only accept 1023 bytes in receive
Expand Down
2 changes: 1 addition & 1 deletion examples/udp_server.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ int main(void)
return show_error("Could not init tinycsocket");

TcsSocket socket = TCS_SOCKET_INVALID;
if (tcs_udp_receiver_str(&socket, "localhost", 1212) != TCS_SUCCESS)
if (tcs_socket_udp_str(&socket, "localhost:1212", NULL) != TCS_SUCCESS)
return show_error("Could not create socket");

struct TcsAddress remote_address = {0};
Expand Down
1,539 changes: 411 additions & 1,128 deletions include/tinycsocket.h

Large diffs are not rendered by default.

Loading
Loading