sr-dev January 2020

sr-dev@lists.kamailio.org

22 participants
418 discussions

git:5.3:f61b2de3: core: more details on error log on failed comp_num() expression
by Daniel-Constantin Mierla 16 Jan '20

16 Jan '20

Module: kamailio Branch: 5.3 Commit: f61b2de38b10e3eb23b01843aacc2b739b7016d8 URL: https://github.com/kamailio/kamailio/commit/f61b2de38b10e3eb23b01843aacc2b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-16T09:27:15+01:00 core: more details on error log on failed comp_num() expression (cherry picked from commit a85bdf58e3f1933a4a1d231b5de4fd9cf1393366) --- Modified: src/core/route.c --- Diff: https://github.com/kamailio/kamailio/commit/f61b2de38b10e3eb23b01843aacc2b7… Patch: https://github.com/kamailio/kamailio/commit/f61b2de38b10e3eb23b01843aacc2b7… --- diff --git a/src/core/route.c b/src/core/route.c index 4aa7f25f76..ad2fa66e64 100644 --- a/src/core/route.c +++ b/src/core/route.c @@ -1212,7 +1212,8 @@ inline static int comp_num(int op, long left, int rtype, union exp_op* r, } break; default: - LM_CRIT("Invalid right operand (%d)\n", rtype); + LM_CRIT("Invalid right operand (rtype: %d expr-op: %d lval: %ld)\n", + rtype, op, left); return E_BUG; }

1 0

git:5.3:ad4871fa: core: kemi - handle notice log level in KSR.log()
by Daniel-Constantin Mierla 16 Jan '20

16 Jan '20

Module: kamailio Branch: 5.3 Commit: ad4871fa367406f03063ae1d387d908a494b035b URL: https://github.com/kamailio/kamailio/commit/ad4871fa367406f03063ae1d387d908… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-16T09:26:37+01:00 core: kemi - handle notice log level in KSR.log() (cherry picked from commit 73088fd871b4b1a292c67e80c55373ed1b891144) --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/ad4871fa367406f03063ae1d387d908… Patch: https://github.com/kamailio/kamailio/commit/ad4871fa367406f03063ae1d387d908… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 9f477a0e17..7a96254159 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -148,8 +148,12 @@ static int sr_kemi_core_log(sip_msg_t *msg, str *level, str *txt) LM_DBG("%s", txt->s); } else if(strcasecmp(level->s, "info")==0) { LM_INFO("%s", txt->s); + } else if(strcasecmp(level->s, "notice")==0) { + LM_NOTICE("%s", txt->s); } else if(strcasecmp(level->s, "warn")==0) { LM_WARN("%s", txt->s); + } else if(strcasecmp(level->s, "err")==0) { + LM_ERR("%s", txt->s); } else if(strcasecmp(level->s, "crit")==0) { LM_CRIT("%s", txt->s); } else {

1 0

git:master:a85bdf58: core: more details on error log on failed comp_num() expression
by Daniel-Constantin Mierla 15 Jan '20

15 Jan '20

Module: kamailio Branch: master Commit: a85bdf58e3f1933a4a1d231b5de4fd9cf1393366 URL: https://github.com/kamailio/kamailio/commit/a85bdf58e3f1933a4a1d231b5de4fd9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-15T17:06:36+01:00 core: more details on error log on failed comp_num() expression --- Modified: src/core/route.c --- Diff: https://github.com/kamailio/kamailio/commit/a85bdf58e3f1933a4a1d231b5de4fd9… Patch: https://github.com/kamailio/kamailio/commit/a85bdf58e3f1933a4a1d231b5de4fd9… --- diff --git a/src/core/route.c b/src/core/route.c index 4aa7f25f76..ad2fa66e64 100644 --- a/src/core/route.c +++ b/src/core/route.c @@ -1212,7 +1212,8 @@ inline static int comp_num(int op, long left, int rtype, union exp_op* r, } break; default: - LM_CRIT("Invalid right operand (%d)\n", rtype); + LM_CRIT("Invalid right operand (rtype: %d expr-op: %d lval: %ld)\n", + rtype, op, left); return E_BUG; }

1 0

