X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ofproto%2Fofproto.h;h=4975a8d3b0bc60bd801b5af3424af7d86af9e0a7;hb=db5b4525b20e0fd6a079831638b5eb3f9fb131f2;hp=2b8011daa88a6f59742ff52751f5ee203b440abd;hpb=fa066f015f716c74315fed1a08912d003dfe3f8c;p=sliver-openvswitch.git diff --git a/ofproto/ofproto.h b/ofproto/ofproto.h index 2b8011daa..4975a8d3b 100644 --- a/ofproto/ofproto.h +++ b/ofproto/ofproto.h @@ -31,9 +31,8 @@ extern "C" { #endif -struct cfm; +struct cfm_settings; struct cls_rule; -struct dpif_port; struct netdev; struct ofproto; struct shash; @@ -93,9 +92,17 @@ 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, struct ofproto **ofprotop); void ofproto_destroy(struct ofproto *); +int ofproto_delete(const char *name, const char *type); + int ofproto_run(struct ofproto *); void ofproto_wait(struct ofproto *); bool ofproto_is_alive(const struct ofproto *); @@ -121,7 +128,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. * @@ -134,6 +141,9 @@ 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); @@ -149,6 +159,7 @@ 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_desc(struct ofproto *, const char *mfr_desc, const char *hw_desc, const char *sw_desc, const char *serial_desc, @@ -156,38 +167,37 @@ 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 *, uint32_t port_no); +void ofproto_port_unregister(struct ofproto *, uint16_t ofp_port); -void ofproto_port_clear_cfm(struct ofproto *, uint32_t port_no); -void ofproto_port_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_port_get_cfm(struct ofproto *, uint32_t port_no); +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); /* Configuration of bundles. */ struct ofproto_bundle_settings { char *name; /* For use in log messages. */ - uint32_t *slaves; /* OpenFlow port numbers for slaves. */ + uint16_t *slaves; /* OpenFlow port numbers for slaves. */ size_t n_slaves; int vlan; /* VLAN if access port, -1 if trunk port. */ unsigned long *trunks; /* vlan_bitmap, NULL to trunk all VLANs. */ 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. */ }; -void ofproto_bundle_register(struct ofproto *, void *aux, - const struct ofproto_bundle_settings *); -void ofproto_bundle_unregister(struct ofproto *, void *aux); +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 { @@ -210,11 +220,11 @@ struct ofproto_mirror_settings { uint16_t out_vlan; /* Output VLAN, only if out_bundle is NULL. */ }; -void ofproto_mirror_register(struct ofproto *, void *aux, - const struct ofproto_mirror_settings *); -void ofproto_mirror_unregister(struct ofproto *, void *aux); +int ofproto_mirror_register(struct ofproto *, void *aux, + const struct ofproto_mirror_settings *); +int ofproto_mirror_unregister(struct ofproto *, void *aux); -void ofproto_set_flood_vlans(struct ofproto *, unsigned long *flood_vlans); +int ofproto_set_flood_vlans(struct ofproto *, unsigned long *flood_vlans); bool ofproto_is_mirror_output_bundle(struct ofproto *, void *aux); /* Configuration querying. */ @@ -223,6 +233,7 @@ 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); +int ofproto_port_get_cfm_fault(const struct ofproto *, uint16_t ofp_port); void ofproto_get_ofproto_controller_info(const struct ofproto *, struct shash *); void ofproto_free_ofproto_controller_info(struct shash *);