move controller_frame and tcp_listener to ofp10 and remove unused code

src/controller.rs

@@ -5,12 +5,11 @@ use std::{collections::HashMap, net::TcpStream};
 use crate::{
     etherparser::ether_type::EtherType,
     openflow::{
-        controller_frame::ControllerFrame,
         ofp10::{
             self,
             events::{flow_mod::MatchFields, Action},
             ofp_v1_0::Openflow10,
-            FlowModEvent, PacketInEvent,
+            ControllerFrame10, FlowModEvent, PacketInEvent,
         },
         traiter::OfpMsgEvent,
     },
@@ -25,7 +24,7 @@ pub struct Controller {
     mac_to_port: HashMap<u64, u16>,
 }
 
-impl ControllerFrame<Openflow10> for Controller {
+impl ControllerFrame10 for Controller {
     fn get_ofp(&self) -> &impl OfpMsgEvent {
         &self.ofp
     }

src/main.rs

-use tenjin::{openflow::controller_frame::ControllerFrame, Controller};
+use tenjin::{openflow::ofp10::ControllerFrame10, Controller};
 
 extern crate byteorder;
 

src/openflow/mod.rs

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

src/openflow/controller_frame.rs → src/openflow/ofp10/controller_frame.rs

-use crate::openflow::ofp10::{ErrorEvent, Msg, PacketInEvent};
+use crate::openflow::{
+    ofp10::{ErrorEvent, Msg, PacketInEvent},
+    traiter::{MessageMarshal, OfpMsgEvent},
+};
 use std::{
     io::{Read, Write},
     net::TcpStream,
 };
 
-use super::{
-    tcp_listener::tcp_listener_handler,
-    traiter::{MessageMarshal, OfpMsgEvent},
-};
+use super::tcp_listener_handler;
 
-pub trait ControllerFrame<OME: OfpMsgEvent> {
+pub trait ControllerFrame10 {
     fn get_ofp(&self) -> &impl OfpMsgEvent;
     fn packet_in_handler(&mut self, xid: u32, packetin: PacketInEvent, stream: &mut TcpStream);
     fn new() -> Self;
 
     fn listener(address: &str) {
-        tcp_listener_handler::<OME>(address);
+        tcp_listener_handler(address);
     }
 
     fn handle_header(&mut self, buf: &mut Vec<u8>) -> (u8, usize, u32) {

src/openflow/ofp10/mod.rs

@@ -9,3 +9,9 @@ pub use events::{ErrorEvent, FlowModEvent, HelloEvent, PacketInEvent, PacketOutE
 
 pub mod ofp_header;
 pub mod ofp_v1_0;
+
+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

src/openflow/tcp_listener.rs → src/openflow/ofp10/tcp_listener.rs

-use crate::Controller;
+use crate::{openflow::traiter::OfpMsgEvent, Controller};
 use std::{io::Read, net::TcpListener, thread};
 
-use super::{controller_frame::ControllerFrame, traiter::OfpMsgEvent};
 use crate::openflow::ofp10::HelloEvent;
 
-pub fn tcp_listener_handler<OME: OfpMsgEvent>(address: &str) {
+use super::ControllerFrame10;
+
+pub fn tcp_listener_handler(address: &str) {
     let listener = TcpListener::bind(address).unwrap();
     for stream in listener.incoming() {
         match stream {