X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=ofproto%2Fconnmgr.h;h=741034a069372845276511368d128c02b4150517;hb=6c6eedc5d6730835a0d9724e2e8cfe9cdf03b07d;hp=dd1a027e3e56446c54b82c54cccc71eb3ae637db;hpb=3fbbcba77615e6f14d0ee4f8d40b9b4838c2ac20;p=cascardo%2Fovs.git

diff --git a/ofproto/connmgr.h b/ofproto/connmgr.h
index dd1a027e3..741034a06 100644
--- a/ofproto/connmgr.h
+++ b/ofproto/connmgr.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014, 2015 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.
@@ -54,41 +54,19 @@ 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;
+/* 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. */
-    int send_len;               /* Length that the action requested sending. */
-    enum ofproto_packet_in_miss_type miss_type;
+
+    enum ofputil_async_msg_type oam;
+    /* OAM_PACKET_IN. */
+    struct {
+        struct ofputil_packet_in_private 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,
@@ -142,11 +120,8 @@ 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]);
-void ofconn_get_async_config(struct ofconn *,
-                             uint32_t *master_masks,
-                             uint32_t *slave_masks);
+                             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 ovs_list *);
@@ -154,9 +129,13 @@ 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;
 
-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);
@@ -167,11 +146,14 @@ 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 ofproto_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 *);
 void connmgr_set_fail_mode(struct connmgr *, enum ofproto_fail_mode);
@@ -235,4 +217,7 @@ void ofmonitor_compose_refresh_updates(struct rule_collection *rules,
                                        struct ovs_list *msgs)
     OVS_REQUIRES(ofproto_mutex);
 
+void connmgr_send_table_status(struct connmgr *,
+                               const struct ofputil_table_desc *td,
+                               uint8_t reason);
 #endif /* connmgr.h */