sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jansson: json_pack with new format to verify required runtime version. 

Add a json_pack at startup that will fail if runtime links against a
library older than jansson-2.11.

Change-Id: I101aebafe0f9407650206f7c552dad3d69377b5a
This commit is contained in:
Corey Farrell 2019-03-07 18:17:49 -05:00
parent afe16021ef
commit 641b6041c7
No known key found for this signature in database
GPG Key ID: D1B6E98EB07F7F6C
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/asterisk/json.h
View File

@ -89,7 +89,7 @@ typedef AST_JSON_INT_T ast_json_int_t;
/*!
* \brief Initialize the JSON library.
*/
void ast_json_init(void);
int ast_json_init(void);
/*!
* \brief Set custom allocators instead of the standard ast_malloc() and ast_free().

2
main/asterisk.c
View File

@ -4056,7 +4056,7 @@ static void asterisk_daemon(int isroot, const char *runuser, const char *rungrou
}
ast_verb(0, "PBX UUID: %s\n", pbx_uuid);
ast_json_init();
check_init(ast_json_init(), "libjansson");
ast_ulaw_init();
ast_alaw_init();
tdd_init();

20
main/json.c
View File

@ -693,10 +693,28 @@ struct ast_json *ast_json_ipaddr(const struct ast_sockaddr *addr, enum ast_trans
return ast_json_string_create(ast_str_buffer(string));
}
void ast_json_init(void)
int ast_json_init(void)
{
json_t *version_check;
/* Setup to use Asterisk custom allocators */
ast_json_reset_alloc_funcs();
/* We depend on functionality of jansson-2.11 but don't actually use
* any symbols. If we link at runtime to less than 2.11 this json_pack
* will return NULL. */
version_check = json_pack("{s: o?, s: o*}",
"JSON", NULL,
"Bourne", NULL);
if (!version_check) {
ast_log(LOG_ERROR, "There was a problem finding jansson 2.11 runtime libraries.\n"
"Please rebuild Asterisk using ./configure --with-jansson-bundled.\n");
return -1;
}
json_decref(version_check);
return 0;
}
static void json_payload_destructor(void *obj)