remove codec folder in nxrp

client/src/net/connection_manager.rs

@@ -1,5 +1,5 @@
 use bytes::Bytes;
-use netrunner_core::nrxp::codec::socks::TargetAddress;
+use netrunner_core::nrxp::socks::TargetAddress;
 use netrunner_logger::{debug, error, info, trace, warn};
 use smoltcp::{
     iface::{SocketHandle, SocketSet},

core/src/net/connection/bridge.rs

@@ -1,6 +1,6 @@
-use crate::nrxp::codec::frame::FrameType;
 use crate::net::connection::muxer::{MuxMessage, Muxer};
 use crate::net::network::NetworkConfig;
+use crate::nrxp::frame::FrameType;
 use bytes::{Bytes, BytesMut};
 use netrunner_logger::{debug, error};
 use tokio::net::UdpSocket;

core/src/net/connection/connection.rs

@@ -6,13 +6,11 @@ use crate::{
         network::NetworkConfig,
     },
     nrxp::{
-        codec::{
         codec::Codec,
+        errors::ErrorAction,
         frame::FrameType,
         socks::{SocksReply, SocksRequest},
     },
-        errors::ErrorAction,
-    },
     parser::Parser,
     tlseng::profile::BrowserProfile,
 };

core/src/net/connection/engine.rs

@@ -11,10 +11,7 @@ use tokio_util::sync::CancellationToken;
 
 use crate::{
     net::connection::{handler::StreamHandler, muxer::MuxMessage},
-    nrxp::{
+    nrxp::{codec::Codec, errors::ErrorAction, frame::FrameType},
-        codec::{codec::Codec, frame::FrameType},
-        errors::ErrorAction,
-    },
 };
 
 pub struct TunnelEngine {

core/src/net/connection/handler.rs

@@ -10,7 +10,7 @@ use crate::{
         },
         network::NetworkConfig,
     },
-    nrxp::codec::{
+    nrxp::{
         frame::{Frame, FrameType},
         socks::SocksReply,
     },

core/src/net/connection/mod.rs

@@ -1,4 +1,4 @@
-pub mod bridge;
+mod bridge;
 pub mod connection;
 pub mod engine;
 pub mod handler;

core/src/net/connection/muxer.rs

@@ -1,10 +1,11 @@
-use crate::nrxp::codec::frame::FrameType;
 use bytes::Bytes;
 use dashmap::DashMap;
 use std::sync::atomic::{AtomicU32, Ordering};
 use std::sync::Arc;
 use tokio::sync::mpsc::{error::SendError, Sender};
 
+use crate::nrxp::frame::FrameType;
+
 pub struct IdGenerator {
     counter: AtomicU32,
 }

core/src/net/network.rs

@@ -1,10 +1,10 @@
 use std::sync::OnceLock;
 
 use crate::{
-    nrxp::codec::{frame::FRAME_HEADER_SIZE, MAX_PADDING_SIZE},
     net::connection::connection::{
         ClientHandler, Connection, ConnectionRole, ServerHandler, TunnelHandler,
     },
+    nrxp::frame::{FRAME_HEADER_SIZE, MAX_PADDING_SIZE},
 };
 use netrunner_logger::{error, info};
 use tokio::net::TcpListener;

core/src/nrxp/codec.rs

@@ -3,9 +3,9 @@ use bytes::{Bytes, BytesMut};
 use crate::crypto::aead::AeadPacker;
 use crate::crypto::chacha::ChaChaCipher;
 use crate::crypto::session::SessionKeys;
-use crate::nrxp::codec::bridge::TlsBridge;
+use crate::nrxp::bridge::TlsBridge;
-use crate::nrxp::codec::frame::{Frame, FrameHeader, FrameType, Padding};
 use crate::nrxp::errors::{ErrorAction, ErrorStage, TlsError};
+use crate::nrxp::frame::{Frame, FrameHeader, FrameType, Padding};
 use crate::parser::Parser;
 use crate::tlseng::profile::{BrowserProfile, ServerProfile};
 

core/src/nrxp/codec/mod.rs

@@ -1,6 +0,0 @@
-mod bridge;
-pub mod codec;
-pub mod frame;
-pub mod socks;
-
-pub const MAX_PADDING_SIZE: u32 = 255;

core/src/nrxp/frame.rs

@@ -2,13 +2,15 @@ use bytes::{Buf, BufMut, Bytes, BytesMut};
 
 use rand::Rng;
 
-use crate::{nrxp::codec::MAX_PADDING_SIZE, parser::Parser};
+use crate::parser::Parser;
 
 pub struct Padding {
     pub len: u16,
     pub data: Bytes,
 }
 
+pub const MAX_PADDING_SIZE: u32 = 255;
+
 impl Padding {
     pub fn generate_padding() -> Padding {
         let mut rng = rand::rng();

core/src/nrxp/mod.rs

@@ -1,2 +1,5 @@
+mod bridge;
 pub mod codec;
 pub mod errors;
+pub mod frame;
+pub mod socks;