Module: kamailio Branch: master Commit: b035558ec76a68ee17b612adb9dce116ed89c48c URL: https://github.com/kamailio/kamailio/commit/b035558ec76a68ee17b612adb9dce11… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-25T12:09:32+02:00 app_python3: fix for executing kemi functions with 4 or more params - more combinations for 4 params --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/b035558ec76a68ee17b612adb9dce11… Patch: https://github.com/kamailio/kamailio/commit/b035558ec76a68ee17b612adb9dce11… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index cacd9067f4..fc0368822b 100644 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -563,21 +563,37 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) break; case 4: if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_STR - || ket->ptypes[3]==SR_KEMIP_STR) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR) { /* ssss */ ret = ((sr_kemi_fmssss_f)(ket->func))(lmsg, &vps[0].s, &vps[1].s, &vps[2].s, &vps[3].s); return sr_kemi_apy_return_int(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_INT) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_INT) { + /* ssnn */ + ret = ((sr_kemi_fmsssn_f)(ket->func))(lmsg, + &vps[0].s, &vps[1].s, &vps[2].s, vps[3].n); + return sr_kemi_apy_return_int(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_INT) { /* ssnn */ ret = ((sr_kemi_fmssnn_f)(ket->func))(lmsg, &vps[0].s, &vps[1].s, vps[2].n, vps[3].n); return sr_kemi_apy_return_int(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_STR) { + /* ssnn */ + ret = ((sr_kemi_fmnsss_f)(ket->func))(lmsg, + vps[0].n, &vps[1].s, &vps[2].s, &vps[3].s); + return sr_kemi_apy_return_int(ket, ret); } else { LM_ERR("invalid parameters for: %.*s\n", fname.len, fname.s); @@ -586,10 +602,10 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) break; case 5: if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_STR - || ket->ptypes[3]==SR_KEMIP_STR - || ket->ptypes[4]==SR_KEMIP_STR) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR + && ket->ptypes[4]==SR_KEMIP_STR) { /* sssss */ ret = ((sr_kemi_fmsssss_f)(ket->func))(lmsg, &vps[0].s, &vps[1].s, &vps[2].s, &vps[3].s, @@ -603,11 +619,11 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) break; case 6: if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_STR - || ket->ptypes[3]==SR_KEMIP_STR - || ket->ptypes[4]==SR_KEMIP_STR - || ket->ptypes[5]==SR_KEMIP_STR) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR + && ket->ptypes[4]==SR_KEMIP_STR + && ket->ptypes[5]==SR_KEMIP_STR) { /* ssssss */ ret = ((sr_kemi_fmssssss_f)(ket->func))(lmsg, &vps[0].s, &vps[1].s, &vps[2].s, &vps[3].s,