rename pcket_in: port -> in_port

Arikato111 · May 19, 2024 · 289482a · 289482a
1 parent 19be69b
commit 289482a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/controller.rs b/src/controller.rs
@@ -31,7 +31,7 @@ impl<OME: OfpMsgEvent> ControllerFrame<OME> for Controller<OME> {
      */
     fn packet_in_handler(&mut self, xid: u32, packetin: PacketInEvent, stream: &mut TcpStream) {
         let pkt = packetin.ether_parse();
-        self.mac_to_port.insert(pkt.mac_src, packetin.port);
+        self.mac_to_port.insert(pkt.mac_src, packetin.in_port);
 
         let mac_dst = pkt.mac_des;
         let mac_src = pkt.mac_src;
@@ -49,7 +49,7 @@ impl<OME: OfpMsgEvent> ControllerFrame<OME> for Controller<OME> {
 
         if let PseudoPort::PhysicalPort(_) = out_port {
             let mut match_fields = MatchFields::match_all();
-            match_fields.in_port = Some(packetin.port);
+            match_fields.in_port = Some(packetin.in_port);
             match_fields.mac_dest = Some(mac_dst);
             match_fields.mac_src = Some(mac_src);
             if let Some(buf_id) = packetin.buf_id {
@@ -61,7 +61,7 @@ impl<OME: OfpMsgEvent> ControllerFrame<OME> for Controller<OME> {
         }
         let packet_out = self
             .ofp
-            .packet_out(Some(packetin.port), packetin.payload, actions);
+            .packet_out(Some(packetin.in_port), packetin.payload, actions);
         self.send_msg(packet_out, xid, stream);
     }
 }

diff --git a/src/openflow/events/packet_in.rs b/src/openflow/events/packet_in.rs
@@ -13,7 +13,7 @@ pub enum PacketInReason {
 pub struct PacketInEvent {
     pub buf_id: Option<u32>,
     pub total_len: u16,
-    pub port: u16,
+    pub in_port: u16,
     pub reason: PacketInReason,
     pub table_id: u8,
     pub payload: Payload,
@@ -32,7 +32,7 @@ impl PacketInEvent {
             n => Some(n as u32),
         };
         let total_len = bytes.read_u16::<BigEndian>().unwrap();
-        let port = bytes.read_u16::<BigEndian>().unwrap();
+        let in_port = bytes.read_u16::<BigEndian>().unwrap();
         let reason = match bytes.read_u8().unwrap() {
             1 => PacketInReason::NoMatch,
             2 => PacketInReason::Action,
@@ -47,7 +47,7 @@ impl PacketInEvent {
         PacketInEvent {
             buf_id,
             total_len,
-            port,
+            in_port,
             reason,
             table_id,
             payload,