nic_bridge.run: use lxip and lwip

* use both IP-stacks with and without labels
* adjust matching rules

issue #5471
This commit is contained in:
Sebastian Sumpf 2025-03-05 16:20:00 +01:00 committed by Norman Feske
parent 92086cce68
commit e985e1c7b1

View File

@ -14,6 +14,7 @@ import_from_depot [depot_user]/src/[base_src] \
[depot_user]/src/libc \
[depot_user]/src/nic_bridge \
[depot_user]/src/vfs_lwip \
[depot_user]/src/vfs_lxip \
[depot_user]/src/vfs
build { test/lwip }
@ -80,7 +81,7 @@ install_config {
<config port="80">
<vfs>
<dir name="socket">
<lwip ip_addr="10.0.2.55" netmask="255.255.255.0" gateway="10.0.2.1"/>
<lwip label="lwip" ip_addr="10.0.2.55" netmask="255.255.255.0" gateway="10.0.2.1"/>
</dir>
<dir name="dev"> <log/> </dir>
</vfs>
@ -97,7 +98,7 @@ install_config {
<config port="80">
<vfs>
<dir name="socket">
<lwip ip_addr="10.0.2.56" netmask="255.255.255.0" gateway="10.0.2.1"/>
<lxip label="lxip" ip_addr="10.0.2.56" netmask="255.255.255.0" gateway="10.0.2.1"/>
</dir>
<dir name="dev"> <log/> </dir>
</vfs>
@ -128,7 +129,7 @@ install_config {
</route>
<config server_ip="10.0.2.56" server_port="80">
<vfs>
<dir name="socket"> <lwip dhcp="yes"/> </dir>
<dir name="socket"> <lxip dhcp="yes"/> </dir>
<dir name="dev"> <log/> </dir>
</vfs>
<libc stdout="/dev/log" stderr="/dev/log" socket="/socket"/>
@ -156,11 +157,11 @@ build_boot_image [build_artifacts]
append qemu_args " -nographic "
append_qemu_nic_args
append done_string {.*?\[init -> client_3] .\[31mError: Nic-session creation failed}
append done_string {.*?\[client_1 -> lwip] rcv ETH 02:02:02:02:42:0.}
append done_string {.*?\[client_2 -> lwip] rcv ETH 02:02:02:02:79:00}
append done_string {.*?\[init -> client_3] .\[31mError: Nic-session creation failed.*?\n}
append done_string {.*?\[client_1 -> ] rcv ETH 02:02:02:02:42:0.}
append done_string {.*?\[client_2 -> ] rcv ETH 02:02:02:02:79:00}
append done_string {.*?\[server_1 -> lwip] rcv ETH 02:02:02:02:42:0.}
append done_string {.*?\[server_2 -> lwip] rcv ETH 02:02:02:02:23:00}
append done_string {.*?\[server_2 -> lxip] rcv ETH 02:02:02:02:23:00}
append done_string {.*?"client_." exited with exit value 0}
append done_string {.*?"client_." exited with exit value 0}
append done_string {.*?\n}