sr-dev May 2020

sr-dev@lists.kamailio.org

24 participants
393 discussions

git:master:ad8868d2: core: receive - reset xavi list after message processing

by Victor Seva

Module: kamailio Branch: master Commit: ad8868d2c951c9b6f605f675574f4b34a433b56a URL: https://github.com/kamailio/kamailio/commit/ad8868d2c951c9b6f605f675574f4b3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-29T23:31:55+02:00 core: receive - reset xavi list after message processing --- Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/ad8868d2c951c9b6f605f675574f4b3… Patch: https://github.com/kamailio/kamailio/commit/ad8868d2c951c9b6f605f675574f4b3… --- diff --git a/src/core/receive.c b/src/core/receive.c index d9194379b2..38bc1e4ab1 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -561,4 +561,5 @@ void ksr_msg_env_reset(void) reset_avps(); xavp_reset_list(); xavu_reset_list(); + xavi_reset_list(); }

4 years, 5 months

git:master:b90a0fb7: core: pv - define xavi types

by Victor Seva

Module: kamailio Branch: master Commit: b90a0fb772c995b0214196270dca062eccc7e75e URL: https://github.com/kamailio/kamailio/commit/b90a0fb772c995b0214196270dca062… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-29T23:31:55+02:00 core: pv - define xavi types --- Modified: src/core/pvar.h --- Diff: https://github.com/kamailio/kamailio/commit/b90a0fb772c995b0214196270dca062… Patch: https://github.com/kamailio/kamailio/commit/b90a0fb772c995b0214196270dca062… --- diff --git a/src/core/pvar.h b/src/core/pvar.h index ffde26dedb..1415f84af0 100644 --- a/src/core/pvar.h +++ b/src/core/pvar.h @@ -77,8 +77,8 @@ enum _pv_type { PVT_DSTURI, PVT_COLOR, PVT_BRANCH, PVT_FROM, PVT_TO, PVT_OURI, PVT_SCRIPTVAR, PVT_MSG_BODY, PVT_CONTEXT, - PVT_XAVP, PVT_XAVU, PVT_HDRC, - PVT_OTHER, PVT_EXTRA /* keep it last */ + PVT_XAVP, PVT_XAVU, PVT_XAVI, + PVT_HDRC, PVT_OTHER, PVT_EXTRA /* keep it last */ }; typedef enum _pv_type pv_type_t;

4 years, 5 months

git:master:8b03c49f: core: xavi api - like xavp but with insensitive case names

by Victor Seva

Module: kamailio Branch: master Commit: 8b03c49f8bd531bf6cf43c986868b1933e7af5aa URL: https://github.com/kamailio/kamailio/commit/8b03c49f8bd531bf6cf43c986868b19… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-29T23:31:55+02:00 core: xavi api - like xavp but with insensitive case names $xavi(WhatEver=>FOo) == $xavi(whatever=>foO) --- Modified: src/core/xavp.c Modified: src/core/xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/8b03c49f8bd531bf6cf43c986868b19… Patch: https://github.com/kamailio/kamailio/commit/8b03c49f8bd531bf6cf43c986868b19…

4 years, 5 months

git:master:74f11793: kemix: functions to get msg buffer and length

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 74f1179390475354cb6fe5983dc7c40afd294be4 URL: https://github.com/kamailio/kamailio/commit/74f1179390475354cb6fe5983dc7c40… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-29T10:40:44+02:00 kemix: functions to get msg buffer and length --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/74f1179390475354cb6fe5983dc7c40… Patch: https://github.com/kamailio/kamailio/commit/74f1179390475354cb6fe5983dc7c40… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index 81e433c9e3..f94ff951d4 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -843,6 +843,35 @@ static int ki_kx_get_conid(sip_msg_t *msg) return conid; } +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_msgbuf(sip_msg_t *msg) +{ + memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); + if(msg==NULL) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, SR_KEMI_XVAL_NULL_EMPTY); + return &_sr_kemi_kx_xval; + } + + _sr_kemi_kx_xval.vtype = SR_KEMIP_STR; + _sr_kemi_kx_xval.v.s.s = msg->buf; + _sr_kemi_kx_xval.v.s.len = msg->len; + return &_sr_kemi_kx_xval; +} + +/** + * + */ +static int ki_kx_get_msglen(sip_msg_t *msg) +{ + if(msg==NULL) { + return -1; + } + + return msg->len; +} + /** * */ @@ -1083,6 +1112,17 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("kx"), str_init("get_msgbuf"), + SR_KEMIP_XVAL, ki_kx_get_msgbuf, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("get_msglen"), + SR_KEMIP_INT, ki_kx_get_msglen, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

