Merge branch 'develop' into feature/packet_in_dpid_setter

trema · Jul 1, 2015 · 7fd97cc · 7fd97cc
2 parents 302f65b + 519c1f6
commit 7fd97cc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## develop (unreleased)
 ### Bugs fixed
+* [#188](https://github.com/trema/pio/pull/188): Add PacketIn#in_port (OpenFlow1.3).
 * [#189](https://github.com/trema/pio/pull/189): Add PacketIn#datapath_id= (OpenFlow1.3).
 
 

diff --git a/features/open_flow13/packet_in.feature b/features/open_flow13/packet_in.feature
@@ -70,6 +70,7 @@ Feature: Pio::PacketIn
       | xid                           |               123 |
       | buffer_id.to_hex              |        0xcafebabe |
       | total_len                     |                60 |
+      | in_port                       |                 1 |
       | reason                        |         :no_match |
       | table_id                      |                 0 |
       | cookie                        |                 0 |

diff --git a/lib/pio/open_flow13/packet_in.rb b/lib/pio/open_flow13/packet_in.rb
@@ -49,6 +49,10 @@ def data
           @data ||= Pio::Parser.read(raw_data)
         end
 
+        def in_port
+          match.in_port
+        end
+
         def method_missing(method, *args)
           data.__send__(method, *args).snapshot
         end