move code around

src/daemon/mod.rs

@@ -1,9 +1,5 @@
-mod namespace;
-mod proxy;
-pub mod link;
-
 use crate::config::{Config, ForwardConfig, NamespaceConfig, NamespaceName};
-use crate::daemon::namespace::{NamespaceError, NetNs};
+use crate::namespace::{NamespaceError, NetNs};
 use futures::FutureExt;
 use futures::StreamExt;
 use futures_concurrency::stream::Merge;
@@ -18,7 +14,7 @@ use tokio::signal::ctrl_c;
 use tokio::signal::unix::{SignalKind, signal};
 use tokio_stream::wrappers::SignalStream;
 use tracing::{debug, error, info};
-use crate::daemon::proxy::{ActiveProxy, ProxyError};
+use crate::proxy::{ActiveProxy, ProxyError};
 
 pub fn daemon(config: Config) -> MainResult {
     let rt = Runtime::new()?;

src/main.rs

@@ -6,6 +6,9 @@ use crate::daemon::daemon;
 
 mod config;
 mod daemon;
+mod namespace;
+mod proxy;
+mod link;
 
 #[derive(Parser, Debug)]
 pub struct Args {

src/namespace/mod.rs

@@ -1,8 +1,8 @@
 mod raw;
 
 use crate::config::NamespaceName;
-use crate::daemon::link::{LinkError, link_up_ns};
+use crate::link::{LinkError, link_up_ns};
-use crate::daemon::namespace::raw::{
+use crate::namespace::raw::{
     NamespaceSetupError, create_network_namespace,
 };
 use nix::errno::Errno;

src/proxy/mod.rs

@@ -1,7 +1,7 @@
 mod tcp;
 
 use crate::config::{ForwardConfig, ForwardTarget, ForwardSource, NamespaceName};
-use crate::daemon::proxy::tcp::Proxy;
+use crate::proxy::tcp::Proxy;
 use futures::future::AbortHandle;
 use nix::sched::{CloneFlags, setns};
 use std::fs::{File, remove_file};

src/proxy/tcp.rs

@@ -1,6 +1,6 @@
 /// Loosely based on https://github.com/fooker/netns-proxy/blob/main/src/tcp.rs
 use crate::config::{ForwardTarget, ForwardSource};
-use crate::daemon::proxy::{ProxyError, ProxyStats};
+use crate::proxy::{ProxyError, ProxyStats};
 use futures::TryStreamExt;
 use futures::stream::{AbortRegistration, Abortable};
 use std::fs::{remove_file, set_permissions};