sr-dev December 2021

sr-dev@lists.kamailio.org

11 participants
269 discussions

git:master:871475c6: app_python3: update to handle xval return for functions with 3 parameters

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 871475c6aba89bd6506255665d304206325bbf4c URL: https://github.com/kamailio/kamailio/commit/871475c6aba89bd6506255665d30420… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-10T08:11:54+01:00 app_python3: update to handle xval return for functions with 3 parameters - fix for functions like KSR.sqlops.sql_result_get() --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/871475c6aba89bd6506255665d30420… Patch: https://github.com/kamailio/kamailio/commit/871475c6aba89bd6506255665d30420…

2 years, 4 months

git:master:466fcb28: app_python: update to handle xval return for functions with 3 parameters

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 466fcb283ccf0de92d78c90ca7df7830f8e8ced5 URL: https://github.com/kamailio/kamailio/commit/466fcb283ccf0de92d78c90ca7df783… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-10T08:08:11+01:00 app_python: update to handle xval return for functions with 3 parameters - fix for functions like KSR.sqlops.sql_result_get() --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/466fcb283ccf0de92d78c90ca7df783… Patch: https://github.com/kamailio/kamailio/commit/466fcb283ccf0de92d78c90ca7df783…

2 years, 4 months

git:master:5a048b94: misc: kemi-code-gen.py - generate code for python functions with xval return

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5a048b9489ce4a5c48e632376f7472b26efefb45 URL: https://github.com/kamailio/kamailio/commit/5a048b9489ce4a5c48e632376f7472b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-10T08:07:23+01:00 misc: kemi-code-gen.py - generate code for python functions with xval return --- Modified: misc/tools/kemi/kemi-code-gen.py --- Diff: https://github.com/kamailio/kamailio/commit/5a048b9489ce4a5c48e632376f7472b… Patch: https://github.com/kamailio/kamailio/commit/5a048b9489ce4a5c48e632376f7472b… --- diff --git a/misc/tools/kemi/kemi-code-gen.py b/misc/tools/kemi/kemi-code-gen.py index dd77d61655..2a024f826e 100644 --- a/misc/tools/kemi/kemi-code-gen.py +++ b/misc/tools/kemi/kemi-code-gen.py @@ -4,7 +4,7 @@ PRINTPARAMS=3 # - print mode: typedefs, js, lua, python, pythonparams, ruby, sqlang -PRINTMODE="js" +PRINTMODE="python" # - two tabs for python params, three for the other cases # PRINTTABS="\t\t" PRINTTABS="\t\t\t" @@ -60,10 +60,8 @@ def printCodeIfJS(prefix): sfunc = PRINTTABS + "\t\txret = ((sr_kemi_xfm" + prefix + "_f)(ket->func))(env_J->msg,\n" + PRINTTABS + "\t\t\t" print(sfunc + sparams) print(PRINTTABS + "\t\treturn sr_kemi_jsdt_return_xval(J, ket, xret);") - print("\t\t\t\t} else {") sfunc = PRINTTABS + "\t\tret = ((sr_kemi_fm" + prefix + "_f)(ket->func))(env_J->msg,\n" + PRINTTABS + "\t\t\t" - print(sfunc + sparams) print(PRINTTABS + "\t\treturn sr_kemi_jsdt_return_int(J, ket, ret);") print("\t\t\t\t}") @@ -100,10 +98,8 @@ def printCodeIfLua(prefix): sfunc = PRINTTABS + "\t\txret = ((sr_kemi_xfm" + prefix + "_f)(ket->func))(env_L->msg,\n" + PRINTTABS + "\t\t\t" print(sfunc + sparams) print(PRINTTABS + "\t\treturn sr_kemi_lua_return_xval(L, ket, xret);") - print("\t\t\t\t} else {") sfunc = PRINTTABS + "\t\tret = ((sr_kemi_fm" + prefix + "_f)(ket->func))(env_L->msg,\n" + PRINTTABS + "\t\t\t" - print(sfunc + sparams) print(PRINTTABS + "\t\treturn sr_kemi_lua_return_int(L, ket, ret);") print("\t\t\t\t}") @@ -111,33 +107,40 @@ def printCodeIfLua(prefix): def printCodeIfPython(prefix): global PRINTELSE - sfunc = PRINTTABS + "\tret = ((sr_kemi_fm" + prefix + "_f)(ket->func))(lmsg,\n" + PRINTTABS + "\t\t\t" + sparams = "" for i, c in enumerate(prefix): if i==0: if c == 's': print(PRINTTABS + PRINTELSE + "if(ket->ptypes[0]==SR_KEMIP_STR") - sfunc += "&vps[" + str(i) +"].s, " + sparams += "&vps[" + str(i) +"].s, " else: print(PRINTTABS + PRINTELSE + "if(ket->ptypes[0]==SR_KEMIP_INT") - sfunc += "vps[" + str(i) +"].n, " + sparams += "vps[" + str(i) +"].n, " PRINTELSE = "} else " elif i==PRINTPARAMS-1: if c == 's': print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_STR) {") - sfunc += "&vps[" + str(i) +"].s);" + sparams += "&vps[" + str(i) +"].s);" else: print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_INT) {") - sfunc += "vps[" + str(i) +"].n);" + sparams += "vps[" + str(i) +"].n);" else: if c == 's': print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_STR") - sfunc += "&vps[" + str(i) +"].s, " + sparams += "&vps[" + str(i) +"].s, " else: print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_INT") - sfunc += "vps[" + str(i) +"].n, " + sparams += "vps[" + str(i) +"].n, " - print(sfunc) - print(PRINTTABS + "\treturn sr_kemi_apy_return_int(ket, ret);") + print("\t\t\t\tif(ket->rtype==SR_KEMIP_XVAL) {") + sfunc = PRINTTABS + "\t\txret = ((sr_kemi_xfm" + prefix + "_f)(ket->func))(lmsg,\n" + PRINTTABS + "\t\t\t" + print(sfunc + sparams) + print(PRINTTABS + "\t\treturn sr_kemi_apy_return_xval(ket, xret);") + print("\t\t\t\t} else {") + sfunc = PRINTTABS + "\t\tret = ((sr_kemi_fm" + prefix + "_f)(ket->func))(lmsg,\n" + PRINTTABS + "\t\t\t" + print(sfunc + sparams) + print(PRINTTABS + "\t\treturn sr_kemi_apy_return_int(ket, ret);") + print("\t\t\t\t}") def printCodeIfPythonParams(prefix):

