X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ofproto%2Fofproto.h;h=9ba6354f59f86aa292611022b3e7938d897ea56b;hb=88bf179aa3f3fa89822edcd9b882e0f06d39bf08;hp=e4abe523d4873f5389dbdf31a4ef0e23d042c88a;hpb=0aeaabc8dbccef7593dc19e891a3f5bbef1991cd;p=sliver-openvswitch.git diff --git a/ofproto/ofproto.h b/ofproto/ofproto.h index e4abe523d..9ba6354f5 100644 --- a/ofproto/ofproto.h +++ b/ofproto/ofproto.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc. + * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,28 +23,31 @@ #include #include #include "cfm.h" +#include "classifier.h" #include "flow.h" +#include "meta-flow.h" #include "netflow.h" #include "sset.h" #include "stp.h" -#include "tag.h" #ifdef __cplusplus extern "C" { #endif +struct bfd_cfg; struct cfm_settings; struct cls_rule; struct netdev; -struct ofproto; +struct netdev_stats; struct ofport; +struct ofproto; struct shash; struct simap; -struct netdev_stats; +struct smap; struct ofproto_controller_info { bool is_connected; - enum nx_role role; + enum ofp12_controller_role role; struct { const char *keys[4]; const char *values[4]; @@ -52,13 +55,6 @@ struct ofproto_controller_info { } pairs; }; -struct ofexpired { - struct flow flow; - uint64_t packet_count; /* Packets from subrules. */ - uint64_t byte_count; /* Bytes from subrules. */ - long long int used; /* Last-used time (0 if never used). */ -}; - struct ofproto_sflow_options { struct sset targets; uint32_t sampling_rate; @@ -69,6 +65,22 @@ struct ofproto_sflow_options { char *control_ip; }; +struct ofproto_ipfix_bridge_exporter_options { + struct sset targets; + uint32_t sampling_rate; + uint32_t obs_domain_id; /* Bridge-wide Observation Domain ID. */ + uint32_t obs_point_id; /* Bridge-wide Observation Point ID. */ + uint32_t cache_active_timeout; + uint32_t cache_max_flows; +}; + +struct ofproto_ipfix_flow_exporter_options { + uint32_t collector_set_id; + struct sset targets; + uint32_t cache_active_timeout; + uint32_t cache_max_flows; +}; + struct ofproto_stp_settings { stp_identifier system_id; uint16_t priority; @@ -97,6 +109,10 @@ struct ofproto_port_stp_status { enum stp_state state; unsigned int sec_in_state; enum stp_role role; +}; + +struct ofproto_port_stp_stats { + bool enabled; /* If false, ignore other members. */ int tx_count; /* Number of BPDUs transmitted. */ int rx_count; /* Number of valid BPDUs received. */ int error_count; /* Number of bad BPDUs received. */ @@ -132,12 +148,6 @@ struct ofproto_controller { uint8_t dscp; /* DSCP value for controller connection. */ }; -#define DEFAULT_MFR_DESC "Nicira, Inc." -#define DEFAULT_HW_DESC "Open vSwitch" -#define DEFAULT_SW_DESC VERSION -#define DEFAULT_SERIAL_DESC "None" -#define DEFAULT_DP_DESC "None" - void ofproto_enumerate_types(struct sset *types); const char *ofproto_normalize_type(const char *); @@ -149,13 +159,12 @@ void ofproto_parse_name(const char *name, char **dp_name, char **dp_type); struct iface_hint { char *br_name; /* Name of owning bridge. */ char *br_type; /* Type of owning bridge. */ - uint16_t ofp_port; /* OpenFlow port number. */ + ofp_port_t ofp_port; /* OpenFlow port number. */ }; void ofproto_init(const struct shash *iface_hints); int ofproto_type_run(const char *datapath_type); -int ofproto_type_run_fast(const char *datapath_type); void ofproto_type_wait(const char *datapath_type); int ofproto_create(const char *datapath, const char *datapath_type, @@ -164,11 +173,11 @@ void ofproto_destroy(struct ofproto *); int ofproto_delete(const char *name, const char *type); int ofproto_run(struct ofproto *); -int ofproto_run_fast(struct ofproto *); void ofproto_wait(struct ofproto *); bool ofproto_is_alive(const struct ofproto *); void ofproto_get_memory_usage(const struct ofproto *, struct simap *); +void ofproto_type_get_memory_usage(const char *datapath_type, struct simap *); /* A port within an OpenFlow switch. * @@ -176,7 +185,7 @@ void ofproto_get_memory_usage(const struct ofproto *, struct simap *); struct ofproto_port { char *name; /* Network device name, e.g. "eth0". */ char *type; /* Network device type, e.g. "system". */ - uint16_t ofp_port; /* OpenFlow port number. */ + ofp_port_t ofp_port; /* OpenFlow port number. */ }; void ofproto_port_clone(struct ofproto_port *, const struct ofproto_port *); void ofproto_port_destroy(struct ofproto_port *); @@ -204,13 +213,13 @@ int ofproto_port_dump_done(struct ofproto_port_dump *); : (ofproto_port_dump_done(DUMP), false)); \ ) -#define OFPROTO_FLOW_EVICTION_THRESHOLD_DEFAULT 1000 -#define OFPROTO_FLOW_EVICTION_THRESHOLD_MIN 100 +#define OFPROTO_FLOW_LIMIT_DEFAULT 200000 +#define OFPROTO_MAX_IDLE_DEFAULT 1500 const char *ofproto_port_open_type(const char *datapath_type, const char *port_type); -int ofproto_port_add(struct ofproto *, struct netdev *, uint16_t *ofp_portp); -int ofproto_port_del(struct ofproto *, uint16_t ofp_port); +int ofproto_port_add(struct ofproto *, struct netdev *, ofp_port_t *ofp_portp); +int ofproto_port_del(struct ofproto *, ofp_port_t ofp_port); int ofproto_port_get_stats(const struct ofport *, struct netdev_stats *stats); int ofproto_port_query_by_name(const struct ofproto *, const char *devname, @@ -227,32 +236,44 @@ 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_flow_limit(unsigned limit); +void ofproto_set_max_idle(unsigned max_idle); void ofproto_set_forward_bpdu(struct ofproto *, bool forward_bpdu); -void ofproto_set_mac_idle_time(struct ofproto *, unsigned idle_time); -void ofproto_set_desc(struct ofproto *, - const char *mfr_desc, const char *hw_desc, - const char *sw_desc, const char *serial_desc, - const char *dp_desc); +void ofproto_set_mac_table_config(struct ofproto *, unsigned idle_time, + size_t max_entries); +void ofproto_set_threads(int n_handlers, int n_revalidators); +void ofproto_set_dp_desc(struct ofproto *, const char *dp_desc); int ofproto_set_snoops(struct ofproto *, const struct sset *snoops); int ofproto_set_netflow(struct ofproto *, const struct netflow_options *nf_options); int ofproto_set_sflow(struct ofproto *, const struct ofproto_sflow_options *); +int ofproto_set_ipfix(struct ofproto *, + const struct ofproto_ipfix_bridge_exporter_options *, + const struct ofproto_ipfix_flow_exporter_options *, + size_t); +void ofproto_set_flow_restore_wait(bool flow_restore_wait_db); +bool ofproto_get_flow_restore_wait(void); int ofproto_set_stp(struct ofproto *, const struct ofproto_stp_settings *); int ofproto_get_stp_status(struct ofproto *, struct ofproto_stp_status *); /* Configuration of ports. */ -void ofproto_port_unregister(struct ofproto *, uint16_t ofp_port); +void ofproto_port_unregister(struct ofproto *, ofp_port_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, +void ofproto_port_clear_cfm(struct ofproto *, ofp_port_t ofp_port); +void ofproto_port_set_cfm(struct ofproto *, ofp_port_t ofp_port, const struct cfm_settings *); -int ofproto_port_is_lacp_current(struct ofproto *, uint16_t ofp_port); -int ofproto_port_set_stp(struct ofproto *, uint16_t ofp_port, +void ofproto_port_set_bfd(struct ofproto *, ofp_port_t ofp_port, + const struct smap *cfg); +int ofproto_port_get_bfd_status(struct ofproto *, ofp_port_t ofp_port, + struct smap *); +int ofproto_port_is_lacp_current(struct ofproto *, ofp_port_t ofp_port); +int ofproto_port_set_stp(struct ofproto *, ofp_port_t ofp_port, const struct ofproto_port_stp_settings *); -int ofproto_port_get_stp_status(struct ofproto *, uint16_t ofp_port, +int ofproto_port_get_stp_status(struct ofproto *, ofp_port_t ofp_port, struct ofproto_port_stp_status *); -int ofproto_port_set_queues(struct ofproto *, uint16_t ofp_port, +int ofproto_port_get_stp_stats(struct ofproto *, ofp_port_t ofp_port, + struct ofproto_port_stp_stats *); +int ofproto_port_set_queues(struct ofproto *, ofp_port_t ofp_port, const struct ofproto_port_queue *, size_t n_queues); @@ -281,7 +302,7 @@ enum port_vlan_mode { struct ofproto_bundle_settings { char *name; /* For use in log messages. */ - uint16_t *slaves; /* OpenFlow port numbers for slaves. */ + ofp_port_t *slaves; /* OpenFlow port numbers for slaves. */ size_t n_slaves; enum port_vlan_mode vlan_mode; /* Selects mode for vlan and trunks */ @@ -290,7 +311,6 @@ struct ofproto_bundle_settings { bool use_priority_tags; /* Use 802.1p tag for frames in VLAN 0? */ 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. */ @@ -301,7 +321,7 @@ struct ofproto_bundle_settings { * 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; /* OpenFlow port number of real device. */ + ofp_port_t realdev_ofp_port;/* OpenFlow port number of real device. */ }; int ofproto_bundle_register(struct ofproto *, void *aux, @@ -353,9 +373,16 @@ struct ofproto_table_settings { * distinguished by different values for the subfields within 'groups'. */ struct mf_subfield *groups; size_t n_groups; + + /* + * Fields for which prefix trie lookup is maintained. + */ + unsigned int n_prefix_fields; + enum mf_field_id prefix_fields[CLS_MAX_TRIES]; }; int ofproto_get_n_tables(const struct ofproto *); +uint8_t ofproto_get_n_visible_tables(const struct ofproto *); void ofproto_configure_table(struct ofproto *, int table_id, const struct ofproto_table_settings *); @@ -365,15 +392,36 @@ 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); -int ofproto_port_get_cfm_opup(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); -int ofproto_port_get_cfm_health(const struct ofproto *ofproto, - uint16_t ofp_port); + void ofproto_get_ofproto_controller_info(const struct ofproto *, struct shash *); void ofproto_free_ofproto_controller_info(struct shash *); + +/* CFM status query. */ +struct ofproto_cfm_status { + /* 0 if not faulted, otherwise a combination of one or more reasons. */ + enum cfm_fault_reason faults; + + /* 0 if the remote CFM endpoint is operationally down, + * 1 if the remote CFM endpoint is operationally up, + * -1 if we don't know because the remote CFM endpoint is not in extended + * mode. */ + int remote_opstate; + + uint64_t flap_count; + + /* Ordinarily a "health status" in the range 0...100 inclusive, with 0 + * being worst and 100 being best, or -1 if the health status is not + * well-defined. */ + int health; + + /* MPIDs of remote maintenance points whose CCMs have been received. */ + uint64_t *rmps; + size_t n_rmps; +}; + +int ofproto_port_get_cfm_status(const struct ofproto *, + ofp_port_t ofp_port, + struct ofproto_cfm_status *); /* Linux VLAN device support (e.g. "eth0.10" for VLAN 10.) * @@ -384,8 +432,29 @@ void ofproto_free_ofproto_controller_info(struct shash *); void ofproto_get_vlan_usage(struct ofproto *, unsigned long int *vlan_bitmap); bool ofproto_has_vlan_usage_changed(const struct ofproto *); -int ofproto_port_set_realdev(struct ofproto *, uint16_t vlandev_ofp_port, - uint16_t realdev_ofp_port, int vid); +int ofproto_port_set_realdev(struct ofproto *, ofp_port_t vlandev_ofp_port, + ofp_port_t realdev_ofp_port, int vid); + +/* Table configuration */ + +enum ofproto_table_config { + /* Send to controller. */ + OFPROTO_TABLE_MISS_CONTROLLER = OFPTC11_TABLE_MISS_CONTROLLER, + + /* Continue to the next table in the pipeline (OpenFlow 1.0 behavior). */ + OFPROTO_TABLE_MISS_CONTINUE = OFPTC11_TABLE_MISS_CONTINUE, + + /* Drop the packet. */ + OFPROTO_TABLE_MISS_DROP = OFPTC11_TABLE_MISS_DROP, + + /* The default miss behaviour for the OpenFlow version of the controller a + * packet_in message would be sent to.. For pre-OF1.3 controllers, send + * packet_in to controller. For OF1.3+ controllers, drop. */ + OFPROTO_TABLE_MISS_DEFAULT = 3, +}; + +enum ofproto_table_config ofproto_table_get_config(const struct ofproto *, + uint8_t table_id); #ifdef __cplusplus }