mirror of
https://github.com/open62541/open62541.git
synced 2025-06-03 04:00:21 +00:00
JSON: Add JSON encoding and decoding
This commit is contained in:
Lukas M
jpfr
parent
74db52e99b
commit
199910fab7
2
.gitignore
vendored
2
.gitignore
vendored
@ -81,3 +81,5 @@ Makefile
|
||||
/.idea
|
||||
/cmake-build*
|
||||
/tools/certs/certs/*
|
||||
nbproject/*
|
||||
|
||||
|
||||
@ -206,6 +206,9 @@ if(UA_ENABLE_PUBSUB_INFORMATIONMODEL)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
option(UA_ENABLE_JSON_ENCODING "Enable Json encoding." OFF)
|
||||
mark_as_advanced(UA_ENABLE_JSON_ENCODING)
|
||||
|
||||
option(UA_ENABLE_STATUSCODE_DESCRIPTIONS "Enable conversion of StatusCode to human-readable error message" ON)
|
||||
mark_as_advanced(UA_ENABLE_STATUSCODE_DESCRIPTIONS)
|
||||
|
||||
@ -483,8 +486,15 @@ set(internal_headers ${PROJECT_SOURCE_DIR}/deps/queue.h
|
||||
${PROJECT_SOURCE_DIR}/deps/pcg_basic.h
|
||||
${PROJECT_SOURCE_DIR}/deps/libc_time.h
|
||||
${PROJECT_SOURCE_DIR}/deps/base64.h
|
||||
${PROJECT_SOURCE_DIR}/deps/jsmn/jsmn.h
|
||||
${PROJECT_SOURCE_DIR}/deps/string_escape.h
|
||||
${PROJECT_SOURCE_DIR}/deps/itoa.h
|
||||
${PROJECT_SOURCE_DIR}/deps/atoi.h
|
||||
#${PROJECT_SOURCE_DIR}/deps/musl/floatscan.h
|
||||
#${PROJECT_SOURCE_DIR}/deps/musl/vfprintf.h
|
||||
${PROJECT_SOURCE_DIR}/src/ua_util_internal.h
|
||||
${PROJECT_SOURCE_DIR}/src/ua_types_encoding_binary.h
|
||||
${PROJECT_SOURCE_DIR}/src/ua_types_encoding_json.h
|
||||
${PROJECT_BINARY_DIR}/src_generated/ua_types_generated_encoding_binary.h
|
||||
${PROJECT_BINARY_DIR}/src_generated/ua_transport_generated.h
|
||||
${PROJECT_BINARY_DIR}/src_generated/ua_transport_generated_handling.h
|
||||
@ -508,6 +518,7 @@ set(internal_headers ${PROJECT_SOURCE_DIR}/deps/queue.h
|
||||
|
||||
# TODO: make client optional
|
||||
set(lib_sources ${PROJECT_SOURCE_DIR}/src/ua_types.c
|
||||
${PROJECT_SOURCE_DIR}/src/ua_types_encoding_json.c
|
||||
${PROJECT_SOURCE_DIR}/src/ua_types_encoding_binary.c
|
||||
${PROJECT_BINARY_DIR}/src_generated/ua_types_generated.c
|
||||
${PROJECT_BINARY_DIR}/src_generated/ua_transport_generated.c
|
||||
@ -553,10 +564,14 @@ set(lib_sources ${PROJECT_SOURCE_DIR}/src/ua_types.c
|
||||
# dependencies
|
||||
${PROJECT_SOURCE_DIR}/deps/libc_time.c
|
||||
${PROJECT_SOURCE_DIR}/deps/pcg_basic.c
|
||||
${PROJECT_SOURCE_DIR}/deps/base64.c)
|
||||
${PROJECT_SOURCE_DIR}/deps/base64.c
|
||||
${PROJECT_SOURCE_DIR}/deps/jsmn/jsmn.c
|
||||
${PROJECT_SOURCE_DIR}/deps/string_escape.c
|
||||
${PROJECT_SOURCE_DIR}/deps/itoa.c
|
||||
${PROJECT_SOURCE_DIR}/deps/atoi.c)
|
||||
|
||||
set(default_plugin_headers ${PROJECT_SOURCE_DIR}/plugins/ua_accesscontrol_default.h
|
||||
${historizing_default_plugin_headers}
|
||||
set(default_plugin_headers #${PROJECT_SOURCE_DIR}/plugins/ua_network_tcp.h
|
||||
${PROJECT_SOURCE_DIR}/plugins/ua_accesscontrol_default.h
|
||||
${PROJECT_SOURCE_DIR}/plugins/ua_pki_certificate.h
|
||||
${PROJECT_SOURCE_DIR}/plugins/ua_log_stdout.h
|
||||
${PROJECT_SOURCE_DIR}/plugins/ua_nodestore_default.h
|
||||
@ -587,6 +602,11 @@ if(UA_ENABLE_PUBSUB)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(UA_ENABLE_CUSTOM_LIBC)
|
||||
list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/deps/musl/floatscan.c)
|
||||
list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/deps/musl/vfprintf.c)
|
||||
endif()
|
||||
|
||||
if(UA_ENABLE_SUBSCRIPTIONS)
|
||||
list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/src/server/ua_subscription.c
|
||||
${PROJECT_SOURCE_DIR}/src/server/ua_subscription_monitoreditem.c
|
||||
|
||||
5024
src/ua_types_encoding_json.c
Normal file
5024
src/ua_types_encoding_json.c
Normal file
File diff suppressed because it is too large
Load Diff
133
src/ua_types_encoding_json.h
Normal file
133
src/ua_types_encoding_json.h
Normal file
@ -0,0 +1,133 @@
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
*
|
||||
* Copyright 2014-2017 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
|
||||
* Copyright 2018 (c) Fraunhofer IOSB (Author: Lukas Meling)
|
||||
*/
|
||||
|
||||
#ifndef UA_TYPES_ENCODING_JSON_H_
|
||||
#define UA_TYPES_ENCODING_JSON_H_
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#include "ua_util_internal.h"
|
||||
#include "ua_types_encoding_binary.h"
|
||||
#include "ua_types_encoding_json.h"
|
||||
#include "ua_types.h"
|
||||
#include "../deps/jsmn/jsmn.h"
|
||||
|
||||
#define TOKENCOUNT 1000
|
||||
|
||||
size_t
|
||||
UA_calcSizeJson(const void *src, const UA_DataType *type,
|
||||
UA_String *namespaces,
|
||||
size_t namespaceSize,
|
||||
UA_String *serverUris,
|
||||
size_t serverUriSize,
|
||||
UA_Boolean useReversible) UA_FUNC_ATTR_WARN_UNUSED_RESULT;
|
||||
|
||||
|
||||
status
|
||||
UA_encodeJson(const void *src, const UA_DataType *type,
|
||||
u8 **bufPos,
|
||||
const u8 **bufEnd,
|
||||
UA_String *namespaces,
|
||||
size_t namespaceSize,
|
||||
UA_String *serverUris,
|
||||
size_t serverUriSize,
|
||||
UA_Boolean useReversible) UA_FUNC_ATTR_WARN_UNUSED_RESULT;
|
||||
|
||||
|
||||
UA_StatusCode
|
||||
UA_decodeJson(const UA_ByteString *src, void *dst,
|
||||
const UA_DataType *type) UA_FUNC_ATTR_WARN_UNUSED_RESULT;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* Functions for future use for the pubsub NetworkMessage and DataSetMessage.
|
||||
* Don't bother using them.
|
||||
*/
|
||||
|
||||
typedef struct {
|
||||
u8 *pos;
|
||||
const u8 *end;
|
||||
|
||||
u16 depth; /* How often did we en-/decoding recurse? */
|
||||
|
||||
size_t namespacesSize;
|
||||
UA_String *namespaces;
|
||||
|
||||
size_t serverUrisSize;
|
||||
UA_String *serverUris;
|
||||
|
||||
UA_Boolean useReversible;
|
||||
} CtxJson;
|
||||
|
||||
status writeKey_UA_String(CtxJson *ctx, UA_String *key, UA_Boolean commaNeeded);
|
||||
status writeKey(CtxJson *ctx, const char* key, UA_Boolean commaNeeded);
|
||||
status encodingJsonStartObject(CtxJson *ctx);
|
||||
size_t encodingJsonEndObject(CtxJson *ctx);
|
||||
status encodingJsonStartArray(CtxJson *ctx);
|
||||
size_t encodingJsonEndArray(CtxJson *ctx);
|
||||
status writeComma(CtxJson *ctx, UA_Boolean commaNeeded);
|
||||
status writeNull(CtxJson *ctx);
|
||||
|
||||
status calcWriteKey_UA_String(CtxJson *ctx, UA_String *key, UA_Boolean commaNeeded);
|
||||
status calcWriteKey(CtxJson *ctx, const char* key,
|
||||
UA_Boolean commaNeeded) UA_FUNC_ATTR_WARN_UNUSED_RESULT;
|
||||
status encodingCalcJsonStartObject(CtxJson *ctx);
|
||||
size_t encodingCalcJsonEndObject(CtxJson *ctx);
|
||||
status encodingCalcJsonStartArray(CtxJson *ctx);
|
||||
size_t encodingCalcJsonEndArray(CtxJson *ctx);
|
||||
status calcWriteComma(CtxJson *ctx, UA_Boolean commaNeeded);
|
||||
status calcWriteNull(CtxJson *ctx);
|
||||
|
||||
|
||||
typedef struct {
|
||||
jsmntok_t *tokenArray;
|
||||
UA_Int32 tokenCount;
|
||||
UA_UInt16 *index;
|
||||
} ParseCtx;
|
||||
|
||||
typedef status(*encodeJsonSignature)(const void *UA_RESTRICT src, const UA_DataType *type,
|
||||
CtxJson *UA_RESTRICT ctx);
|
||||
|
||||
typedef status(*calcSizeJsonSignature)(const void *UA_RESTRICT src, const UA_DataType *type,
|
||||
CtxJson *UA_RESTRICT ctx);
|
||||
|
||||
typedef status (*decodeJsonSignature)(void *UA_RESTRICT dst, const UA_DataType *type,
|
||||
CtxJson *UA_RESTRICT ctx, ParseCtx *parseCtx, UA_Boolean moveToken);
|
||||
|
||||
typedef struct {
|
||||
const char ** fieldNames;
|
||||
void ** fieldPointer;
|
||||
decodeJsonSignature * functions;
|
||||
UA_Boolean * found;
|
||||
u8 memberSize;
|
||||
} DecodeContext;
|
||||
|
||||
status
|
||||
decodeFields(CtxJson *ctx, ParseCtx *parseCtx, DecodeContext *decodeContext, const UA_DataType *type);
|
||||
|
||||
status
|
||||
decodeJsonInternal(void *dst, const UA_DataType *type, CtxJson *ctx, ParseCtx *parseCtx, UA_Boolean moveToken);
|
||||
|
||||
/* workaround: TODO generate functions for UA_xxx_decodeJson */
|
||||
decodeJsonSignature getDecodeSignature(u8 index);
|
||||
status lookAheadForKey(const char* search, CtxJson *ctx, ParseCtx *parseCtx, size_t *resultIndex);
|
||||
|
||||
jsmntype_t getJsmnType(const ParseCtx *parseCtx);
|
||||
status tokenize(ParseCtx *parseCtx, CtxJson *ctx, const UA_ByteString *src, UA_UInt16 *tokenIndex);
|
||||
UA_Boolean isJsonNull(const CtxJson *ctx, const ParseCtx *parseCtx);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* UA_TYPES_ENCODING_JSON_H_ */
|
||||
@ -99,6 +99,19 @@ add_executable(check_types_builtin check_types_builtin.c $<TARGET_OBJECTS:open62
|
||||
target_link_libraries(check_types_builtin ${LIBS})
|
||||
add_test_valgrind(types_builtin ${TESTS_BINARY_DIR}/check_types_builtin)
|
||||
|
||||
if(UA_ENABLE_JSON_ENCODING)
|
||||
add_executable(check_types_builtin_json check_types_builtin_json.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
|
||||
target_link_libraries(check_types_builtin_json ${LIBS})
|
||||
add_test_valgrind(types_builtin_json ${TESTS_BINARY_DIR}/check_types_builtin_json)
|
||||
|
||||
if(UA_ENABLE_PUBSUB)
|
||||
#later batch
|
||||
#add_executable(check_pubsub_encoding_json pubsub/check_pubsub_encoding_json.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
|
||||
#target_link_libraries(check_pubsub_encoding_json ${LIBS})
|
||||
#add_test_valgrind(pubsub_encoding_json ${TESTS_BINARY_DIR}/check_pubsub_encoding_json)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
add_executable(check_types_memory check_types_memory.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
|
||||
target_link_libraries(check_types_memory ${LIBS})
|
||||
add_test_valgrind(types_memory ${TESTS_BINARY_DIR}/check_types_memory)
|
||||
|
||||
5393
tests/check_types_builtin_json.c
Normal file
5393
tests/check_types_builtin_json.c
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user