2 years, 4 months

git:master:6064b1ee: app_jsdt: update to handle xval return for functions with 3 parameters

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6064b1ee64fa2fa6682c671f554acaead5ca1898 URL: https://github.com/kamailio/kamailio/commit/6064b1ee64fa2fa6682c671f554acae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-09T21:01:04+01:00 app_jsdt: update to handle xval return for functions with 3 parameters - fix for functions like KSR.sqlops.sql_result_get() --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/6064b1ee64fa2fa6682c671f554acae… Patch: https://github.com/kamailio/kamailio/commit/6064b1ee64fa2fa6682c671f554acae…

2 years, 4 months

git:master:a99f581a: misc: kemi-code-gen.py - generate code for javascript functions with xval return

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a99f581a519123e7c47479b724308a5dc239393a URL: https://github.com/kamailio/kamailio/commit/a99f581a519123e7c47479b724308a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-09T20:42:01+01:00 misc: kemi-code-gen.py - generate code for javascript functions with xval return --- Modified: misc/tools/kemi/kemi-code-gen.py --- Diff: https://github.com/kamailio/kamailio/commit/a99f581a519123e7c47479b724308a5… Patch: https://github.com/kamailio/kamailio/commit/a99f581a519123e7c47479b724308a5… --- diff --git a/misc/tools/kemi/kemi-code-gen.py b/misc/tools/kemi/kemi-code-gen.py index 6c2893a688..dd77d61655 100644 --- a/misc/tools/kemi/kemi-code-gen.py +++ b/misc/tools/kemi/kemi-code-gen.py @@ -4,7 +4,7 @@ PRINTPARAMS=3 # - print mode: typedefs, js, lua, python, pythonparams, ruby, sqlang -PRINTMODE="lua" +PRINTMODE="js" # - two tabs for python params, three for the other cases # PRINTTABS="\t\t" PRINTTABS="\t\t\t" @@ -31,33 +31,42 @@ def printCodeIfEnd(sretfunc): def printCodeIfJS(prefix): global PRINTELSE - sfunc = PRINTTABS + "\tret = ((sr_kemi_fm" + prefix + "_f)(ket->func))(env_J->msg,\n" + PRINTTABS + "\t\t\t" + sparams = "" for i, c in enumerate(prefix): if i==0: if c == 's': print(PRINTTABS + PRINTELSE + "if(ket->ptypes[0]==SR_KEMIP_STR") - sfunc += "&vps[" + str(i) +"].s, " + sparams += "&vps[" + str(i) +"].s, " else: print(PRINTTABS + PRINTELSE + "if(ket->ptypes[0]==SR_KEMIP_INT") - sfunc += "vps[" + str(i) +"].n, " + sparams += "vps[" + str(i) +"].n, " PRINTELSE = "} else " elif i==PRINTPARAMS-1: if c == 's': print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_STR) {") - sfunc += "&vps[" + str(i) +"].s);" + sparams += "&vps[" + str(i) +"].s);" else: print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_INT) {") - sfunc += "vps[" + str(i) +"].n);" + sparams += "vps[" + str(i) +"].n);" else: if c == 's': print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_STR") - sfunc += "&vps[" + str(i) +"].s, " + sparams += "&vps[" + str(i) +"].s, " else: print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_INT") - sfunc += "vps[" + str(i) +"].n, " + sparams += "vps[" + str(i) +"].n, " - print(sfunc) - print(PRINTTABS + "\treturn sr_kemi_jsdt_return_int(J, ket, ret);") + print("\t\t\t\tif(ket->rtype==SR_KEMIP_XVAL) {") + sfunc = PRINTTABS + "\t\txret = ((sr_kemi_xfm" + prefix + "_f)(ket->func))(env_J->msg,\n" + PRINTTABS + "\t\t\t" + print(sfunc + sparams) + print(PRINTTABS + "\t\treturn sr_kemi_jsdt_return_xval(J, ket, xret);") + + print("\t\t\t\t} else {") + sfunc = PRINTTABS + "\t\tret = ((sr_kemi_fm" + prefix + "_f)(ket->func))(env_J->msg,\n" + PRINTTABS + "\t\t\t" + + print(sfunc + sparams) + print(PRINTTABS + "\t\treturn sr_kemi_jsdt_return_int(J, ket, ret);") + print("\t\t\t\t}") def printCodeIfLua(prefix):