[kamailio/kamailio] KEMI: kx subclass not found (#2196)
by Romain Untereiner 14 Jan '20

14 Jan '20

## Description Hello all, I'm migrating my Kamailio logics from legacy .cfg file to KEMI script. I began with Python but switched then to Lua, but there are some subclass / functions described in KEMI documentation that seem not to be present in Lua KSR object. In this case, I am having trouble with the subclass "kx" described [here](https://kamailio.org/docs/tutorials/devel/kamailio-kemi-framework/mod… which is used in the default Lua script example [here](https://github.com/kamailio/kamailio/blob/ca49dc0344f2ca4eae1999f6b46… The error in the logs: ```bash app_lua [app_lua_api.c:726]: app_lua_run_ex(): error from Lua: /etc/kamailio/kamailio.lua:196: attempt to index field 'kx' (a nil value) ``` Referring to the following line in my Lua script: ```lua function ksr_route_reqinit() if not KSR.is_myself_srcip() then local srcip = KSR.kx.get_srcip(); if KSR.htable.sht_match_name("ipban", "eq", srcip) > 0 then -- ip is already blocked KSR.dbg("request from blocked IP - " .. KSR.pv.get("$rm") .. " from " .. KSR.kex.gete_furi() .. " (IP:" .. srcip .. ":" .. KSR.kex.get_srcport() .. ")\n"); KSR.x.exit(); end if KSR.pike.pike_check_req() < 0 then KSR.err("ALERT: pike blocking " .. KSR.pv.get("$rm") .. " from " .. KSR.kex.gete_furi() .. " (IP:" .. srcip .. ":" .. KSR.kex.get_srcport() .. ")\n"); KSR.htable.sht_seti("ipban", srcip, 1); KSR.x.exit(); end end end ``` - Should this function be available through KSR object ? If yes we're talking about an issue Or - Is this function not supported anymore / not with app_lua ? In this case we should fix the documentation + the example script ### Troubleshooting Debian Jessie Kamailio 5.3 Lua 5.2 #### Reproduction I tried different versions, all KO (Kamailio 5.2, 5.3, and last commit on master: kamailio 5.4.0-dev3 (x86_64/linux) 5afe1e) 1. Install Debian Jessie 2. Clone Kamilio GIT 3. Build from source with make (enabling the desired modules before) 4. Insert Lua script (demo one is fine to reproduce my issue) #### Debugging Data ```bash aaaa@bbbbb:/# kamailio -V version: kamailio 5.4.0-dev3 (x86_64/linux) 5afe1e 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, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, 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, epoll_lt, epoll_et, sigio_rt, select. id: 5afe1e compiled on 14:27:15 Jan 14 2020 with gcc 6.3.0 ``` #### Log Messages ```bash app_lua [app_lua_api.c:726]: app_lua_run_ex(): error from Lua: /etc/kamailio/kamailio.lua:196: attempt to index field 'kx' (a nil value) ``` #### SIP Traffic Any message going through ksr_route_reqinit() function is triggering the error Thanks ! -- 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/2196

2 4

[kamailio/kamailio] ims_ipsec_pcscf: fixed warnings, added a new config param (#2148)
by alexyosifov 14 Jan '20

14 Jan '20

- fixed a defect reported from Coverity Scan - Concurrent data access violations in spi_gen.c for spi_data->spi_val. - added a new conf param - ipsec_reuse_server_port - reuse or not PCSCF server port for UA Re-registration. - added description for the new parameter in ims_ipsec_pcscf_admin.xml. - in fill_contact() for Request messages set received host, port and proto fro request uri if alias is presented. - A new server port is used for Re-registration, depending on the new parameter ipsec_reuse_server_port. - in create_ipsec_tunnel() return -1 when unable to convert ip address. - in ipsec_forward() add supported and require secagree headers only for Register reply with code 200. Set SND_F_FORCE_SOCKET for request messages.   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2148 -- Commit Summary -- * ims_ipsec_pcscf: fixed warnings, added a new config param -- File Changes -- M src/modules/ims_ipsec_pcscf/cmd.c (209) M src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml (22) M src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c (2) M src/modules/ims_ipsec_pcscf/spi_gen.c (14) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2148.patch https://github.com/kamailio/kamailio/pull/2148.diff -- 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/pull/2148

3 8

git:master:5afe1e59: pv: new transformations s.encode.base64t and s.decode.base64t
by Daniel-Constantin Mierla 14 Jan '20

14 Jan '20

Module: kamailio Branch: master Commit: 5afe1e5942ba586ef3165e220a588a7176fc79e9 URL: https://github.com/kamailio/kamailio/commit/5afe1e5942ba586ef3165e220a588a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-14T09:38:54+01:00 pv: new transformations s.encode.base64t and s.decode.base64t - base64 encode/decode with optional trailing padding --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/5afe1e5942ba586ef3165e220a588a7… Patch: https://github.com/kamailio/kamailio/commit/5afe1e5942ba586ef3165e220a588a7… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 547ba60705..354a51795c 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -465,6 +465,55 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, val->rs.s = _tr_buffer; val->rs.len = i; break; + case TR_S_ENCODEBASE64T: + if(!(val->flags&PV_VAL_STR)) + val->rs.s = int2str(val->ri, &val->rs.len); + i = base64_enc((unsigned char *) val->rs.s, val->rs.len, + (unsigned char *) _tr_buffer, TR_BUFFER_SIZE-1); + if (i < 0) + return -1; + if (i>1 && _tr_buffer[i-1] == '=') { + i--; + if (i>1 && _tr_buffer[i-1] == '=') { + i--; + } + } + _tr_buffer[i] = '\0'; + memset(val, 0, sizeof(pv_value_t)); + val->flags = PV_VAL_STR; + val->rs.s = _tr_buffer; + val->rs.len = i; + break; + case TR_S_DECODEBASE64T: + if(!(val->flags&PV_VAL_STR)) + val->rs.s = int2str(val->ri, &val->rs.len); + if(val->rs.len % 4) { + if(val->rs.len + 4 >= TR_BUFFER_SIZE-1) { + LM_ERR("not enough space to insert padding\n"); + return -1; + } + memcpy(_tr_buffer, val->rs.s, val->rs.len); + for(i=0; i < (4 - (val->rs.len % 4)); i++) { + _tr_buffer[val->rs.len + i] = '='; + } + st.s = _tr_buffer; + st.len = val->rs.len + (4 - (val->rs.len % 4)); + /* move to next buffer */ + tr_set_crt_buffer(); + i = base64_dec((unsigned char *) st.s, st.len, + (unsigned char *) _tr_buffer, TR_BUFFER_SIZE-1); + } else { + i = base64_dec((unsigned char *) val->rs.s, val->rs.len, + (unsigned char *) _tr_buffer, TR_BUFFER_SIZE-1); + } + if (i < 0 || (i == 0 && val->rs.len > 0)) + return -1; + _tr_buffer[i] = '\0'; + memset(val, 0, sizeof(pv_value_t)); + val->flags = PV_VAL_STR; + val->rs.s = _tr_buffer; + val->rs.len = i; + break; case TR_S_ESCAPECOMMON: if(!(val->flags&PV_VAL_STR)) val->rs.s = int2str(val->ri, &val->rs.len); @@ -2315,6 +2364,12 @@ char* tr_parse_string(str* in, trans_t *t) } else if(name.len==13 && strncasecmp(name.s, "decode.base64", 13)==0) { t->subtype = TR_S_DECODEBASE64; goto done; + } else if(name.len==14 && strncasecmp(name.s, "encode.base64t", 14)==0) { + t->subtype = TR_S_ENCODEBASE64T; + goto done; + } else if(name.len==14 && strncasecmp(name.s, "decode.base64t", 14)==0) { + t->subtype = TR_S_DECODEBASE64T; + goto done; } else if(name.len==13 && strncasecmp(name.s, "escape.common", 13)==0) { t->subtype = TR_S_ESCAPECOMMON; goto done; diff --git a/src/modules/pv/pv_trans.h b/src/modules/pv/pv_trans.h index 0b579e4b27..88cb9eb321 100644 --- a/src/modules/pv/pv_trans.h +++ b/src/modules/pv/pv_trans.h @@ -13,8 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ @@ -42,7 +42,7 @@ enum _tr_s_subtype { TR_S_TIMEFORMAT, TR_S_TRIM, TR_S_RTRIM, TR_S_LTRIM, TR_S_RM, TR_S_STRIPTO, TR_S_URLENCODEPARAM, TR_S_URLDECODEPARAM, TR_S_NUMERIC, TR_S_ESCAPECSV, TR_S_ENCODEBASE58, TR_S_DECODEBASE58, TR_S_COREHASH, TR_S_UNQUOTE, - TR_S_UNBRACKET, TR_S_COUNT + TR_S_UNBRACKET, TR_S_COUNT, TR_S_ENCODEBASE64T, TR_S_DECODEBASE64T }; enum _tr_uri_subtype { TR_URI_NONE=0, TR_URI_USER, TR_URI_HOST, TR_URI_PASSWD, TR_URI_PORT,

1 0

[kamailio/kamailio] userblacklist: added missing kemi functions (#2190)
by Federico Santulli 13 Jan '20

13 Jan '20

- fixed dynamic sources loading - fixed match_mode in check_whitelist function   #### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2190 -- Commit Summary -- * Added missing KEMI functions, fixed sources loading and match_mode in -- File Changes -- M src/modules/userblacklist/userblacklist.c (173) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2190.patch https://github.com/kamailio/kamailio/pull/2190.diff -- 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/pull/2190

4 15

git:master:cf2e3968: userblacklist: add KEMI functions, adapt source load, fix match_mode for check_whitelist (GH #2190)
by Henning Westerholt 13 Jan '20

13 Jan '20

Module: kamailio Branch: master Commit: cf2e3968000f1292ad1b1eb8f7d190fb53878c2b URL: https://github.com/kamailio/kamailio/commit/cf2e3968000f1292ad1b1eb8f7d190f… Author: fsantulli <federico.santulli(a)nhm.it> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-01-13T21:39:26+01:00 userblacklist: add KEMI functions, adapt source load, fix match_mode for check_whitelist (GH #2190) - add KEMI functions for userblacklist module - adapt source loading function after KEMI addition - fix match mode for alphanumeric characters for check_whitelist function - merged pull request GH #2190 --- Modified: src/modules/userblacklist/userblacklist.c --- Diff: https://github.com/kamailio/kamailio/commit/cf2e3968000f1292ad1b1eb8f7d190f… Patch: https://github.com/kamailio/kamailio/commit/cf2e3968000f1292ad1b1eb8f7d190f…

1 0

git:master:8d55c6eb: modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci]
by Kamailio Dev 13 Jan '20

13 Jan '20

Module: kamailio Branch: master Commit: 8d55c6eba94ab7c5ac76c116729b1efa007a9a50 URL: https://github.com/kamailio/kamailio/commit/8d55c6eba94ab7c5ac76c116729b1ef… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-01-13T21:16:19+01:00 modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci] --- Modified: src/modules/ims_ipsec_pcscf/README --- Diff: https://github.com/kamailio/kamailio/commit/8d55c6eba94ab7c5ac76c116729b1ef… Patch: https://github.com/kamailio/kamailio/commit/8d55c6eba94ab7c5ac76c116729b1ef…

1 0

[kamailio/kamailio] ims_ipsec_pcscf: new config param for ipsec (#2164)
by alexyosifov 13 Jan '20

13 Jan '20

- added a new config param - ipsec_reuse_server_port - reuse or not PCSCF server port for UA Re-registration. - added description for the new parameter in ims_ipsec_pcscf_admin.xml. parameter ipsec_reuse_server_port. - in ipsec_forward() add supported and require secagree headers only for Register reply with code 200. - in fill_contact() for Request messages set received host, port and proto from request uri if alias is presented.   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2164 -- Commit Summary -- * ims_ipsec_pcscf: new config param for ipsec -- File Changes -- M src/modules/ims_ipsec_pcscf/cmd.c (192) M src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml (22) M src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2164.patch https://github.com/kamailio/kamailio/pull/2164.diff -- 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/pull/2164

3 4

← Newer
1
...
29
30
31
32
33
34
35
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2020