Skip to content

Commit 6016e71

Browse files
authored
merge TCP implementations in tcp.c (#748)
Merge TCP implementations in `tcp.c` as suggested in #745 (comment) --------- Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>
1 parent db6b89c commit 6016e71

6 files changed

Lines changed: 512 additions & 526 deletions

File tree

expected/wasm32-wasip2/defined-symbols.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -342,8 +342,6 @@ __wasilibc_rmdirat
342342
__wasilibc_sockaddr_to_wasi
343343
__wasilibc_sockaddr_validate
344344
__wasilibc_stat
345-
__wasilibc_tcp_getsockopt
346-
__wasilibc_tcp_setsockopt
347345
__wasilibc_tell
348346
__wasilibc_unlinkat
349347
__wasilibc_unspecified_addr
@@ -1346,7 +1344,6 @@ tanl
13461344
tcp_borrow_tcp_socket
13471345
tcp_create_socket_create_tcp_socket
13481346
tcp_create_socket_result_own_tcp_socket_error_code_free
1349-
tcp_getpeername
13501347
tcp_ip_socket_address_free
13511348
tcp_method_tcp_socket_accept
13521349
tcp_method_tcp_socket_address_family

expected/wasm32-wasip3/defined-symbols.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,8 +339,6 @@ __wasilibc_rmdirat
339339
__wasilibc_sockaddr_to_wasi
340340
__wasilibc_sockaddr_validate
341341
__wasilibc_stat
342-
__wasilibc_tcp_getsockopt
343-
__wasilibc_tcp_setsockopt
344342
__wasilibc_tell
345343
__wasilibc_unlinkat
346344
__wasilibc_unspecified_addr

libc-bottom-half/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ else()
145145
sources/socket.c
146146
sources/sockets_utils.c
147147
sources/sockopt.c
148-
sources/tcp_sockopt.c
148+
sources/tcp.c
149149
)
150150
endif()
151151

@@ -156,7 +156,6 @@ if(WASI STREQUAL "p2")
156156
sources/wasip2_file.c
157157
sources/wasip2_file_utils.c
158158
sources/wasip2_stdio.c
159-
sources/wasip2_tcp.c
160159
sources/wasip2_udp.c
161160
)
162161
endif()
@@ -168,7 +167,6 @@ if (WASI STREQUAL "p3")
168167
sources/wasip3_file.c
169168
sources/wasip3_file_utils.c
170169
sources/wasip3_stdio.c
171-
sources/wasip3_tcp.c
172170
sources/wasip3_udp.c
173171
)
174172
endif()

0 commit comments

Comments
 (0)