2 years, 4 months

git:master:da9eee21: app_lua: update to handle xval return for functions with 3 parameters

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: da9eee2125fc6e632bcbeae4d9133bb39c412dee URL: https://github.com/kamailio/kamailio/commit/da9eee2125fc6e632bcbeae4d9133bb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-09T20:37:51+01:00 app_lua: update to handle xval return for functions with 3 parameters - fix for functions like KSR.sqlops.sql_result_get() --- Modified: src/modules/app_lua/app_lua_api.c --- Diff: https://github.com/kamailio/kamailio/commit/da9eee2125fc6e632bcbeae4d9133bb… Patch: https://github.com/kamailio/kamailio/commit/da9eee2125fc6e632bcbeae4d9133bb…

2 years, 4 months

git:master:8bce8a73: misc: kemi-code-gen.py - generate code for lua functions with 3 params and xval return

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8bce8a738e16303985ed386213e1d86a1a6a7878 URL: https://github.com/kamailio/kamailio/commit/8bce8a738e16303985ed386213e1d86… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-09T20:15:31+01:00 misc: kemi-code-gen.py - generate code for lua functions with 3 params and xval return --- Modified: misc/tools/kemi/kemi-code-gen.py --- Diff: https://github.com/kamailio/kamailio/commit/8bce8a738e16303985ed386213e1d86… Patch: https://github.com/kamailio/kamailio/commit/8bce8a738e16303985ed386213e1d86… --- diff --git a/misc/tools/kemi/kemi-code-gen.py b/misc/tools/kemi/kemi-code-gen.py index 8593c154140..6c2893a6884 100644 --- a/misc/tools/kemi/kemi-code-gen.py +++ b/misc/tools/kemi/kemi-code-gen.py @@ -2,9 +2,9 @@ # - print IF conditions with param types for KEMI interpreters # - print typedefs for functions -PRINTPARAMS=4 +PRINTPARAMS=3 # - print mode: typedefs, js, lua, python, pythonparams, ruby, sqlang -PRINTMODE="sqlang" +PRINTMODE="lua" # - two tabs for python params, three for the other cases # PRINTTABS="\t\t" PRINTTABS="\t\t\t" @@ -62,33 +62,42 @@ def printCodeIfJS(prefix): def printCodeIfLua(prefix): global PRINTELSE - sfunc = PRINTTABS + "\tret = ((sr_kemi_fm" + prefix + "_f)(ket->func))(env_L->msg,\n" + PRINTTABS + "\t\t\t" + sparams = "" for i, c in enumerate(prefix): if i==0: if c == 's': print(PRINTTABS + PRINTELSE + "if(ket->ptypes[0]==SR_KEMIP_STR") - sfunc += "&vps[" + str(i) +"].s, " + sparams += "&vps[" + str(i) +"].s, " else: print(PRINTTABS + PRINTELSE + "if(ket->ptypes[0]==SR_KEMIP_INT") - sfunc += "vps[" + str(i) +"].n, " + sparams += "vps[" + str(i) +"].n, " PRINTELSE = "} else " elif i==PRINTPARAMS-1: if c == 's': print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_STR) {") - sfunc += "&vps[" + str(i) +"].s);" + sparams += "&vps[" + str(i) +"].s);" else: print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_INT) {") - sfunc += "vps[" + str(i) +"].n);" + sparams += "vps[" + str(i) +"].n);" else: if c == 's': print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_STR") - sfunc += "&vps[" + str(i) +"].s, " + sparams += "&vps[" + str(i) +"].s, " else: print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_INT") - sfunc += "vps[" + str(i) +"].n, " + sparams += "vps[" + str(i) +"].n, " - print(sfunc) - print(PRINTTABS + "\treturn sr_kemi_lua_return_int(L, ket, ret);") + print("\t\t\t\tif(ket->rtype==SR_KEMIP_XVAL) {") + sfunc = PRINTTABS + "\t\txret = ((sr_kemi_xfm" + prefix + "_f)(ket->func))(env_L->msg,\n" + PRINTTABS + "\t\t\t" + print(sfunc + sparams) + print(PRINTTABS + "\t\treturn sr_kemi_lua_return_xval(L, ket, xret);") + + print("\t\t\t\t} else {") + sfunc = PRINTTABS + "\t\tret = ((sr_kemi_fm" + prefix + "_f)(ket->func))(env_L->msg,\n" + PRINTTABS + "\t\t\t" + + print(sfunc + sparams) + print(PRINTTABS + "\t\treturn sr_kemi_lua_return_int(L, ket, ret);") + print("\t\t\t\t}") def printCodeIfPython(prefix):

2 years, 4 months

git:master:72cc434e: core: kemi - added typedefs for functions with three params and xval return

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 72cc434ef75a0667c843206cf84fe080bb912dd3 URL: https://github.com/kamailio/kamailio/commit/72cc434ef75a0667c843206cf84fe08… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-09T20:12:22+01:00 core: kemi - added typedefs for functions with three params and xval return --- Modified: src/core/kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/72cc434ef75a0667c843206cf84fe08… Patch: https://github.com/kamailio/kamailio/commit/72cc434ef75a0667c843206cf84fe08… --- diff --git a/src/core/kemi.h b/src/core/kemi.h index 6493ab5009..26e9bd4860 100644 --- a/src/core/kemi.h +++ b/src/core/kemi.h @@ -180,6 +180,16 @@ typedef sr_kemi_xval_t* (*sr_kemi_xfmns_f)(sip_msg_t*, int, str*); typedef sr_kemi_xval_t* (*sr_kemi_xfmsn_f)(sip_msg_t*, str*, int); typedef sr_kemi_xval_t* (*sr_kemi_xfmss_f)(sip_msg_t*, str*, str*); +/* return xval, params sip_msg_t and three int|str params */ +typedef sr_kemi_xval_t* (*sr_kemi_xfmnnn_f)(sip_msg_t*, int, int, int); +typedef sr_kemi_xval_t* (*sr_kemi_xfmnns_f)(sip_msg_t*, int, int, str*); +typedef sr_kemi_xval_t* (*sr_kemi_xfmnsn_f)(sip_msg_t*, int, str*, int); +typedef sr_kemi_xval_t* (*sr_kemi_xfmnss_f)(sip_msg_t*, int, str*, str*); +typedef sr_kemi_xval_t* (*sr_kemi_xfmsnn_f)(sip_msg_t*, str*, int, int); +typedef sr_kemi_xval_t* (*sr_kemi_xfmsns_f)(sip_msg_t*, str*, int, str*); +typedef sr_kemi_xval_t* (*sr_kemi_xfmssn_f)(sip_msg_t*, str*, str*, int); +typedef sr_kemi_xval_t* (*sr_kemi_xfmsss_f)(sip_msg_t*, str*, str*, str*); + sr_kemi_t* sr_kemi_lookup(str *mname, int midx, str *fname); int sr_kemi_modules_add(sr_kemi_t *klist);

2 years, 4 months

