Incorporate review comments

Signed-off-by: Guvenc Gulce <[email protected]>

Author: guvenc

.github/workflows/release-oci.yaml

@@ -4,8 +4,6 @@ on:
   push:
     branches:
       - master
-      - feat/container
-      - feature/prefix_delegation
     tags:
     - '*'
     paths-ignore:

src/daemon.rs

@@ -251,6 +251,7 @@ impl FeosGrpc for FeOSAPI {
             .map_err(|_| Status::invalid_argument("Failed to parse UUID"))?;
 
         self.vmm.boot_vm(id).map_err(|e| self.handle_error(e))?;
+        //TODO remove this sleep
         sleep(Duration::from_secs(2)).await;
         self.network
             .start_dhcp(id)

src/filesystem.rs

@@ -1,7 +1,5 @@
 use log::debug;
 use nix::mount::{mount, MsFlags};
-use std::fs::File;
-use std::io::{Error, Write};
 
 pub fn mount_virtual_filesystems() {
     const NONE: Option<&'static [u8]> = None;
@@ -55,17 +53,4 @@ pub fn mount_virtual_filesystems() {
         NONE,
     )
     .unwrap_or_else(|e| panic!("/sys/fs/cgroup mount failed: {e}"));
-
-    enable_ipv6_forwarding().unwrap_or_else(|e| panic!("Failed to enable ipv6 forwarding: {e}"));
-}
-
-fn enable_ipv6_forwarding() -> Result<(), Error> {
-    let forwarding_paths = ["/proc/sys/net/ipv6/conf/all/forwarding"];
-
-    for path in forwarding_paths {
-        let mut file = File::create(path)?;
-        file.write_all(b"1")?;
-    }
-
-    Ok(())
 }

src/isolated_container/mod.rs

@@ -193,6 +193,7 @@ impl IsolatedContainerService for IsolatedContainerAPI {
         let id = Uuid::new_v4();
 
         self.prepare_vm(id).map_err(|e| self.handle_error(e))?;
+        //TODO get rid of sleep
         sleep(Duration::from_secs(2)).await;
 
         self.network

src/main.rs

@@ -9,6 +9,7 @@ use std::{env::args, ffi::CString};
 use tokio::io;
 use tokio::io::{AsyncBufReadExt, BufReader};
 
+//TODO remove this in future, the reason https://github.com/youki-dev/youki/issues/2144
 #[tokio::main(flavor = "current_thread")]
 async fn main() -> Result<(), String> {
     let mut ipv6_address = Ipv6Addr::UNSPECIFIED;

src/network/utils.rs

@@ -1,5 +1,6 @@
-use std::error::Error;
+use std::fs::File;
 use std::io;
+use std::io::Write;
 
 use crate::network::dhcpv6::*;
 use futures::stream::TryStreamExt;
@@ -33,6 +34,8 @@ pub async fn configure_network_devices() -> Result<Option<(Ipv6Addr, u8)>, Strin
     let mut delegated_prefix_option: Option<(Ipv6Addr, u8)> = None;
     tokio::spawn(connection);
 
+    enable_ipv6_forwarding().map_err(|e| format!("Failed to enable ipv6 forwarding: {}", e))?;
+
     let mut link_ts = handle
         .link()
         .get()
@@ -157,12 +160,23 @@ pub async fn configure_network_devices() -> Result<Option<(Ipv6Addr, u8)>, Strin
     Ok(delegated_prefix_option)
 }
 
+pub fn enable_ipv6_forwarding() -> Result<(), std::io::Error> {
+    let forwarding_paths = ["/proc/sys/net/ipv6/conf/all/forwarding"];
+
+    for path in forwarding_paths {
+        let mut file = File::create(path)?;
+        file.write_all(b"1")?;
+    }
+
+    Ok(())
+}
+
 // Keep for debugging purposes
 async fn _print_ipv6_routes(
     handle: &Handle,
     iface_index: u32,
     interface_name: &str,
-) -> Result<(), Box<dyn Error>> {
+) -> Result<(), Box<dyn std::error::Error>> {
     info!("IPv6 Routes:");
 
     let mut route_ts = handle.route().get(IpVersion::V6).execute();