X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ofproto%2Fconnmgr.h;h=48b81193f6acb1571cc13dc2eb43d74155b04041;hb=a6ca7c672f6d5aaf24111d3414ea132ec36b40d6;hp=e326482a1a1b882cb03947a29d584d13ddd0ac76;hpb=a7349929fb86d41f2e2ef77395e33b21f9457d48;p=sliver-openvswitch.git diff --git a/ofproto/connmgr.h b/ofproto/connmgr.h index e326482a1..48b81193f 100644 --- a/ofproto/connmgr.h +++ b/ofproto/connmgr.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, 2011, 2012 Nicira Networks. + * Copyright (c) 2009, 2010, 2011, 2012, 2013 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,8 +17,10 @@ #ifndef CONNMGR_H #define CONNMGR_H 1 +#include "classifier.h" #include "hmap.h" #include "list.h" +#include "match.h" #include "ofp-errors.h" #include "ofproto.h" #include "openflow/nicira-ext.h" @@ -29,6 +31,9 @@ struct ofconn; struct ofopgroup; struct ofputil_flow_removed; struct ofputil_packet_in; +struct ofputil_phy_port; +struct rule; +struct simap; struct sset; /* ofproto supports two kinds of OpenFlow connections: @@ -69,6 +74,8 @@ void connmgr_run(struct connmgr *, struct ofpbuf *ofp_msg)); void connmgr_wait(struct connmgr *, bool handling_openflow); +void connmgr_get_memory_usage(const struct connmgr *, struct simap *usage); + struct ofproto *ofconn_get_ofproto(const struct ofconn *); void connmgr_retry(struct connmgr *); @@ -78,7 +85,8 @@ bool connmgr_has_controllers(const struct connmgr *); void connmgr_get_controller_info(struct connmgr *, struct shash *); void connmgr_free_controller_info(struct shash *); void connmgr_set_controllers(struct connmgr *, - const struct ofproto_controller[], size_t n); + const struct ofproto_controller[], size_t n, + uint32_t allowed_versions); void connmgr_reconnect(const struct connmgr *); int connmgr_set_snoops(struct connmgr *, const struct sset *snoops); @@ -88,20 +96,19 @@ void connmgr_get_snoops(const struct connmgr *, struct sset *snoops); /* Individual connections to OpenFlow controllers. */ enum ofconn_type ofconn_get_type(const struct ofconn *); -enum nx_role ofconn_get_role(const struct ofconn *); -void ofconn_set_role(struct ofconn *, enum nx_role); +bool ofconn_get_master_election_id(const struct ofconn *, uint64_t *idp); +bool ofconn_set_master_election_id(struct ofconn *, uint64_t); +enum ofp12_controller_role ofconn_get_role(const struct ofconn *); +void ofconn_set_role(struct ofconn *, enum ofp12_controller_role); -enum nx_flow_format ofconn_get_flow_format(struct ofconn *); -void ofconn_set_flow_format(struct ofconn *, enum nx_flow_format); +enum ofputil_protocol ofconn_get_protocol(const struct ofconn *); +void ofconn_set_protocol(struct ofconn *, enum ofputil_protocol); enum nx_packet_in_format ofconn_get_packet_in_format(struct ofconn *); void ofconn_set_packet_in_format(struct ofconn *, enum nx_packet_in_format); void ofconn_set_controller_id(struct ofconn *, uint16_t controller_id); -bool ofconn_get_flow_mod_table_id(const struct ofconn *); -void ofconn_set_flow_mod_table_id(struct ofconn *, bool enable); - void ofconn_set_invalid_ttl_to_controller(struct ofconn *, bool); bool ofconn_get_invalid_ttl_to_controller(struct ofconn *); @@ -126,12 +133,12 @@ void ofconn_remove_opgroup(struct ofconn *, struct list *, const struct ofp_header *request, int error); /* Sending asynchronous messages. */ -void connmgr_send_port_status(struct connmgr *, const struct ofp_phy_port *, - uint8_t reason); +void connmgr_send_port_status(struct connmgr *, + const struct ofputil_phy_port *, uint8_t reason); void connmgr_send_flow_removed(struct connmgr *, const struct ofputil_flow_removed *); -void connmgr_send_packet_in(struct connmgr *, const struct ofputil_packet_in *, - const struct flow *); +void connmgr_send_packet_in(struct connmgr *, + const struct ofputil_packet_in *); /* Fail-open settings. */ enum ofproto_fail_mode connmgr_get_fail_mode(const struct connmgr *); @@ -142,7 +149,6 @@ int connmgr_get_max_probe_interval(const struct connmgr *); bool connmgr_is_any_controller_connected(const struct connmgr *); bool connmgr_is_any_controller_admitted(const struct connmgr *); int connmgr_failure_duration(const struct connmgr *); -void connmgr_broadcast(struct connmgr *, struct ofpbuf *); /* In-band configuration. */ void connmgr_set_extra_in_band_remotes(struct connmgr *, @@ -153,10 +159,41 @@ void connmgr_set_in_band_queue(struct connmgr *, int queue_id); bool connmgr_msg_in_hook(struct connmgr *, const struct flow *, const struct ofpbuf *packet); bool connmgr_may_set_up_flow(struct connmgr *, const struct flow *, + uint32_t local_odp_port, const struct nlattr *odp_actions, size_t actions_len); /* Fail-open and in-band implementation. */ void connmgr_flushed(struct connmgr *); +/* A flow monitor managed by NXST_FLOW_MONITOR and related requests. */ +struct ofmonitor { + struct ofconn *ofconn; /* Owning 'ofconn'. */ + struct hmap_node ofconn_node; /* In ofconn's 'monitors' hmap. */ + uint32_t id; + + enum nx_flow_monitor_flags flags; + + /* Matching. */ + uint16_t out_port; + uint8_t table_id; + struct minimatch match; +}; + +struct ofputil_flow_monitor_request; + +enum ofperr ofmonitor_create(const struct ofputil_flow_monitor_request *, + struct ofconn *, struct ofmonitor **); +struct ofmonitor *ofmonitor_lookup(struct ofconn *, uint32_t id); +void ofmonitor_destroy(struct ofmonitor *); + +void ofmonitor_report(struct connmgr *, struct rule *, + enum nx_flow_update_event, enum ofp_flow_removed_reason, + const struct ofconn *abbrev_ofconn, ovs_be32 abbrev_xid); +void ofmonitor_flush(struct connmgr *); + +void ofmonitor_collect_resume_rules(struct ofmonitor *, uint64_t seqno, + struct list *rules); +void ofmonitor_compose_refresh_updates(struct list *rules, struct list *msgs); + #endif /* connmgr.h */