X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ofproto%2Fofproto.h;h=1f39a254692d540ea9d24633c5259e960e28a211;hb=4a86aece2c907dcc7f0777899d16ef0e71ee08c6;hp=4860ba36441f006857aa97fc8921bc942bea83ab;hpb=b5827b24c7c136b088e719bfe2020de31032ae37;p=sliver-openvswitch.git diff --git a/ofproto/ofproto.h b/ofproto/ofproto.h index 4860ba364..1f39a2546 100644 --- a/ofproto/ofproto.h +++ b/ofproto/ofproto.h @@ -22,6 +22,7 @@ #include #include #include +#include "cfm.h" #include "flow.h" #include "netflow.h" #include "sset.h" @@ -31,12 +32,9 @@ extern "C" { #endif -struct cfm; +struct cfm_settings; struct cls_rule; -struct dpif_port; struct netdev; -struct nlattr; -struct ofhooks; struct ofproto; struct shash; @@ -95,14 +93,18 @@ struct ofproto_controller { #define DEFAULT_SERIAL_DESC "None" #define DEFAULT_DP_DESC "None" +void ofproto_enumerate_types(struct sset *types); +const char *ofproto_normalize_type(const char *); + +int ofproto_enumerate_names(const char *type, struct sset *names); +void ofproto_parse_name(const char *name, char **dp_name, char **dp_type); + int ofproto_create(const char *datapath, const char *datapath_type, - const struct ofhooks *, void *aux, struct ofproto **ofprotop); void ofproto_destroy(struct ofproto *); -void ofproto_destroy_and_delete(struct ofproto *); +int ofproto_delete(const char *name, const char *type); + int ofproto_run(struct ofproto *); -int ofproto_run1(struct ofproto *); -int ofproto_run2(struct ofproto *, bool revalidate_all); void ofproto_wait(struct ofproto *); bool ofproto_is_alive(const struct ofproto *); @@ -127,7 +129,7 @@ void ofproto_port_dump_start(struct ofproto_port_dump *, bool ofproto_port_dump_next(struct ofproto_port_dump *, struct ofproto_port *); int ofproto_port_dump_done(struct ofproto_port_dump *); -/* Iterates through each DPIF_PORT in OFPROTO, using DUMP as state. +/* Iterates through each OFPROTO_PORT in OFPROTO, using DUMP as state. * * Arguments all have pointer type. * @@ -140,9 +142,11 @@ int ofproto_port_dump_done(struct ofproto_port_dump *); : (ofproto_port_dump_done(DUMP), false)); \ ) +#define OFPROTO_FLOW_EVICTON_THRESHOLD_DEFAULT 1000 +#define OFPROTO_FLOW_EVICTION_THRESHOLD_MIN 100 + int ofproto_port_add(struct ofproto *, struct netdev *, uint16_t *ofp_portp); int ofproto_port_del(struct ofproto *, uint16_t ofp_port); -bool ofproto_port_is_floodable(struct ofproto *, uint16_t odp_port); int ofproto_port_query_by_name(const struct ofproto *, const char *devname, struct ofproto_port *); @@ -156,6 +160,8 @@ void ofproto_reconnect_controllers(struct ofproto *); void ofproto_set_extra_in_band_remotes(struct ofproto *, const struct sockaddr_in *, size_t n); void ofproto_set_in_band_queue(struct ofproto *, int queue_id); +void ofproto_set_flow_eviction_threshold(struct ofproto *, unsigned threshold); +void ofproto_set_forward_bpdu(struct ofproto *, bool forward_bpdu); void ofproto_set_desc(struct ofproto *, const char *mfr_desc, const char *hw_desc, const char *sw_desc, const char *serial_desc, @@ -163,49 +169,98 @@ void ofproto_set_desc(struct ofproto *, int ofproto_set_snoops(struct ofproto *, const struct sset *snoops); int ofproto_set_netflow(struct ofproto *, const struct netflow_options *nf_options); -void ofproto_set_sflow(struct ofproto *, const struct ofproto_sflow_options *); +int ofproto_set_sflow(struct ofproto *, const struct ofproto_sflow_options *); + +/* Configuration of ports. */ + +void ofproto_port_unregister(struct ofproto *, uint16_t ofp_port); + +void ofproto_port_clear_cfm(struct ofproto *, uint16_t ofp_port); +void ofproto_port_set_cfm(struct ofproto *, uint16_t ofp_port, + const struct cfm_settings *); +int ofproto_port_is_lacp_current(struct ofproto *, uint16_t ofp_port); + +/* The behaviour of the port regarding VLAN handling */ +enum port_vlan_mode { + /* This port is an access port. 'vlan' is the VLAN ID. 'trunks' is + * ignored. */ + PORT_VLAN_ACCESS, + + /* This port is a trunk. 'trunks' is the set of trunks. 'vlan' is + * ignored. */ + PORT_VLAN_TRUNK, + + /* Untagged incoming packets are part of 'vlan', as are incoming packets + * tagged with 'vlan'. Outgoing packets tagged with 'vlan' stay tagged. + * Other VLANs in 'trunks' are trunked. */ + PORT_VLAN_NATIVE_TAGGED, + + /* Untagged incoming packets are part of 'vlan', as are incoming packets + * tagged with 'vlan'. Outgoing packets tagged with 'vlan' are untagged. + * Other VLANs in 'trunks' are trunked. */ + PORT_VLAN_NATIVE_UNTAGGED +}; + +/* Configuration of bundles. */ +struct ofproto_bundle_settings { + char *name; /* For use in log messages. */ + + uint16_t *slaves; /* OpenFlow port numbers for slaves. */ + size_t n_slaves; -/* Configuration of individual interfaces. */ -void ofproto_iface_clear_cfm(struct ofproto *, uint32_t port_no); -void ofproto_iface_set_cfm(struct ofproto *, uint32_t port_no, - const struct cfm *, - const uint16_t *remote_mps, size_t n_remote_mps); -const struct cfm *ofproto_iface_get_cfm(struct ofproto *, uint32_t port_no); + enum port_vlan_mode vlan_mode; /* Selects mode for vlan and trunks */ + int vlan; /* VLAN VID, except for PORT_VLAN_TRUNK. */ + unsigned long *trunks; /* vlan_bitmap, except for PORT_VLAN_ACCESS. */ + + struct bond_settings *bond; /* Must be nonnull iff if n_slaves > 1. */ + uint32_t *bond_stable_ids; /* Array of n_slaves elements. */ + + struct lacp_settings *lacp; /* Nonnull to enable LACP. */ + struct lacp_slave_settings *lacp_slaves; /* Array of n_slaves elements. */ +}; + +int ofproto_bundle_register(struct ofproto *, void *aux, + const struct ofproto_bundle_settings *); +int ofproto_bundle_unregister(struct ofproto *, void *aux); + +/* Configuration of mirrors. */ +struct ofproto_mirror_settings { + /* Name for log messages. */ + char *name; + + /* Bundles that select packets for mirroring upon ingress. */ + void **srcs; /* A set of registered ofbundle handles. */ + size_t n_srcs; + + /* Bundles that select packets for mirroring upon egress. */ + void **dsts; /* A set of registered ofbundle handles. */ + size_t n_dsts; + + /* VLANs of packets to select for mirroring. */ + unsigned long *src_vlans; /* vlan_bitmap, NULL selects all VLANs. */ + + /* Output (mutually exclusive). */ + void *out_bundle; /* A registered ofbundle handle or NULL. */ + uint16_t out_vlan; /* Output VLAN, only if out_bundle is NULL. */ +}; + +int ofproto_mirror_register(struct ofproto *, void *aux, + const struct ofproto_mirror_settings *); +int ofproto_mirror_unregister(struct ofproto *, void *aux); + +int ofproto_set_flood_vlans(struct ofproto *, unsigned long *flood_vlans); +bool ofproto_is_mirror_output_bundle(struct ofproto *, void *aux); /* Configuration querying. */ -uint64_t ofproto_get_datapath_id(const struct ofproto *); -enum ofproto_fail_mode ofproto_get_fail_mode(const struct ofproto *); -void ofproto_get_listeners(const struct ofproto *, struct sset *); bool ofproto_has_snoops(const struct ofproto *); void ofproto_get_snoops(const struct ofproto *, struct sset *); void ofproto_get_all_flows(struct ofproto *p, struct ds *); void ofproto_get_netflow_ids(const struct ofproto *, uint8_t *engine_type, uint8_t *engine_id); - -/* Functions for use by ofproto implementation modules, not by clients. */ -void ofproto_add_flow(struct ofproto *, const struct cls_rule *, - const union ofp_action *, size_t n_actions); -void ofproto_delete_flow(struct ofproto *, const struct cls_rule *); -void ofproto_flush_flows(struct ofproto *); - -/* Hooks for ovs-vswitchd. */ -struct ofhooks { - bool (*normal_cb)(const struct flow *, const struct ofpbuf *packet, - struct ofpbuf *odp_actions, tag_type *, - uint16_t *nf_output_iface, void *aux); - bool (*special_cb)(const struct flow *flow, const struct ofpbuf *packet, - void *aux); - void (*account_flow_cb)(const struct flow *, tag_type tags, - const struct nlattr *odp_actions, - size_t actions_len, - uint64_t n_bytes, void *aux); - void (*account_checkpoint_cb)(void *aux); - - uint16_t (*autopath_cb)(const struct flow *, uint32_t id, - tag_type *, void *aux); -}; -void ofproto_revalidate(struct ofproto *, tag_type); -struct tag_set *ofproto_get_revalidate_set(struct ofproto *); +int ofproto_port_get_cfm_fault(const struct ofproto *, uint16_t ofp_port); +int ofproto_port_get_cfm_remote_mpids(const struct ofproto *, + uint16_t ofp_port, const uint64_t **rmps, + size_t *n_rmps); void ofproto_get_ofproto_controller_info(const struct ofproto *, struct shash *); void ofproto_free_ofproto_controller_info(struct shash *);