From b81d6990eeecc85bf987d1af48c5d7bfe0de2a9b Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Fri, 3 Feb 2017 10:57:01 -0600 Subject: [PATCH] FS-9997: [mod_verto] Invalid JSON-RPC Response to an incorrect JSON-RPC Request. #resolve --- src/mod/endpoints/mod_verto/mod_verto.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/mod/endpoints/mod_verto/mod_verto.c b/src/mod/endpoints/mod_verto/mod_verto.c index dfefe66177..ad440a8fae 100644 --- a/src/mod/endpoints/mod_verto/mod_verto.c +++ b/src/mod/endpoints/mod_verto/mod_verto.c @@ -2726,6 +2726,9 @@ static switch_bool_t verto__answer_func(const char *method, cJSON *params, jsock } switch_core_session_rwunlock(session); + } else { + err = 1; + cJSON_AddItemToObject(obj, "message", cJSON_CreateString("CALL DOES NOT EXIST")); } cleanup: @@ -2733,7 +2736,7 @@ static switch_bool_t verto__answer_func(const char *method, cJSON *params, jsock if (!err) return SWITCH_TRUE; - cJSON_AddItemToObject(obj, "message", cJSON_CreateString("CALL DOES NOT EXIST")); + cJSON_AddItemToObject(obj, "code", cJSON_CreateNumber(CODE_SESSION_ERROR)); @@ -2783,6 +2786,7 @@ static switch_bool_t verto__bye_func(const char *method, cJSON *params, jsock_t cJSON_AddItemToObject(obj, "cause", cJSON_CreateString(switch_channel_cause2str(cause))); switch_core_session_rwunlock(session); } else { + cJSON_AddItemToObject(obj, "message", cJSON_CreateString("CALL DOES NOT EXIST")); err = 1; } @@ -2791,7 +2795,7 @@ static switch_bool_t verto__bye_func(const char *method, cJSON *params, jsock_t if (!err) return SWITCH_TRUE; - cJSON_AddItemToObject(obj, "message", cJSON_CreateString("CALL DOES NOT EXIST")); + cJSON_AddItemToObject(obj, "code", cJSON_CreateNumber(CODE_SESSION_ERROR)); @@ -3154,6 +3158,7 @@ static switch_bool_t verto__modify_func(const char *method, cJSON *params, jsock switch_core_session_rwunlock(session); } else { + cJSON_AddItemToObject(obj, "message", cJSON_CreateString("CALL DOES NOT EXIST")); err = 1; } @@ -3162,7 +3167,7 @@ static switch_bool_t verto__modify_func(const char *method, cJSON *params, jsock if (!err) return SWITCH_TRUE; - cJSON_AddItemToObject(obj, "message", cJSON_CreateString("CALL DOES NOT EXIST")); + cJSON_AddItemToObject(obj, "code", cJSON_CreateNumber(CODE_SESSION_ERROR)); @@ -3197,7 +3202,7 @@ static switch_bool_t verto__attach_func(const char *method, cJSON *params, jsock } if (!(session = switch_core_session_locate(call_id))) { - cJSON_AddItemToObject(obj, "message", cJSON_CreateString("Call does not exist")); + cJSON_AddItemToObject(obj, "message", cJSON_CreateString("CALL DOES NOT EXIST")); err = 1; goto cleanup; }