Merge "sflow" into "master".

[openvswitch] / lib / dpif.h

diff --git a/lib/dpif.h b/lib/dpif.h
index aa4c1a4b71179f5fd2b8d972a80eb6869e92cc42..bf3c64819a3ac1855fcb222c68d7c5763369e196 100644 (file)
--- a/lib/dpif.h
+++ b/lib/dpif.h
@@ -29,15 +29,19 @@
 
 struct dpif;
 struct ofpbuf;
+struct svec;
 
 void dp_run(void);
 void dp_wait(void);
+int dp_enumerate(struct svec *);
 
 int dpif_open(const char *name, struct dpif **);
 int dpif_create(const char *name, struct dpif **);
+int dpif_create_and_open(const char *name, struct dpif **);
 void dpif_close(struct dpif *);
 
 const char *dpif_name(const struct dpif *);
+int dpif_get_all_names(const struct dpif *, struct svec *);
 
 int dpif_delete(struct dpif *);
 
@@ -80,6 +84,8 @@ int dpif_execute(struct dpif *, uint16_t in_port,
 
 int dpif_recv_get_mask(const struct dpif *, int *listen_mask);
 int dpif_recv_set_mask(struct dpif *, int listen_mask);
+int dpif_get_sflow_probability(const struct dpif *, uint32_t *probability);
+int dpif_set_sflow_probability(struct dpif *, uint32_t probability);
 int dpif_recv(struct dpif *, struct ofpbuf **);
 int dpif_recv_purge(struct dpif *);
 void dpif_recv_wait(struct dpif *);