sr-dev July 2021

sr-dev@lists.kamailio.org

13 participants
227 discussions

git:master:63f6b5a2: modules: readme files regenerated - secsipid ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 63f6b5a2c9bc86446feb3852b91384839bb701e6 URL: https://github.com/kamailio/kamailio/commit/63f6b5a2c9bc86446feb3852b913848… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-01T16:16:19+02:00 modules: readme files regenerated - secsipid ... [skip ci] --- Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/63f6b5a2c9bc86446feb3852b913848… Patch: https://github.com/kamailio/kamailio/commit/63f6b5a2c9bc86446feb3852b913848… --- diff --git a/src/modules/secsipid/README b/src/modules/secsipid/README index 87a33aebfd..945143421c 100644 --- a/src/modules/secsipid/README +++ b/src/modules/secsipid/README @@ -36,7 +36,7 @@ Daniel-Constantin Mierla 4. Functions 4.1. secsipid_check_identity(keyPath) - 4.2. secsipid_check_identity(pubkeyVal) + 4.2. secsipid_check_identity_pubkey(pubkeyVal) 4.3. secsipid_check(sIdentity, keyPath) 4.4. secsipid_get_url(url, ovar) 4.5. secsipid_add_identity(origTN, destTN, attest, origID, @@ -88,7 +88,7 @@ Chapter 1. Admin Guide 4. Functions 4.1. secsipid_check_identity(keyPath) - 4.2. secsipid_check_identity(pubkeyVal) + 4.2. secsipid_check_identity_pubkey(pubkeyVal) 4.3. secsipid_check(sIdentity, keyPath) 4.4. secsipid_get_url(url, ovar) 4.5. secsipid_add_identity(origTN, destTN, attest, origID, x5u, @@ -223,7 +223,7 @@ modparam("secsipid", "libopt", "CacheExpires=0") 4. Functions 4.1. secsipid_check_identity(keyPath) - 4.2. secsipid_check_identity(pubkeyVal) + 4.2. secsipid_check_identity_pubkey(pubkeyVal) 4.3. secsipid_check(sIdentity, keyPath) 4.4. secsipid_get_url(url, ovar) 4.5. secsipid_add_identity(origTN, destTN, attest, origID, x5u, @@ -262,7 +262,7 @@ request_route { header and payload using {s.select} and {s.decode.base64t} transformations together with jansson module. -4.2. secsipid_check_identity(pubkeyVal) +4.2. secsipid_check_identity_pubkey(pubkeyVal) Similar to secsipid_check_identity() with the public key value provided in the parameter. @@ -300,9 +300,9 @@ request_route { ... request_route { ... - if(secsipid_check_identity("...", "/secsipid/$si/cert.pem")) { ... } + if(secsipid_check("...", "/secsipid/$si/cert.pem")) { ... } ... - if(secsipid_check_identity("...", "")) { ... } + if(secsipid_check("...", "")) { ... } ... } ...

3 years, 4 months

git:master:22476389: secsipid: fix documentation example for secsipid_check() function

by Ovidiu Sas

Module: kamailio Branch: master Commit: 224763898a9a6c1d3214129ecf0b4bf07baf62f3 URL: https://github.com/kamailio/kamailio/commit/224763898a9a6c1d3214129ecf0b4bf… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-07-01T10:09:24-04:00 secsipid: fix documentation example for secsipid_check() function --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/224763898a9a6c1d3214129ecf0b4bf… Patch: https://github.com/kamailio/kamailio/commit/224763898a9a6c1d3214129ecf0b4bf… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index 4588868d2c..88c4e761db 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -291,9 +291,9 @@ request_route { ... request_route { ... - if(secsipid_check_identity("...", "/secsipid/$si/cert.pem")) { ... } + if(secsipid_check("...", "/secsipid/$si/cert.pem")) { ... } ... - if(secsipid_check_identity("...", "")) { ... } + if(secsipid_check("...", "")) { ... } ... } ...

3 years, 4 months

git:5.5:6751ccf1: secsipid: fix documentation for secsipid_check_identity_pubkey

