sr-dev

sr-dev@lists.kamailio.org

45190 discussions

git:master:ff7913f5: core: snexpr - compile time options for formatting fload with full precission
by Daniel-Constantin Mierla 30 Sep '22

30 Sep '22

Module: kamailio Branch: master Commit: ff7913f511f95a891fe870cb1fe88f586573af79 URL: https://github.com/kamailio/kamailio/commit/ff7913f511f95a891fe870cb1fe88f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-30T09:17:36+02:00 core: snexpr - compile time options for formatting fload with full precission --- Modified: src/core/utils/snexpr.h --- Diff: https://github.com/kamailio/kamailio/commit/ff7913f511f95a891fe870cb1fe88f5… Patch: https://github.com/kamailio/kamailio/commit/ff7913f511f95a891fe870cb1fe88f5… --- diff --git a/src/core/utils/snexpr.h b/src/core/utils/snexpr.h index d6b9adac86..df409f8381 100644 --- a/src/core/utils/snexpr.h +++ b/src/core/utils/snexpr.h @@ -395,7 +395,11 @@ static int snexpr_format_num(char **out, float value) return -1; } if(value - (long)value != 0) { +#ifdef SNEXPR_FLOAT_FULLPREC + ret = snprintf(*out, 24, "%g", value); +#else ret = snprintf(*out, 24, "%.4g", value); +#endif } else { ret = snprintf(*out, 24, "%lld", (long long)value); }

1 0

Kamailio_IMS VMware image
by Khalil Toubia 29 Sep '22

29 Sep '22

Dear all I'm sending this email asking for Kamailio_IMS VMware image regards -- Khalil Toubia Telecom Consultant / Electronic Expert +961 70 226 442 Beirut - Lebanon

3 2

New feature: #defexp -preprocessor define with expression
by Daniel-Constantin Mierla 29 Sep '22

29 Sep '22

Hello, following the recent new feature of #!ifexp based on snexpr (https://www.kamailio.org/w/2022/09/ifexp-conditional-preprocessor-blocks/), another preprocessor directive was added which allows defining IDs with a value computed from the evaluation of an expression, respectively: #!defexp ID EXP The EXP can be any expression supported by snexpr, including the previously defined IDs. For example: #!define IPADDR 1.2.3.4 #!define PORT 5060 #!defexp SIPURI "sip:" + IPADDR + ":" + PORT The result is that SIPURI is defined to sip:1.2.3.4:5060. Another variant is available as #!defexps, which encloses the result of the expression in double quotes, making it suitable to be used further as string value: #!defexps SIPURI "sip:" + IPADDR + ":" + PORT The result is that SIPURI is defined to “sip:1.2.3.4:5060”. More details at: - https://www.kamailio.org/wikidocs/cookbooks/devel/core/#defexp - https://www.kamailio.org/wikidocs/cookbooks/devel/core/#defexps Testing would be appreciated, feedback can be addressed to sr-users mailing list! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online Nov 7-10, 2022 (Europe Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 0

git:master:d5df2e45: core: snexpr.h - custom function to format float value
by Daniel-Constantin Mierla 29 Sep '22

29 Sep '22

Module: kamailio Branch: master Commit: d5df2e45cf6ae3c8fc61f565c9291b26ff255ede URL: https://github.com/kamailio/kamailio/commit/d5df2e45cf6ae3c8fc61f565c9291b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-29T10:06:03+02:00 core: snexpr.h - custom function to format float value - use a precision of 4 decimals --- Modified: src/core/utils/snexpr.h --- Diff: https://github.com/kamailio/kamailio/commit/d5df2e45cf6ae3c8fc61f565c9291b2… Patch: https://github.com/kamailio/kamailio/commit/d5df2e45cf6ae3c8fc61f565c9291b2… --- diff --git a/src/core/utils/snexpr.h b/src/core/utils/snexpr.h index d1ade48525..d6b9adac86 100644 --- a/src/core/utils/snexpr.h +++ b/src/core/utils/snexpr.h @@ -387,6 +387,26 @@ static int to_int(float x) } +static int snexpr_format_num(char **out, float value) +{ + int ret = 0; + *out = (char*)malloc(24*sizeof(char)); + if(*out==NULL) { + return -1; + } + if(value - (long)value != 0) { + ret = snprintf(*out, 24, "%.4g", value); + } else { + ret = snprintf(*out, 24, "%lld", (long long)value); + } + if((ret < 0) || (ret >= 24)) { + free(*out); + *out = NULL; + return -2; + } + return 0; +} + static struct snexpr *snexpr_convert_num(float value, unsigned int ctype) { struct snexpr *e = (struct snexpr *)malloc(sizeof(struct snexpr)); @@ -398,7 +418,7 @@ static struct snexpr *snexpr_convert_num(float value, unsigned int ctype) if(ctype == SNE_OP_CONSTSTZ) { e->eflags |= SNEXPR_EXPALLOC | SNEXPR_VALALLOC; e->type = SNE_OP_CONSTSTZ; - asprintf(&e->param.stz.sval, "%g", value); + snexpr_format_num(&e->param.stz.sval, value); return e; }

