ofproto-dpif-rid: Fix names of recirc_metadata_{hash,equal}().

[cascardo/ovs.git] / ofproto / ofproto-dpif-sflow.c

diff --git a/ofproto/ofproto-dpif-sflow.c b/ofproto/ofproto-dpif-sflow.c
index e54d3fb..f11699c 100644 (file)
--- a/ofproto/ofproto-dpif-sflow.c
+++ b/ofproto/ofproto-dpif-sflow.c
@@ -60,10 +60,8 @@ enum dpif_sflow_tunnel_type {
     DPIF_SFLOW_TUNNEL_UNKNOWN = 0,
     DPIF_SFLOW_TUNNEL_VXLAN,
     DPIF_SFLOW_TUNNEL_GRE,
-    DPIF_SFLOW_TUNNEL_GRE64,
     DPIF_SFLOW_TUNNEL_LISP,
     DPIF_SFLOW_TUNNEL_IPSEC_GRE,
-    DPIF_SFLOW_TUNNEL_IPSEC_GRE64,
     DPIF_SFLOW_TUNNEL_GENEVE
 };
 
@@ -138,7 +136,7 @@ static void *
 sflow_agent_alloc_cb(void *magic OVS_UNUSED, SFLAgent *agent OVS_UNUSED,
                      size_t bytes)
 {
-    return calloc(1, bytes);
+    return xzalloc(bytes);
 }
 
 /* sFlow library callback to free memory. */
@@ -370,12 +368,10 @@ sflow_agent_get_counters(void *ds_, SFLPoller *poller,
     if (ofproto_port_get_lacp_stats(dsp->ofport, &lacp_stats) == 0) {
        memset(&lacp_elem, 0, sizeof lacp_elem);
        lacp_elem.tag = SFLCOUNTERS_LACP;
-       memcpy(&lacp_elem.counterBlock.lacp.actorSystemID,
-              lacp_stats.dot3adAggPortActorSystemID,
-              ETH_ADDR_LEN);
-       memcpy(&lacp_elem.counterBlock.lacp.partnerSystemID,
-              lacp_stats.dot3adAggPortPartnerOperSystemID,
-              ETH_ADDR_LEN);
+       lacp_elem.counterBlock.lacp.actorSystemID =
+        lacp_stats.dot3adAggPortActorSystemID;
+       lacp_elem.counterBlock.lacp.partnerSystemID =
+        lacp_stats.dot3adAggPortPartnerOperSystemID;
        lacp_elem.counterBlock.lacp.attachedAggID =
            lacp_stats.dot3adAggPortAttachedAggID;
        lacp_elem.counterBlock.lacp.portState.v.actorAdmin =
@@ -459,7 +455,7 @@ sflow_choose_agent_address(const char *agent_device,
             && sa.ss.ss_family == AF_INET) {
             ovs_be32 gw;
 
-            if (ovs_router_lookup(sa.sin.sin_addr.s_addr, name, &gw)
+            if (ovs_router_lookup4(sa.sin.sin_addr.s_addr, name, &gw)
                 && !netdev_get_in4_by_name(name, &in4)) {
                 goto success;
             }
@@ -590,12 +586,8 @@ dpif_sflow_tunnel_type(struct ofport *ofport) {
     if (type) {
        if (strcmp(type, "gre") == 0) {
            return DPIF_SFLOW_TUNNEL_GRE;
-       } else if (strcmp(type, "gre64") == 0) {
-           return DPIF_SFLOW_TUNNEL_GRE64;
        } else if (strcmp(type, "ipsec_gre") == 0) {
            return DPIF_SFLOW_TUNNEL_IPSEC_GRE;
-       } else if (strcmp(type, "ipsec_gre64") == 0) {
-           return DPIF_SFLOW_TUNNEL_IPSEC_GRE64;
        } else if (strcmp(type, "vxlan") == 0) {
            return DPIF_SFLOW_TUNNEL_VXLAN;
        } else if (strcmp(type, "lisp") == 0) {
@@ -615,12 +607,10 @@ dpif_sflow_tunnel_proto(enum dpif_sflow_tunnel_type tunnel_type)
     switch(tunnel_type) {
 
     case DPIF_SFLOW_TUNNEL_GRE:
-    case DPIF_SFLOW_TUNNEL_GRE64:
         ipproto = IPPROTO_GRE;
         break;
 
     case DPIF_SFLOW_TUNNEL_IPSEC_GRE:
-    case DPIF_SFLOW_TUNNEL_IPSEC_GRE64:
         ipproto = IPPROTO_ESP;
         break;
 
@@ -972,7 +962,7 @@ sflow_read_set_action(const struct nlattr *attr,
             /* Do not handle multi-encap for now. */
             sflow_actions->tunnel_err = true;
         } else {
-            if (odp_tun_key_from_attr(attr, &sflow_actions->tunnel)
+            if (odp_tun_key_from_attr(attr, false, &sflow_actions->tunnel)
                 == ODP_FIT_ERROR) {
                 /* Tunnel parsing error. */
                 sflow_actions->tunnel_err = true;
@@ -1039,6 +1029,10 @@ sflow_read_set_action(const struct nlattr *attr,
     case OVS_KEY_ATTR_ICMPV6:
     case OVS_KEY_ATTR_ARP:
     case OVS_KEY_ATTR_ND:
+    case OVS_KEY_ATTR_CT_STATE:
+    case OVS_KEY_ATTR_CT_ZONE:
+    case OVS_KEY_ATTR_CT_MARK:
+    case OVS_KEY_ATTR_CT_LABELS:
     case OVS_KEY_ATTR_UNSPEC:
     case __OVS_KEY_ATTR_MAX:
     default:
@@ -1147,6 +1141,7 @@ dpif_sflow_read_actions(const struct flow *flow,
        case OVS_ACTION_ATTR_USERSPACE:
        case OVS_ACTION_ATTR_RECIRC:
        case OVS_ACTION_ATTR_HASH:
+        case OVS_ACTION_ATTR_CT:
            break;
 
        case OVS_ACTION_ATTR_SET_MASKED: