From bafdb3b66a50ff77528421618764067ec2d55740 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Thu, 11 Jul 2024 21:08:12 +0200
Subject: [PATCH] Use the new scheme format

---
 src/dnsd/main.rs     |  6 +++---
 src/dnsd/scheme.rs   |  2 +-
 src/smolnetd/main.rs | 28 ++++++++++++++--------------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/dnsd/main.rs b/src/dnsd/main.rs
index 7a6becfd0c..41ce75854e 100644
--- a/src/dnsd/main.rs
+++ b/src/dnsd/main.rs
@@ -16,15 +16,15 @@ mod scheme;
 fn run(daemon: redox_daemon::Daemon) -> Result<()> {
     use libredox::flag::*;
 
-    let dns_fd = Fd::open(":dns", O_RDWR | O_CREAT | O_NONBLOCK, 0)
+    let dns_fd = Fd::open("/scheme/dns", O_RDWR | O_CREAT | O_NONBLOCK, 0)
         .context("failed to open :dns")?;
 
-    let time_path = format!("time:{}", CLOCK_MONOTONIC);
+    let time_path = format!("/scheme/time/{}", CLOCK_MONOTONIC);
     let time_fd = Fd::open(&time_path, O_RDWR, 0)
         .context("failed to open time")?;
 
     let nameserver_fd = Fd::open(
-        "netcfg:resolv/nameserver",
+        "/scheme/netcfg/resolv/nameserver",
         O_RDWR | O_CREAT | O_NONBLOCK,
         0,
     ).context("failed to open nameserver")?;
diff --git a/src/dnsd/scheme.rs b/src/dnsd/scheme.rs
index 93a6ea7126..5d7ae5454f 100644
--- a/src/dnsd/scheme.rs
+++ b/src/dnsd/scheme.rs
@@ -68,7 +68,7 @@ impl Domains {
     }
 
     pub fn update_nameserver(&mut self) {
-        if let Ok(mut file) = File::open("netcfg:resolv/nameserver") {
+        if let Ok(mut file) = File::open("/scheme/netcfg/resolv/nameserver") {
             let mut nameserver = String::new();
             if file.read_to_string(&mut nameserver).is_ok() {
                 if let Some(line) = nameserver.lines().next() {
diff --git a/src/smolnetd/main.rs b/src/smolnetd/main.rs
index d16fcf3be7..1e41dab4c7 100644
--- a/src/smolnetd/main.rs
+++ b/src/smolnetd/main.rs
@@ -64,36 +64,36 @@ fn get_network_adapter() -> Result<String> {
 fn run(daemon: redox_daemon::Daemon) -> Result<()> {
     let adapter = get_network_adapter()?;
     trace!("opening {adapter}:");
-    let network_fd = Fd::open(&format!("{adapter}:"), O_RDWR | O_NONBLOCK, 0)
+    let network_fd = Fd::open(&format!("/scheme/{adapter}"), O_RDWR | O_NONBLOCK, 0)
         .map_err(|e| anyhow!("failed to open {adapter}: {e}"))?;
 
-    let hardware_addr = std::fs::read(format!("{adapter}:mac"))
+    let hardware_addr = std::fs::read(format!("/scheme/{adapter}/mac"))
         .map(|mac_address| EthernetAddress::from_bytes(&mac_address))
         .context("failed to get mac address from network adapter")?;
 
-    trace!("opening :ip");
-    let ip_fd = Fd::open(":ip", O_RDWR | O_CREAT | O_NONBLOCK, 0)
+    trace!("opening /scheme/ip");
+    let ip_fd = Fd::open("/scheme/ip", O_RDWR | O_CREAT | O_NONBLOCK, 0)
         .context("failed to open :ip")?;
 
-    trace!("opening :udp");
-    let udp_fd = Fd::open(":udp", O_RDWR | O_CREAT | O_NONBLOCK, 0)
+    trace!("opening /scheme/udp");
+    let udp_fd = Fd::open("/scheme/udp", O_RDWR | O_CREAT | O_NONBLOCK, 0)
         .context("failed to open :udp")?;
 
-    trace!("opening :tcp");
-    let tcp_fd = Fd::open(":tcp", O_RDWR | O_CREAT | O_NONBLOCK, 0)
+    trace!("opening /scheme/tcp");
+    let tcp_fd = Fd::open("/scheme/tcp", O_RDWR | O_CREAT | O_NONBLOCK, 0)
         .context("failed to open :tcp")?;
 
-    trace!("opening :icmp");
-    let icmp_fd = Fd::open(":icmp", O_RDWR | O_CREAT | O_NONBLOCK, 0)
+    trace!("opening /scheme/icmp");
+    let icmp_fd = Fd::open("/scheme/icmp", O_RDWR | O_CREAT | O_NONBLOCK, 0)
         .context("failed to open :icmp")?;
 
-    trace!("opening :netcfg");
-    let netcfg_fd = Fd::open(":netcfg", O_RDWR | O_CREAT | O_NONBLOCK, 0)
+    trace!("opening /scheme/netcfg");
+    let netcfg_fd = Fd::open("/scheme/netcfg", O_RDWR | O_CREAT | O_NONBLOCK, 0)
         .context("failed to open :netcfg")?;
 
-    let time_path = format!("time:{}", syscall::CLOCK_MONOTONIC);
+    let time_path = format!("/scheme/time/{}", syscall::CLOCK_MONOTONIC);
     let time_fd = Fd::open(&time_path, O_RDWR, 0)
-        .context("failed to open time:")?;
+        .context("failed to open /scheme/time")?;
 
     event::user_data! {
         enum EventSource {