Skip to content

Commit 374668f

Browse files
committed
update dependency refactor tls, example, test pass
- added `fetch` like example, ** todo: further make a `curl clone` ** - removed https://github.com/deleisha/evt-tls implementation
1 parent 668fcde commit 374668f

20 files changed

Lines changed: 347 additions & 1252 deletions

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
3030
find_package(raii QUIET)
3131
if(NOT raii_FOUND)
3232
FetchContent_Declare(raii
33-
URL https://github.com/zelang-dev/c-raii/archive/refs/tags/2.1.1.zip
34-
URL_MD5 15c0497b21eb12960fbec91523df8b30
33+
URL https://github.com/zelang-dev/c-raii/archive/refs/tags/2.1.2.zip
34+
URL_MD5 2dda8069df5be87906ac6893d1718df9
3535
)
3636
FetchContent_MakeAvailable(raii)
3737
endif()

README.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -149,13 +149,14 @@ int uv_main(int argc, char **argv) {
149149
int uv_main(int argc, char **argv) {
150150
string text = nullptr;
151151
fprintf(stderr, "irc.libera.chat is...\033[0K\n");
152-
dnsinfo_t *dns = get_addrinfo("irc.libera.chat", "6667",
153-
3, kv(ai_flags, AF_UNSPEC),
154-
kv(ai_socktype, SOCK_STREAM),
155-
kv(ai_protocol, IPPROTO_TCP));
152+
dnsinfo_t *dns = get_addrinfo("irc.libera.chat", "6667", 3,
153+
kv(ai_flags, AF_UNSPEC),
154+
kv(ai_socktype, SOCK_STREAM),
155+
kv(ai_protocol, IPPROTO_TCP)
156+
);
156157

157158
fprintf(stderr, "%s\033[0K\n", addrinfo_ip(dns));
158-
uv_stream_t *server = stream_connect_ex(UV_TCP, addrinfo_ip(dns), 6667);
159+
uv_stream_t *server = stream_connect_ex(UV_TCP, addrinfo_ip(dns), "irc.libera.chat", 6667);
159160
while (text = stream_read(server))
160161
fprintf(stderr, "\033[0K%s", text);
161162

@@ -430,7 +431,8 @@ C_API int stream_shutdown(uv_stream_t *);
430431
*
431432
* NOTE: Combines `uv_pipe_connect`, `uv_tcp_connect`, `uv_ip4_addr`, `uv_ip6_addr`. */
432433
C_API uv_stream_t *stream_connect(string_t address);
433-
C_API uv_stream_t *stream_connect_ex(uv_handle_type scheme, string_t address, int port);
434+
C_API uv_stream_t *stream_connect_ex(uv_handle_type scheme, string_t address, string_t name, int port);
435+
C_API uv_stream_t *stream_secure(string_t address, string_t name, int port);
434436

435437
/*
436438
* Starts listing for `new` incoming connections on the given `stream` handle.

docs/index.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -149,13 +149,14 @@ int uv_main(int argc, char **argv) {
149149
int uv_main(int argc, char **argv) {
150150
string text = nullptr;
151151
fprintf(stderr, "irc.libera.chat is...\033[0K\n");
152-
dnsinfo_t *dns = get_addrinfo("irc.libera.chat", "6667",
153-
3, kv(ai_flags, AF_UNSPEC),
154-
kv(ai_socktype, SOCK_STREAM),
155-
kv(ai_protocol, IPPROTO_TCP));
152+
dnsinfo_t *dns = get_addrinfo("irc.libera.chat", "6667", 3,
153+
kv(ai_flags, AF_UNSPEC),
154+
kv(ai_socktype, SOCK_STREAM),
155+
kv(ai_protocol, IPPROTO_TCP)
156+
);
156157

157158
fprintf(stderr, "%s\033[0K\n", addrinfo_ip(dns));
158-
uv_stream_t *server = stream_connect_ex(UV_TCP, addrinfo_ip(dns), 6667);
159+
uv_stream_t *server = stream_connect_ex(UV_TCP, addrinfo_ip(dns), "irc.libera.chat", 6667);
159160
while (text = stream_read(server))
160161
fprintf(stderr, "\033[0K%s", text);
161162

@@ -430,7 +431,8 @@ C_API int stream_shutdown(uv_stream_t *);
430431
*
431432
* NOTE: Combines `uv_pipe_connect`, `uv_tcp_connect`, `uv_ip4_addr`, `uv_ip6_addr`. */
432433
C_API uv_stream_t *stream_connect(string_t address);
433-
C_API uv_stream_t *stream_connect_ex(uv_handle_type scheme, string_t address, int port);
434+
C_API uv_stream_t *stream_connect_ex(uv_handle_type scheme, string_t address, string_t name, int port);
435+
C_API uv_stream_t *stream_secure(string_t address, string_t name, int port);
434436

435437
/*
436438
* Starts listing for `new` incoming connections on the given `stream` handle.

examples/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
add_subdirectory(evt_tls)
21

32
set(TARGET_LIST
43
helloworld
54
spawn
65
tcp-echo-server
6+
fetch
77
uvcat
88
uvtee
99
onchange
@@ -15,6 +15,8 @@ set(TARGET_LIST
1515
waitgroup_work
1616
)
1717

18+
file(COPY ../cert.pem DESTINATION ${CMAKE_BINARY_DIR})
19+
1820
foreach (TARGET ${TARGET_LIST})
1921
add_executable(${TARGET} ${TARGET}.c)
2022
target_link_libraries(${TARGET} ${PROJECT_NAME})

examples/dns.c

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@
22

33
int uv_main(int argc, char **argv) {
44
string text = nullptr;
5-
fprintf(stderr, "irc.libera.chat is...\033[0K\n");
6-
dnsinfo_t *dns = get_addrinfo("irc.libera.chat", "6667",
7-
3, kv(ai_flags, AF_UNSPEC),
8-
kv(ai_socktype, SOCK_STREAM),
9-
kv(ai_protocol, IPPROTO_TCP));
5+
cerr("irc.libera.chat is..."CLR_LN);
6+
dnsinfo_t *dns = get_addrinfo("irc.libera.chat", "6667", 3,
7+
kv(ai_flags, AF_UNSPEC),
8+
kv(ai_socktype, SOCK_STREAM),
9+
kv(ai_protocol, IPPROTO_TCP)
10+
);
1011

11-
fprintf(stderr, "%s\033[0K\n", addrinfo_ip(dns));
12-
uv_stream_t *server = stream_connect_ex(UV_TCP, addrinfo_ip(dns), 6667);
12+
cerr("%s"CLR_LN, addrinfo_ip(dns));
13+
uv_stream_t *server = stream_connect_ex(UV_TCP, addrinfo_ip(dns), "irc.libera.chat", 6667);
1314
while (text = stream_read(server))
14-
fprintf(stderr, "\033[0K%s", text);
15+
cerr(CLR_LN"%s", text);
1516

1617
return coro_err_code();
1718
}

examples/evt_tls/CMakeLists.txt

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)