[kamailio/kamailio] Network route priority (Issue #2968)

by xaled1

Hi, if event_route[network:msg] and event_route[siptrace:msg] both are enabled, then event_route[siptrace:msg] seems to be called before event_route[network:msg] when a message has been received (and event_route[siptrace:msg] called after event_route[network:msg], if a message has been sent) As network:msg (nio) is designed to process compression or encryption, it makes sense, that it is called before event_route[siptrace:msg], that is meant to work on a SIP message (when receiving data from the network). When sending a message, it makes sense, to call siptrace:msg before network:msg. Is there any option to change this priority (e.g. defining anchors/priorities)? -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2968

2 years, 4 months

git:master:cd2f5d4c: core: enclose in quotes the value for #!defenvs

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cd2f5d4ca2a3ec31c1e67cd08ad025a152241e35 URL: https://github.com/kamailio/kamailio/commit/cd2f5d4ca2a3ec31c1e67cd08ad025a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-09T10:41:41+01:00 core: enclose in quotes the value for #!defenvs --- Modified: src/core/cfg.lex Modified: src/core/ppcfg.c Modified: src/core/ppcfg.h --- Diff: https://github.com/kamailio/kamailio/commit/cd2f5d4ca2a3ec31c1e67cd08ad025a… Patch: https://github.com/kamailio/kamailio/commit/cd2f5d4ca2a3ec31c1e67cd08ad025a… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 551cfab014..84f5630483 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -2087,6 +2087,7 @@ int pp_define_env(const char *text, int len, int qmode) char *r; str defname; str defvalue; + str newval; r = strchr(text, '='); @@ -2115,6 +2116,13 @@ int pp_define_env(const char *text, int len, int qmode) LM_ERR("cannot set define name [%s]\n", (char*)text); return -1; } + if(qmode==KSR_PPDEF_QUOTED) { + if(pp_def_qvalue(&defvalue, &newval) < 0) { + LM_ERR("failed to enclose in quotes the value\n"); + return -1; + } + defvalue = newval; + } if(pp_define_set(defvalue.len, defvalue.s, qmode)<0) { LM_ERR("cannot set define value [%s]\n", (char*)text); return -1; diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index 67391557f8..3d91679df6 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -48,6 +48,31 @@ static pp_subst_rule_t *pp_subst_rules_tail = NULL; static int _pp_ifdef_level = 0; static str_list_t *_ksr_substdef_strlist = NULL; +int pp_def_qvalue(str *defval, str *outval) +{ + str newval; + str_list_t *sb; + + if(pv_get_buffer_size() < defval->len + 4) { + LM_ERR("defined value is too large\n"); + return -1; + } + newval.s = pv_get_buffer(); + newval.s[0] = '"'; + memcpy(newval.s + 1, defval->s, defval->len); + newval.s[defval->len + 1] = '"'; + newval.s[defval->len + 2] = '\0'; + newval.len = defval->len + 2; + sb = str_list_block_add(&_ksr_substdef_strlist, newval.s, newval.len); + if(sb==NULL) { + LM_ERR("failed to link quoted value [%.*s]\n", defval->len, defval->s); + return -1; + } + *outval = sb->s; + + return 0; +} + int pp_subst_add(char *data) { struct subst_expr* se; @@ -163,22 +188,11 @@ int pp_substdef_add(char *data, int mode) } } if(mode==KSR_PPDEF_QUOTED) { - if(pv_get_buffer_size() < defvalue.len + 4) { - LM_ERR("defined value is too large\n"); - return -1; - } - newval.s = pv_get_buffer(); - newval.s[0] = '"'; - memcpy(newval.s + 1, defvalue.s, defvalue.len); - newval.s[defvalue.len + 1] = '"'; - newval.s[defvalue.len + 2] = '\0'; - newval.len = defvalue.len + 2; - sb = str_list_block_add(&_ksr_substdef_strlist, newval.s, newval.len); - if(sb==NULL) { - LM_ERR("failed to handle substdef: [%s]\n", data); + if(pp_def_qvalue(&defvalue, &newval) < 0) { + LM_ERR("failed to enclose in quotes the value\n"); return -1; } - defvalue = sb->s; + defvalue = newval; } if(pp_define_set(defvalue.len, defvalue.s, KSR_PPDEF_QUOTED)<0) { LM_ERR("cannot set define value\n"); diff --git a/src/core/ppcfg.h b/src/core/ppcfg.h index a8d27f7083..d08884775c 100644 --- a/src/core/ppcfg.h +++ b/src/core/ppcfg.h @@ -34,6 +34,8 @@ typedef struct ksr_ppdefine { int dtype; } ksr_ppdefine_t; +int pp_def_qvalue(str *defval, str *outval); + str* pp_get_define_name(int idx); ksr_ppdefine_t* pp_get_define(int idx);

2 years, 4 months

← Newer
1
...
18
19
20
21
22
23
24
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2021