union user_action_cookie;
-#define MAX_MIRRORS 32
-typedef uint32_t mirror_mask_t;
-#define MIRROR_MASK_C(X) UINT32_C(X)
-BUILD_ASSERT_DECL(sizeof(mirror_mask_t) * CHAR_BIT >= MAX_MIRRORS);
-
/* Number of implemented OpenFlow tables. */
enum { N_TABLES = 255 };
enum { TBL_INTERNAL = N_TABLES - 1 }; /* Used for internal hidden rules. */
struct dpif_ipfix *ipfix;
struct hmap bundles; /* Contains "struct ofbundle"s. */
struct mac_learning *ml;
- struct ofmirror *mirrors[MAX_MIRRORS];
- bool has_mirrors;
bool has_bonded_bundles;
+ struct mbridge *mbridge;
/* Facets. */
struct classifier facets; /* Contains 'struct facet's. */
/* Support for debugging async flow mods. */
struct list completions;
- bool has_bundle_action; /* True when the first bundle action appears. */
struct netdev_stats stats; /* To account packets generated and consumed in
* userspace. */
struct hmap_node odp_port_node; /* In dpif_backer's "odp_to_ofport_map". */
struct ofport up;
- uint32_t odp_port;
+ odp_port_t odp_port;
struct ofbundle *bundle; /* Bundle that contains this port, if any. */
struct list bundle_node; /* In struct ofbundle's "ports" list. */
struct cfm *cfm; /* Connectivity Fault Management, if any. */
struct bfd *bfd; /* BFD, if any. */
tag_type tag; /* Tag associated with this port. */
bool may_enable; /* May be enabled in bonds. */
+ bool is_tunnel; /* This port is a tunnel. */
long long int carrier_seq; /* Carrier status changes. */
- struct tnl_port *tnl_port; /* Tunnel handle, or null. */
+ struct ofport_dpif *peer; /* Peer if patch port. */
/* Spanning tree. */
struct stp_port *stp_port; /* Spanning Tree Protocol, if any. */
* drivers in old versions of Linux that do not properly support VLANs when
* VLAN devices are not used. When broken device drivers are no longer in
* widespread use, we will delete these interfaces. */
- uint16_t realdev_ofp_port;
+ ofp_port_t realdev_ofp_port;
int vlandev_vid;
};
/* Status. */
bool floodable; /* True if no port has OFPUTIL_PC_NO_FLOOD set. */
-
- /* Port mirroring info. */
- mirror_mask_t src_mirrors; /* Mirrors triggered when packet received. */
- mirror_mask_t dst_mirrors; /* Mirrors triggered when packet sent. */
- mirror_mask_t mirror_out; /* Mirrors that output to this bundle. */
-};
-
-struct ofmirror {
- struct ofproto_dpif *ofproto; /* Owning ofproto. */
- size_t idx; /* In ofproto's "mirrors" array. */
- void *aux; /* Key supplied by ofproto's client. */
- char *name; /* Identifier for log messages. */
-
- /* Selection criteria. */
- struct hmapx srcs; /* Contains "struct ofbundle *"s. */
- struct hmapx dsts; /* Contains "struct ofbundle *"s. */
- unsigned long *vlans; /* Bitmap of chosen VLANs, NULL selects all. */
-
- /* Output (exactly one of out == NULL and out_vlan == -1 is true). */
- struct ofbundle *out; /* Output port or NULL. */
- int out_vlan; /* Output VLAN or -1. */
- mirror_mask_t dup_mirrors; /* Bitmap of mirrors with the same output. */
-
- /* Counters. */
- int64_t packet_count; /* Number of packets sent. */
- int64_t byte_count; /* Number of bytes sent. */
};
static inline struct rule_dpif *rule_dpif_cast(const struct rule *rule)
bundle_node);
}
-static inline int
-mirror_mask_ffs(mirror_mask_t mask)
-{
- BUILD_ASSERT_DECL(sizeof(unsigned int) >= sizeof(mask));
- return ffs(mask);
-}
-
struct ofport_dpif *get_ofp_port(const struct ofproto_dpif *,
- uint16_t ofp_port);
+ ofp_port_t ofp_port);
struct ofport_dpif *get_odp_port(const struct ofproto_dpif *,
- uint32_t odp_port);
-
-struct ofport_dpif *ofport_get_peer(const struct ofport_dpif *);
+ odp_port_t odp_port);
-uint32_t ofp_port_to_odp_port(const struct ofproto_dpif *, uint16_t ofp_port);
+odp_port_t ofp_port_to_odp_port(const struct ofproto_dpif *,
+ ofp_port_t ofp_port);
struct rule_dpif *rule_dpif_lookup_in_table(struct ofproto_dpif *,
const struct flow *,
const union user_action_cookie *,
const size_t cookie_size);
-enum slow_path_reason process_special(struct ofproto_dpif *,
- const struct flow *,
- const struct ofport_dpif *,
- const struct ofpbuf *packet);
+bool stp_should_process_flow(const struct flow *, struct flow_wildcards *);
+void stp_process_packet(const struct ofport_dpif *,
+ const struct ofpbuf *packet);
-uint16_t vsp_realdev_to_vlandev(const struct ofproto_dpif *,
- uint16_t realdev_ofp_port,
- ovs_be16 vlan_tci);
+ofp_port_t vsp_realdev_to_vlandev(const struct ofproto_dpif *,
+ ofp_port_t realdev_ofp_port,
+ ovs_be16 vlan_tci);
bool ofproto_dpif_dscp_from_priority(const struct ofport_dpif *,
uint32_t priority, uint8_t *dscp);
int ofproto_dpif_queue_to_priority(const struct ofproto_dpif *,
uint32_t queue_id, uint32_t *priority);
-
+tag_type calculate_flow_tag(struct ofproto_dpif *, const struct flow *,
+ uint8_t table_id, struct rule_dpif *);
#endif /* ofproto-dpif.h */
git://git.onelab.eu / sliver-openvswitch.git / blobdiff