X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fdpif.h;h=0e0f407c3244f8abdac5478744874e5630cefdff;hb=cd400f3e5950d0cdeff0f73fdc2cfb8349eac5d9;hp=c51071da6a6f8ff973c6f58c0def9deab35f9765;hpb=1ba530f4b2cd5476a224dbbf87a3089a831a24b6;p=sliver-openvswitch.git

diff --git a/lib/dpif.h b/lib/dpif.h
index c51071da6..0e0f407c3 100644
--- a/lib/dpif.h
+++ b/lib/dpif.h
@@ -30,10 +30,11 @@ extern "C" {
 #endif
 
 struct dpif;
+struct ds;
 struct netdev;
 struct nlattr;
 struct ofpbuf;
-struct svec;
+struct sset;
 struct dpif_class;
 
 void dp_run(void);
@@ -41,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 **);
@@ -53,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 *);
 
@@ -80,6 +80,7 @@ int dpif_port_query_by_name(const struct dpif *, const char *devname,
                             struct dpif_port *);
 int dpif_port_get_name(struct dpif *, uint16_t port_no,
                        char *name, size_t name_size);
+int dpif_get_max_ports(const struct dpif *);
 
 struct dpif_port_dump {
     const struct dpif *dpif;
@@ -106,11 +107,32 @@ int dpif_port_dump_done(struct dpif_port_dump *);
 int dpif_port_poll(const struct dpif *, char **devnamep);
 void dpif_port_poll_wait(const struct dpif *);
 
+struct dpif_flow_stats {
+    uint64_t n_packets;
+    uint64_t n_bytes;
+    long long int used;
+    uint8_t tcp_flags;
+};
+
+void dpif_flow_stats_format(const struct dpif_flow_stats *, struct ds *);
+
+enum dpif_flow_put_flags {
+    DPIF_FP_CREATE = 1 << 0,    /* Allow creating a new flow. */
+    DPIF_FP_MODIFY = 1 << 1,    /* Allow modifying an existing flow. */
+    DPIF_FP_ZERO_STATS = 1 << 2 /* Zero the stats of an existing flow. */
+};
+
 int dpif_flow_flush(struct dpif *);
-int dpif_flow_put(struct dpif *, struct odp_flow_put *);
-int dpif_flow_del(struct dpif *, struct odp_flow *);
-int dpif_flow_get(const struct dpif *, struct odp_flow *);
-int dpif_flow_get_multiple(const struct dpif *, struct odp_flow[], size_t n);
+int dpif_flow_put(struct dpif *, enum dpif_flow_put_flags,
+                  const struct nlattr *key, size_t key_len,
+                  const struct nlattr *actions, size_t actions_len,
+                  struct dpif_flow_stats *);
+int dpif_flow_del(struct dpif *,
+                  const struct nlattr *key, size_t key_len,
+                  struct dpif_flow_stats *);
+int dpif_flow_get(const struct dpif *,
+                  const struct nlattr *key, size_t key_len,
+                  struct ofpbuf **actionsp, struct dpif_flow_stats *);
 
 struct dpif_flow_dump {
     const struct dpif *dpif;
@@ -118,12 +140,22 @@ struct dpif_flow_dump {
     void *state;
 };
 void dpif_flow_dump_start(struct dpif_flow_dump *, const struct dpif *);
-bool dpif_flow_dump_next(struct dpif_flow_dump *, struct odp_flow *);
+bool dpif_flow_dump_next(struct dpif_flow_dump *,
+                         const struct nlattr **key, size_t *key_len,
+                         const struct nlattr **actions, size_t *actions_len,
+                         const struct dpif_flow_stats **);
 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
@@ -132,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;