Skip to content

Commit

Permalink
apy_python: fixed condition in matching parameter types
Browse files Browse the repository at this point in the history 
- GH #1944

(cherry picked from commit cbec7f9)
(cherry picked from commit 42117d1)
  • Loading branch information
@miconda
miconda committed Sep 24, 2019
1 parent 8ff3c22 commit 3849f7f
Showing 1 changed file with 44 additions and 15 deletions.
59 changes: 44 additions & 15 deletions src/modules/app_python/apy_kemi.c
View file
Expand Up @@ -353,9 +353,9 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx)
} else if(ket->ptypes[4]==SR_KEMIP_NONE) {
i = 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) {
if(!PyArg_ParseTuple(args, "ssss:kemi-param-ssss",
&vps[0].s.s, &vps[1].s.s, &vps[2].s.s, &vps[3].s.s)) {
LM_ERR("unable to retrieve str-str-str-str params %d\n", i);
Expand All @@ -371,9 +371,9 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx)
vps[1].s.len, vps[1].s.s, vps[2].s.len, vps[2].s.s,
vps[3].s.len, vps[3].s.s);
} 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_INT
&& ket->ptypes[3]==SR_KEMIP_INT) {
if(!PyArg_ParseTuple(args, "ssii:kemi-param-ssnn",
&vps[0].s.s, &vps[1].s.s, &vps[2].n, &vps[3].n)) {
LM_ERR("unable to retrieve str-str-int-int params %d\n", i);
Expand All @@ -392,10 +392,10 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx)
} else if(ket->ptypes[5]==SR_KEMIP_NONE) {
i = 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) {
if(!PyArg_ParseTuple(args, "sssss:kemi-param-sssss",
&vps[0].s.s, &vps[1].s.s, &vps[2].s.s, &vps[3].s.s,
&vps[4].s.s)) {
Expand All @@ -412,18 +412,37 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx)
fname.len, fname.s, vps[0].s.len, vps[0].s.s,
vps[1].s.len, vps[1].s.s, vps[2].s.len, vps[2].s.s,
vps[3].s.len, vps[3].s.s, vps[4].s.len, vps[4].s.s);
} 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[4]==SR_KEMIP_STR) {
if(!PyArg_ParseTuple(args, "ssiis:kemi-param-ssnns",
&vps[0].s.s, &vps[1].s.s, &vps[2].n, &vps[3].n,
&vps[4].s.s)) {
LM_ERR("unable to retrieve str-str-int-int-str params %d\n", i);
return sr_kemi_apy_return_false();
}
vps[0].s.len = strlen(vps[0].s.s);
vps[1].s.len = strlen(vps[1].s.s);
vps[4].s.len = strlen(vps[4].s.s);
LM_DBG("params[%d] for: %.*s are str: [%.*s] [%.*s]"
" [%d] [%d] [%.*s]\n", i,
fname.len, fname.s, vps[0].s.len, vps[0].s.s,
vps[1].s.len, vps[1].s.s, vps[2].n, vps[3].n,
vps[4].s.len, vps[4].s.s);
} else {
LM_ERR("not implemented yet\n");
return sr_kemi_apy_return_false();
}
} else {
i = 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) {
if(!PyArg_ParseTuple(args, "ssssss:kemi-param-ssssss",
&vps[0].s.s, &vps[1].s.s, &vps[2].s.s, &vps[3].s.s,
&vps[4].s.s, &vps[5].s.s)) {
Expand Down Expand Up @@ -658,6 +677,16 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx)
&vps[0].s, &vps[1].s, &vps[2].s, &vps[3].s,
&vps[4].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[4]==SR_KEMIP_STR) {
/* ssnns */
ret = ((sr_kemi_fmssnns_f)(ket->func))(lmsg,
&vps[0].s, &vps[1].s, vps[2].n, vps[3].n,
&vps[4].s);
return sr_kemi_apy_return_int(ket, ret);
} else {
LM_ERR("invalid parameters for: %.*s\n",
fname.len, fname.s);
Expand Down

0 comments on commit 3849f7f

Please sign in to comment.