zebra, lib: fix the ZEBRA_INTERFACE_VRF_UPDATE zapi message

[mirror_frr.git] / lib / json.h

diff --git a/lib/json.h b/lib/json.h
index 5faaaa841ab06186927bc563442ece5d08384c81..d34916230473447e79f399c29d85dd8b283c6df2 100644 (file)
--- a/lib/json.h
+++ b/lib/json.h
@@ -23,6 +23,20 @@
 
 #if defined(HAVE_JSON_C_JSON_H)
 #include <json-c/json.h>
+
+/*
+ * FRR style JSON iteration.
+ * Usage: JSON_FOREACH(...) { ... }
+ */
+#define JSON_FOREACH(jo, joi, join)                                            \
+       /* struct json_object *jo; */                                          \
+       /* struct json_object_iterator joi; */                                 \
+       /* struct json_object_iterator join; */                                \
+       for ((joi) = json_object_iter_begin((jo)),                             \
+           (join) = json_object_iter_end((jo));                               \
+            json_object_iter_equal(&(joi), &(join)) == 0;                     \
+            json_object_iter_next(&(joi)))
+
 #else
 #include <json/json.h>
 
@@ -32,27 +46,39 @@
  */
 #define json_object_to_json_string_ext(A, B) json_object_to_json_string (A)
 
-extern int json_object_object_get_ex(struct json_object *obj,
-                                          const char *key,
-                                          struct json_object **value);
+extern int json_object_object_get_ex(struct json_object *obj, const char *key,
+                                    struct json_object **value);
 #endif
 
 #include "command.h"
 
-extern int use_json(const int argc, struct cmd_token *argv[]);
-extern void json_object_string_add(struct json_object* obj, const char *key,
-                                   const char *s);
-extern void json_object_int_add(struct json_object* obj, const char *key,
-                                int32_t i);
-extern void json_object_long_add(struct json_object* obj, const char *key,
-                                 int64_t i);
-extern void json_object_boolean_false_add(struct json_object* obj,
-                                          const char *key);
-extern void json_object_boolean_true_add(struct json_object* obj,
-                                         const char *key);
-extern struct json_object* json_object_lock(struct json_object *obj);
+extern bool use_json(const int argc, struct cmd_token *argv[]);
+extern void json_object_string_add(struct json_object *obj, const char *key,
+                                  const char *s);
+extern void json_object_int_add(struct json_object *obj, const char *key,
+                               int64_t i);
+extern void json_object_boolean_false_add(struct json_object *obj,
+                                         const char *key);
+extern void json_object_boolean_true_add(struct json_object *obj,
+                                        const char *key);
+extern struct json_object *json_object_lock(struct json_object *obj);
 extern void json_object_free(struct json_object *obj);
 
 #define JSON_STR "JavaScript Object Notation\n"
 
+/* NOTE: json-c lib has following commit 316da85 which
+ * handles escape of forward slash.
+ * This allows prefix  "20.0.14.0\/24":{
+ * to  "20.0.14.0/24":{ some platforms do not have
+ * latest copy of json-c where defining below macro.
+ */
+
+#ifndef JSON_C_TO_STRING_NOSLASHESCAPE
+
+/**
+  * Don't escape forward slashes.
+  */
+#define JSON_C_TO_STRING_NOSLASHESCAPE (1<<4)
+#endif
+
 #endif /* _QUAGGA_JSON_H */