sr-dev

sr-dev@lists.kamailio.org

16 participants
45408 discussions

git:master:efcf941d: pkg/docker: Updated reference to kamailio-ci (dockerfiles) repo
by Sergey Safarov 14 Jan '18

14 Jan '18

Module: kamailio Branch: master Commit: efcf941d87f5ee95df9974e328e371d04ab5e173 URL: https://github.com/kamailio/kamailio/commit/efcf941d87f5ee95df9974e328e371d… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-01-14T15:07:09-05:00 pkg/docker: Updated reference to kamailio-ci (dockerfiles) repo --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/efcf941d87f5ee95df9974e328e371d… Patch: https://github.com/kamailio/kamailio/commit/efcf941d87f5ee95df9974e328e371d… --- diff --git a/pkg/docker b/pkg/docker index 1368cea8a4..d5eef889b8 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit 1368cea8a47edae754ded68ff61e263fcad29fee +Subproject commit d5eef889b8be77c90a4ab1eac29e240132499060

1 0

[kamailio/kamailio] Updated reference to kamailio-ci (dockerfiles) repo (#1398)
by sergey-safarov 14 Jan '18

14 Jan '18

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1398 -- Commit Summary -- * Updated reference to kamailio-ci (dockerfiles) repo -- File Changes -- M pkg/docker (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1398.patch https://github.com/kamailio/kamailio/pull/1398.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/1398

2 4

git:master:6af1a011: README.md: added code triage badge link [skip ci]
by Daniel-Constantin Mierla 14 Jan '18

14 Jan '18

Module: kamailio Branch: master Commit: 6af1a0110083ba98c7f4695410f9c71f225ca1a9 URL: https://github.com/kamailio/kamailio/commit/6af1a0110083ba98c7f4695410f9c71… Author: Richard Schneeman <richard.schneeman(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-14T17:55:53+01:00 README.md: added code triage badge link [skip ci] - codetriage is an app with the goal of getting people involved in open source projects, sending to subscribers a random open issue for them to help "triage" - more at: https://www.codetriage.com - based on PR #1389 --- Modified: README.md --- Diff: https://github.com/kamailio/kamailio/commit/6af1a0110083ba98c7f4695410f9c71… Patch: https://github.com/kamailio/kamailio/commit/6af1a0110083ba98c7f4695410f9c71… --- diff --git a/README.md b/README.md index d3513d9a84..6cc093737d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # Kamailio - The Open Source SIP Server [![Build Status](https://travis-ci.org/kamailio/kamailio.svg?branch=master)](https:/… +[![Code Triage Badge](https://www.codetriage.com/kamailio/kamailio/badges/users.svg)](http… Project Website:

1 0

git:master:1f9366ab: db2_ops: proper check for memory allocation pointer
by Daniel-Constantin Mierla 14 Jan '18

14 Jan '18

Module: kamailio Branch: master Commit: 1f9366ab5978ee4aa8fd3cefea0393c94889c26e URL: https://github.com/kamailio/kamailio/commit/1f9366ab5978ee4aa8fd3cefea0393c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-14T09:52:25+01:00 db2_ops: proper check for memory allocation pointer - check result codes for registering script callbacks --- Modified: src/modules/db2_ops/db2_ops.c --- Diff: https://github.com/kamailio/kamailio/commit/1f9366ab5978ee4aa8fd3cefea0393c… Patch: https://github.com/kamailio/kamailio/commit/1f9366ab5978ee4aa8fd3cefea0393c… --- diff --git a/src/modules/db2_ops/db2_ops.c b/src/modules/db2_ops/db2_ops.c index dca2c81a1c..433d5293fc 100644 --- a/src/modules/db2_ops/db2_ops.c +++ b/src/modules/db2_ops/db2_ops.c @@ -201,7 +201,7 @@ static int split_fields(char *part, int *n, struct xlstr **strs) { int i, res; char *c, *fld; - if(part==NULL || *part=='\0') + if(part==NULL || *part=='\0' || strs==NULL) return -1; *n = 0; @@ -213,7 +213,7 @@ static int split_fields(char *part, int *n, struct xlstr **strs) { (*n)++; } *strs = pkg_malloc( (*n)*sizeof(**strs)); - if (!strs) { + if (*strs==NULL) { ERR(MODULE_NAME": split_fields: not enough pkg memory\n"); return E_OUT_OF_MEM; } @@ -1043,12 +1043,27 @@ static int mod_init(void) { for (p=dbops_actions; p; p=p->next) { int res; res = init_action(p); - if (res < 0) + if (res < 0) { + pkg_free(xlbuf); + xlbuf = NULL; return res; + } } - register_script_cb(dbops_pre_script_cb, REQUEST_CB | ONREPLY_CB | PRE_SCRIPT_CB, 0); - register_script_cb(dbops_post_script_cb, REQUEST_CB | ONREPLY_CB | POST_SCRIPT_CB, 0); + if(register_script_cb(dbops_pre_script_cb, + REQUEST_CB | ONREPLY_CB | PRE_SCRIPT_CB, 0)<0) { + LM_ERR("failed to register pre script callback\n"); + pkg_free(xlbuf); + xlbuf = NULL; + return -1; + } + if(register_script_cb(dbops_post_script_cb, + REQUEST_CB | ONREPLY_CB | POST_SCRIPT_CB, 0)<0) { + LM_ERR("failed to register post script callback\n"); + pkg_free(xlbuf); + xlbuf = NULL; + return -1; + } register_select_table(sel_declaration); return 0;

1 0

git:master:554a7dbb: modules: readme files regenerated - pipelimit ... [skip ci]
by Kamailio Dev 13 Jan '18

13 Jan '18

Module: kamailio Branch: master Commit: 554a7dbb77730efdfe56f279e98b6c0d4b4be314 URL: https://github.com/kamailio/kamailio/commit/554a7dbb77730efdfe56f279e98b6c0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-01-13T19:31:46+01:00 modules: readme files regenerated - pipelimit ... [skip ci] --- Modified: src/modules/pipelimit/README --- Diff: https://github.com/kamailio/kamailio/commit/554a7dbb77730efdfe56f279e98b6c0… Patch: https://github.com/kamailio/kamailio/commit/554a7dbb77730efdfe56f279e98b6c0…

1 0

[kamailio/kamailio] Pipelimit timer doesn't seem to be working (#1390)
by jcpriotti 13 Jan '18

13 Jan '18

### Description Timer on pipelimit doesn't seem to be working. When changing the time interval the limit gets changed in a way that it's multiplied by the time interval. For example if I use a time interval of 1 second and a limit of 20 (if (!pl_check("$si", "TAILDROP", "20"))) the module start limiting right after the traffic gets over 20 CPS. But if I change the time interval to 3 seconds, the module starts limiting the traffic right after 60 CPS. This is my configuration: # ----- pipelimit params----- modparam("pipelimit", "timer_interval", 3) modparam("pipelimit", "hash_size", 10) modparam("pipelimit", "db_url", DBURL) modparam("pipelimit", "reply_code", 503) modparam("pipelimit", "reply_reason", "Limiting") ... ... ... request_route { ... ... if(is_method("INVITE")) { $var(limit) = 20; if (!pl_check("$si", "TAILDROP", "$var(limit)")) { xlog("L_INFO", "[$ci] $si - Limiting INVITE using pipe $var(limit) req/sec\n"); pl_drop(); exit; } ..... ..... ..... } } Checking the source for pipelimit module (https://github.com/kamailio/kamailio/blob/master/src/modules/pipelimit/pipe…) I see that for taildrop it's checking for the limit times the time_interval: case PIPE_ALGO_TAILDROP: ret = (pipe->counter <= pipe->limit * timer_interval) ? 1 : -1; break; I've made a change eliminating the time_interval (set it to 1) from that check and after that I've got the limit working OK, and the traffic gets drop right after it's over the limit (20 cps) using any time_interval. Is there some issue with the timer for the check not being updated by the module settings (timer_interval)? I'm using kamailio 4.4 and I've also tested it in kamailio 4.3 and 5.1 with same results. ### Troubleshooting #### Reproduction #### Debugging Data ### Additional Information version: kamailio 4.4.6 (x86_64/linux) 212b33 flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, 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_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 212b33 compiled on 13:02:03 Dec 15 2017 with gcc 4.9.2 * **Operating System**: Linux sjc-lb-test-cps.telnyx.com 3.16.0-4-amd64 #1 SMP Debian 3.16.39-1+deb8u2 (2017-03-07) x86_64 GNU/Linux -- 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/1390

2 2

git:master:93cfd4e8: pipelimit: docs - more details about timer interval and limit values
by Daniel-Constantin Mierla 13 Jan '18

13 Jan '18

Module: kamailio Branch: master Commit: 93cfd4e8581fed04d4e596ed7f3d284c53fc5501 URL: https://github.com/kamailio/kamailio/commit/93cfd4e8581fed04d4e596ed7f3d284… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-13T19:29:00+01:00 pipelimit: docs - more details about timer interval and limit values --- Modified: src/modules/pipelimit/doc/pipelimit_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/93cfd4e8581fed04d4e596ed7f3d284… Patch: https://github.com/kamailio/kamailio/commit/93cfd4e8581fed04d4e596ed7f3d284…

1 0

git:master:1880f1f8: pipelimit: remove mutiplying the limit with timer interval for TAILDROP alg
by Daniel-Constantin Mierla 13 Jan '18

13 Jan '18

Module: kamailio Branch: master Commit: 1880f1f8be4b51cec2a0567580828e9ac449947d URL: https://github.com/kamailio/kamailio/commit/1880f1f8be4b51cec2a0567580828e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-13T19:29:00+01:00 pipelimit: remove mutiplying the limit with timer interval for TAILDROP alg - the limit is documented as per interval, not per second (closes GH #1390) - renamed macro for default limit to use module specific prefix --- Modified: src/modules/pipelimit/pipelimit.c --- Diff: https://github.com/kamailio/kamailio/commit/1880f1f8be4b51cec2a0567580828e9… Patch: https://github.com/kamailio/kamailio/commit/1880f1f8be4b51cec2a0567580828e9… --- diff --git a/src/modules/pipelimit/pipelimit.c b/src/modules/pipelimit/pipelimit.c index 9025623435..a15e2ca696 100644 --- a/src/modules/pipelimit/pipelimit.c +++ b/src/modules/pipelimit/pipelimit.c @@ -64,7 +64,7 @@ MODULE_VERSION /* * timer interval length in seconds, tunable via modparam */ -#define RL_TIMER_INTERVAL 10 +#define PL_TIMER_INTERVAL 10 /** SL API structure */ sl_api_t slb; @@ -107,7 +107,7 @@ static int load_source_mp = LOAD_SOURCE_CPU; static int * load_source; /* these only change in the mod_init() process -- no locking needed */ -static int timer_interval = RL_TIMER_INTERVAL; +static int timer_interval = PL_TIMER_INTERVAL; int _pl_cfg_setpoint; /* desired load, used when reading modparams */ /* === */ @@ -565,7 +565,7 @@ static int pipe_push_direct(pl_pipe_t *pipe) ret = 2; break; case PIPE_ALGO_TAILDROP: - ret = (pipe->counter <= pipe->limit * timer_interval) ? 1 : -1; + ret = (pipe->counter <= pipe->limit) ? 1 : -1; break; case PIPE_ALGO_RED: if (pipe->load == 0) @@ -869,4 +869,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_pipelimit_exports); return 0; -} \ No newline at end of file +}

1 0

git:master:5e7330cd: modules: readme files regenerated - nathelper ... [skip ci]
by Kamailio Dev 13 Jan '18

13 Jan '18

Module: kamailio Branch: master Commit: 5e7330cd419d8d149cc4a4ca6105d1bfa11996be URL: https://github.com/kamailio/kamailio/commit/5e7330cd419d8d149cc4a4ca6105d1b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-01-13T18:32:27+01:00 modules: readme files regenerated - nathelper ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/5e7330cd419d8d149cc4a4ca6105d1b… Patch: https://github.com/kamailio/kamailio/commit/5e7330cd419d8d149cc4a4ca6105d1b… --- diff --git a/src/modules/nathelper/README b/src/modules/nathelper/README index 55a1245053..102a639ea0 100644 --- a/src/modules/nathelper/README +++ b/src/modules/nathelper/README @@ -249,15 +249,14 @@ Chapter 1. Admin Guide 4.1. force_socket (string) - Socket to be used when sending NAT pings for UDP communication. - It uses the first socket it finds based on the IP address. If - no one specified, the OS will choose a socket. + Socket to be used when sending NAT pings for UDP communication. If no + one specified, the OS will choose a socket. Default value is “NULL”. Example 1.1. Set force_socket parameter ... -modparam("nathelper", "force_socket", "127.0.0.1") +modparam("nathelper", "force_socket", "127.0.0.1:5060") ... 4.2. natping_interval (integer)

1 0

git:5.0:bc93a218: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 13 Jan '18

13 Jan '18

Module: kamailio Branch: 5.0 Commit: bc93a218ae02f35e230cdef6db390424c1383748 URL: https://github.com/kamailio/kamailio/commit/bc93a218ae02f35e230cdef6db39042… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-01-13T18:31:23+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/bc93a218ae02f35e230cdef6db39042… Patch: https://github.com/kamailio/kamailio/commit/bc93a218ae02f35e230cdef6db39042… --- diff --git a/src/modules/nathelper/README b/src/modules/nathelper/README index 3918f479ba..38d00646e3 100644 --- a/src/modules/nathelper/README +++ b/src/modules/nathelper/README @@ -256,7 +256,7 @@ Chapter 1. Admin Guide Example 1.1. Set force_socket parameter ... -modparam("nathelper", "force_socket", "localhost:33333") +modparam("nathelper", "force_socket", "127.0.0.1:5060") ... 4.2. natping_interval (integer)

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