diff mbox

[ovs-dev,v4,6/7] userspace: Complete Packet In handling

Message ID AM2PR07MB1042FFF6E45C2760F475C3D88AD80@AM2PR07MB1042.eurprd07.prod.outlook.com
State Accepted
Headers show

Commit Message

Zoltan Balogh June 23, 2017, 4:48 p.m. UTC 
From: Jan Scheurich <jan.scheurich@ericsson.com>

Send packet_in for non-Ethernet packets.
Include packet_type in Packet In for ptap bridges.

Signed-off-by: Jan Scheurich <jan.scheurich@ericsson.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
---
 lib/flow.c                   | 4 ++++
 lib/ofp-print.c              | 7 +++----
 ofproto/ofproto-dpif-xlate.c | 5 -----
 3 files changed, 7 insertions(+), 9 deletions(-)
diff mbox

Patch

diff --git a/lib/flow.c b/lib/flow.c
index 6be645730..dbca4d03d 100644
--- a/lib/flow.c
+++ b/lib/flow.c
@@ -994,6 +994,10 @@  flow_get_metadata(const struct flow *flow, struct match *flow_metadata)
     }
 
     match_set_in_port(flow_metadata, flow->in_port.ofp_port);
+    if (flow->packet_type != htonl(PT_ETH)) {
+        match_set_packet_type(flow_metadata, flow->packet_type);
+    }
+
     if (flow->ct_state != 0) {
         match_set_ct_state(flow_metadata, flow->ct_state);
         if (is_ct_valid(flow, NULL, NULL) && flow->ct_nw_proto != 0) {
diff --git a/lib/ofp-print.c b/lib/ofp-print.c
index b1c412ea4..8a6c54e1d 100644
--- a/lib/ofp-print.c
+++ b/lib/ofp-print.c
@@ -218,10 +218,9 @@  ofp_print_packet_in(struct ds *string, const struct ofp_header *oh,
     }
 
     if (verbosity > 0) {
-        /* Packet In can only carry Ethernet packets. */
-        char *packet = ofp_packet_to_string(public->packet,
-                                            public->packet_len,
-                                            htonl(PT_ETH));
+        char *packet = ofp_packet_to_string(
+            public->packet, public->packet_len,
+            public->flow_metadata.flow.packet_type);
         ds_put_cstr(string, packet);
         free(packet);
     }
diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c
index ce364b361..1f4fe1dd6 100644
--- a/ofproto/ofproto-dpif-xlate.c
+++ b/ofproto/ofproto-dpif-xlate.c
@@ -4259,11 +4259,6 @@  execute_controller_action(struct xlate_ctx *ctx, int len,
         return;
     }
 
-    if (packet->packet_type != htonl(PT_ETH)) {
-        dp_packet_delete(packet);
-        return;
-    }
-
     /* A packet sent by an action in a table-miss rule is considered an
      * explicit table miss.  OpenFlow before 1.3 doesn't have that concept so
      * it will get translated back to OFPR_ACTION for those versions. */