X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=ofproto%2Fconnmgr.h;h=fb7573ea0e8b4cc426c70915168b5ee7a7e60cc6;hb=a2b53dec11a6d001fd024ba8729de5c63bd2b6a1;hp=0242116c967930b71731627e6df4e3829a9bccf9;hpb=4e022ec09e14ac89add74c1b4b8e3ff3873edbf0;p=cascardo%2Fovs.git diff --git a/ofproto/connmgr.h b/ofproto/connmgr.h index 0242116c9..fb7573ea0 100644 --- a/ofproto/connmgr.h +++ b/ofproto/connmgr.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, 2011, 2012, 2013 Nicira, Inc. + * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,16 +22,14 @@ #include "list.h" #include "match.h" #include "ofp-errors.h" +#include "ofp-util.h" #include "ofproto.h" +#include "ofproto-provider.h" #include "openflow/nicira-ext.h" #include "openvswitch/types.h" struct nlattr; struct ofconn; -struct ofopgroup; -struct ofputil_flow_removed; -struct ofputil_packet_in; -struct ofputil_phy_port; struct rule; struct simap; struct sset; @@ -56,13 +54,21 @@ enum ofconn_type { OFCONN_SERVICE /* A service connection, e.g. "ovs-ofctl". */ }; -/* The type of an OpenFlow asynchronous message. */ -enum ofconn_async_msg_type { - OAM_PACKET_IN, /* OFPT_PACKET_IN or NXT_PACKET_IN. */ - OAM_PORT_STATUS, /* OFPT_PORT_STATUS. */ - OAM_FLOW_REMOVED, /* OFPT_FLOW_REMOVED or NXT_FLOW_REMOVED. */ - OAM_N_TYPES +/* An asynchronous message that might need to be queued between threads. */ +struct ofproto_async_msg { + struct ovs_list list_node; /* For queuing. */ + uint16_t controller_id; /* Controller ID to send to. */ + + enum ofputil_async_msg_type oam; + union { + /* OAM_PACKET_IN. */ + struct { + struct ofputil_packet_in up; + int max_len; /* From action, or -1 if none. */ + } pin; + }; }; +void ofproto_async_msg_free(struct ofproto_async_msg *); /* Basics. */ struct connmgr *connmgr_create(struct ofproto *ofproto, @@ -70,9 +76,9 @@ struct connmgr *connmgr_create(struct ofproto *ofproto, void connmgr_destroy(struct connmgr *); void connmgr_run(struct connmgr *, - bool (*handle_openflow)(struct ofconn *, + void (*handle_openflow)(struct ofconn *, const struct ofpbuf *ofp_msg)); -void connmgr_wait(struct connmgr *, bool handling_openflow); +void connmgr_wait(struct connmgr *); void connmgr_get_memory_usage(const struct connmgr *, struct simap *usage); @@ -116,29 +122,39 @@ int ofconn_get_miss_send_len(const struct ofconn *); void ofconn_set_miss_send_len(struct ofconn *, int miss_send_len); void ofconn_set_async_config(struct ofconn *, - const uint32_t master_masks[OAM_N_TYPES], - const uint32_t slave_masks[OAM_N_TYPES]); + const struct ofputil_async_cfg *); +struct ofputil_async_cfg ofconn_get_async_config(const struct ofconn *); void ofconn_send_reply(const struct ofconn *, struct ofpbuf *); -void ofconn_send_replies(const struct ofconn *, struct list *); +void ofconn_send_replies(const struct ofconn *, struct ovs_list *); void ofconn_send_error(const struct ofconn *, const struct ofp_header *request, enum ofperr); enum ofperr ofconn_pktbuf_retrieve(struct ofconn *, uint32_t id, - struct ofpbuf **bufferp, ofp_port_t *in_port); + struct dp_packet **bufferp, ofp_port_t *in_port); -bool ofconn_has_pending_opgroups(const struct ofconn *); -void ofconn_add_opgroup(struct ofconn *, struct list *); -void ofconn_remove_opgroup(struct ofconn *, struct list *, - const struct ofp_header *request, int error); +struct ofp_bundle; + +struct ofp_bundle *ofconn_get_bundle(struct ofconn *, uint32_t id); +enum ofperr ofconn_insert_bundle(struct ofconn *, struct ofp_bundle *); +enum ofperr ofconn_remove_bundle(struct ofconn *, struct ofp_bundle *); + +/* Logging flow_mod summaries. */ +void ofconn_report_flow_mod(struct ofconn *, enum ofp_flow_mod_command); /* Sending asynchronous messages. */ -void connmgr_send_port_status(struct connmgr *, +bool connmgr_wants_packet_in_on_miss(struct connmgr *mgr); +void connmgr_send_port_status(struct connmgr *, struct ofconn *source, 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 *); +void connmgr_send_async_msg(struct connmgr *, + const struct ofproto_async_msg *); +void ofconn_send_role_status(struct ofconn *ofconn, uint32_t role, + uint8_t reason); + +void connmgr_send_requestforward(struct connmgr *, const struct ofconn *source, + const struct ofputil_requestforward *); /* Fail-open settings. */ enum ofproto_fail_mode connmgr_get_fail_mode(const struct connmgr *); @@ -156,14 +172,13 @@ void connmgr_set_extra_in_band_remotes(struct connmgr *, void connmgr_set_in_band_queue(struct connmgr *, int queue_id); /* In-band implementation. */ -bool connmgr_must_output_local(struct connmgr *, const struct flow *, - odp_port_t local_odp_port, - const struct nlattr *odp_actions, - size_t actions_len); +bool connmgr_has_in_band(struct connmgr *); /* Fail-open and in-band implementation. */ void connmgr_flushed(struct connmgr *); +int connmgr_count_hidden_rules(const struct connmgr *); + /* A flow monitor managed by NXST_FLOW_MONITOR and related requests. */ struct ofmonitor { struct ofconn *ofconn; /* Owning 'ofconn'. */ @@ -181,17 +196,27 @@ struct ofmonitor { 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 *); + struct ofconn *, struct ofmonitor **) + OVS_REQUIRES(ofproto_mutex); +struct ofmonitor *ofmonitor_lookup(struct ofconn *, uint32_t id) + OVS_REQUIRES(ofproto_mutex); +void ofmonitor_destroy(struct ofmonitor *) + OVS_REQUIRES(ofproto_mutex); 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 *); + const struct ofconn *abbrev_ofconn, ovs_be32 abbrev_xid, + const struct rule_actions *old_actions) + OVS_REQUIRES(ofproto_mutex); +void ofmonitor_flush(struct connmgr *) OVS_REQUIRES(ofproto_mutex); + +struct rule_collection; void ofmonitor_collect_resume_rules(struct ofmonitor *, uint64_t seqno, - struct list *rules); -void ofmonitor_compose_refresh_updates(struct list *rules, struct list *msgs); + struct rule_collection *) + OVS_REQUIRES(ofproto_mutex); +void ofmonitor_compose_refresh_updates(struct rule_collection *rules, + struct ovs_list *msgs) + OVS_REQUIRES(ofproto_mutex); #endif /* connmgr.h */