datapath: Do not send notification if ovs_vport_set_options() failed

[sliver-openvswitch.git] / lib / flow.c

diff --git a/lib/flow.c b/lib/flow.c
index 922412f..29714b1 100644 (file)
--- a/lib/flow.c
+++ b/lib/flow.c
@@ -312,7 +312,9 @@ invalid:
 
 }
 
-/* Initializes 'flow' members from 'packet', 'tun_id', and 'ofp_in_port'.
+/* Initializes 'flow' members from 'packet', 'skb_priority', 'tun_id', and
+ * 'ofp_in_port'.
+ *
  * Initializes 'packet' header pointers as follows:
  *
  *    - packet->l2 to the start of the Ethernet header.
@@ -328,7 +330,7 @@ invalid:
  *      present and has a correct length, and otherwise NULL.
  */
 void
-flow_extract(struct ofpbuf *packet, uint32_t priority, ovs_be64 tun_id,
+flow_extract(struct ofpbuf *packet, uint32_t skb_priority, ovs_be64 tun_id,
              uint16_t ofp_in_port, struct flow *flow)
 {
     struct ofpbuf b = *packet;
@@ -339,7 +341,7 @@ flow_extract(struct ofpbuf *packet, uint32_t priority, ovs_be64 tun_id,
     memset(flow, 0, sizeof *flow);
     flow->tun_id = tun_id;
     flow->in_port = ofp_in_port;
-    flow->priority = priority;
+    flow->skb_priority = skb_priority;
 
     packet->l2 = b.data;
     packet->l3 = NULL;
@@ -502,7 +504,20 @@ flow_zero_wildcards(struct flow *flow, const struct flow_wildcards *wildcards)
     if (wc & FWW_ND_TARGET) {
         memset(&flow->nd_target, 0, sizeof flow->nd_target);
     }
-    flow->priority = 0;
+    flow->skb_priority = 0;
+}
+
+/* Initializes 'fmd' with the metadata found in 'flow'. */
+void
+flow_get_metadata(const struct flow *flow, struct flow_metadata *fmd)
+{
+    fmd->tun_id = flow->tun_id;
+    fmd->tun_id_mask = htonll(UINT64_MAX);
+
+    memcpy(fmd->regs, flow->regs, sizeof fmd->regs);
+    memset(fmd->reg_masks, 0xff, sizeof fmd->reg_masks);
+
+    fmd->in_port = flow->in_port;
 }
 
 char *
@@ -516,41 +531,41 @@ flow_to_string(const struct flow *flow)
 void
 flow_format(struct ds *ds, const struct flow *flow)
 {
-    ds_put_format(ds, "priority%"PRIu32
-                      ":tunnel%#"PRIx64
-                      ":in_port%04"PRIx16,
-                      flow->priority,
+    ds_put_format(ds, "priority:%"PRIu32
+                      ",tunnel:%#"PRIx64
+                      ",in_port:%04"PRIx16,
+                      flow->skb_priority,
                       ntohll(flow->tun_id),
                       flow->in_port);
 
-    ds_put_format(ds, ":tci(");
+    ds_put_format(ds, ",tci(");
     if (flow->vlan_tci) {
-        ds_put_format(ds, "vlan%"PRIu16",pcp%d",
+        ds_put_format(ds, "vlan:%"PRIu16",pcp:%d",
                       vlan_tci_to_vid(flow->vlan_tci),
                       vlan_tci_to_pcp(flow->vlan_tci));
     } else {
         ds_put_char(ds, '0');
     }
-    ds_put_format(ds, ") mac"ETH_ADDR_FMT"->"ETH_ADDR_FMT
-                      " type%04"PRIx16,
+    ds_put_format(ds, ") mac("ETH_ADDR_FMT"->"ETH_ADDR_FMT
+                      ") type:%04"PRIx16,
                   ETH_ADDR_ARGS(flow->dl_src),
                   ETH_ADDR_ARGS(flow->dl_dst),
                   ntohs(flow->dl_type));
 
     if (flow->dl_type == htons(ETH_TYPE_IPV6)) {
-        ds_put_format(ds, " label%#"PRIx32" proto%"PRIu8" tos%#"PRIx8
-                          " ttl%"PRIu8" ipv6",
+        ds_put_format(ds, " label:%#"PRIx32" proto:%"PRIu8" tos:%#"PRIx8
+                          " ttl:%"PRIu8" ipv6(",
                       ntohl(flow->ipv6_label), flow->nw_proto,
                       flow->nw_tos, flow->nw_ttl);
         print_ipv6_addr(ds, &flow->ipv6_src);
         ds_put_cstr(ds, "->");
         print_ipv6_addr(ds, &flow->ipv6_dst);
-
+        ds_put_char(ds, ')');
     } else {
-        ds_put_format(ds, " proto%"PRIu8" tos%#"PRIx8" ttl%"PRIu8
-                          " ip"IP_FMT"->"IP_FMT,
-                      flow->nw_proto, flow->nw_tos, flow->nw_ttl,
-                      IP_ARGS(&flow->nw_src), IP_ARGS(&flow->nw_dst));
+        ds_put_format(ds, " proto:%"PRIu8" tos:%#"PRIx8" ttl:%"PRIu8
+                          " ip("IP_FMT"->"IP_FMT")",
+                          flow->nw_proto, flow->nw_tos, flow->nw_ttl,
+                          IP_ARGS(&flow->nw_src), IP_ARGS(&flow->nw_dst));
     }
     if (flow->nw_frag) {
         ds_put_format(ds, " frag(%s)",
@@ -559,11 +574,11 @@ flow_format(struct ds *ds, const struct flow *flow)
                       ? "later" : "<error>");
     }
     if (flow->tp_src || flow->tp_dst) {
-        ds_put_format(ds, " port%"PRIu16"->%"PRIu16,
+        ds_put_format(ds, " port(%"PRIu16"->%"PRIu16")",
                 ntohs(flow->tp_src), ntohs(flow->tp_dst));
     }
     if (!eth_addr_is_zero(flow->arp_sha) || !eth_addr_is_zero(flow->arp_tha)) {
-        ds_put_format(ds, " arp_ha"ETH_ADDR_FMT"->"ETH_ADDR_FMT,
+        ds_put_format(ds, " arp_ha("ETH_ADDR_FMT"->"ETH_ADDR_FMT")",
                 ETH_ADDR_ARGS(flow->arp_sha),
                 ETH_ADDR_ARGS(flow->arp_tha));
     }
@@ -993,7 +1008,7 @@ flow_compose(struct ofpbuf *b, const struct flow *flow)
     }
 
     if (flow->vlan_tci & htons(VLAN_CFI)) {
-        eth_push_vlan(b, flow->vlan_tci & ~htons(VLAN_CFI));
+        eth_push_vlan(b, flow->vlan_tci);
     }
 
     if (flow->dl_type == htons(ETH_TYPE_IP)) {