kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 03:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

json: Support older jansson versions.

Browse Source 
The use of '?' is a fairly new addition to jansson and is not
supported in the version of jansson that can be used by 13.
This change returns to previous supported behavior and removes
usage of '?'.

ASTERISK-28663

Change-Id: I6d596007ae85e8724d928865d99968f679be1142
This commit is contained in:
Joshua C. Colp
2019-12-16 21:18:37 -04:00
parent 815d0f8e5a
commit c1faa9ecda
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
main/json.c
View File

@@ -895,12 +895,12 @@ struct ast_json *ast_json_name_number(const char *name, const char *number)
struct ast_json *ast_json_dialplan_cep_app(
const char *context, const char *exten, int priority, const char *app_name, const char *app_data)
{
return ast_json_pack("{s: s?, s: s?, s: o, s: s?, s: s?}",
"context", context,
"exten", exten,
return ast_json_pack("{s: o, s: o, s: o, s: o, s: o}",
"context", context ? ast_json_string_create(context) : ast_json_null(),
"exten", exten ? ast_json_string_create(exten) : ast_json_null(),
"priority", priority != -1 ? ast_json_integer_create(priority) : ast_json_null(),
"app_name", app_name,
"app_data", app_data
"app_name", app_name ? ast_json_string_create(app_name) : ast_json_null(),
"app_data", app_data ? ast_json_string_create(app_data) : ast_json_null()
);
}

2
res/res_stasis_playback.c
View File

@@ -105,7 +105,7 @@ static struct ast_json *playback_to_json(struct stasis_message *message,
return NULL;
}
return ast_json_pack("{s: s, s: o?, s: O}",
return ast_json_pack("{s: s, s: o, s: O}",
"type", type,
"timestamp", ast_json_timeval(*stasis_message_timestamp(message), NULL),
"playback", blob);

2
res/res_stasis_recording.c
View File

@@ -91,7 +91,7 @@ static struct ast_json *recording_to_json(struct stasis_message *message,
return NULL;
}
return ast_json_pack("{s: s, s: o?, s: O}",
return ast_json_pack("{s: s, s: o, s: O}",
"type", type,
"timestamp", ast_json_timeval(*stasis_message_timestamp(message), NULL),
"recording", blob);

2
res/stasis/app.c
View File

@@ -1164,7 +1164,7 @@ void app_update(struct stasis_app *app, stasis_app_cb handler, void *data)
ast_verb(1, "Replacing Stasis app '%s'\n", app->name);
msg = ast_json_pack("{s: s, s: o?, s: s}",
msg = ast_json_pack("{s: s, s: o, s: s}",
"type", "ApplicationReplaced",
"timestamp", ast_json_timeval(ast_tvnow(), NULL),
"application", app->name);