Commit f7f8a371 authored by Nawasan Wisitsingkhon's avatar Nawasan Wisitsingkhon

refactor and clear unused

parent 8bd9e85a
...@@ -7,7 +7,6 @@ use crate::{ ...@@ -7,7 +7,6 @@ use crate::{
openflow::ofp10::{ openflow::ofp10::{
self, self,
events::{flow_mod::MatchFields, Action}, events::{flow_mod::MatchFields, Action},
ofp_manager::Openflow10,
ControllerFrame10, FlowModEvent, OfpMsgEvent, PacketInEvent, ControllerFrame10, FlowModEvent, OfpMsgEvent, PacketInEvent,
}, },
}; };
...@@ -60,7 +59,7 @@ impl ControllerFrame10 for Controller10 { ...@@ -60,7 +59,7 @@ impl ControllerFrame10 for Controller10 {
let actions = vec![Action::Oputput(out_port.clone())]; let actions = vec![Action::Oputput(out_port.clone())];
if let ofp10::PseudoPort::PhysicalPort(_) = out_port { if let ofp10::PseudoPort::PhysicalPort(_) = out_port {
let mut match_fields = MatchFields::match_all(); let mut match_fields = ofp10::MatchFields::match_all();
match_fields.in_port = Some(packetin.in_port); match_fields.in_port = Some(packetin.in_port);
match_fields.mac_dest = Some(mac_dst); match_fields.mac_dest = Some(mac_dst);
match_fields.mac_src = Some(mac_src); match_fields.mac_src = Some(mac_src);
......
...@@ -7,7 +7,6 @@ use crate::{ ...@@ -7,7 +7,6 @@ use crate::{
openflow::ofp13::{ openflow::ofp13::{
self, self,
events::{flow_mod::MatchFields, Action}, events::{flow_mod::MatchFields, Action},
ofp_manager::Openflow13,
ControllerFrame13, FlowModEvent, OfpMsgEvent, PacketInEvent, ControllerFrame13, FlowModEvent, OfpMsgEvent, PacketInEvent,
}, },
}; };
......
...@@ -8,7 +8,7 @@ pub mod packet_out; ...@@ -8,7 +8,7 @@ pub mod packet_out;
pub use packet_out::PacketOutEvent; pub use packet_out::PacketOutEvent;
pub mod flow_mod; pub mod flow_mod;
pub use flow_mod::FlowModEvent; pub use flow_mod::{FlowModEvent, MatchFields};
pub mod actions; pub mod actions;
pub use actions::Action; pub use actions::Action;
......
...@@ -6,8 +6,8 @@ pub use ofp_port::PseudoPort; ...@@ -6,8 +6,8 @@ pub use ofp_port::PseudoPort;
pub mod events; pub mod events;
pub use events::{ pub use events::{
Action, EchoReplyEvent, EchoRequestEvent, ErrorEvent, FlowModEvent, HelloEvent, PacketInEvent, Action, EchoReplyEvent, EchoRequestEvent, ErrorEvent, FlowModEvent, HelloEvent, MatchFields,
PacketOutEvent, PacketInEvent, PacketOutEvent,
}; };
pub mod ofp_header; pub mod ofp_header;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment