refactor: Move proxy components into crate::net

crates/test/src/xdp_util.rs

@@ -1,4 +1,4 @@
-use quilkin::net::xdp::process;
+use quilkin::net::io::nic::xdp::process;
 use xdp::{Packet, packet::net_types::UdpHeaders};
 
 #[inline]

crates/test/tests/proxy.rs

@@ -3,7 +3,7 @@
 #![cfg(debug_assertions)]
 
 use qt::*;
-use quilkin::{components::proxy, net, test::TestConfig};
+use quilkin::{net, test::TestConfig};
 
 trace_test!(server, {
     let mut sc = qt::sandbox_config!();
@@ -103,12 +103,12 @@ trace_test!(uring_receiver, {
     let pending_sends = net::queue(1).unwrap();
 
     // we'll test a single DownstreamReceiveWorkerConfig
-    proxy::packet_router::DownstreamReceiveWorkerConfig {
+    quilkin::net::io::Listener {
         worker_id: 1,
         port: addr.port(),
         config: config.clone(),
         buffer_pool: quilkin::test::BUFFER_POOL.clone(),
-        sessions: proxy::SessionPool::new(
+        sessions: quilkin::net::sessions::SessionPool::new(
             config,
             vec![pending_sends.0.clone()],
             BUFFER_POOL.clone(),
@@ -152,7 +152,7 @@ trace_test!(
         .into_iter()
         .collect();
 
-        let sessions = proxy::SessionPool::new(
+        let sessions = net::SessionPool::new(
             config.clone(),
             pending_sends.iter().map(|ps| ps.0.clone()).collect(),
             BUFFER_POOL.clone(),
@@ -161,7 +161,7 @@ trace_test!(
         const WORKER_COUNT: usize = 3;
 
         let (socket, addr) = sb.socket();
-        proxy::packet_router::spawn_receivers(
+        net::packet::spawn_receivers(
             config,
             socket,
             pending_sends,

crates/test/tests/xdp.rs

@@ -4,7 +4,7 @@
 use qt::xdp_util::{endpoints, make_config};
 use quilkin::{
     filters,
-    net::xdp::process::{
+    net::io::nic::xdp::process::{
         self,
         xdp::{
             self,

src/cli/service.rs

@@ -537,13 +537,7 @@ impl Service {
 
         let sessions = SessionPool::new(config.clone(), session_sends, buffer_pool.clone());
 
-        crate::components::proxy::packet_router::spawn_receivers(
-            config,
-            socket,
-            worker_sends,
-            &sessions,
-            buffer_pool,
-        )?;
+        crate::net::packet::spawn_receivers(config, socket, worker_sends, &sessions, buffer_pool)?;
 
         Ok((
             std::future::pending(),
@@ -554,7 +548,7 @@ impl Service {
 
     #[cfg(target_os = "linux")]
     fn spawn_xdp(&self, config: Arc<Config>, force_xdp: bool) -> eyre::Result<Option<Finalizer>> {
-        use crate::net::xdp;
+        use crate::net::io::nic::xdp;
         use eyre::{Context as _, ContextCompat as _};
 
         // TODO: remove this once it's been more stabilized
@@ -573,7 +567,7 @@ impl Service {
             .context("XDP requires a cluster map")?
             .clone();
 
-        let config = crate::net::xdp::process::ConfigState { filters, clusters };
+        let config = crate::net::io::nic::xdp::process::ConfigState { filters, clusters };
 
         let udp_port = if self.udp_enabled { self.udp_port } else { 0 };
         let qcmp_port = if self.qcmp_enabled { self.qcmp_port } else { 0 };

src/components/proxy.rs

@@ -14,15 +14,6 @@
  *  limitations under the License.
  */
 
-pub(crate) mod error;
-pub mod packet_router;
-pub(crate) mod sessions;
-
-use crate::config::IcaoCode;
-
-use super::RunArgs;
-pub use error::PipelineError;
-pub use sessions::SessionPool;
 use std::{
     net::SocketAddr,
     sync::{
@@ -31,6 +22,12 @@ use std::{
     },
 };
 
+pub use crate::{
+    components::RunArgs,
+    config::IcaoCode,
+    net::{error::PipelineError, sessions::SessionPool},
+};
+
 #[derive(Clone, Debug)]
 pub struct Ready {
     pub idle_request_interval: std::time::Duration,