4 years, 5 months

git:master:0972e045: crypto: event route to allow encrypting/decrypting net i/o traffic

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0972e0455d2514846e82a705ef261fc5d6798cb5 URL: https://github.com/kamailio/kamailio/commit/0972e0455d2514846e82a705ef261fc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-29T10:40:44+02:00 crypto: event route to allow encrypting/decrypting net i/o traffic - work in progress --- Added: src/modules/crypto/crypto_evcb.c Added: src/modules/crypto/crypto_evcb.h Modified: src/modules/crypto/crypto_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0972e0455d2514846e82a705ef261fc… Patch: https://github.com/kamailio/kamailio/commit/0972e0455d2514846e82a705ef261fc…

4 years, 5 months

git:master:df2fa2c5: misc: examples/kemi - fixes to the python script

by Torrey Searle

Module: kamailio Branch: master Commit: df2fa2c5589bd5f651e814e32e2edf00c23ffebc URL: https://github.com/kamailio/kamailio/commit/df2fa2c5589bd5f651e814e32e2edf0… Author: Torrey Searle <tsearle(a)voxbone.com> Committer: Torrey Searle <tsearle(a)voxbone.com> Date: 2020-05-29T09:30:56+02:00 misc: examples/kemi - fixes to the python script remove dependency on Router.Logger remove ; fix comment ref exit() --- Modified: misc/examples/kemi/kamailio-basic-kemi-python.py --- Diff: https://github.com/kamailio/kamailio/commit/df2fa2c5589bd5f651e814e32e2edf0… Patch: https://github.com/kamailio/kamailio/commit/df2fa2c5589bd5f651e814e32e2edf0…

4 years, 5 months

