Merge into master from pull request floodlight#228:

OVSDriver: remove unnecessary fields from the packet-in match (floodlight#228)
rlane · Dec 6, 2014 · 8d5f796 · 8d5f796
2 parents 5d28566 + 8e227a5
commit 8d5f796
Showing 1 changed file with 0 additions and 102 deletions.
diff --git a/modules/OVSDriver/module/src/translate_match.c b/modules/OVSDriver/module/src/translate_match.c
@@ -103,12 +103,6 @@ ind_ovs_key_to_match(const struct ind_ovs_parsed_key *pkey,
     }
     OF_MATCH_MASK_IN_PORT_EXACT_SET(match);
 
-    assert(ATTR_BITMAP_TEST(pkey->populated, OVS_KEY_ATTR_ETHERNET));
-    memcpy(&fields->eth_dst, pkey->ethernet.eth_dst, OF_MAC_ADDR_BYTES);
-    memcpy(&fields->eth_src, pkey->ethernet.eth_src, OF_MAC_ADDR_BYTES);
-    OF_MATCH_MASK_ETH_DST_EXACT_SET(match);
-    OF_MATCH_MASK_ETH_SRC_EXACT_SET(match);
-
     if (ATTR_BITMAP_TEST(pkey->populated, OVS_KEY_ATTR_ETHERTYPE)) {
         fields->eth_type = ntohs(pkey->ethertype);
         if (fields->eth_type <= OF_DL_TYPE_NOT_ETH_TYPE) {
@@ -118,100 +112,4 @@ ind_ovs_key_to_match(const struct ind_ovs_parsed_key *pkey,
         fields->eth_type = OF_DL_TYPE_NOT_ETH_TYPE;
     }
     OF_MATCH_MASK_ETH_TYPE_EXACT_SET(match);
-
-    if (ATTR_BITMAP_TEST(pkey->populated, OVS_KEY_ATTR_VLAN)) {
-        fields->vlan_vid = VLAN_VID(ntohs(pkey->vlan));
-        fields->vlan_pcp = VLAN_PCP(ntohs(pkey->vlan));
-        if (version >= OF_VERSION_1_3) {
-            fields->vlan_vid |= VLAN_CFI_BIT;
-        }
-    } else {
-        if (version == OF_VERSION_1_0) {
-            fields->vlan_vid = -1;
-        } else {
-            fields->vlan_vid = 0;
-        }
-        fields->vlan_pcp = 0;
-    }
-    OF_MATCH_MASK_VLAN_VID_EXACT_SET(match);
-    OF_MATCH_MASK_VLAN_PCP_EXACT_SET(match);
-
-    if (ATTR_BITMAP_TEST(pkey->populated, OVS_KEY_ATTR_IPV4)) {
-        fields->ipv4_src = ntohl(pkey->ipv4.ipv4_src);
-        fields->ipv4_dst = ntohl(pkey->ipv4.ipv4_dst);
-        fields->ip_dscp = pkey->ipv4.ipv4_tos;
-        fields->ip_proto = pkey->ipv4.ipv4_proto;
-        OF_MATCH_MASK_IPV4_SRC_EXACT_SET(match);
-        OF_MATCH_MASK_IPV4_DST_EXACT_SET(match);
-        OF_MATCH_MASK_IP_DSCP_EXACT_SET(match);
-        OF_MATCH_MASK_IP_PROTO_EXACT_SET(match);
-    }
-
-    if (ATTR_BITMAP_TEST(pkey->populated, OVS_KEY_ATTR_IPV6)) {
-        memcpy(&fields->ipv6_src, pkey->ipv6.ipv6_src, OF_IPV6_BYTES);
-        memcpy(&fields->ipv6_dst, pkey->ipv6.ipv6_dst, OF_IPV6_BYTES);
-        fields->ipv6_flabel = ntohl(pkey->ipv6.ipv6_label);
-    }
-
-    if (ATTR_BITMAP_TEST(pkey->populated, OVS_KEY_ATTR_ARP)) {
-        fields->arp_op = ntohs(pkey->arp.arp_op);
-        fields->arp_spa = ntohl(pkey->arp.arp_sip);
-        fields->arp_tpa = ntohl(pkey->arp.arp_tip);
-        memcpy(&fields->arp_sha, pkey->arp.arp_sha, OF_MAC_ADDR_BYTES);
-        memcpy(&fields->arp_tha, pkey->arp.arp_tha, OF_MAC_ADDR_BYTES);
-
-        /* Special case ARP for OF 1.0 */
-        if (version == OF_VERSION_1_0) {
-            fields->ipv4_src = ntohl(pkey->arp.arp_sip);
-            fields->ipv4_dst = ntohl(pkey->arp.arp_tip);
-            fields->ip_proto = ntohs(pkey->arp.arp_op) & 0xFF;
-            OF_MATCH_MASK_IPV4_SRC_EXACT_SET(match);
-            OF_MATCH_MASK_IPV4_DST_EXACT_SET(match);
-            OF_MATCH_MASK_IP_PROTO_EXACT_SET(match);
-        }
-    }
-
-    if (ATTR_BITMAP_TEST(pkey->populated, OVS_KEY_ATTR_TCP)) {
-        fields->tcp_dst = ntohs(pkey->tcp.tcp_dst);
-        fields->tcp_src = ntohs(pkey->tcp.tcp_src);
-        OF_MATCH_MASK_TCP_DST_EXACT_SET(match);
-        OF_MATCH_MASK_TCP_SRC_EXACT_SET(match);
-    }
-
-    if (ATTR_BITMAP_TEST(pkey->populated, OVS_KEY_ATTR_UDP)) {
-        fields->udp_dst = ntohs(pkey->udp.udp_dst);
-        fields->udp_src = ntohs(pkey->udp.udp_src);
-
-        /* Special case UDP for OF 1.0 */
-        if (version == OF_VERSION_1_0) {
-            fields->tcp_dst = ntohs(pkey->udp.udp_dst);
-            fields->tcp_src = ntohs(pkey->udp.udp_src);
-            OF_MATCH_MASK_TCP_DST_EXACT_SET(match);
-            OF_MATCH_MASK_TCP_SRC_EXACT_SET(match);
-        }
-    }
-
-    if (ATTR_BITMAP_TEST(pkey->populated, OVS_KEY_ATTR_ICMP)) {
-        fields->icmpv4_type = pkey->icmp.icmp_type;
-        fields->icmpv4_code = pkey->icmp.icmp_code;
-
-        /* Special case ICMP for OF 1.0 */
-        if (version == OF_VERSION_1_0) {
-            fields->tcp_dst = pkey->icmp.icmp_code;
-            fields->tcp_src = pkey->icmp.icmp_type;
-            OF_MATCH_MASK_TCP_DST_EXACT_SET(match);
-            OF_MATCH_MASK_TCP_SRC_EXACT_SET(match);
-        }
-    }
-
-    if (ATTR_BITMAP_TEST(pkey->populated, OVS_KEY_ATTR_ICMPV6)) {
-        fields->icmpv6_type = pkey->icmpv6.icmpv6_type;
-        fields->icmpv6_code = pkey->icmpv6.icmpv6_code;
-    }
-
-    /*
-     * Not supported by OVS:
-     * sctp_dst, sctp_src, ipv6_nd_target, ipv6_nd_sll, ipv6_nd_tll,
-     * mpls_label, mpls_tc, ip_ecn, in_phy_port, metadata
-    */
 }