move traiter into ofp10

src/controller.rs

@@ -4,14 +4,11 @@ use std::{collections::HashMap, net::TcpStream};
 
 use crate::{
     etherparser::ether_type::EtherType,
-    openflow::{
-        ofp10::{
-            self,
-            events::{flow_mod::MatchFields, Action},
-            ofp_manager::Openflow10,
-            ControllerFrame10, FlowModEvent, PacketInEvent,
-        },
-        traiter::OfpMsgEvent,
+    openflow::ofp10::{
+        self,
+        events::{flow_mod::MatchFields, Action},
+        ofp_manager::Openflow10,
+        ControllerFrame10, FlowModEvent, OfpMsgEvent, PacketInEvent,
     },
 };
 /**

src/openflow/mod.rs

-pub mod ofp10;
-pub mod traiter;
\ No newline at end of file
+pub mod ofp10;
\ No newline at end of file

src/openflow/ofp10/controller_frame.rs

-use crate::openflow::{
-    ofp10::{ErrorEvent, Msg, PacketInEvent},
-    traiter::{MessageMarshal, OfpMsgEvent},
-};
+use crate::openflow::ofp10::{ErrorEvent, Msg, PacketInEvent};
 use std::{
     io::{Read, Write},
     net::TcpStream,
 };
 
-use super::tcp_listener_handler;
+use super::{tcp_listener_handler, MessageMarshal, OfpMsgEvent};
 
 pub trait ControllerFrame10 {
     fn get_ofp(&self) -> &impl OfpMsgEvent;

src/openflow/ofp10/events/error/error_handler.rs

@@ -4,10 +4,7 @@ use std::{
 };
 
 use super::error_type::ErrorType;
-use crate::openflow::{
-    ofp10::Msg,
-    traiter::{MessageMarshal, OfpMsgEvent},
-};
+use crate::openflow::ofp10::{MessageMarshal, Msg, OfpMsgEvent};
 use byteorder::{BigEndian, ReadBytesExt};
 
 pub struct ErrorEvent {

src/openflow/ofp10/events/features_req.rs

-use crate::openflow::{
-    ofp10::Msg,
-    traiter::{MessageMarshal, OfpMsgEvent},
-};
+use crate::openflow::ofp10::{MessageMarshal, Msg, OfpMsgEvent};
 
 pub struct FeaturesReqEvent {}
 

src/openflow/ofp10/events/flow_mod/flow_mod_handler.rs

@@ -2,13 +2,10 @@ use std::io::Cursor;
 
 use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
 
-use crate::openflow::{
-    ofp10::{
-        events::{actions::SizeCheck, Action},
-        ofp_port::OfpPort,
-        Msg, PseudoPort,
-    },
-    traiter::{MessageMarshal, OfpMsgEvent},
+use crate::openflow::ofp10::{
+    events::{actions::SizeCheck, Action},
+    ofp_port::OfpPort,
+    MessageMarshal, Msg, OfpMsgEvent, PseudoPort,
 };
 
 use super::{FlowModCommand, MatchFields};

src/openflow/ofp10/events/hello.rs

-use crate::openflow::{
-    ofp10::Msg,
-    traiter::{MessageMarshal, OfpMsgEvent},
-};
+use crate::openflow::ofp10::{MessageMarshal, Msg, OfpMsgEvent};
 
 pub struct HelloEvent {}
 

src/openflow/ofp10/events/packet_out.rs

@@ -3,11 +3,8 @@ use std::{
     mem::size_of,
 };
 
-use crate::openflow::ofp10::{ofp_port::OfpPort, Msg};
-use crate::openflow::{
-    ofp10::PseudoPort,
-    traiter::{MessageMarshal, OfpMsgEvent},
-};
+use crate::openflow::ofp10::PseudoPort;
+use crate::openflow::ofp10::{ofp_port::OfpPort, MessageMarshal, Msg, OfpMsgEvent};
 use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
 
 use super::{actions::SizeCheck, Action, Payload};

src/openflow/ofp10/mod.rs

@@ -14,4 +14,7 @@ pub mod controller_frame;
 pub use controller_frame::ControllerFrame10;
 
 pub mod tcp_listener;
-pub use tcp_listener::tcp_listener_handler;
\ No newline at end of file
+pub use tcp_listener::tcp_listener_handler;
+
+pub mod traiter;
+pub use traiter::{MessageMarshal, OfpMsgEvent, OpenflowHeader};

src/openflow/ofp10/ofp_header/ofp_header.rs

-use crate::openflow::traiter::header_trait::OpenflowHeader;
+use crate::openflow::ofp10::OpenflowHeader;
 
 pub struct OfpHeader<OFH: OpenflowHeader> {
     ofp_header: OFH,

src/openflow/ofp10/ofp_header/ofp_header_v1_0.rs

 use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
 use std::{io::Cursor, mem::size_of};
 
-use crate::openflow::traiter::header_trait::OpenflowHeader;
+use crate::openflow::ofp10::OpenflowHeader;
 
 pub struct OfpHeader10 {
     pub version: u8,

src/openflow/ofp10/ofp_manager.rs

 use super::{
     events::{Action, FeaturesReqEvent, Payload},
     ofp_header::{OfpHeader, OfpHeader10},
-    HelloEvent, Msg, PacketOutEvent,
+    HelloEvent, Msg, OfpMsgEvent, OpenflowHeader, PacketOutEvent,
 };
-use crate::openflow::traiter::{event_trait::OfpMsgEvent, header_trait::OpenflowHeader};
 
 pub struct Openflow10 {}
 

src/openflow/ofp10/tcp_listener.rs

-use crate::{openflow::traiter::OfpMsgEvent, Controller};
+use crate::Controller;
 use std::{io::Read, net::TcpListener, thread};
 
 use crate::openflow::ofp10::HelloEvent;
 
-use super::ControllerFrame10;
+use super::{ControllerFrame10, OfpMsgEvent};
 
 pub fn tcp_listener_handler(address: &str) {
     let listener = TcpListener::bind(address).unwrap();