/*
- * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014 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.
#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 rule;
struct simap;
struct sset;
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,
/* A packet_in, with extra members to assist in queuing and routing it. */
struct ofproto_packet_in {
struct ofputil_packet_in up;
- struct list list_node; /* For queuing. */
+ 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;
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);
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, 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 *);
+struct ofp_bundle;
-struct hmap *ofconn_get_bundles(struct ofconn *ofconn);
+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);
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 *);
void connmgr_set_fail_mode(struct connmgr *, enum ofproto_fail_mode);
/* 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'. */
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)
+ 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 *)
OVS_REQUIRES(ofproto_mutex);
void ofmonitor_compose_refresh_updates(struct rule_collection *rules,
- struct list *msgs)
+ struct ovs_list *msgs)
OVS_REQUIRES(ofproto_mutex);
#endif /* connmgr.h */