Merge branch 'master' of ssh://github.com/openvswitch/ovs into master_new

[cascardo/ovs.git] / ovsdb / monitor.h

diff --git a/ovsdb/monitor.h b/ovsdb/monitor.h
index dc2fc1a..d6e9635 100644 (file)
--- a/ovsdb/monitor.h
+++ b/ovsdb/monitor.h
@@ -18,6 +18,7 @@
 #define OVSDB_MONITOR_H
 
 struct ovsdb_monitor;
+struct ovsdb_jsonrpc_monitor;
 
 enum ovsdb_monitor_selection {
     OJMS_INITIAL = 1 << 0,      /* All rows when monitor is created. */
@@ -27,6 +28,15 @@ enum ovsdb_monitor_selection {
 };
 
 
+enum ovsdb_monitor_version {
+      OVSDB_MONITOR_V1,         /* RFC 7047 "monitor" method. */
+      OVSDB_MONITOR_V2,         /* Extension to RFC 7047, see ovsdb-server
+                                   man page for details. */
+
+      /* Last entry.  */
+      OVSDB_MONITOR_VERSION_MAX
+};
+
 struct ovsdb_monitor *ovsdb_monitor_create(struct ovsdb *db,
                        struct ovsdb_jsonrpc_monitor *jsonrpc_monitor);
 
@@ -54,8 +64,10 @@ const char * OVS_WARN_UNUSED_RESULT
 ovsdb_monitor_table_check_duplicates(struct ovsdb_monitor *,
                           const struct ovsdb_table *);
 
-struct json *ovsdb_monitor_compose_update(const struct ovsdb_monitor *dbmon,
-                                bool initial, uint64_t *unflushed_transaction);
+struct json *ovsdb_monitor_get_update(struct ovsdb_monitor *dbmon,
+                                      bool initial,
+                                      uint64_t *unflushed_transaction,
+                                      enum ovsdb_monitor_version version);
 
 void ovsdb_monitor_table_add_select(struct ovsdb_monitor *dbmon,
                                     const struct ovsdb_table *table,