X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=ofproto%2Fconnmgr.h;h=8048424b7bbe43ede0af8378b064c2c21370d03a;hb=30ef36c6dbc77f91ee63ccd177b2db236270ab66;hp=429e678229c8545dee0a2ae5b6fe65943f06aea3;hpb=e03248b7cb460a79d6e4b4aef5815d59f3d0ea32;p=cascardo%2Fovs.git diff --git a/ofproto/connmgr.h b/ofproto/connmgr.h index 429e67822..8048424b7 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 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,12 +54,32 @@ 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 +enum ofproto_packet_in_miss_type { + /* Not generated by a flow miss or table-miss flow. */ + OFPROTO_PACKET_IN_NO_MISS, + + /* The packet_in was generated directly by a table-miss flow, that is, a + * flow with priority 0 that wildcards all fields. See OF1.3.3 section + * 5.4. + * + * (Our interpretation of "directly" is "not via groups". Packet_ins + * generated by table-miss flows via groups use + * OFPROTO_PACKET_IN_NO_MISS.) */ + OFPROTO_PACKET_IN_MISS_FLOW, + + /* The packet-in was generated directly by a table-miss, but not a + * table-miss flow. That is, it was generated by the OpenFlow 1.0, 1.1, or + * 1.2 table-miss behavior. */ + OFPROTO_PACKET_IN_MISS_WITHOUT_FLOW, +}; + +/* A packet_in, with extra members to assist in queuing and routing it. */ +struct ofproto_packet_in { + struct ofputil_packet_in up; + struct ovs_list list_node; /* For queuing. */ + uint16_t controller_id; /* Controller ID to send to. */ + int send_len; /* Length that the action requested sending. */ + enum ofproto_packet_in_miss_type miss_type; }; /* Basics. */ @@ -70,9 +88,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); @@ -118,27 +136,40 @@ 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]); +void ofconn_get_async_config(struct ofconn *, + uint32_t *master_masks, + uint32_t *slave_masks); 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, uint16_t *in_port); + struct dp_packet **bufferp, ofp_port_t *in_port); + +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 *); -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); +/* 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 *); + const struct ofproto_packet_in *); +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 +187,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 *, - uint32_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'. */ @@ -173,7 +203,7 @@ struct ofmonitor { enum nx_flow_monitor_flags flags; /* Matching. */ - uint16_t out_port; + ofp_port_t out_port; uint8_t table_id; struct minimatch match; }; @@ -181,17 +211,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 */