[kamailio/kamailio] dispatcher: rework attrs parameter in rpc 'add' command (#2339)

by Federico Cabiddu

#### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Fixed attrs parameters handling i rpc 'add' command. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2339 -- Commit Summary -- * dispatcher: rework attrs parameter in rpc 'add' command -- File Changes -- M src/modules/dispatcher/dispatch.c (4) M src/modules/dispatcher/dispatcher.c (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2339.patch https://github.com/kamailio/kamailio/pull/2339.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/2339

4 years, 5 months

git:master:41714a49: dispatcher: rework attrs parameter in rpc 'add' command

by Henning Westerholt

Module: kamailio Branch: master Commit: 41714a49e88800378db37670fbc22cafb7eca81a URL: https://github.com/kamailio/kamailio/commit/41714a49e88800378db37670fbc22ca… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-29T08:41:44+02:00 dispatcher: rework attrs parameter in rpc 'add' command --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/41714a49e88800378db37670fbc22ca… Patch: https://github.com/kamailio/kamailio/commit/41714a49e88800378db37670fbc22ca… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 8cff6cdb56..d859dc3907 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2426,10 +2426,6 @@ int ds_add_dst(int group, str *address, int flags, str *attrs) setn = _ds_list_nr; priority = 0; - if (attrs->len == 0) { - attrs->s = 0; - } - *next_idx = (*crt_idx + 1) % 2; ds_avl_destroy(&ds_lists[*next_idx]); diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index b2693a2947..836038442f 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1798,15 +1798,19 @@ static const char *dispatcher_rpc_add_doc[2] = { */ static void dispatcher_rpc_add(rpc_t *rpc, void *ctx) { - int group, flags; + int group, flags, nparams; str dest; - str attrs; + str attrs; flags = 0; - if(rpc->scan(ctx, "dS*d", &group, &dest, &flags, &attrs) < 3) { + nparams = rpc->scan(ctx, "dS*dS", &group, &dest, &flags, &attrs); + if(nparams < 2) { rpc->fault(ctx, 500, "Invalid Parameters"); return; + } else if (nparams < 3) { + attrs.s = 0; + attrs.len = 0; } if(ds_add_dst(group, &dest, flags, &attrs) != 0) {

4 years, 5 months

congestion control priority for priority based dispatching

by Julien Chavanton

Hi Folks, Just found another simple use case of the dispatcher latency stats. Just shraing this idea of a feature I want to contribute. When using dispatcher algorithm 8: “8” - select destination sorted by priority attribute value (serial forking ordered by priority). If the gateway as the attribute, the priority becomes the estimated latency. cc-priority - The dispatcher would automatically prioritize the closest one. - If a gateway is becoming unresponsive it will automatically become de prioritize. Consider this real life scenario where you have gateways in East and West Coast Example URI: sip:28.71.19.140 FLAGS: AP PRIORITY: 10 ATTRS: { BODY: cc_priority=1 } LATENCY: { AVG: 84.001000 STD: 0.062000 EST: 84.001000 (high == low priority) MAX: 93 TIMEOUT: 0 URI: sip:28.71.16.140 FLAGS: AP PRIORITY: 10 ATTRS: { BODY: cc_priority=1 } LATENCY: { AVG: 29.110000 STD: 2.383000 EST: 31.999000 (low == high priority) MAX: 1499 TIMEOUT: 1 Another major improvement to all of this would be to gather stats on INVITE <> 100 to have a very accurate latency estimation even if the gateway does not support SIP OPTIONS pings

4 years, 5 months

[kamailio/kamailio] Cannot set alias from substdef/environment (#2310)

by Mathias Brodala

### Description I tried to set the `alias` configuration option using an ID set by `#!substdef` but this leads to `grep_sock_info()` to fail, falling back to `corex_check_self()` and failing altogether finally. ### Troubleshooting #### Reproduction The basic setup given `BASE_HOST=example.org`: ``` #!substdef "/BASE_HOST/$env(BASE_HOST)/" alias="BASE_HOST" listen=tcp:0.0.0.0:80 route[AUTH] { # ... if (from_uri!=myself && uri!=myself) { sl_send_reply("403","Not relaying"); exit; } return; } ``` With this, any properly authenticated `REGISTER` call leads to a `403 Not Relaying`. However, this works perfectly fine if I use a static value instead: ``` alias=example.org ``` #### Log Messages ``` kamailio_1 | 12(17) DEBUG: <core> [core/socket_info.c:628]: grep_sock_info(): checking if host==us: 11==7 && [example.org] == [0.0.0.0] kamailio_1 | 12(17) DEBUG: <core> [core/socket_info.c:635]: grep_sock_info(): checking if port 80 (advertise 0) matches port 5060 kamailio_1 | 12(17) DEBUG: <core> [core/forward.c:412]: check_self(): host != me kamailio_1 | 12(17) DEBUG: corex [corex_lib.c:200]: corex_check_self(): check self for: 0:example.org:5060 kamailio_1 | 12(17) DEBUG: corex [corex_lib.c:227]: corex_check_self(): no match found kamailio_1 | 12(17) DEBUG: <core> [core/socket_info.c:628]: grep_sock_info(): checking if host==us: 11==7 && [example.org] == [0.0.0.0] kamailio_1 | 12(17) DEBUG: <core> [core/socket_info.c:635]: grep_sock_info(): checking if port 80 (advertise 0) matches port 5060 kamailio_1 | 12(17) DEBUG: <core> [core/forward.c:412]: check_self(): host != me kamailio_1 | 12(17) DEBUG: corex [corex_lib.c:200]: corex_check_self(): check self for: 0:example.org:5060 kamailio_1 | 12(17) DEBUG: corex [corex_lib.c:227]: corex_check_self(): no match found ``` Output with the static value: ``` kamailio_1 | 11(16) DEBUG: <core> [core/socket_info.c:628]: grep_sock_info(): checking if host==us: 11==7 && [example.org] == [0.0.0.0] kamailio_1 | 11(16) DEBUG: <core> [core/socket_info.c:635]: grep_sock_info(): checking if port 80 (advertise 0) matches port 5060 kamailio_1 | 11(16) DEBUG: <core> [core/socket_info.c:628]: grep_sock_info(): checking if host==us: 11==7 && [example.org] == [0.0.0.0] kamailio_1 | 11(16) DEBUG: <core> [core/socket_info.c:635]: grep_sock_info(): checking if port 80 (advertise 0) matches port 5060 ``` ### Possible Solutions Right now I need to work around this issue by including a separate `kamailio-aliases.cfg` file which must then be provided in each environment. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.3 (x86_64/linux) 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 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: unknown compiled with gcc 5.3.1 ``` * **Operating System**:  Using the Docker image `kamailio/kamailio:5.3.3-xenial`. Info from the Docker host: ``` # uname -a Linux ubuntu-s-1vcpu-1gb-fra1-01-sip 4.4.0-177-generic #207-Ubuntu SMP Mon Mar 16 01:16:10 UTC 2020 x86_64 x86_64 x86_64 GNU/Linux # lsb_release -a No LSB modules are available. Distributor ID: Ubuntu Description: Ubuntu 16.04.6 LTS Release: 16.04 Codename: xenial ``` -- 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/2310

4 years, 5 months

← Newer
1
...
8
9
10
11
12
13
14
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2020