X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fflow.c;h=d6d45277a3c1145877ab09676b3533c1725668d2;hb=851d3105c7a4166d0cd05f3f9198edea2623bcd7;hp=0844b3bca329329e2c1e3130fc985ca4b7ac17e3;hpb=3840c40624f366f560af6165c7e36ec13fc3a51b;p=openvswitch diff --git a/lib/flow.c b/lib/flow.c index 0844b3bc..d6d45277 100644 --- a/lib/flow.c +++ b/lib/flow.c @@ -445,7 +445,7 @@ flow_zero_wildcards(struct flow *flow, const struct flow_wildcards *wildcards) const flow_wildcards_t wc = wildcards->wildcards; int i; - BUILD_ASSERT_DECL(FLOW_WC_SEQ == 15); + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 16); for (i = 0; i < FLOW_N_REGS; i++) { flow->regs[i] &= wildcards->reg_masks[i]; @@ -465,10 +465,8 @@ flow_zero_wildcards(struct flow *flow, const struct flow_wildcards *wildcards) flow->tp_dst &= wildcards->tp_dst_mask; eth_addr_bitand(flow->dl_src, wildcards->dl_src_mask, flow->dl_src); eth_addr_bitand(flow->dl_dst, wildcards->dl_dst_mask, flow->dl_dst); - if (wc & FWW_NW_PROTO) { - flow->nw_proto = 0; - } flow->ipv6_label &= wildcards->ipv6_label_mask; + flow->nw_proto &= wildcards->nw_proto_mask; flow->nw_tos &= wildcards->nw_tos_mask; flow->nw_ttl &= wildcards->nw_ttl_mask; flow->nw_frag &= wildcards->nw_frag_mask; @@ -487,7 +485,7 @@ flow_zero_wildcards(struct flow *flow, const struct flow_wildcards *wildcards) void flow_get_metadata(const struct flow *flow, struct flow_metadata *fmd) { - BUILD_ASSERT_DECL(FLOW_WC_SEQ == 15); + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 16); fmd->tun_id = flow->tun_id; fmd->metadata = flow->metadata; @@ -575,7 +573,7 @@ flow_print(FILE *stream, const struct flow *flow) void flow_wildcards_init_catchall(struct flow_wildcards *wc) { - BUILD_ASSERT_DECL(FLOW_WC_SEQ == 15); + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 16); wc->wildcards = FWW_ALL; wc->tun_id_mask = htonll(0); @@ -595,6 +593,7 @@ flow_wildcards_init_catchall(struct flow_wildcards *wc) memset(wc->dl_dst_mask, 0, ETH_ADDR_LEN); memset(wc->arp_sha_mask, 0, ETH_ADDR_LEN); memset(wc->arp_tha_mask, 0, ETH_ADDR_LEN); + wc->nw_proto_mask = 0; wc->nw_tos_mask = 0; wc->nw_ttl_mask = 0; memset(wc->zeros, 0, sizeof wc->zeros); @@ -605,7 +604,7 @@ flow_wildcards_init_catchall(struct flow_wildcards *wc) void flow_wildcards_init_exact(struct flow_wildcards *wc) { - BUILD_ASSERT_DECL(FLOW_WC_SEQ == 15); + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 16); wc->wildcards = 0; wc->tun_id_mask = htonll(UINT64_MAX); @@ -625,6 +624,7 @@ flow_wildcards_init_exact(struct flow_wildcards *wc) memset(wc->dl_dst_mask, 0xff, ETH_ADDR_LEN); memset(wc->arp_sha_mask, 0xff, ETH_ADDR_LEN); memset(wc->arp_tha_mask, 0xff, ETH_ADDR_LEN); + wc->nw_proto_mask = UINT8_MAX; wc->nw_tos_mask = UINT8_MAX; wc->nw_ttl_mask = UINT8_MAX; memset(wc->zeros, 0, sizeof wc->zeros); @@ -637,7 +637,7 @@ flow_wildcards_is_exact(const struct flow_wildcards *wc) { int i; - BUILD_ASSERT_DECL(FLOW_WC_SEQ == 15); + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 16); if (wc->wildcards || wc->tun_id_mask != htonll(UINT64_MAX) @@ -655,6 +655,7 @@ flow_wildcards_is_exact(const struct flow_wildcards *wc) || !ipv6_mask_is_exact(&wc->ipv6_dst_mask) || wc->ipv6_label_mask != htonl(UINT32_MAX) || !ipv6_mask_is_exact(&wc->nd_target_mask) + || wc->nw_proto_mask != UINT8_MAX || wc->nw_frag_mask != UINT8_MAX || wc->nw_tos_mask != UINT8_MAX || wc->nw_ttl_mask != UINT8_MAX) { @@ -677,7 +678,7 @@ flow_wildcards_is_catchall(const struct flow_wildcards *wc) { int i; - BUILD_ASSERT_DECL(FLOW_WC_SEQ == 15); + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 16); if (wc->wildcards != FWW_ALL || wc->tun_id_mask != htonll(0) @@ -695,6 +696,7 @@ flow_wildcards_is_catchall(const struct flow_wildcards *wc) || !ipv6_mask_is_any(&wc->ipv6_dst_mask) || wc->ipv6_label_mask != htonl(0) || !ipv6_mask_is_any(&wc->nd_target_mask) + || wc->nw_proto_mask != 0 || wc->nw_frag_mask != 0 || wc->nw_tos_mask != 0 || wc->nw_ttl_mask != 0) { @@ -720,7 +722,7 @@ flow_wildcards_combine(struct flow_wildcards *dst, { int i; - BUILD_ASSERT_DECL(FLOW_WC_SEQ == 15); + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 16); dst->wildcards = src1->wildcards | src2->wildcards; dst->tun_id_mask = src1->tun_id_mask & src2->tun_id_mask; @@ -745,6 +747,7 @@ flow_wildcards_combine(struct flow_wildcards *dst, eth_addr_bitand(src1->dl_dst_mask, src2->dl_dst_mask, dst->dl_dst_mask); eth_addr_bitand(src1->arp_sha_mask, src2->arp_sha_mask, dst->arp_sha_mask); eth_addr_bitand(src1->arp_tha_mask, src2->arp_tha_mask, dst->arp_tha_mask); + dst->nw_proto_mask = src1->nw_proto_mask & src2->nw_proto_mask; dst->nw_tos_mask = src1->nw_tos_mask & src2->nw_tos_mask; dst->nw_ttl_mask = src1->nw_ttl_mask & src2->nw_ttl_mask; } @@ -768,7 +771,7 @@ flow_wildcards_equal(const struct flow_wildcards *a, { int i; - BUILD_ASSERT_DECL(FLOW_WC_SEQ == 15); + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 16); if (a->wildcards != b->wildcards || a->tun_id_mask != b->tun_id_mask @@ -787,6 +790,7 @@ flow_wildcards_equal(const struct flow_wildcards *a, || !eth_addr_equals(a->dl_dst_mask, b->dl_dst_mask) || !eth_addr_equals(a->arp_sha_mask, b->arp_sha_mask) || !eth_addr_equals(a->arp_tha_mask, b->arp_tha_mask) + || a->nw_proto_mask != b->nw_proto_mask || a->nw_tos_mask != b->nw_tos_mask || a->nw_ttl_mask != b->nw_ttl_mask) { return false; @@ -811,7 +815,7 @@ flow_wildcards_has_extra(const struct flow_wildcards *a, uint8_t eth_masked[ETH_ADDR_LEN]; struct in6_addr ipv6_masked; - BUILD_ASSERT_DECL(FLOW_WC_SEQ == 15); + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 16); for (i = 0; i < FLOW_N_REGS; i++) { if ((a->reg_masks[i] & b->reg_masks[i]) != b->reg_masks[i]) { @@ -863,6 +867,7 @@ flow_wildcards_has_extra(const struct flow_wildcards *a, || (a->metadata_mask & b->metadata_mask) != b->metadata_mask || (a->tp_src_mask & b->tp_src_mask) != b->tp_src_mask || (a->tp_dst_mask & b->tp_dst_mask) != b->tp_dst_mask + || (a->nw_proto_mask & b->nw_proto_mask) != b->nw_proto_mask || (a->nw_frag_mask & b->nw_frag_mask) != b->nw_frag_mask || (a->nw_tos_mask & b->nw_tos_mask) != b->nw_tos_mask || (a->nw_ttl_mask & b->nw_ttl_mask) != b->nw_ttl_mask);