ofproto: Fix potential leak during flow mods.

[sliver-openvswitch.git] / lib / ovsdb-idl-provider.h

diff --git a/lib/ovsdb-idl-provider.h b/lib/ovsdb-idl-provider.h
index cf6c486..7ea5ce6 100644 (file)
--- a/lib/ovsdb-idl-provider.h
+++ b/lib/ovsdb-idl-provider.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009 Nicira Networks.
+/* Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,25 +41,31 @@ struct ovsdb_idl_row {
 struct ovsdb_idl_column {
     char *name;
     struct ovsdb_type type;
+    bool mutable;
+    void (*parse)(struct ovsdb_idl_row *, const struct ovsdb_datum *);
+    void (*unparse)(struct ovsdb_idl_row *);
 };
 
 struct ovsdb_idl_table_class {
     char *name;
+    bool is_root;
     const struct ovsdb_idl_column *columns;
     size_t n_columns;
     size_t allocation_size;
-    void (*parse)(struct ovsdb_idl_row *);
-    void (*unparse)(struct ovsdb_idl_row *);
+    void (*row_init)(struct ovsdb_idl_row *);
 };
 
 struct ovsdb_idl_table {
     const struct ovsdb_idl_table_class *class;
+    unsigned char *modes;    /* OVSDB_IDL_* bitmasks, indexed by column. */
+    bool need_table;         /* Monitor table even if no columns? */
     struct shash columns;    /* Contains "const struct ovsdb_idl_column *"s. */
     struct hmap rows;        /* Contains "struct ovsdb_idl_row"s. */
     struct ovsdb_idl *idl;   /* Containing idl. */
 };
 
 struct ovsdb_idl_class {
+    const char *database;       /* <db-name> for this database. */
     const struct ovsdb_idl_table_class *tables;
     size_t n_tables;
 };
@@ -69,19 +75,9 @@ struct ovsdb_idl_row *ovsdb_idl_get_row_arc(
     struct ovsdb_idl_table_class *dst_table,
     const struct uuid *dst_uuid);
 
-struct ovsdb_idl_row *ovsdb_idl_first_row(
-    const struct ovsdb_idl *, const struct ovsdb_idl_table_class *);
-
-struct ovsdb_idl_row *ovsdb_idl_next_row(const struct ovsdb_idl_row *);
-
-void ovsdb_idl_txn_write(struct ovsdb_idl_row *,
-                         const struct ovsdb_idl_column *,
-                         struct ovsdb_datum *);
 void ovsdb_idl_txn_verify(const struct ovsdb_idl_row *,
                           const struct ovsdb_idl_column *);
-void ovsdb_idl_txn_delete(struct ovsdb_idl_row *);
-struct ovsdb_idl_row *ovsdb_idl_txn_insert(
-    struct ovsdb_idl_txn *,
-    const struct ovsdb_idl_table_class *);
+
+struct ovsdb_idl_txn *ovsdb_idl_txn_get(const struct ovsdb_idl_row *);
 
 #endif /* ovsdb-idl-provider.h */