improve tcp_listener of ofp10

src/controller.rs

@@ -16,6 +16,7 @@ use crate::{
  * In production please remove allow unused.
  */
 
+ #[derive(Clone)]
 pub struct Controller {
     mac_to_port: HashMap<u64, u16>,
 }

src/main.rs

@@ -3,6 +3,7 @@ use tenjin::{openflow::ofp10::ControllerFrame10, Controller};
 extern crate byteorder;
 
 fn main() -> Result<(), std::io::Error> {
-    Controller::listener("127.0.0.1:6653");
+    let controller = Controller::new();
+    controller.listener("127.0.0.1:6633");
     Ok(())
 }

src/openflow/ofp10/controller_frame.rs

@@ -9,16 +9,24 @@ use super::{
     tcp_listener_handler, MessageMarshal, OfpMsgEvent, Openflow10, OpenflowHeader,
 };
 
-pub trait ControllerFrame10 {
+pub trait ControllerFrame10
+where
+    Self: 'static,
+{
     fn ofp(&self) -> ofp10::Openflow10 {
         Openflow10::new()
     }
     fn packet_in_handler(&mut self, xid: u32, packetin: PacketInEvent, stream: &mut TcpStream);
     fn new() -> Self;
 
-    fn listener(address: &str) {
+    fn listener(&self, address: &str)
+    where
+        Self: Sized,
+        Self: Send,
+        Self: Clone,
+    {
         println!("server run at {}", address);
-        let _ = tcp_listener_handler(address);
+        let _ = tcp_listener_handler(address, self.clone());
     }
 
     fn handle_header(&mut self, buf: &mut Vec<u8>) -> Option<(u8, usize, u32)> {

src/openflow/ofp10/tcp_listener.rs

@@ -5,7 +5,10 @@ use crate::openflow::ofp10::HelloEvent;
 
 use super::{ControllerFrame10, OfpMsgEvent};
 
-pub fn tcp_listener_handler(address: &str) -> Result<(), std::io::Error> {
+pub fn tcp_listener_handler(
+    address: &str,
+    controller: impl ControllerFrame10 + Send + 'static + Clone,
+) -> Result<(), std::io::Error> {
     let listener = TcpListener::bind(address)?;
     for stream in listener.incoming() {
         match stream {
@@ -14,8 +17,8 @@ pub fn tcp_listener_handler(address: &str) -> Result<(), std::io::Error> {
                     println!("server has connection from {}", addr);
                 }
 
+                let mut ctrl = controller.clone();
                 thread::spawn(move || {
-                    let mut ctrl = Controller::new();
                     ctrl.send_msg(HelloEvent::new(), 0, &mut stream);
                     let ofp_size = ctrl.ofp().header_size();
                     let mut buffer = vec![0u8; ofp_size];

src/openflow/ofp13/tcp_listener.rs

@@ -9,7 +9,6 @@ pub fn tcp_listener_handler(
     controller: impl ControllerFrame13 + Send + 'static + Clone,
 ) -> Result<(), std::io::Error> {
     let listener = TcpListener::bind(address)?;
-    // let controller = Arc::new(Mutex::new(controller));
     for stream in listener.incoming() {
         match stream {
             Ok(mut stream) => {