vswitchd: New function cfg_is_valid().

diff --git a/vswitchd/cfg.c b/vswitchd/cfg.c
index 757f214d2634bf178f3f6d8aa1c63c4e1accd08e..545e6e028e9e3f86d44f2ced2bc84bffbcb94f31 100644 (file)
--- a/vswitchd/cfg.c
+++ b/vswitchd/cfg.c
@@ -77,6 +77,7 @@ static bool is_int(const char *);
 static bool is_bool(const char *);
 static const char *extract_value(const char *key);
 static const char *get_nth_value(int idx, const char *key);
+static bool is_type(const char *s, enum cfg_flags);
 
 /* Adds 'file_name' to the set of files or directories that are read by
  * cfg_read().  Returns 0 on success, otherwise a positive errno value if
@@ -172,6 +173,26 @@ cfg_has(const char *key_, ...)
     return retval;
 }
 
+bool
+cfg_is_valid(enum cfg_flags flags, const char *key_, ...)
+{
+    char *key, **first, **last, **p;
+    size_t n;
+    bool retval;
+
+    FORMAT_KEY(key_, key);
+    first = find_key_le(key);
+    last = find_key_ge(key);
+    n = last - first;
+    retval = ((!(flags & CFG_REQUIRED) || n)
+              && (!(flags & CFG_MULTIPLE) || n <= 1));
+    for (p = first; retval && p < last; p++) {
+        retval = is_type(strchr(*p, '=') + 1, flags);
+    }
+    free(key);
+    return retval;
+}
+
 /* Returns true if the configuration includes at least one key whose name
  * begins with 'section' followed by a dot. */
 bool
@@ -749,7 +770,6 @@ get_nth_value(int idx, const char *key)
     return idx < q - p ? extract_value(p[idx]) : NULL;
 }
 
-#if 0
 static bool
 is_type(const char *s, enum cfg_flags flags)
 {
@@ -763,4 +783,3 @@ is_type(const char *s, enum cfg_flags flags)
             || (flags & CFG_IP && inet_aton(s, &addr))
             || (flags & CFG_MAC && parse_mac(s, mac)));
 }
-#endif

diff --git a/vswitchd/cfg.h b/vswitchd/cfg.h
index 1cee0560fdea356bf001c8dbd7e823a4d74122d8..d11110319e144a40f56c6b3347a0740cded4c62b 100644 (file)
--- a/vswitchd/cfg.h
+++ b/vswitchd/cfg.h
@@ -62,6 +62,7 @@ enum cfg_flags {
 void cfg_register(const char *key_spec, enum cfg_flags);
 
 bool cfg_has(const char *key, ...) PRINTF_FORMAT(1, 2);
+bool cfg_is_valid(enum cfg_flags, const char *key, ...) PRINTF_FORMAT(2, 3);
 bool cfg_has_section(const char *key, ...) PRINTF_FORMAT(1, 2);
 int cfg_count(const char *key, ...) PRINTF_FORMAT(1, 2);