move code around

src/daemon/namespace/mod.rs

@@ -1,112 +0,0 @@
-mod raw;
-
-use crate::config::NamespaceName;
-use crate::daemon::link::{LinkError, link_up_ns};
-use crate::daemon::namespace::raw::{
-    NamespaceSetupError, create_network_namespace,
-};
-use nix::errno::Errno;
-use nix::mount::{MsFlags, mount, umount2, MntFlags};
-use std::fs::{File, create_dir_all, remove_file};
-use std::io::{Error as IoError, ErrorKind};
-use std::path::{Path, PathBuf};
-use thiserror::Error;
-use tracing::{debug, error, info};
-
-pub struct NetNs {
-    name: NamespaceName,
-    path: PathBuf,
-}
-
-impl NetNs {
-    /// Create a new named network namespace that will be removed when dropped
-    pub fn new(name: NamespaceName) -> Result<Self, NamespaceError> {
-        let parent = Path::new("/var/run/netns");
-        create_dir_all(parent).map_err(NamespaceError::Parent)?;
-        let path = parent.join(&name);
-
-        match File::create_new(&path) {
-            Ok(_) => {}
-            Err(e) if e.kind() == ErrorKind::AlreadyExists => {
-                info!(%name, "using existing network namespace");
-                return Ok(NetNs {
-                    name: name.clone(),
-                    path,
-                });
-            }
-            Err(e) => return Err(NamespaceError::from_create(path.clone(), e)),
-        }
-        info!(%name, "creating network namespace");
-
-        let ns = create_network_namespace(move |ns| {
-            bind_namespace(&ns, &path)?;
-            Result::<_, NamespaceError>::Ok(NetNs {
-                name,
-                path,
-            })
-        })?;
-
-        ns.setup_interfaces()?;
-
-        Ok(ns)
-    }
-}
-
-fn bind_namespace(namespace: &Path, path: &Path) -> Result<(), NamespaceError> {
-    debug!(namespace = %namespace.display(), path = %path.display(), "mounting namespace");
-    mount(
-        Some(namespace.as_os_str()),
-        path.as_os_str(),
-        Option::<&str>::None,
-        MsFlags::MS_BIND,
-        Option::<&str>::None,
-    )
-    .map_err(NamespaceError::Mount)
-}
-
-impl NetNs {
-    pub fn name(&self) -> &NamespaceName {
-        &self.name
-    }
-
-    fn setup_interfaces(&self) -> Result<(), NamespaceError> {
-        link_up_ns(&self.path, "lo")?;
-        Ok(())
-    }
-}
-
-impl Drop for NetNs {
-    fn drop(&mut self) {
-        let name = self.path.file_name().unwrap().to_str().unwrap();
-        info!(name, "deleting network namespace");
-        if let Err(error) = umount2(&self.path, MntFlags::MNT_DETACH) {
-            error!(%error, path = %self.path.display(), "Failed to unmount network namespace");
-        }
-        if let Err(error) = remove_file(&self.path) {
-            error!(%error, path = %self.path.display(), "Failed to remove namespace file");
-        }
-    }
-}
-
-#[derive(Debug, Error)]
-pub enum NamespaceError {
-    #[error("Failed to create parent directory for namespaces (/var/run/netns): {0:#}")]
-    Parent(IoError),
-    #[error("Failed to create namespace file {}: {error:#}", path.display())]
-    Create { path: PathBuf, error: IoError },
-    #[error("Failed to setup namespace: {0:#}")]
-    Setup(#[from] NamespaceSetupError),
-    #[error("Failed to bind-mount netns handle: {0:?}")]
-    Mount(Errno),
-    #[error("Failed to setup loopback inside namespace: {0:#}")]
-    Link(#[from] LinkError),
-}
-
-impl NamespaceError {
-    fn from_create(path: PathBuf, error: IoError) -> Self {
-        NamespaceError::Create {
-            path,
-            error,
-        }
-    }
-}