Simple Berkeley Socket APIs #836

lum1n0us · 2021-11-15T08:17:29Z

Reference:
[Networking API design] (WebAssembly/WASI#370)

lum1n0us · 2021-12-30T06:00:46Z

It is a simple socket example and related APIs implementation. The goal is to make it easy to compile a C socket program.

The first version ignores the capability security model.

core/iwasm/common/wasm_runtime_common.c

wenyongh · 2022-02-21T09:43:46Z

core/iwasm/include/wasm_export.h

@@ -337,6 +337,7 @@ wasm_runtime_set_wasi_args_ex(wasm_module_t module,
                           const char *dir_list[], uint32_t dir_count,
                           const char *map_dir_list[], uint32_t map_dir_count,
                           const char *env[], uint32_t env_count,
+                           const char *addr_pool[], uint32_t addr_pool_size,


wasm_runtime_set_wasi_args and wasm_runtime_set_wasi_args_ex should have been used by developers, changing the API will cause compatibility issue. How about introduce new API to set the option? e.g.

void wasm_runtime_set_wasi_addr_pool(wasm_module_t module, const char *addr_pool[], uint32_t addr_pool_size);

core/iwasm/libraries/lib-socket/inc/wasi_socket_ext.h

core/iwasm/libraries/libc-wasi/libc_wasi_wrapper.c

wenyongh · 2022-02-21T10:11:18Z

core/iwasm/libraries/libc-wasi/sandboxed-system-primitives/include/wasmtime_ssp.h

+typedef struct __wasi_addr_ip6_port_t {
+    __wasi_addr_ip6_t addr;
+    __wasi_ip_port_t port;
+} __wasi_addr_ip6_port_t;
+
+typedef struct __wasi_addr_t {
+    __wasi_addr_type_t kind;
+    union {
+        __wasi_addr_ip4_port_t ip4;
+        __wasi_addr_ip6_port_t ip6;
+    } addr;
+} __wasi_addr_t;


Can the layout of these structures be same in 32-bit and 64-bit system? Had we tested it in x86-32? If not the same, should add the related padding bytes in the structure.

Thanks for bringing it. Will run more test under x86-32

core/iwasm/libraries/lib-socket/src/wasi/wasi_socket_ext.c

core/iwasm/libraries/lib-socket/inc/wasi_socket_ext.h

core/iwasm/libraries/libc-wasi/libc_wasi_wrapper.c

wenyongh · 2022-02-22T01:17:37Z

core/iwasm/libraries/libc-wasi/sandboxed-system-primitives/src/posix.c

+    uint32_t target;
+    uint32_t address = addr_pool_entry->addr;


Had better use uint32 but not uint32_t here, we usually use uint32/uint16 like types inside runtime, and use uint32_t/uint16_t like types in header files of core/iwasm/include

wenyongh · 2022-02-22T01:18:13Z

core/iwasm/libraries/libc-wasi/sandboxed-system-primitives/src/posix.c

+
+    uint32_t mask = addr_pool_entry->mask;
+    uint32_t first_address = address & mask;
+    uint32_t last_address = address | (~mask);


Same as above

wenyongh · 2022-02-22T01:21:06Z

core/iwasm/libraries/libc-wasi/sandboxed-system-primitives/src/posix.h

+    uint32_t addr;
+    uint8_t mask;


Same as above, had better use uint32 and uint8

wenyongh · 2022-02-22T01:26:15Z

product-mini/platforms/posix/main.c

+            /* TODO: parse the configuration file */
+        }
+        else if (!strncmp(argv[0], "--addr-pool=", strlen("--addr-pool="))) {
+            /* --addr-pool=100.200.244.255/30 */


Had better remove the unused hardcode code

wenyongh · 2022-02-22T01:28:21Z

product-mini/platforms/posix/main.c

+            /* --addr-pool=100.200.244.255/30 */
+            char *token = NULL;
+
+            if ('\0' == argv[0][13])


Should be argv[0][12]

wenyongh · 2022-02-23T07:28:16Z

core/iwasm/common/wasm_runtime_common.c

@@ -1969,14 +1969,36 @@ wasm_runtime_set_wasi_args(WASMModuleCommon *module, const char *dir_list[],
                                  argc, -1, -1, -1);
 }

+void
+wasm_runtime_set_wasi_addr_pool(wasm_module_t module, const char *addr_pool[],
+                                uint32_t addr_pool_size)


uint32_t to uint32

wenyongh · 2022-02-23T07:31:03Z

core/iwasm/common/wasm_runtime_common.h

@@ -731,6 +733,9 @@ wasm_runtime_set_wasi_ctx(WASMModuleInstanceCommon *module_inst,
 WASIContext *
 wasm_runtime_get_wasi_ctx(WASMModuleInstanceCommon *module_inst);

+WASM_RUNTIME_API_EXTERN void
+wasm_runtime_set_wasi_addr_pool(wasm_module_t module, const char *addr_pool[],
+                                uint32_t addr_pool_size);


uint32_t to uint32

Refer to [WASI PR#459](WebAssembly/WASI#459) Users use `--addr-pool=` to identify an valid ip address range

lum1n0us changed the base branch from main to dev/socket_api November 15, 2021 08:48

lum1n0us force-pushed the network_api branch 3 times, most recently from 6388af0 to 6bf86a7 Compare November 18, 2021 10:13

lum1n0us changed the title ~~[WIP] Network APIs~~ [WIP] Simple Berkeley Socket APIs Nov 19, 2021

robberphex mentioned this pull request Dec 18, 2021

feat(socket): berkeley socket API v2 WebAssembly/WASI#459

Closed

lum1n0us force-pushed the network_api branch 2 times, most recently from a48f1e4 to 2dd7004 Compare December 30, 2021 05:53

lum1n0us force-pushed the network_api branch from 2dd7004 to 862fa16 Compare December 30, 2021 06:54

lum1n0us force-pushed the network_api branch 2 times, most recently from c7523d5 to 8088bfc Compare January 28, 2022 01:47

lum1n0us force-pushed the network_api branch 3 times, most recently from 3c5dac5 to 23a8cda Compare February 17, 2022 06:56

lum1n0us changed the title ~~[WIP] Simple Berkeley Socket APIs~~ Simple Berkeley Socket APIs Feb 17, 2022

wenyongh reviewed Feb 21, 2022

View reviewed changes

wenyongh reviewed Feb 22, 2022

View reviewed changes

lum1n0us force-pushed the network_api branch 3 times, most recently from ddc5375 to c5d86a7 Compare February 22, 2022 06:35

wenyongh reviewed Feb 23, 2022

View reviewed changes

lum1n0us force-pushed the network_api branch from c5d86a7 to 0fad0ca Compare February 23, 2022 07:49

wenyongh merged commit d4fc644 into bytecodealliance:dev/socket_api Feb 23, 2022

Basic implementation about Berkeley Socket of WASI

0fad0ca

Refer to [WASI PR#459](WebAssembly/WASI#459) Users use `--addr-pool=` to identify an valid ip address range

lum1n0us deleted the network_api branch May 10, 2022 14:43

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Simple Berkeley Socket APIs #836

Simple Berkeley Socket APIs #836

lum1n0us commented Nov 15, 2021

lum1n0us commented Dec 30, 2021

wenyongh Feb 21, 2022

wenyongh Feb 21, 2022

lum1n0us Feb 22, 2022

wenyongh Feb 22, 2022

lum1n0us Feb 22, 2022

wenyongh Feb 22, 2022

wenyongh Feb 22, 2022

wenyongh Feb 22, 2022

wenyongh Feb 22, 2022

wenyongh Feb 23, 2022

wenyongh Feb 23, 2022

Simple Berkeley Socket APIs #836

Simple Berkeley Socket APIs #836

Conversation

lum1n0us commented Nov 15, 2021

lum1n0us commented Dec 30, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment