X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=lib%2Fdpif.h;h=0e0f407c3244f8abdac5478744874e5630cefdff;hb=42bb6c72b58ba99e59e740f8cca4e201d7efaa02;hp=e401168e2ac5a4bf278fbf42ba4e768ed81fabc1;hpb=693c4a01124ec5ad9253f8cfcfd99075a9d637f6;p=openvswitch

diff --git a/lib/dpif.h b/lib/dpif.h
index e401168e..0e0f407c 100644
--- a/lib/dpif.h
+++ b/lib/dpif.h
@@ -34,7 +34,7 @@ struct ds;
 struct netdev;
 struct nlattr;
 struct ofpbuf;
-struct svec;
+struct sset;
 struct dpif_class;
 
 void dp_run(void);
@@ -42,9 +42,9 @@ void dp_wait(void);
 
 int dp_register_provider(const struct dpif_class *);
 int dp_unregister_provider(const char *type);
-void dp_enumerate_types(struct svec *types);
+void dp_enumerate_types(struct sset *types);
 
-int dp_enumerate_names(const char *type, struct svec *names);
+int dp_enumerate_names(const char *type, struct sset *names);
 void dp_parse_name(const char *datapath_name, char **name, char **type);
 
 int dpif_open(const char *name, const char *type, struct dpif **);
@@ -54,7 +54,6 @@ void dpif_close(struct dpif *);
 
 const char *dpif_name(const struct dpif *);
 const char *dpif_base_name(const struct dpif *);
-int dpif_get_all_names(const struct dpif *, struct svec *);
 
 int dpif_delete(struct dpif *);
 
@@ -150,6 +149,13 @@ int dpif_flow_dump_done(struct dpif_flow_dump *);
 int dpif_execute(struct dpif *, const struct nlattr *actions,
                  size_t actions_len, const struct ofpbuf *);
 
+enum dpif_upcall_type {
+    DPIF_UC_MISS,               /* Miss in flow table. */
+    DPIF_UC_ACTION,             /* ODP_ACTION_ATTR_CONTROLLER action. */
+    DPIF_UC_SAMPLE,             /* Packet sampling. */
+    DPIF_N_UC_TYPES
+};
+
 /* A packet passed up from the datapath to userspace.
  *
  * If 'key' or 'actions' is nonnull, then it points into data owned by
@@ -158,17 +164,16 @@ int dpif_execute(struct dpif *, const struct nlattr *actions,
  * clients that exist so far.)
  */
 struct dpif_upcall {
-    uint32_t type;              /* One of _ODPL_*_NR. */
-
     /* All types. */
+    enum dpif_upcall_type type;
     struct ofpbuf *packet;      /* Packet data. */
     struct nlattr *key;         /* Flow key. */
     size_t key_len;             /* Length of 'key' in bytes. */
 
-    /* _ODPL_ACTION_NR only. */
-    uint64_t userdata;          /* Argument to ODPAT_CONTROLLER. */
+    /* DPIF_UC_ACTION only. */
+    uint64_t userdata;          /* Argument to ODP_ACTION_ATTR_CONTROLLER. */
 
-    /* _ODPL_SFLOW_NR only. */
+    /* DPIF_UC_SAMPLE only. */
     uint32_t sample_pool;       /* # of sampling candidate packets so far. */
     struct nlattr *actions;     /* Associated flow actions. */
     size_t actions_len;