fix!: bypass middle modules

similar to a68bb8f, expose structs and enums from inner modules

Author: thatdevsherry

examples/responder/responder.rs

@@ -11,7 +11,7 @@ use tokio::{
 use tracing::*;
 use twamp_rs::server::Server;
 use twamp_rs::session_reflector::SessionReflector;
-use twamp_rs::twamp_control::request_tw_session::RequestTwSession;
+use twamp_rs::twamp_control::RequestTwSession;
 
 #[derive(Debug)]
 pub struct Responder {

src/control_client/mod.rs

@@ -1,13 +1,13 @@
-use crate::twamp_control::accept::Accept;
-use crate::twamp_control::accept_session::AcceptSession;
-use crate::twamp_control::request_tw_session::RequestTwSession;
-use crate::twamp_control::security_mode::Mode;
-use crate::twamp_control::server_greeting::ServerGreeting;
-use crate::twamp_control::server_start::ServerStart;
-use crate::twamp_control::set_up_response::SetUpResponse;
-use crate::twamp_control::start_ack::StartAck;
-use crate::twamp_control::start_sessions::StartSessions;
-use crate::twamp_control::stop_sessions::StopSessions;
+use crate::twamp_control::Accept;
+use crate::twamp_control::AcceptSession;
+use crate::twamp_control::RequestTwSession;
+use crate::twamp_control::SecurityMode;
+use crate::twamp_control::ServerGreeting;
+use crate::twamp_control::ServerStart;
+use crate::twamp_control::SetUpResponse;
+use crate::twamp_control::StartAck;
+use crate::twamp_control::StartSessions;
+use crate::twamp_control::StopSessions;
 use anyhow::{Result, anyhow};
 use deku::prelude::*;
 use std::mem::size_of;
@@ -90,7 +90,7 @@ impl ControlClient {
     /// Creates a `SetUpResponse`, converts to bytes and sends it out on `TWAMP-Control`.
     pub async fn send_set_up_response(&mut self) -> Result<()> {
         info!("Preparing to send Set-Up-Response");
-        let set_up_response = SetUpResponse::new(Mode::Unauthenticated);
+        let set_up_response = SetUpResponse::new(SecurityMode::Unauthenticated);
         debug!("Set-Up-Response: {:?}", set_up_response);
         let encoded = set_up_response.unwrap().to_bytes().unwrap();
         self.stream

src/server/mod.rs

@@ -1,13 +1,13 @@
+use crate::twamp_control::Accept;
+use crate::twamp_control::AcceptSession;
 use crate::twamp_control::Messages;
-use crate::twamp_control::accept::Accept;
-use crate::twamp_control::accept_session::AcceptSession;
-use crate::twamp_control::request_tw_session::RequestTwSession;
-use crate::twamp_control::security_mode::Mode;
-use crate::twamp_control::server_start::ServerStart;
-use crate::twamp_control::start_ack::StartAck;
-use crate::twamp_control::start_sessions::StartSessions;
-use crate::twamp_control::stop_sessions::StopSessions;
-use crate::twamp_control::{server_greeting::ServerGreeting, set_up_response::SetUpResponse};
+use crate::twamp_control::RequestTwSession;
+use crate::twamp_control::SecurityMode;
+use crate::twamp_control::ServerStart;
+use crate::twamp_control::StartAck;
+use crate::twamp_control::StartSessions;
+use crate::twamp_control::StopSessions;
+use crate::twamp_control::{ServerGreeting, SetUpResponse};
 use anyhow::Result;
 use deku::prelude::*;
 use std::time::Duration;
@@ -130,7 +130,7 @@ impl Server {
     /// Creates a `ServerGreeting`, converts to bytes and sends it out on `TWAMP-Control`.
     pub async fn send_server_greeting(&mut self) -> Result<ServerGreeting> {
         info!("Sending ServerGreeting");
-        let server_greeting = ServerGreeting::new(&[Mode::Unauthenticated]);
+        let server_greeting = ServerGreeting::new(&[SecurityMode::Unauthenticated]);
         debug!("ServerGreeting: {:?}", server_greeting);
         let encoded = server_greeting.to_bytes().unwrap();
         self.socket.write_all(&encoded[..]).await?;

src/twamp_control/accept_session.rs

@@ -1,4 +1,4 @@
-use super::accept::Accept;
+use super::Accept;
 use deku::prelude::*;
 
 /// Response for a Request-TW-Session command.

src/twamp_control/mod.rs

@@ -1,14 +1,25 @@
-pub mod accept;
-pub mod accept_session;
-pub mod command_number;
+mod accept;
+mod accept_session;
+mod command_number;
 mod constants;
-pub mod request_tw_session;
-pub mod security_mode;
-pub mod server_greeting;
-pub mod server_start;
-pub mod set_up_response;
-pub mod start_ack;
-pub mod start_sessions;
-pub mod stop_sessions;
+mod request_tw_session;
+mod security_mode;
+mod server_greeting;
+mod server_start;
+mod set_up_response;
+mod start_ack;
+mod start_sessions;
+mod stop_sessions;
 
+pub use accept::*;
+pub use accept_session::*;
+pub use command_number::*;
 pub use constants::*;
+pub use request_tw_session::*;
+pub use security_mode::*;
+pub use server_greeting::*;
+pub use server_start::*;
+pub use set_up_response::*;
+pub use start_ack::*;
+pub use start_sessions::*;
+pub use stop_sessions::*;

src/twamp_control/security_mode.rs

@@ -6,7 +6,7 @@ use num_enum::IntoPrimitive;
 #[derive(Clone, Debug, Default, PartialEq, Copy, IntoPrimitive, DekuRead, DekuWrite)]
 #[repr(u32)]
 #[deku(type = "u32", endian = "endian", ctx = "endian: deku::ctx::Endian")]
-pub enum Mode {
+pub enum SecurityMode {
     /// Unused.
     /// Control-Client **should** close the connection.
     /// Server **may** close the connection immediately.
@@ -33,10 +33,10 @@ mod tests {
 
     #[test]
     fn should_have_valid_discriminants() {
-        let reserved: u32 = Mode::Reserved.into();
-        let unauthenticated: u32 = Mode::Unauthenticated.into();
-        let authenticated: u32 = Mode::Authenticated.into();
-        let encrypted: u32 = Mode::Encrypted.into();
+        let reserved: u32 = SecurityMode::Reserved.into();
+        let unauthenticated: u32 = SecurityMode::Unauthenticated.into();
+        let authenticated: u32 = SecurityMode::Authenticated.into();
+        let encrypted: u32 = SecurityMode::Encrypted.into();
         assert_eq!(reserved, 0u32);
         assert_eq!(unauthenticated, 1u32);
         assert_eq!(authenticated, 2u32);