by Ovidiu Sas

Module: kamailio Branch: 5.5 Commit: 6751ccf10f7860098cfc080e492aa2e35107fdf2 URL: https://github.com/kamailio/kamailio/commit/6751ccf10f7860098cfc080e492aa2e… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-07-01T10:06:33-04:00 secsipid: fix documentation for secsipid_check_identity_pubkey (cherry picked from commit 1e4911d8a92e9e2ff25457d76d47bee111433947) --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6751ccf10f7860098cfc080e492aa2e… Patch: https://github.com/kamailio/kamailio/commit/6751ccf10f7860098cfc080e492aa2e… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index 527db1aecf..52a0dfeb35 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -239,7 +239,7 @@ request_route { </section> <section id="secsipid.f.secsipid_check_identity_pubkey"> <title> - <function moreinfo="none">secsipid_check_identity(pubkeyVal)</function> + <function moreinfo="none">secsipid_check_identity_pubkey(pubkeyVal)</function> </title> <para> Similar to secsipid_check_identity() with the public key value

3 years, 4 months

git:master:1e4911d8: secsipid: fix documentation for secsipid_check_identity_pubkey

by Ovidiu Sas

Module: kamailio Branch: master Commit: 1e4911d8a92e9e2ff25457d76d47bee111433947 URL: https://github.com/kamailio/kamailio/commit/1e4911d8a92e9e2ff25457d76d47bee… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-07-01T10:04:10-04:00 secsipid: fix documentation for secsipid_check_identity_pubkey --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1e4911d8a92e9e2ff25457d76d47bee… Patch: https://github.com/kamailio/kamailio/commit/1e4911d8a92e9e2ff25457d76d47bee… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index cc9c6c9fdf..4588868d2c 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -239,7 +239,7 @@ request_route { </section> <section id="secsipid.f.secsipid_check_identity_pubkey"> <title> - <function moreinfo="none">secsipid_check_identity(pubkeyVal)</function> + <function moreinfo="none">secsipid_check_identity_pubkey(pubkeyVal)</function> </title> <para> Similar to secsipid_check_identity() with the public key value

3 years, 4 months

