cleanup: namespace Montauk (capital M) => montauk::abi
This commit is contained in:
@@ -335,7 +335,7 @@ extern "C" void _start() {
|
||||
montauk::print("MontaukOS DHCP Client\n");
|
||||
|
||||
// 1. Get MAC address
|
||||
Montauk::NetCfg origCfg;
|
||||
montauk::abi::NetCfg origCfg;
|
||||
montauk::get_netcfg(&origCfg);
|
||||
|
||||
char macStr[32];
|
||||
@@ -344,14 +344,14 @@ extern "C" void _start() {
|
||||
montauk::print(msg);
|
||||
|
||||
// 2. Set IP to 0.0.0.0 to allow broadcast send/receive
|
||||
Montauk::NetCfg zeroCfg;
|
||||
montauk::abi::NetCfg zeroCfg;
|
||||
zeroCfg.ipAddress = 0;
|
||||
zeroCfg.subnetMask = 0;
|
||||
zeroCfg.gateway = 0;
|
||||
montauk::set_netcfg(&zeroCfg);
|
||||
|
||||
// 3. Create UDP socket and bind to port 68
|
||||
int fd = montauk::socket(Montauk::SOCK_UDP);
|
||||
int fd = montauk::socket(montauk::abi::SOCK_UDP);
|
||||
if (fd < 0) {
|
||||
montauk::print("Error: failed to create UDP socket\n");
|
||||
montauk::set_netcfg(&origCfg);
|
||||
@@ -399,7 +399,7 @@ extern "C" void _start() {
|
||||
}
|
||||
uint64_t now = montauk::get_milliseconds();
|
||||
if (now >= startMs + 10000) break;
|
||||
montauk::wait_handle(fd, Montauk::IPC_SIGNAL_READABLE, startMs + 10000 - now);
|
||||
montauk::wait_handle(fd, montauk::abi::IPC_SIGNAL_READABLE, startMs + 10000 - now);
|
||||
}
|
||||
|
||||
if (!gotOffer) {
|
||||
@@ -451,7 +451,7 @@ extern "C" void _start() {
|
||||
}
|
||||
uint64_t now = montauk::get_milliseconds();
|
||||
if (now >= startMs + 10000) break;
|
||||
montauk::wait_handle(fd, Montauk::IPC_SIGNAL_READABLE, startMs + 10000 - now);
|
||||
montauk::wait_handle(fd, montauk::abi::IPC_SIGNAL_READABLE, startMs + 10000 - now);
|
||||
}
|
||||
|
||||
montauk::closesocket(fd);
|
||||
@@ -463,7 +463,7 @@ extern "C" void _start() {
|
||||
}
|
||||
|
||||
// 8. Apply configuration
|
||||
Montauk::NetCfg newCfg;
|
||||
montauk::abi::NetCfg newCfg;
|
||||
newCfg.ipAddress = offer.offeredIp;
|
||||
newCfg.subnetMask = offer.subnetMask;
|
||||
newCfg.gateway = offer.router;
|
||||
|
||||
Reference in New Issue
Block a user