From 9d2476f7348ec40c3b20420360d0c75ebd79f776 Mon Sep 17 00:00:00 2001 From: Daniel-Constantin Mierla Date: Thu, 16 May 2019 09:15:48 +0200 Subject: [PATCH] app_jsdt: completed the handling of KEMI functions with 4 parameters --- src/modules/app_jsdt/app_jsdt_api.c | 59 ++++++++++++++++++++++++++++- 1 file changed, 57 insertions(+), 2 deletions(-) diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index e7d884e8922..4643f017ffc 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -1242,6 +1242,13 @@ int sr_kemi_jsdt_exec_func_ex(duk_context *J, sr_kemi_t *ket) ret = ((sr_kemi_fmsssn_f)(ket->func))(env_J->msg, &vps[0].s, &vps[1].s, &vps[2].s, vps[3].n); return sr_kemi_jsdt_return_int(J, ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_STR + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_INT + && ket->ptypes[3]==SR_KEMIP_STR) { + ret = ((sr_kemi_fmssns_f)(ket->func))(env_J->msg, + &vps[0].s, &vps[1].s, vps[2].n, &vps[3].s); + return sr_kemi_jsdt_return_int(J, ket, ret); } else if(ket->ptypes[0]==SR_KEMIP_STR && ket->ptypes[1]==SR_KEMIP_STR && ket->ptypes[2]==SR_KEMIP_INT @@ -1249,6 +1256,27 @@ int sr_kemi_jsdt_exec_func_ex(duk_context *J, sr_kemi_t *ket) ret = ((sr_kemi_fmssnn_f)(ket->func))(env_J->msg, &vps[0].s, &vps[1].s, vps[2].n, vps[3].n); return sr_kemi_jsdt_return_int(J, ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_STR + && ket->ptypes[1]==SR_KEMIP_INT + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR) { + ret = ((sr_kemi_fmsnss_f)(ket->func))(env_J->msg, + &vps[0].s, vps[1].n, &vps[2].s, &vps[3].s); + return sr_kemi_jsdt_return_int(J, ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_STR + && ket->ptypes[1]==SR_KEMIP_INT + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_INT) { + ret = ((sr_kemi_fmsnsn_f)(ket->func))(env_J->msg, + &vps[0].s, vps[1].n, &vps[2].s, vps[3].n); + return sr_kemi_jsdt_return_int(J, ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_STR + && ket->ptypes[1]==SR_KEMIP_INT + && ket->ptypes[2]==SR_KEMIP_INT + && ket->ptypes[3]==SR_KEMIP_STR) { + ret = ((sr_kemi_fmsnns_f)(ket->func))(env_J->msg, + &vps[0].s, vps[1].n, vps[2].n, &vps[3].s); + return sr_kemi_jsdt_return_int(J, ket, ret); } else if(ket->ptypes[0]==SR_KEMIP_STR && ket->ptypes[1]==SR_KEMIP_INT && ket->ptypes[2]==SR_KEMIP_INT @@ -1263,6 +1291,27 @@ int sr_kemi_jsdt_exec_func_ex(duk_context *J, sr_kemi_t *ket) ret = ((sr_kemi_fmnsss_f)(ket->func))(env_J->msg, vps[0].n, &vps[1].s, &vps[2].s, &vps[3].s); return sr_kemi_jsdt_return_int(J, ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_INT + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_INT) { + ret = ((sr_kemi_fmnssn_f)(ket->func))(env_J->msg, + vps[0].n, &vps[1].s, &vps[2].s, vps[3].n); + return sr_kemi_jsdt_return_int(J, ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_INT + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_INT + && ket->ptypes[3]==SR_KEMIP_STR) { + ret = ((sr_kemi_fmnsns_f)(ket->func))(env_J->msg, + vps[0].n, &vps[1].s, vps[2].n, &vps[3].s); + return sr_kemi_jsdt_return_int(J, ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_INT + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_INT + && ket->ptypes[3]==SR_KEMIP_INT) { + ret = ((sr_kemi_fmnsnn_f)(ket->func))(env_J->msg, + vps[0].n, &vps[1].s, vps[2].n, vps[3].n); + return sr_kemi_jsdt_return_int(J, ket, ret); } else if(ket->ptypes[0]==SR_KEMIP_INT && ket->ptypes[1]==SR_KEMIP_INT && ket->ptypes[2]==SR_KEMIP_STR @@ -1270,6 +1319,13 @@ int sr_kemi_jsdt_exec_func_ex(duk_context *J, sr_kemi_t *ket) ret = ((sr_kemi_fmnnss_f)(ket->func))(env_J->msg, vps[0].n, vps[1].n, &vps[2].s, &vps[3].s); return sr_kemi_jsdt_return_int(J, ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_INT + && ket->ptypes[1]==SR_KEMIP_INT + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_INT) { + ret = ((sr_kemi_fmnnsn_f)(ket->func))(env_J->msg, + vps[0].n, vps[1].n, &vps[2].s, vps[3].n); + return sr_kemi_jsdt_return_int(J, ket, ret); } else if(ket->ptypes[0]==SR_KEMIP_INT && ket->ptypes[1]==SR_KEMIP_INT && ket->ptypes[2]==SR_KEMIP_INT @@ -1285,8 +1341,7 @@ int sr_kemi_jsdt_exec_func_ex(duk_context *J, sr_kemi_t *ket) vps[0].n, vps[1].n, vps[2].n, vps[3].n); return sr_kemi_jsdt_return_int(J, ket, ret); } else { - LM_ERR("invalid parameters for: %.*s\n", - fname->len, fname->s); + LM_ERR("invalid parameters for: %.*s\n", fname->len, fname->s); return app_jsdt_return_false(J); } break;