X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fodp-execute.c;h=d505c6034925cf2b0a6d6e7adaddc09591d60ee0;hb=591cb419cf3694e0ae66a95973e73c61bad9e03d;hp=b4a99a608cfbbc2efb1622da1d28e5bb82576641;hpb=f094af7b17631ce688595d7cf70235a3eed9798c;p=sliver-openvswitch.git

diff --git a/lib/odp-execute.c b/lib/odp-execute.c
index b4a99a608..d505c6034 100644
--- a/lib/odp-execute.c
+++ b/lib/odp-execute.c
@@ -23,6 +23,7 @@
 
 #include "netlink.h"
 #include "ofpbuf.h"
+#include "odp-util.h"
 #include "packets.h"
 #include "util.h"
 
@@ -36,7 +37,17 @@ odp_eth_set_addrs(struct ofpbuf *packet, const struct ovs_key_ethernet *eth_key)
 }
 
 static void
-odp_execute_set_action(struct ofpbuf *packet, const struct nlattr *a)
+odp_set_tunnel_action(const struct nlattr *a, struct flow_tnl *tun_key)
+{
+    enum odp_key_fitness fitness;
+
+    fitness = odp_tun_key_from_attr(a, tun_key);
+    ovs_assert(fitness != ODP_FIT_ERROR);
+}
+
+static void
+odp_execute_set_action(struct ofpbuf *packet, const struct nlattr *a,
+                       struct flow *flow)
 {
     enum ovs_key_attr type = nl_attr_type(a);
     const struct ovs_key_ipv4 *ipv4_key;
@@ -46,9 +57,15 @@ odp_execute_set_action(struct ofpbuf *packet, const struct nlattr *a)
 
     switch (type) {
     case OVS_KEY_ATTR_PRIORITY:
+        flow->skb_priority = nl_attr_get_u32(a);
+        break;
+
     case OVS_KEY_ATTR_TUNNEL:
+        odp_set_tunnel_action(a, &flow->tunnel);
+        break;
+
     case OVS_KEY_ATTR_SKB_MARK:
-        /* not implemented */
+        flow->pkt_mark = nl_attr_get_u32(a);
         break;
 
     case OVS_KEY_ATTR_ETHERNET:
@@ -74,26 +91,26 @@ odp_execute_set_action(struct ofpbuf *packet, const struct nlattr *a)
         packet_set_tcp_port(packet, tcp_key->tcp_src, tcp_key->tcp_dst);
         break;
 
-     case OVS_KEY_ATTR_UDP:
+    case OVS_KEY_ATTR_UDP:
         udp_key = nl_attr_get_unspec(a, sizeof(struct ovs_key_udp));
         packet_set_udp_port(packet, udp_key->udp_src, udp_key->udp_dst);
         break;
 
-     case OVS_KEY_ATTR_MPLS:
+    case OVS_KEY_ATTR_MPLS:
          set_mpls_lse(packet, nl_attr_get_be32(a));
          break;
 
-     case OVS_KEY_ATTR_UNSPEC:
-     case OVS_KEY_ATTR_ENCAP:
-     case OVS_KEY_ATTR_ETHERTYPE:
-     case OVS_KEY_ATTR_IN_PORT:
-     case OVS_KEY_ATTR_VLAN:
-     case OVS_KEY_ATTR_ICMP:
-     case OVS_KEY_ATTR_ICMPV6:
-     case OVS_KEY_ATTR_ARP:
-     case OVS_KEY_ATTR_ND:
-     case __OVS_KEY_ATTR_MAX:
-     default:
+    case OVS_KEY_ATTR_UNSPEC:
+    case OVS_KEY_ATTR_ENCAP:
+    case OVS_KEY_ATTR_ETHERTYPE:
+    case OVS_KEY_ATTR_IN_PORT:
+    case OVS_KEY_ATTR_VLAN:
+    case OVS_KEY_ATTR_ICMP:
+    case OVS_KEY_ATTR_ICMPV6:
+    case OVS_KEY_ATTR_ARP:
+    case OVS_KEY_ATTR_ND:
+    case __OVS_KEY_ATTR_MAX:
+    default:
         NOT_REACHED();
     }
 }
@@ -153,7 +170,9 @@ odp_execute_actions(void *dp, struct ofpbuf *packet, struct flow *key,
 
         switch ((enum ovs_action_attr) type) {
         case OVS_ACTION_ATTR_OUTPUT:
-            output(dp, packet, nl_attr_get_u32(a));
+            if (output) {
+                output(dp, packet, nl_attr_get_u32(a));
+            }
             break;
 
         case OVS_ACTION_ATTR_USERSPACE: {
@@ -185,7 +204,7 @@ odp_execute_actions(void *dp, struct ofpbuf *packet, struct flow *key,
             break;
 
         case OVS_ACTION_ATTR_SET:
-            odp_execute_set_action(packet, nl_attr_get(a));
+            odp_execute_set_action(packet, nl_attr_get(a), key);
             break;
 
         case OVS_ACTION_ATTR_SAMPLE: