change ofp_header to one file

src/openflow/ofp10/controller_frame.rs

@@ -4,7 +4,7 @@ use std::{
     net::TcpStream,
 };
 
-use super::{tcp_listener_handler, MessageMarshal, OfpMsgEvent};
+use super::{tcp_listener_handler, MessageMarshal, OfpMsgEvent, OpenflowHeader};
 
 pub trait ControllerFrame10 {
     fn get_ofp(&self) -> &impl OfpMsgEvent;

src/openflow/ofp10/ofp_header/ofp_header_v1_0.rs → src/openflow/ofp10/ofp_header.rs

@@ -3,19 +3,19 @@ use std::{io::Cursor, mem::size_of};
 
 use crate::openflow::ofp10::OpenflowHeader;
 
-pub struct OfpHeader10 {
+pub struct OfpHeader {
     pub version: u8,
     pub message: u8,
     pub length: u16,
     pub xid: u32,
 }
 
-impl OpenflowHeader for OfpHeader10 {
+impl OpenflowHeader for OfpHeader {
     fn new(message: u8, length: usize, xid: usize) -> Self {
         Self {
             version: 1,
             message,
-            length: (size_of::<OfpHeader10>() + length) as u16,
+            length: (size_of::<OfpHeader>() + length) as u16,
             xid: xid as u32,
         }
     }
@@ -32,10 +32,10 @@ impl OpenflowHeader for OfpHeader10 {
         self.xid
     }
     fn header_size(&self) -> usize {
-        size_of::<OfpHeader10>()
+        size_of::<Self>()
     }
     fn pkt_size(&self) -> usize {
-        return self.length as usize - size_of::<OfpHeader10>();
+        return self.length as usize - size_of::<Self>();
     }
 
     fn parse(buf: &Vec<u8>) -> Self {

src/openflow/ofp10/ofp_header/mod.rs

-pub mod ofp_header;
-pub use ofp_header::OfpHeader;
-
-pub mod ofp_header_v1_0;
-pub use ofp_header_v1_0::OfpHeader10;

src/openflow/ofp10/ofp_header/ofp_header.rs

-use crate::openflow::ofp10::OpenflowHeader;
-
-pub struct OfpHeader<OFH: OpenflowHeader> {
-    ofp_header: OFH,
-}
-
-impl<OFH: OpenflowHeader> OfpHeader<OFH> {
-    pub fn new(ofp_header: OFH) -> Self {
-        Self { ofp_header }
-    }
-    pub fn version(&self) -> usize {
-        self.ofp_header.version()
-    }
-    pub fn message(&self) -> u8 {
-        self.ofp_header.message()
-    }
-    pub fn length(&self) -> usize {
-        self.ofp_header.length()
-    }
-    pub fn xid(&self) -> u32 {
-        self.ofp_header.xid()
-    }
-    pub fn header_size(&self) -> usize {
-        self.ofp_header.header_size()
-    }
-    pub fn pkt_size(&self) -> usize {
-        self.ofp_header.pkt_size()
-    }
-    pub fn marshal(&self, bytes: &mut Vec<u8>) {
-        self.ofp_header.marshal(bytes);
-    }
-}

src/openflow/ofp10/ofp_manager.rs

 use super::{
     events::{Action, FeaturesReqEvent, Payload},
-    ofp_header::{OfpHeader, OfpHeader10},
+    ofp_header::OfpHeader,
     HelloEvent, Msg, OfpMsgEvent, OpenflowHeader, PacketOutEvent,
 };
 
@@ -13,8 +13,8 @@ impl Openflow10 {
 }
 
 impl OfpMsgEvent for Openflow10 {
-    fn header_parse(&self, bytes: &Vec<u8>) -> OfpHeader<impl OpenflowHeader> {
-        OfpHeader::new(OfpHeader10::parse(bytes))
+    fn header_parse(&self, bytes: &Vec<u8>) -> OfpHeader {
+        OfpHeader::parse(bytes)
     }
     fn header_size(&self) -> usize {
         8
@@ -41,8 +41,8 @@ impl OfpMsgEvent for Openflow10 {
         1
     }
 
-    fn header(&self, message: u8, length: u16, xid: u32) -> OfpHeader<impl OpenflowHeader> {
-        OfpHeader::new(OfpHeader10::new(message, length as usize, xid as usize))
+    fn header(&self, message: u8, length: u16, xid: u32) -> OfpHeader {
+        OfpHeader::new(message, length as usize, xid as usize)
     }
 
     fn msg_parse(&self, msg: u8) -> Msg {

src/openflow/ofp10/traiter/event_trait.rs

@@ -4,8 +4,6 @@ use crate::openflow::ofp10::{
     Msg,
 };
 
-use super::header_trait::OpenflowHeader;
-
 /**
  * the trait for parse value to bytes.
  * for use with Controller's send_msg.
@@ -21,8 +19,8 @@ pub trait MessageMarshal {
  * for works with controller to create OfpMsgEvent
  */
 pub trait OfpMsgEvent {
-    fn header(&self, message: u8, length: u16, xid: u32) -> OfpHeader<impl OpenflowHeader>;
-    fn header_parse(&self, bytes: &Vec<u8>) -> OfpHeader<impl OpenflowHeader>;
+    fn header(&self, message: u8, length: u16, xid: u32) -> OfpHeader;
+    fn header_parse(&self, bytes: &Vec<u8>) -> OfpHeader;
     fn version(&self) -> usize;
     fn ofp_version() -> usize;
     fn header_size(&self) -> usize;

tests/headers.rs

 #[cfg(test)]
 mod tests {
     use tenjin::{
-        openflow::ofp10::{ControllerFrame10, Msg, OfpMsgEvent},
+        openflow::ofp10::{ControllerFrame10, Msg, OfpMsgEvent, OpenflowHeader},
         Controller,
     };