projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto: Generalize facet_put__() so that it is more useful.
[openvswitch]
/
lib
/
flow.c
diff --git
a/lib/flow.c
b/lib/flow.c
index e7ed2a97efe1b33e58d72765653289cea61573c6..87ca0f282d437c4c6c61a946eec18007cdb6ebfd 100644
(file)
--- a/
lib/flow.c
+++ b/
lib/flow.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2008, 2009, 2010 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010
, 2011
Nicira Networks.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-22,9
+22,9
@@
#include <string.h>
#include "byte-order.h"
#include "coverage.h"
#include <string.h>
#include "byte-order.h"
#include "coverage.h"
+#include "dpif.h"
#include "dynamic-string.h"
#include "hash.h"
#include "dynamic-string.h"
#include "hash.h"
-#include "ofp-util.h"
#include "ofpbuf.h"
#include "openflow/openflow.h"
#include "openvswitch/datapath-protocol.h"
#include "ofpbuf.h"
#include "openflow/openflow.h"
#include "openvswitch/datapath-protocol.h"
@@
-101,12
+101,12
@@
parse_ethertype(struct ofpbuf *b)
ovs_be16 proto;
proto = *(ovs_be16 *) ofpbuf_pull(b, sizeof proto);
ovs_be16 proto;
proto = *(ovs_be16 *) ofpbuf_pull(b, sizeof proto);
- if (ntohs(proto) >=
ODP_DL_TYPE_ETH2_CUTOFF
) {
+ if (ntohs(proto) >=
ETH_TYPE_MIN
) {
return proto;
}
if (b->size < sizeof *llc) {
return proto;
}
if (b->size < sizeof *llc) {
- return htons(
ODP_DL_TYPE_NOT_ETH_TYP
E);
+ return htons(
FLOW_DL_TYPE_NON
E);
}
llc = b->data;
}
llc = b->data;
@@
-115,7
+115,7
@@
parse_ethertype(struct ofpbuf *b)
|| llc->llc.llc_cntl != LLC_CNTL_SNAP
|| memcmp(llc->snap.snap_org, SNAP_ORG_ETHERNET,
sizeof llc->snap.snap_org)) {
|| llc->llc.llc_cntl != LLC_CNTL_SNAP
|| memcmp(llc->snap.snap_org, SNAP_ORG_ETHERNET,
sizeof llc->snap.snap_org)) {
- return htons(
ODP_DL_TYPE_NOT_ETH_TYP
E);
+ return htons(
FLOW_DL_TYPE_NON
E);
}
ofpbuf_pull(b, sizeof *llc);
}
ofpbuf_pull(b, sizeof *llc);
@@
-235,9
+235,9
@@
flow_extract(struct ofpbuf *packet, ovs_be64 tun_id, uint16_t in_port,
*/
void
flow_extract_stats(const struct flow *flow, struct ofpbuf *packet,
*/
void
flow_extract_stats(const struct flow *flow, struct ofpbuf *packet,
-
struct odp
_flow_stats *stats)
+
struct dpif
_flow_stats *stats)
{
{
- memset(stats,
'\0'
, sizeof(*stats));
+ memset(stats,
0
, sizeof(*stats));
if ((flow->dl_type == htons(ETH_TYPE_IP)) && packet->l4) {
if ((flow->nw_proto == IP_TYPE_TCP) && packet->l7) {
if ((flow->dl_type == htons(ETH_TYPE_IP)) && packet->l4) {
if ((flow->nw_proto == IP_TYPE_TCP) && packet->l7) {
@@
-302,6
+302,7
@@
void
flow_wildcards_init_catchall(struct flow_wildcards *wc)
{
wc->wildcards = FWW_ALL;
flow_wildcards_init_catchall(struct flow_wildcards *wc)
{
wc->wildcards = FWW_ALL;
+ wc->tun_id_mask = htonll(0);
wc->nw_src_mask = htonl(0);
wc->nw_dst_mask = htonl(0);
memset(wc->reg_masks, 0, sizeof wc->reg_masks);
wc->nw_src_mask = htonl(0);
wc->nw_dst_mask = htonl(0);
memset(wc->reg_masks, 0, sizeof wc->reg_masks);
@@
-315,6
+316,7
@@
void
flow_wildcards_init_exact(struct flow_wildcards *wc)
{
wc->wildcards = 0;
flow_wildcards_init_exact(struct flow_wildcards *wc)
{
wc->wildcards = 0;
+ wc->tun_id_mask = htonll(UINT64_MAX);
wc->nw_src_mask = htonl(UINT32_MAX);
wc->nw_dst_mask = htonl(UINT32_MAX);
memset(wc->reg_masks, 0xff, sizeof wc->reg_masks);
wc->nw_src_mask = htonl(UINT32_MAX);
wc->nw_dst_mask = htonl(UINT32_MAX);
memset(wc->reg_masks, 0xff, sizeof wc->reg_masks);
@@
-330,6
+332,7
@@
flow_wildcards_is_exact(const struct flow_wildcards *wc)
int i;
if (wc->wildcards
int i;
if (wc->wildcards
+ || wc->tun_id_mask != htonll(UINT64_MAX)
|| wc->nw_src_mask != htonl(UINT32_MAX)
|| wc->nw_dst_mask != htonl(UINT32_MAX)
|| wc->vlan_tci_mask != htons(UINT16_MAX)) {
|| wc->nw_src_mask != htonl(UINT32_MAX)
|| wc->nw_dst_mask != htonl(UINT32_MAX)
|| wc->vlan_tci_mask != htons(UINT16_MAX)) {
@@
-356,6
+359,7
@@
flow_wildcards_combine(struct flow_wildcards *dst,
int i;
dst->wildcards = src1->wildcards | src2->wildcards;
int i;
dst->wildcards = src1->wildcards | src2->wildcards;
+ dst->tun_id_mask = src1->tun_id_mask & src2->tun_id_mask;
dst->nw_src_mask = src1->nw_src_mask & src2->nw_src_mask;
dst->nw_dst_mask = src1->nw_dst_mask & src2->nw_dst_mask;
for (i = 0; i < FLOW_N_REGS; i++) {
dst->nw_src_mask = src1->nw_src_mask & src2->nw_src_mask;
dst->nw_dst_mask = src1->nw_dst_mask & src2->nw_dst_mask;
for (i = 0; i < FLOW_N_REGS; i++) {
@@
-371,7
+375,7
@@
flow_wildcards_hash(const struct flow_wildcards *wc)
/* If you change struct flow_wildcards and thereby trigger this
* assertion, please check that the new struct flow_wildcards has no holes
* in it before you update the assertion. */
/* If you change struct flow_wildcards and thereby trigger this
* assertion, please check that the new struct flow_wildcards has no holes
* in it before you update the assertion. */
- BUILD_ASSERT_DECL(sizeof *wc ==
16
+ FLOW_N_REGS * 4);
+ BUILD_ASSERT_DECL(sizeof *wc ==
24
+ FLOW_N_REGS * 4);
return hash_bytes(wc, sizeof *wc, 0);
}
return hash_bytes(wc, sizeof *wc, 0);
}
@@
-384,6
+388,7
@@
flow_wildcards_equal(const struct flow_wildcards *a,
int i;
if (a->wildcards != b->wildcards
int i;
if (a->wildcards != b->wildcards
+ || a->tun_id_mask != b->tun_id_mask
|| a->nw_src_mask != b->nw_src_mask
|| a->nw_dst_mask != b->nw_dst_mask
|| a->vlan_tci_mask != b->vlan_tci_mask) {
|| a->nw_src_mask != b->nw_src_mask
|| a->nw_dst_mask != b->nw_dst_mask
|| a->vlan_tci_mask != b->vlan_tci_mask) {
@@
-414,6
+419,7
@@
flow_wildcards_has_extra(const struct flow_wildcards *a,
}
return (a->wildcards & ~b->wildcards
}
return (a->wildcards & ~b->wildcards
+ || (a->tun_id_mask & b->tun_id_mask) != b->tun_id_mask
|| (a->nw_src_mask & b->nw_src_mask) != b->nw_src_mask
|| (a->nw_dst_mask & b->nw_dst_mask) != b->nw_dst_mask
|| (a->vlan_tci_mask & b->vlan_tci_mask) != b->vlan_tci_mask);
|| (a->nw_src_mask & b->nw_src_mask) != b->nw_src_mask
|| (a->nw_dst_mask & b->nw_dst_mask) != b->nw_dst_mask
|| (a->vlan_tci_mask & b->vlan_tci_mask) != b->vlan_tci_mask);