1 0

git:master:d5eebda3: core: snexpr.h - removed mistakenly placed string concat
by Daniel-Constantin Mierla 29 Sep '22

29 Sep '22

Module: kamailio Branch: master Commit: d5eebda3a09401478e6707bb03043d75b90fe1d3 URL: https://github.com/kamailio/kamailio/commit/d5eebda3a09401478e6707bb03043d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-29T09:27:51+02:00 core: snexpr.h - removed mistakenly placed string concat --- Modified: src/core/utils/snexpr.h --- Diff: https://github.com/kamailio/kamailio/commit/d5eebda3a09401478e6707bb03043d7… Patch: https://github.com/kamailio/kamailio/commit/d5eebda3a09401478e6707bb03043d7… --- diff --git a/src/core/utils/snexpr.h b/src/core/utils/snexpr.h index a0834c5180..d1ade48525 100644 --- a/src/core/utils/snexpr.h +++ b/src/core/utils/snexpr.h @@ -508,7 +508,6 @@ static void snexpr_result_free(struct snexpr *e) rv1 = tv; \ snexpr_eval_check_val(rv1, SNE_OP_CONSTSTZ); \ } \ - lv = snexpr_concat_strz(rv0->param.stz.sval, rv1->param.stz.sval); \ if(strcmp(rv0->param.stz.sval, rv1->param.stz.sval) _CMPOP_ 0) { \ lv = snexpr_convert_num(1, SNE_OP_CONSTNUM); \ } else { \

1 0

[kamailio/kamailio] Regression on app_lua after ASLR enable (Issue #3202)
by Boris Korzun 28 Sep '22

28 Sep '22

### Description There's a regression after enabling Address Space Layout Randomization (ASLR). Kamailio causes SIGSEGV while loading `app_lua` (or other KEMI Interpreters probably). ### Troubleshooting #### Reproduction The regression has appeared after update FreeBSD kernel to https://github.com/freebsd/freebsd-src/commit/10192e77cfacd1f27601882af6188… Kamailio falls after `loadmodule "app_lua.so"` in `kamailio.cfg`. #### Debugging Data ``` root@server:/usr/jails/containers/kamailio/var/coredump/986# jexec kamailio lldb -c /var/coredump/986/kamailio.13521.core -- /usr/local/sbin/kamailio (lldb) target create "/usr/local/sbin/kamailio" --core "/var/coredump/986/kamailio.13521.core" Core file '/var/coredump/986/kamailio.13521.core' (x86_64) was loaded. (lldb) bt all * thread #1, name = 'kamailio', stop reason = signal SIGSEGV * frame #0: 0x0000000825b61350 libc.so.7`strncmp(s1=<unavailable>, s2=<unavailable>, n=<unavailable>) at strncmp.c:47:7 frame #1: 0x00000000003fc394 kamailio`sr_kemi_modules_add(klist=0x0000000861afb410) at kemi.c:3392:8 frame #2: 0x0000000861ae6154 app_lua.so`mod_register(path="/usr/local/lib/kamailio/modules/app_lua.so", dlflags=0x0000000821805b48, p1=0x0000000000000000, p2=0x0000000000000000) at app_lua_mod.c:605:2 frame #3: 0x00000000005e4b30 kamailio`load_module(mod_path="app_lua.so") at sr_module.c:592:7 frame #4: 0x0000000000885936 kamailio`yyparse at cfg.y:1965:8 frame #5: 0x00000000002ff384 kamailio`main(argc=7, argv=0x000000082180a848) at main.c:2506:6 frame #6: 0x00000000002ddd90 kamailio`_start(ap=<unavailable>, cleanup=<unavailable>) at crt1_c.c:75:7 ``` `_sr_kemi_modules[].mname.s` for `app_lua` points to incorrect data after second call `mod_register()(a)app_lua_mod.c` from `load_module()(a)sr_module.c` (reloading the module for setting correct `dlflags`). #### Log Messages ``` 08:35:53.689647 DEBUG: <core> [core/cfg.y:1964]: yyparse(): loading module kemix.so 08:35:53.689684 DEBUG: <core> [core/sr_module.c:516]: ksr_locate_module(): found module to load </usr/local/lib/kamailio/modules/kemix.so> 08:35:53.689698 DEBUG: <core> [core/sr_module.c:566]: load_module(): trying to load </usr/local/lib/kamailio/modules/kemix.so> 08:35:53.689796 DEBUG: <core> [core/kemi.c:3398]: sr_kemi_modules_add(): adding module: kx 08:35:53.689847 DEBUG: <core> [core/cfg.lex:2039]: pp_define(): defining id: MOD_kemix 08:35:53.689895 DEBUG: <core> [core/cfg.y:1964]: yyparse(): loading module app_lua.so 08:35:53.689931 DEBUG: <core> [core/sr_module.c:516]: ksr_locate_module(): found module to load </usr/local/lib/kamailio/modules/app_lua.so> 08:35:53.689948 DEBUG: <core> [core/sr_module.c:566]: load_module(): trying to load </usr/local/lib/kamailio/modules/app_lua.so> 08:35:53.690418 DEBUG: <core> [core/kemi.c:3494]: sr_kemi_eng_register(): registered config routing enginge [lua] 08:35:53.690444 DEBUG: <core> [core/kemi.c:3398]: sr_kemi_modules_add(): adding module: app_lua ``` ### Possible Solutions Temporary solution is disabling ASLR, ex. FreeBSD: ``` # sysctl kern.elf64.aslr.enable=0 # sysctl kern.elf64.aslr.pie_enable=0 ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.6.1 (x86_64/freebsd) b36a13 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, select, kqueue. id: b36a13 compiled on 08:12:34 Jul 27 2022 with cc FreeBSD clang version 14.0.5 (https://github.com/llvm/llvm-project.git llvmorg-14.0.5-0-gc12386ae247c) ``` 5.5.4 is affected too * **Operating System**: ``` FreeBSD 13/stable ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3202 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3202(a)github.com>

3 16

git:master:9a41fb54: rtpengine: allow to-tag usage for all commands
by Richard Fuchs 28 Sep '22

28 Sep '22

Module: kamailio Branch: master Commit: 9a41fb5403a6bc4fd5ccee239ccdf725fe6f91df URL: https://github.com/kamailio/kamailio/commit/9a41fb5403a6bc4fd5ccee239ccdf72… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2022-09-28T09:33:56-04:00 rtpengine: allow to-tag usage for all commands --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/9a41fb5403a6bc4fd5ccee239ccdf72… Patch: https://github.com/kamailio/kamailio/commit/9a41fb5403a6bc4fd5ccee239ccdf72… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 2a38636609..ac1387bb39 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -2689,8 +2689,11 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, struct sip_ || op == OP_UNBLOCK_MEDIA || op == OP_START_FORWARDING || op == OP_STOP_FORWARDING || op == OP_SILENCE_MEDIA || op == OP_UNSILENCE_MEDIA) { - if (ng_flags.directional) + if (ng_flags.directional) { bencode_dictionary_add_str(ng_flags.dict, "from-tag", &ng_flags.from_tag); + if (ng_flags.to && ng_flags.to_tag.s && ng_flags.to_tag.len) + bencode_dictionary_add_str(ng_flags.dict, "to-tag", &ng_flags.to_tag); + } } else if ((msg->first_line.type == SIP_REQUEST && op != OP_ANSWER) || (msg->first_line.type == SIP_REPLY && op == OP_DELETE)

1 0

git:master:28ce28f2: modules: readme files regenerated - lrkproxy ... [skip ci]
by Kamailio Dev 28 Sep '22

28 Sep '22

Module: kamailio Branch: master Commit: 28ce28f26ba069781ac6aee6c7ffcbd1281d7848 URL: https://github.com/kamailio/kamailio/commit/28ce28f26ba069781ac6aee6c7ffcbd… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-09-28T13:01:21+02:00 modules: readme files regenerated - lrkproxy ... [skip ci] --- Modified: src/modules/lrkproxy/README --- Diff: https://github.com/kamailio/kamailio/commit/28ce28f26ba069781ac6aee6c7ffcbd… Patch: https://github.com/kamailio/kamailio/commit/28ce28f26ba069781ac6aee6c7ffcbd…

1 0

git:master:6eb5bb67: lrkproxy: Add new features : TURN support, behind_nat support, subset of range ports
by Mojtaba Esfandiari.S 28 Sep '22

28 Sep '22

Module: kamailio Branch: master Commit: 6eb5bb67586bf91c5d42a5864d881a4fc82a6638 URL: https://github.com/kamailio/kamailio/commit/6eb5bb67586bf91c5d42a5864d881a4… Author: Mojtaba Esfandiari.S <mespio(a)gmail.com> Committer: Mojtaba Esfandiari.S <mespio(a)gmail.com> Date: 2022-09-28T14:25:26+03:30 lrkproxy: Add new features : TURN support, behind_nat support, subset of range ports --- Modified: src/modules/lrkproxy/doc/lrkproxy_admin.xml Modified: src/modules/lrkproxy/lrkproxy.c Modified: src/modules/lrkproxy/lrkproxy_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/6eb5bb67586bf91c5d42a5864d881a4… Patch: https://github.com/kamailio/kamailio/commit/6eb5bb67586bf91c5d42a5864d881a4…

1 0

git:master:a26eb52b: core: snexpr.h - declare iterators out of for() statements
by Daniel-Constantin Mierla 28 Sep '22

28 Sep '22

Module: kamailio Branch: master Commit: a26eb52bf50e687251f994fd35b3afc5ff2a32ca URL: https://github.com/kamailio/kamailio/commit/a26eb52bf50e687251f994fd35b3afc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-28T09:19:58+02:00 core: snexpr.h - declare iterators out of for() statements - support non-C99 compilers --- Modified: src/core/utils/snexpr.h --- Diff: https://github.com/kamailio/kamailio/commit/a26eb52bf50e687251f994fd35b3afc… Patch: https://github.com/kamailio/kamailio/commit/a26eb52bf50e687251f994fd35b3afc… --- diff --git a/src/core/utils/snexpr.h b/src/core/utils/snexpr.h index d6e853ffb4..a0834c5180 100644 --- a/src/core/utils/snexpr.h +++ b/src/core/utils/snexpr.h @@ -269,7 +269,8 @@ static struct static enum snexpr_type snexpr_op(const char *s, size_t len, int unary) { - for(unsigned int i = 0; i < sizeof(OPS) / sizeof(OPS[0]); i++) { + unsigned int i; + for(i = 0; i < sizeof(OPS) / sizeof(OPS[0]); i++) { if(strlen(OPS[i].s) == len && strncmp(OPS[i].s, s, len) == 0 && (unary == -1 || snexpr_is_unary(OPS[i].op) == unary)) { return OPS[i].op; @@ -283,7 +284,8 @@ static float snexpr_parse_number(const char *s, size_t len) float num = 0; unsigned int frac = 0; unsigned int digits = 0; - for(unsigned int i = 0; i < len; i++) { + unsigned int i; + for(i = 0; i < len; i++) { if(s[i] == '.' && frac == 0) { frac++; continue; @@ -319,7 +321,8 @@ struct snexpr_func static struct snexpr_func *snexpr_func_find( struct snexpr_func *funcs, const char *s, size_t len) { - for(struct snexpr_func *f = funcs; f->name; f++) { + struct snexpr_func *f; + for(f = funcs; f->name; f++) { if(strlen(f->name) == len && strncmp(f->name, s, len) == 0) { return f; } @@ -1190,7 +1193,8 @@ static struct snexpr *snexpr_create(const char *s, size_t len, sne_vec_free(&arg.args); goto cleanup; /* first argument is not a variable */ } - for(struct snexpr_var *v = vars->head; v; v = v->next) { + struct snexpr_var *v; + for(v = vars->head; v; v = v->next) { if(v == u->param.var.vref) { struct macro m = {v->name, arg.args}; sne_vec_push(&macros, m); @@ -1213,8 +1217,9 @@ static struct snexpr *snexpr_create(const char *s, size_t len, m = sne_vec_nth(&macros, found); struct snexpr root = snexpr_constnum(0); struct snexpr *p = &root; + int j; /* Assign macro parameters */ - for(int j = 0; j < sne_vec_len(&arg.args); j++) { + for(j = 0; j < sne_vec_len(&arg.args); j++) { char varname[4]; snprintf(varname, sizeof(varname) - 1, "$%d", (j + 1)); @@ -1228,7 +1233,7 @@ static struct snexpr *snexpr_create(const char *s, size_t len, p = &sne_vec_nth(&p->param.op.args, 1); } /* Expand macro body */ - for(int j = 1; j < sne_vec_len(&m.body); j++) { + for(j = 1; j < sne_vec_len(&m.body); j++) { if(j < sne_vec_len(&m.body) - 1) { *p = snexpr_binary(SNE_OP_COMMA, snexpr_constnum(0), snexpr_constnum(0)); @@ -1402,6 +1407,7 @@ static void snexpr_destroy_args(struct snexpr *e) static void snexpr_destroy(struct snexpr *e, struct snexpr_var_list *vars) { + struct snexpr_var *v; _snexternval_cbf = NULL; if(e != NULL) { @@ -1409,7 +1415,7 @@ static void snexpr_destroy(struct snexpr *e, struct snexpr_var_list *vars) free(e); } if(vars != NULL) { - for(struct snexpr_var *v = vars->head; v;) { + for(v = vars->head; v;) { struct snexpr_var *next = v->next; if(v->evflags & SNEXPR_VALALLOC) { free(v->v.sval);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev