X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=ofproto%2Fconnmgr.h;h=8048424b7bbe43ede0af8378b064c2c21370d03a;hb=3ae91c019019889fbe93aa7dfd6e3747da362b24;hp=f4bcb2b8ce7839f27a8af321dc99db7d141e7c8c;hpb=d5447a0e661767651b481b7b22abc00c6da319cf;p=cascardo%2Fovs.git

diff --git a/ofproto/connmgr.h b/ofproto/connmgr.h
index f4bcb2b8c..8048424b7 100644
--- a/ofproto/connmgr.h
+++ b/ofproto/connmgr.h
@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -24,12 +24,12 @@
 #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;
@@ -54,14 +54,6 @@ 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,
@@ -84,7 +76,7 @@ enum ofproto_packet_in_miss_type {
 /* 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;
@@ -96,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);
 
@@ -149,17 +141,21 @@ void ofconn_get_async_config(struct ofconn *,
                              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);
+
+struct ofp_bundle;
 
-bool ofconn_has_pending_opgroups(const struct ofconn *);
-void ofconn_add_opgroup(struct ofconn *, struct list *);
+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 *);
 
-struct hmap *ofconn_get_bundles(struct ofconn *ofconn);
+/* Logging flow_mod summaries. */
+void ofconn_report_flow_mod(struct ofconn *, enum ofp_flow_mod_command);
 
 /* Sending asynchronous messages. */
 bool connmgr_wants_packet_in_on_miss(struct connmgr *mgr);
@@ -172,6 +168,9 @@ void connmgr_send_packet_in(struct connmgr *,
 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);
@@ -193,6 +192,8 @@ 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'. */
@@ -219,7 +220,8 @@ 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)
+                      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);
 
@@ -229,7 +231,7 @@ void ofmonitor_collect_resume_rules(struct ofmonitor *, uint64_t seqno,
                                     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 */