X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=ofproto%2Fofproto.h;h=7516068ffb9b7102226f4bdca7b6de126045e191;hb=a4a2643672e4d2f68f8246e406749009a3f3211b;hp=a3cc8255638c2a45693d2f2093c9b3d473595b6d;hpb=fa8b054f50e6f669a1cc4c41ada0f1fdad03e9dd;p=openvswitch

diff --git a/ofproto/ofproto.h b/ofproto/ofproto.h
index a3cc8255..7516068f 100644
--- a/ofproto/ofproto.h
+++ b/ofproto/ofproto.h
@@ -31,11 +31,22 @@ extern "C" {
 #endif
 
 struct cls_rule;
-struct odp_actions;
+struct nlattr;
 struct ofhooks;
 struct ofproto;
+struct shash;
 struct svec;
 
+struct ofproto_controller_info {
+    bool is_connected;
+    enum nx_role role;
+    struct {
+        const char *keys[3];
+        const char *values[3];
+        size_t n;
+    } pairs;
+};
+
 struct ofexpired {
     struct flow flow;
     uint64_t packet_count;      /* Packets from subrules. */
@@ -106,6 +117,7 @@ void ofproto_set_fail_mode(struct ofproto *, enum ofproto_fail_mode fail_mode);
 void ofproto_reconnect_controllers(struct ofproto *);
 void ofproto_set_extra_in_band_remotes(struct ofproto *,
                                        const struct sockaddr_in *, size_t n);
+void ofproto_set_in_band_queue(struct ofproto *, int queue_id);
 void ofproto_set_desc(struct ofproto *,
                       const char *mfr_desc, const char *hw_desc,
                       const char *sw_desc, const char *serial_desc,
@@ -135,16 +147,22 @@ void ofproto_flush_flows(struct ofproto *);
 /* Hooks for ovs-vswitchd. */
 struct ofhooks {
     bool (*normal_cb)(const struct flow *, const struct ofpbuf *packet,
-                      struct odp_actions *, tag_type *,
+                      struct ofpbuf *odp_actions, tag_type *,
                       uint16_t *nf_output_iface, void *aux);
+    bool (*special_cb)(const struct flow *flow, const struct ofpbuf *packet,
+                       void *aux);
     void (*account_flow_cb)(const struct flow *, tag_type tags,
-                            const union odp_action *, size_t n_actions,
+                            const struct nlattr *odp_actions,
+                            size_t actions_len,
                             unsigned long long int n_bytes, void *aux);
     void (*account_checkpoint_cb)(void *aux);
 };
 void ofproto_revalidate(struct ofproto *, tag_type);
 struct tag_set *ofproto_get_revalidate_set(struct ofproto *);
 
+void ofproto_get_ofproto_controller_info(const struct ofproto *, struct shash *);
+void ofproto_free_ofproto_controller_info(struct shash *);
+
 #ifdef  __cplusplus
 }
 #endif