git:master:879f8c4e: core: fix building quoted value for #!subsdefs

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 879f8c4e52ab7f7f489107f18e2c80795c788bdd URL: https://github.com/kamailio/kamailio/commit/879f8c4e52ab7f7f489107f18e2c807… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-01T11:17:56+02:00 core: fix building quoted value for #!subsdefs --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/ppcfg.c Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/879f8c4e52ab7f7f489107f18e2c807… Patch: https://github.com/kamailio/kamailio/commit/879f8c4e52ab7f7f489107f18e2c807… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 45d9114c05..aabd724032 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -2049,11 +2049,12 @@ int pp_define_set(int len, char *text, int mode) pp_defines[ppos].value.len = len; pp_defines[ppos].value.s = text; - LM_DBG("### setting define ID [%.*s] value [%.*s]\n", + LM_DBG("### setting define ID [%.*s] value [%.*s] (mode: %d)\n", pp_defines[ppos].name.len, pp_defines[ppos].name.s, pp_defines[ppos].value.len, - pp_defines[ppos].value.s); + pp_defines[ppos].value.s, + mode); return 0; } diff --git a/src/core/cfg.y b/src/core/cfg.y index be0a664dce..5b205fd230 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -2213,9 +2213,9 @@ event_route_stm: preprocess_stm: SUBST STRING { if(pp_subst_add($2)<0) YYERROR; } | SUBST error { yyerror("invalid subst preprocess statement"); } - | SUBSTDEF STRING { if(pp_substdef_add($2, 0)<0) YYERROR; } + | SUBSTDEF STRING { if(pp_substdef_add($2, KSR_PPDEF_NORMAL)<0) YYERROR; } | SUBSTDEF error { yyerror("invalid substdef preprocess statement"); } - | SUBSTDEFS STRING { if(pp_substdef_add($2, 1)<0) YYERROR; } + | SUBSTDEFS STRING { if(pp_substdef_add($2, KSR_PPDEF_QUOTED)<0) YYERROR; } | SUBSTDEFS error { yyerror("invalid substdefs preprocess statement"); } ; diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index 73c0a2ef3c..67391557f8 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -30,6 +30,7 @@ #include "ut.h" #include "re.h" #include "pvar.h" +#include "pvapi.h" #include "str_list.h" #include "dprint.h" @@ -149,25 +150,40 @@ int pp_substdef_add(char *data, int mode) if(memchr(defvalue.s, '$', defvalue.len) != NULL) { fmsg = faked_msg_get_next(); if(pv_eval_str(fmsg, &newval, &defvalue)>=0) { - sb = str_list_block_add(&_ksr_substdef_strlist, newval.s, newval.len); - if(sb==NULL) { - LM_ERR("failed to handle substdef: [%s]\n", data); - return -1; + if(mode!=KSR_PPDEF_QUOTED) { + sb = str_list_block_add(&_ksr_substdef_strlist, newval.s, newval.len); + if(sb==NULL) { + LM_ERR("failed to handle substdef: [%s]\n", data); + return -1; + } + defvalue = sb->s; + } else { + defvalue = newval; } - defvalue = sb->s; } } - if(pp_define_set(defvalue.len, defvalue.s, - (mode==1)?KSR_PPDEF_QUOTED:KSR_PPDEF_NORMAL)<0) { + 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); + return -1; + } + defvalue = sb->s; + } + if(pp_define_set(defvalue.len, defvalue.s, KSR_PPDEF_QUOTED)<0) { LM_ERR("cannot set define value\n"); goto error; } - if(mode==1) { - defvalue.s++; - defvalue.len -= 2; - *(defvalue.s-1) = c; - defvalue.s[defvalue.len] = c; - } LM_DBG("### added substdef: [%.*s]=[%.*s] (%d)\n", defname.len, defname.s, defvalue.len, defvalue.s, mode); diff --git a/src/main.c b/src/main.c index 950bcd895a..c1bf2c864f 100644 --- a/src/main.c +++ b/src/main.c @@ -2349,7 +2349,7 @@ int main(int argc, char** argv) fprintf(stderr, "bad substdef parameter\n"); goto error; } - if(pp_substdef_add(optarg, 0)<0) { + if(pp_substdef_add(optarg, KSR_PPDEF_NORMAL)<0) { LM_ERR("failed to add substdef expression: %s\n", optarg); goto error; } @@ -2359,7 +2359,7 @@ int main(int argc, char** argv) fprintf(stderr, "bad substdefs parameter\n"); goto error; } - if(pp_substdef_add(optarg, 1)<0) { + if(pp_substdef_add(optarg, KSR_PPDEF_QUOTED)<0) { LM_ERR("failed to add substdefs expression: %s\n", optarg); goto error; }

3 years, 4 months

[kamailio/kamailio] core on start (#2788)

by sergey-safarov

### Description coredump kamailio start ### Troubleshooting #### Debugging Data ``` (gdb) bt #0 0x00007ffff7dd56b1 in __memmove_avx_unaligned_erms () from /lib64/libc.so.6 #1 0x00007ffff639d5df in pv_parse_hdr_name (sp=0x7ffff6ae4ce8, in=0x7fffffffd620) at pv_core.c:3594 #2 0x00000000005658e6 in pv_parse_spec2 (in=0x7ffff6ae4cd0, e=0x7ffff6ae4ce8, silent=0) at core/pvapi.c:969 #3 0x0000000000560fcd in pv_cache_add (name=0x7fffffffd810) at core/pvapi.c:359 #4 0x0000000000562898 in pv_spec_lookup (name=0x7fffffffd8d0, len=0x7fffffffd8cc) at core/pvapi.c:498 #5 0x000000000056903c in pv_parse_format (in=0x7fffffffd9d0, el=0x7ffff6ae4bb8) at core/pvapi.c:1194 #6 0x000000000062e790 in fix_param (type=256, param=0x7ffff6afc4a8) at core/sr_module.c:1214 #7 0x000000000062ee08 in fix_param_types (types=256, param=0x7ffff6afc4a8) at core/sr_module.c:1336 #8 0x000000000050de56 in fixup_spve_null (param=0x7ffff6afc4a8, param_no=1) at core/mod_fix.c:564 #9 0x00007ffff1ae0074 in fixup_hvalue_param (param=0x7ffff6afc4a8, param_no=2) at textopsx.c:622 #10 0x00007ffff1ae0e63 in fixup_hname_str (param=0x7ffff6afc4a8, param_no=2) at textopsx.c:719 #11 0x00007ffff1ae89ff in append_hf_value_fixup (param=0x7ffff6afc4a8, param_no=2) at textopsx.c:1644 #12 0x00000000005a3abd in fix_actions (a=0x7ffff6afc430) at core/route.c:932 #13 0x000000000059f111 in fix_actions (a=0x7ffff6afc6e8) at core/route.c:723 #14 0x00000000005b0dd3 in fix_rl (rt=0x91bec0 <main_rt>) at core/route.c:2102 #15 0x00000000005b0e0a in fix_rls () at core/route.c:2118 #16 0x0000000000438084 in main (argc=12, argv=0x7fffffffe608) at main.c:3047 (gdb) bt full #0 0x00007ffff7dd56b1 in __memmove_avx_unaligned_erms () from /lib64/libc.so.6 No symbol table info available. #1 0x00007ffff639d5df in pv_parse_hdr_name (sp=0x7ffff6ae4ce8, in=0x7fffffffd620) at pv_core.c:3594 s = {s = 0x7ffff6af9178 "\001", len = -156263992} p = 0x82be18 <__func__.9> "pv_init_buffer" nsp = 0x0 hdr = {type = 8368264, name = {s = 0x85 <error: Cannot access memory at address 0x85>, len = -10896}, body = {s = 0x5634f1 <pv_lookup_spec_name+910> "\205\300u<H\213EȋP\020H\213\205p\377\377\377\211\020H\213E\310H\213P\030H\213\205p\377\377\377H\211P\bH\213E\310H\213P H\213\205p\377\377\377H\211P\020H\213E\310\353\037H\213E\310H\213@PH\211E\310H\203", <incomplete sequence \310>, len = -156349208}, len = -10736, parsed = 0x1, next = 0x0} __func__ = "pv_parse_hdr_name" #2 0x00000000005658e6 in pv_parse_spec2 (in=0x7ffff6ae4cd0, e=0x7ffff6ae4ce8, silent=0) at core/pvapi.c:969 p = 0x7ffff6ae4d53 ")[0])" s = {s = 0x7ffff6ae4d4e "X-CID)[0])", len = 5} pvname = {s = 0x7ffff6ae4d4a "hdr(X-CID)[0])", len = 3} pvstate = 2 tr = 0x0 pte = 0x7ffff6500c38 n = 0 __func__ = "pv_parse_spec2" #3 0x0000000000560fcd in pv_cache_add (name=0x7fffffffd810) at core/pvapi.c:359 pvn = 0x7ffff6ae4cd0 pvid = 949637875 p = 0x0 __func__ = "pv_cache_add" #4 0x0000000000562898 in pv_spec_lookup (name=0x7fffffffd8d0, len=0x7fffffffd8cc) at core/pvapi.c:498 pvs = 0x0 tname = {s = 0x7ffff6afc668 "$(hdr(X-CID)[0])", len = 16} __func__ = "pv_spec_lookup" #5 0x000000000056903c in pv_parse_format (in=0x7fffffffd9d0, el=0x7ffff6ae4bb8) at core/pvapi.c:1194 p = 0x7ffff6afc668 "$(hdr(X-CID)[0])" p0 = 0xc600000001 <error: Cannot access memory at address 0xc600000001> n = 1 e = 0x7ffff6ae4c48 e0 = 0x0 s = {s = 0x7ffff6afc668 "$(hdr(X-CID)[0])", len = 16} len = 16 __func__ = "pv_parse_format" #6 0x000000000062e790 in fix_param (type=256, param=0x7ffff6afc4a8) at core/sr_module.c:1214 p = 0x7ffff6ae4ba8 name = {s = 0x7ffff6afc668 "$(hdr(X-CID)[0])", len = 16} s = {s = 0x1800000 <error: Cannot access memory at address 0x1800000>, len = 0} num = 32767 err = -156291736 __func__ = "fix_param" #7 0x000000000062ee08 in fix_param_types (types=256, param=0x7ffff6afc4a8) at core/sr_module.c:1336 ret = -156248399 t = 256 #8 0x000000000050de56 in fixup_spve_null (param=0x7ffff6afc4a8, param_no=1) at core/mod_fix.c:564 ret = 0 fp = 0x0 __func__ = "fixup_spve_null" #9 0x00007ffff1ae0074 in fixup_hvalue_param (param=0x7ffff6afc4a8, param_no=2) at textopsx.c:622 No locals. #10 0x00007ffff1ae0e63 in fixup_hname_str (param=0x7ffff6afc4a8, param_no=2) at textopsx.c:719 No locals. #11 0x00007ffff1ae89ff in append_hf_value_fixup (param=0x7ffff6afc4a8, param_no=2) at textopsx.c:1644 res = 0 __func__ = "append_hf_value_fixup" #12 0x00000000005a3abd in fix_actions (a=0x7ffff6afc430) at core/route.c:932 t = 0x7ffff6afc430 p = 0x7ffff6af8730 tmp = 0x4bbed9 <sr_event_exec+415> "\211E\374\213E\374\351/\003" tmp_p = 0x7ffff6afc668 ret = 0 i = 1 cmd = 0x7ffff6528150 s = {s = 0x7ffff6af99c8 "\001", len = -8700} he = 0x7fffffffded0 ip = {af = 25165824, len = 0, u = {addrl = {0, 140737488346496}, addr32 = {0, 0, 4294958464, 32767}, addr16 = {0, 0, 0, 0, 56704, 65535, 32767, 0}, addr = "\000\000\000\000\000\000\000\000\200\335\377\377\377\177\000"}} si = 0x7fffffffdecc lval = 0x7fffffffded4 rve = 0x7ffff6af8398 err_rve = 0x4000000 rve_type = RV_NONE err_type = 133 expected_type = RV_NONE rv = 0x7ffff6af8448 rve_param_no = 0 __func__ = "fix_actions" #13 0x000000000059f111 in fix_actions (a=0x7ffff6afc6e8) at core/route.c:723 t = 0x7ffff6afc6e8 p = 0x0 tmp = 0x6f16b7 <qm_malloc+1321> "H\203\304\020H\213E\310H\213P\030H\213E\270H\213" tmp_p = 0x7ffff6af88f0 ret = 0 i = 2 cmd = 0x7ffff652bab8 s = {s = 0x7ffff6ac87f8 "LIS_REPLY", len = 9} he = 0x7fffffffe020 ip = {af = 0, len = 0, u = {addrl = {140737274206128, 140737488347056}, addr32 = {4080818096, 32767, 4294959024, 32767}, addr16 = {22448, 62268, 32767, 0, 57264, 65535, 32767, 0}, addr = "\260W<\363\377\177\000\000\260\337\377\377\377\177\000"}} si = 0xaab32f7585fd7500 lval = 0x7ffff6ac7520 rve = 0x7ffff6afbc18 err_rve = 0x0 rve_type = RV_INT err_type = 32 expected_type = RV_NONE rv = 0x7ffff6ac91e0 rve_param_no = 0 __func__ = "fix_actions" #14 0x00000000005b0dd3 in fix_rl (rt=0x91bec0 <main_rt>) at core/route.c:2102 i = 97 ret = 0 #15 0x00000000005b0e0a in fix_rls () at core/route.c:2118 ret = 0 #16 0x0000000000438084 in main (argc=12, argv=0x7fffffffe608) at main.c:3047 cfg_stream = 0x9c02d0 c = -1 r = 0 tmp = 0x7fffffffe8bb "" tmp_len = 896 port = 896 proto = 896 ahost = 0x0 aport = 0 options = 0x7fe158 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 4231472377 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 2 n_lst = 0x0 p = 0xc2 <error: Cannot access memory at address 0xc2> st = {st_dev = 56, st_ino = 279340502, st_nlink = 2, st_mode = 16832, st_uid = 0, st_gid = 0, __pad0 = 0, st_rdev = 0, st_size = 120, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1622741422, tv_nsec = 474562221}, st_mtim = {tv_sec = 1624650702, tv_nsec = 443892052}, st_ctim = {tv_sec = 1624650702, tv_nsec = 443892052}, __glibc_reserved = {0, 0, 0}} tbuf = "\000\342\377\377\377\177", '\000' <repeats 11 times>, "\342\377\377\377\177", '\000' <repeats 18 times>, "\260\027\375\367\377\177\000\000\350\317\377\367\377\177\000\000\b\345\377\367\377\177\000\000\340\031\375\367\377\177\000\000\025\217\376\367\377\177\000\000$f\307\367\377\177\000\000\354K\377\367\377\177\000\000\336K\377\367\377\177\000\000\205\317c\t\000\000\000\000\300S\374\367\377\177\000\000ߏ\376\367\377\177\000\000\000\000\000\000\254\202\226\006\334P\307\367\377\177\000\000\000\000\000\000\000\000\000\000\300S\374\367\377\177\000\000\001\000\000\000\000\000\000\000@\347N\360\356\"\000\000\240\341\377\367\377\177\000\000\370\377\377\377\377\377\377\377\240\341\377\367\377\177\000\000R"... option_index = 12 long_options = {{name = 0x800836 "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x7fb521 "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x80083b "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x800841 "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x800847 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x800850 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x80085a "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x800864 "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x80086f "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x800878 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x800883 "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x800889 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, {name = 0x800893 "atexit", has_arg = 1, flag = 0x0, val = 1034}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __func__ = "main" ``` ### Additional Information master on CentOS8 -- 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/2788

3 years, 4 months

git:master:56d41f62: core: ppcfg - clone value for substdef

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 56d41f6238f39d0046c97527abcb23b8dd7924be URL: https://github.com/kamailio/kamailio/commit/56d41f6238f39d0046c97527abcb23b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-01T10:19:08+02:00 core: ppcfg - clone value for substdef - GH #2788 --- Modified: src/core/ppcfg.c --- Diff: https://github.com/kamailio/kamailio/commit/56d41f6238f39d0046c97527abcb23b… Patch: https://github.com/kamailio/kamailio/commit/56d41f6238f39d0046c97527abcb23b… --- diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index a5aa1d3e28..73c0a2ef3c 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -30,6 +30,7 @@ #include "ut.h" #include "re.h" #include "pvar.h" +#include "str_list.h" #include "dprint.h" #include "ppcfg.h" @@ -44,6 +45,7 @@ typedef struct _pp_subst_rule { static pp_subst_rule_t *pp_subst_rules_head = NULL; 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_subst_add(char *data) { @@ -94,6 +96,7 @@ int pp_substdef_add(char *data, int mode) str defvalue; str newval; sip_msg_t *fmsg; + str_list_t *sb; if(pp_subst_add(data)<0) { LM_ERR("subst rule cannot be added\n"); @@ -146,7 +149,12 @@ int pp_substdef_add(char *data, int mode) if(memchr(defvalue.s, '$', defvalue.len) != NULL) { fmsg = faked_msg_get_next(); if(pv_eval_str(fmsg, &newval, &defvalue)>=0) { - defvalue = newval; + sb = str_list_block_add(&_ksr_substdef_strlist, newval.s, newval.len); + if(sb==NULL) { + LM_ERR("failed to handle substdef: [%s]\n", data); + return -1; + } + defvalue = sb->s; } } if(pp_define_set(defvalue.len, defvalue.s,

3 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2021