Changeset 4643 for pjproject

Timestamp:

Nov 6, 2013 7:46:15 AM (11 years ago)

Author:

bennylp

Message:

Re #1519: Added support for JSON (JavaScript? Object Notation, RFC 4627) format in PJLIB-UTIL.

Location:

pjproject/branches/projects/pjsua2/pjlib-util

Files:

• build/Makefile (modified) (2 diffs)
• include/pjlib-util.h (modified) (1 diff)
• include/pjlib-util/errno.h (modified) (1 diff)
• include/pjlib-util/json.h (added)
• src/pjlib-util-test/json_test.c (added)
• src/pjlib-util-test/test.c (modified) (1 diff)
• src/pjlib-util-test/test.h (modified) (2 diffs)
• src/pjlib-util/errno.c (modified) (1 diff)
• src/pjlib-util/json.c (added)

pjproject/branches/projects/pjsua2/pjlib-util/build/Makefile

@@ -31 +31 @@
                 base64.o cli.o cli_console.o cli_telnet.o crc32.o errno.o dns.o \
                 dns_dump.o dns_server.o getopt.o hmac_md5.o hmac_sha1.o \
-                http_client.o md5.o pcap.o resolver.o scanner.o sha1.o \
+                http_client.o json.o md5.o pcap.o resolver.o scanner.o sha1.o \
                 srv_resolver.o string.o stun_simple.o \
                 stun_simple_client.o xml.o
@@ -41 +41 @@
 export UTIL_TEST_SRCDIR = ../src/pjlib-util-test
 export UTIL_TEST_OBJS += xml.o encryption.o stun.o resolver_test.o test.o \
-                http_client.o
+                json_test.o http_client.o
 export UTIL_TEST_CFLAGS += $(_CFLAGS)
 export UTIL_TEST_LDFLAGS += $(_LDFLAGS)

pjproject/branches/projects/pjsua2/pjlib-util/include/pjlib-util.h

@@ -55 +55 @@
 #include <pjlib-util/xml.h>
 
+/* JSON */
+#include <pjlib-util/json.h>
+
 /* Old STUN */
 #include <pjlib-util/stun_simple.h>

pjproject/branches/projects/pjsua2/pjlib-util/include/pjlib-util/errno.h

@@ -118 +118 @@
 
 
+/************************************************************
+ * JSON ERROR
+ ***********************************************************/
+/**
+ * @hideinitializer
+ * General invalid JSON message.
+ */
+#define PJLIB_UTIL_EINJSON          (PJLIB_UTIL_ERRNO_START+30) /* 320030 */
+
 
 /************************************************************

pjproject/branches/projects/pjsua2/pjlib-util/src/pjlib-util-test/test.c

@@ -73 +73 @@
 #endif
 
+#if INCLUDE_JSON_TEST
+    DO_TEST(json_test());
+#endif
+
 #if INCLUDE_ENCRYPTION_TEST
     DO_TEST(encryption_test());

pjproject/branches/projects/pjsua2/pjlib-util/src/pjlib-util-test/test.h

@@ -21 +21 @@
 
 #define INCLUDE_XML_TEST            1
+#define INCLUDE_JSON_TEST           1
 #define INCLUDE_ENCRYPTION_TEST     1
 #define INCLUDE_STUN_TEST           1
@@ -27 +28 @@
 
 extern int xml_test(void);
+extern int json_test(void);
 extern int encryption_test();
 extern int encryption_benchmark();

pjproject/branches/projects/pjsua2/pjlib-util/src/pjlib-util/errno.c

@@ -51 +51 @@
     /* XML errors */
     PJ_BUILD_ERR( PJLIB_UTIL_EINXML,            "Invalid XML message" ),
+
+    /* JSON errors */
+    PJ_BUILD_ERR( PJLIB_UTIL_EINJSON,           "Invalid JSON document" ),
 
     /* DNS errors */