kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-13 12:40:17 +00:00
Code Issues Projects Releases Wiki Activity

FS-9952: Add blade rpc error response creation

Browse Source
This commit is contained in:
colm 2017-02-15 21:17:13 -05:00 committed by Mike Jerris
parent aeff38c165
commit 8e417220d3
3 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libs/libblade/src/blade_rpcproto.c
View File

@ -811,6 +811,31 @@ KS_DECLARE(ks_rpcmessageid_t) blade_rpc_create_response(cJSON *request,
return msgid; return msgid;
} }
KS_DECLARE(ks_rpcmessageid_t) blade_rpc_create_errorresponse(cJSON *request,
cJSON **errorP,
cJSON **responseP)
{
ks_rpcmessageid_t msgid = blade_rpc_create_response(request, NULL, responseP);
if (msgid) {
if (errorP) {
if (*errorP) {
cJSON_AddItemToObject(*responseP, "error", *errorP);
}
else {
cJSON *error = cJSON_CreateObject();
cJSON_AddItemToObject(*responseP, "error", error);
*errorP = error;
}
}
}
return msgid;
}
const char BLADE_JRPC_METHOD[] = "method"; const char BLADE_JRPC_METHOD[] = "method";
const char BLADE_JRPC_ID[] = "id"; const char BLADE_JRPC_ID[] = "id";
const char BLADE_JRPC_FIELDS[] = "blade"; const char BLADE_JRPC_FIELDS[] = "blade";

4
libs/libblade/src/include/blade_rpcproto.h
View File

@ -127,6 +127,10 @@ KS_DECLARE(ks_rpcmessageid_t) blade_rpc_create_response(cJSON *request,
cJSON **reply, cJSON **reply,
cJSON **response); cJSON **response);
KS_DECLARE(ks_rpcmessageid_t) blade_rpc_create_errorresponse(cJSON *request,
cJSON **reply,
cJSON **response);
KS_DECLARE(ks_status_t) blade_rpc_parse_message(cJSON *message, KS_DECLARE(ks_status_t) blade_rpc_parse_message(cJSON *message,
char **namespace, char **namespace,
char **method, char **method,

5
libs/libks/src/ks_rpcmessage.c
View File

@ -286,7 +286,7 @@ KS_DECLARE(ks_rpcmessageid_t) ks_rpcmessage_create_errorresponse(
cJSON **errorP, cJSON **errorP,
cJSON **responseP) cJSON **responseP)
{ {
ks_rpcmessageid_t msgid = ks_rpcmessage_new_response(request, errorP, responseP); ks_rpcmessageid_t msgid = ks_rpcmessage_new_response(request, NULL, responseP);
cJSON *respmsg = *responseP; cJSON *respmsg = *responseP;
if (msgid) { if (msgid) {
@ -296,6 +296,9 @@ KS_DECLARE(ks_rpcmessageid_t) ks_rpcmessage_create_errorresponse(
*errorP = error; *errorP = error;
cJSON_AddItemToObject(respmsg, ERROR, error); cJSON_AddItemToObject(respmsg, ERROR, error);
} }
else if (errorP && *errorP) {
cJSON_AddItemToObject(*responseP, ERROR, *errorP);
}
} }
return msgid; return msgid;