X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ofproto%2Fofproto.h;h=96f00988851e6c1d4f0f490e38f1850e06d2ef74;hb=95a224c5f4ea3558f67c9f9f28e6e8309d8b8c9a;hp=22484519e9d59cd89bf9257a6234eebe13800355;hpb=ba186119ca5f787486189c041d76d63dee629dc1;p=sliver-openvswitch.git diff --git a/ofproto/ofproto.h b/ofproto/ofproto.h index 22484519e..96f009888 100644 --- a/ofproto/ofproto.h +++ b/ofproto/ofproto.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010 Nicira Networks. + * Copyright (c) 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. @@ -24,31 +24,38 @@ #include #include "flow.h" #include "netflow.h" +#include "sset.h" #include "tag.h" #ifdef __cplusplus extern "C" { #endif -struct odp_actions; +struct cls_rule; +struct nlattr; struct ofhooks; struct ofproto; -struct svec; - -enum { - DP_GROUP_FLOOD = 0, - DP_GROUP_ALL = 1 +struct shash; + +struct ofproto_controller_info { + bool is_connected; + enum nx_role role; + struct { + const char *keys[4]; + const char *values[4]; + size_t n; + } pairs; }; struct ofexpired { - flow_t flow; + 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 svec targets; + struct sset targets; uint32_t sampling_rate; uint32_t polling_interval; uint32_t header_len; @@ -74,10 +81,6 @@ struct ofproto_controller { int probe_interval; /* Max idle time before probing, in seconds. */ enum ofproto_band band; /* In-band or out-of-band? */ - /* Discovery options. */ - char *accept_re; /* Regexp for acceptable controllers. */ - bool update_resolv_conf; /* Update /etc/resolv.conf? */ - /* OpenFlow packet-in rate-limiting. */ int rate_limit; /* Max packet-in rate in packets per second. */ int burst_limit; /* Limit on accumulating packet credits. */ @@ -99,7 +102,10 @@ int ofproto_run2(struct ofproto *, bool revalidate_all); void ofproto_wait(struct ofproto *); bool ofproto_is_alive(const struct ofproto *); -/* Configuration. */ +int ofproto_port_del(struct ofproto *, uint16_t odp_port); +bool ofproto_port_is_floodable(struct ofproto *, uint16_t odp_port); + +/* Top-level configuration. */ void ofproto_set_datapath_id(struct ofproto *, uint64_t datapath_id); void ofproto_set_controllers(struct ofproto *, const struct ofproto_controller *, size_t n); @@ -107,50 +113,61 @@ void ofproto_set_fail_mode(struct ofproto *, enum ofproto_fail_mode fail_mode); 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_desc(struct ofproto *, const char *mfr_desc, const char *hw_desc, const char *sw_desc, const char *serial_desc, const char *dp_desc); -int ofproto_set_snoops(struct ofproto *, const struct svec *snoops); +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 *); +/* Configuration of individual interfaces. */ +struct cfm; + +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); + /* Configuration querying. */ uint64_t ofproto_get_datapath_id(const struct ofproto *); bool ofproto_has_primary_controller(const struct ofproto *); enum ofproto_fail_mode ofproto_get_fail_mode(const struct ofproto *); -void ofproto_get_listeners(const struct ofproto *, struct svec *); -void ofproto_get_snoops(const struct ofproto *, struct svec *); +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 *); /* Functions for use by ofproto implementation modules, not by clients. */ -int ofproto_send_packet(struct ofproto *, const flow_t *, - const union ofp_action *, size_t n_actions, +int ofproto_send_packet(struct ofproto *, uint32_t port_no, uint16_t vlan_tci, const struct ofpbuf *); -void ofproto_add_flow(struct ofproto *, const flow_t *, uint32_t wildcards, - unsigned int priority, - const union ofp_action *, size_t n_actions, - int idle_timeout); -void ofproto_delete_flow(struct ofproto *, const flow_t *, uint32_t wildcards, - unsigned int priority); +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 { - void (*port_changed_cb)(enum ofp_port_reason, const struct ofp_phy_port *, - void *aux); - bool (*normal_cb)(const flow_t *, const struct ofpbuf *packet, - struct odp_actions *, tag_type *, + bool (*normal_cb)(const struct flow *, const struct ofpbuf *packet, + struct ofpbuf *odp_actions, tag_type *, uint16_t *nf_output_iface, void *aux); - void (*account_flow_cb)(const flow_t *, tag_type tags, - const union odp_action *, size_t n_actions, - unsigned long long int n_bytes, 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); }; void ofproto_revalidate(struct ofproto *, tag_type); struct tag_set *ofproto_get_revalidate_set(struct ofproto *); +void ofproto_get_ofproto_controller_info(const struct ofproto *, struct shash *); +void ofproto_free_ofproto_controller_info(struct shash *); + #ifdef __cplusplus } #endif