eliott/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2026-04-25 17:15:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

NetworkServer: Make "IPv4Address" Network.ini entry work again

Browse Source 
ac44ec5ebc removed the short "-i" flag from ifconfig, breaking this
code.
This commit is contained in:
Sönke Holz
2026-04-18 21:12:39 +02:00
committed by Nico Weber
parent ab76043248
commit c11f877284
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Userland/Services/NetworkServer/main.cpp
View File

@@ -75,7 +75,7 @@ ErrorOr<int> serenity_main(Main::Arguments)
// FIXME: Propagate errors
// FIXME: Do this asynchronously
dbgln("Setting up interface {} statically ({}/{})", ifname, config.ipv4_address, config.ipv4_netmask);
MUST(Core::command("ifconfig"sv, { "-a", ifname.characters(), "-i", config.ipv4_address.characters(), "-m", config.ipv4_netmask.characters() }, {}));
MUST(Core::command("ifconfig"sv, { "-a", ifname.characters(), "--ipv4", config.ipv4_address.characters(), "-m", config.ipv4_netmask.characters() }, {}));
if (config.ipv4_gateway != "0.0.0.0") {
MUST(Core::command("route"sv, { "del", "-n", "0.0.0.0", "-m", "0.0.0.0", "-i", ifname }, {}));
MUST(Core::command("route"sv, { "add", "-n", "0.0.0.0", "-m", "0.0.0.0", "-g", config.ipv4_gateway, "-i", ifname }, {}));
@@ -85,7 +85,7 @@ ErrorOr<int> serenity_main(Main::Arguments)
// FIXME: Propagate errors
dbgln("Disabling interface {}", ifname);
MUST(Core::command("route"sv, { "del", "-n", "0.0.0.0", "-m", "0.0.0.0", "-i", ifname }, {}));
MUST(Core::command("ifconfig"sv, { "-a", ifname.characters(), "-i", "0.0.0.0", "-m", "0.0.0.0" }, {}));
MUST(Core::command("ifconfig"sv, { "-a", ifname.characters(), "--ipv4", "0.0.0.0", "-m", "0.0.0.0" }, {}));
}
});