sr-dev April 2017

sr-dev@lists.kamailio.org

31 participants
426 discussions

git:master:6af11bf9: Merge pull request #1101 from codyherzog/master

by GitHub

Module: kamailio Branch: master Commit: 6af11bf9858921deb74cce351013b734e1b29a6f URL: https://github.com/kamailio/kamailio/commit/6af11bf9858921deb74cce351013b73… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-04-28T08:35:55+02:00 Merge pull request #1101 from codyherzog/master core: Don't terminate on harmless SIGCHLD. --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/6af11bf9858921deb74cce351013b73… Patch: https://github.com/kamailio/kamailio/commit/6af11bf9858921deb74cce351013b73… --- diff --git a/src/main.c b/src/main.c index 7781901..3fdf070 100644 --- a/src/main.c +++ b/src/main.c @@ -675,6 +675,7 @@ void handle_sigs(void) { pid_t chld; int chld_status; + int any_chld_stopped; int memlog; switch(sig_flag){ @@ -730,7 +731,9 @@ void handle_sigs(void) break; case SIGCHLD: + any_chld_stopped=0; while ((chld=waitpid( -1, &chld_status, WNOHANG ))>0) { + any_chld_stopped=1; if (WIFEXITED(chld_status)) LM_ALERT("child process %ld exited normally," " status=%d\n", (long)chld, @@ -747,6 +750,16 @@ void handle_sigs(void) " signal %d\n", (long)chld, WSTOPSIG(chld_status)); } + + /* If it appears that no child process has stopped, then do not terminate on SIGCHLD. + Certain modules like app_python can run external scripts which cause child processes to be started and + stopped. That can result in SIGCHLD being received here even though there is no real problem. Therefore, + we do not terminate Kamailio unless we can find the child process which has stopped. */ + if (!any_chld_stopped) { + LM_INFO("SIGCHLD received, but no child has stopped, ignoring it\n"); + break; + } + #ifndef STOP_JIRIS_CHANGES if (dont_fork) { LM_INFO("dont_fork turned on, living on\n");

7 years

git:master:1c5e1660: core: Don't terminate on harmless SIGCHLD.

by codyherzog

Module: kamailio Branch: master Commit: 1c5e166001306a1a9d9d8412f0a54910093109cb URL: https://github.com/kamailio/kamailio/commit/1c5e166001306a1a9d9d8412f0a5491… Author: codyherzog <cherzog(a)intouchhealth.com> Committer: codyherzog <cherzog(a)intouchhealth.com> Date: 2017-04-27T14:04:35-07:00 core: Don't terminate on harmless SIGCHLD. If it appears that no child process has stopped, then do not terminate on SIGCHLD. Certain modules like app_python can run external scripts which cause child processes to be started and stopped. That can result in SIGCHLD being received even though there is no real problem. Therefore, we do not terminate Kamailio unless we can find the child process which has stopped. --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/1c5e166001306a1a9d9d8412f0a5491… Patch: https://github.com/kamailio/kamailio/commit/1c5e166001306a1a9d9d8412f0a5491… --- diff --git a/src/main.c b/src/main.c index 7781901..3fdf070 100644 --- a/src/main.c +++ b/src/main.c @@ -675,6 +675,7 @@ void handle_sigs(void) { pid_t chld; int chld_status; + int any_chld_stopped; int memlog; switch(sig_flag){ @@ -730,7 +731,9 @@ void handle_sigs(void) break; case SIGCHLD: + any_chld_stopped=0; while ((chld=waitpid( -1, &chld_status, WNOHANG ))>0) { + any_chld_stopped=1; if (WIFEXITED(chld_status)) LM_ALERT("child process %ld exited normally," " status=%d\n", (long)chld, @@ -747,6 +750,16 @@ void handle_sigs(void) " signal %d\n", (long)chld, WSTOPSIG(chld_status)); } + + /* If it appears that no child process has stopped, then do not terminate on SIGCHLD. + Certain modules like app_python can run external scripts which cause child processes to be started and + stopped. That can result in SIGCHLD being received here even though there is no real problem. Therefore, + we do not terminate Kamailio unless we can find the child process which has stopped. */ + if (!any_chld_stopped) { + LM_INFO("SIGCHLD received, but no child has stopped, ignoring it\n"); + break; + } + #ifndef STOP_JIRIS_CHANGES if (dont_fork) { LM_INFO("dont_fork turned on, living on\n");

7 years

[kamailio/kamailio] core: Don't terminate on harmless SIGCHLD. (#1101)

by codyherzog

If it appears that no child process has stopped, then do not terminate on SIGCHLD. Certain modules like app_python can run external scripts which cause child processes to be started and stopped. That can result in SIGCHLD being received even though there is no real problem. Therefore, we do not terminate Kamailio unless we can find the child process which has stopped. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1101 -- Commit Summary -- * core: Don't terminate on harmless SIGCHLD. -- File Changes -- M src/main.c (13) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1101.patch https://github.com/kamailio/kamailio/pull/1101.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/1101

7 years

git:5.0:c270da3c: ims_icscf: Fix fixup functions

by Carsten Bock

Module: kamailio Branch: 5.0 Commit: c270da3cd3200e7074fd7368f0899e679c38c5c2 URL: https://github.com/kamailio/kamailio/commit/c270da3cd3200e7074fd7368f0899e6… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2017-04-28T08:10:54+02:00 ims_icscf: Fix fixup functions --- Modified: src/modules/ims_icscf/ims_icscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c270da3cd3200e7074fd7368f0899e6… Patch: https://github.com/kamailio/kamailio/commit/c270da3cd3200e7074fd7368f0899e6… --- diff --git a/src/modules/ims_icscf/ims_icscf_mod.c b/src/modules/ims_icscf/ims_icscf_mod.c index 07eb29c..47813e2 100644 --- a/src/modules/ims_icscf/ims_icscf_mod.c +++ b/src/modules/ims_icscf/ims_icscf_mod.c @@ -270,15 +270,14 @@ static int fixup_uar(void** param, int param_no) { if (strlen((char*) *param) <= 0) { LM_ERR("empty parameter %d not allowed\n", param_no); - return -1; + return -1; } - if (param_no == 1) { //route name - static or dynamic string (config vars) - if (fixup_spve_null(param, param_no) < 0){ - LM_ERR("fixup spve failed on %d\n", param_no); - return -1; - } - return 0; + switch (param_no) { + case 1: + return fixup_spve_null(param, param_no); + case 2: + return fixup_var_int_12(param, 1); } return 0; @@ -291,11 +290,12 @@ static int fixup_lir(void** param, int param_no) return -1; } - if (param_no == 1) { //route name - static or dynamic string (config vars) - if (fixup_spve_null(param, param_no) < 0) - return -1; - return 0; - } + switch (param_no) { + case 1: + return fixup_spve_null(param, param_no); + case 2: + return fixup_var_int_12(param, 1); + } return 0; }

7 years

git:master:ca39ea81: Packaging: Update Centos 7 Spec file

by Carsten Bock

Module: kamailio Branch: master Commit: ca39ea810c01f6947db70870cc1d786e95cb4bc3 URL: https://github.com/kamailio/kamailio/commit/ca39ea810c01f6947db70870cc1d786… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2017-04-28T08:05:28+02:00 Packaging: Update Centos 7 Spec file --- Modified: pkg/kamailio/centos/7/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/ca39ea810c01f6947db70870cc1d786… Patch: https://github.com/kamailio/kamailio/commit/ca39ea810c01f6947db70870cc1d786… --- diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index e4339fa..d6fd642 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -38,6 +38,7 @@ Conflicts: kamailio-utils < %ver, kamailio-websocket < %ver Conflicts: kamailio-xhttp-pi < %ver, kamailio-xmlops < %ver Conflicts: kamailio-xmlrpc < %ver, kamailio-xmpp < %ver Conflicts: kamailio-uuid < %ver +Conflicts: kamailio-sqlang < %ver BuildRequires: bison, flex, gcc, make, redhat-rpm-config %description @@ -552,6 +553,14 @@ BuildRequires: libuuid-devel %description uuid UUID module for Kamailio. +%package sqlang +Summary: Squirrel Language (SQLang) for Kamailio +Group: System Environment/Daemons +Requires: squirrel-libs, kamailio = %version +BuildRequires: squirrel-devel gcc-c++ + +%description sqlang +app_sqlang module for Kamailio. %prep %setup -n %{name}-%{ver} @@ -767,6 +776,9 @@ fi %doc %{_docdir}/kamailio/modules/README.jsonrpcs %doc %{_docdir}/kamailio/modules/README.nosip %doc %{_docdir}/kamailio/modules/README.tsilo +%doc %{_docdir}/kamailio/modules/README.call_obj +%doc %{_docdir}/kamailio/modules/README.evrexec +%doc %{_docdir}/kamailio/modules/README.keepalive %dir %attr(-,kamailio,kamailio) %{_sysconfdir}/kamailio @@ -906,7 +918,9 @@ fi %{_libdir}/kamailio/modules/jsonrpcs.so %{_libdir}/kamailio/modules/nosip.so %{_libdir}/kamailio/modules/tsilo.so - +%{_libdir}/kamailio/modules/call_obj.so +%{_libdir}/kamailio/modules/evrexec.so +%{_libdir}/kamailio/modules/keepalive.so %{_sbindir}/kamailio %{_sbindir}/kamctl @@ -1037,6 +1051,7 @@ fi %doc %{_docdir}/kamailio/modules/README.ims_registrar_pcscf %doc %{_docdir}/kamailio/modules/README.ims_registrar_scscf %doc %{_docdir}/kamailio/modules/README.ims_usrloc_pcscf +%doc %{_docdir}/kamailio/modules/README.ims_diameter_server %doc %{_docdir}/kamailio/modules/README.log_custom %doc %{_docdir}/kamailio/modules/README.smsops %doc %{_docdir}/kamailio/modules/README.statsc @@ -1056,6 +1071,7 @@ fi %{_libdir}/kamailio/modules/ims_registrar_scscf.so %{_libdir}/kamailio/modules/ims_usrloc_pcscf.so %{_libdir}/kamailio/modules/ims_usrloc_scscf.so +%{_libdir}/kamailio/modules/ims_diameter_server.so %{_libdir}/kamailio/modules/log_custom.so %{_libdir}/kamailio/modules/smsops.so %{_libdir}/kamailio/modules/statsc.so @@ -1230,7 +1246,9 @@ fi %files redis %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.ndb_redis +%doc %{_docdir}/kamailio/modules/README.topos_redis %{_libdir}/kamailio/modules/ndb_redis.so +%{_libdir}/kamailio/modules/topos_redis.so %files regex @@ -1341,8 +1359,19 @@ fi %doc %{_docdir}/kamailio/modules/README.uuid %{_libdir}/kamailio/modules/uuid.so +%files sqlang +%defattr(-,root,root) +%doc %{_docdir}/kamailio/modules/README.app_sqlang +%{_libdir}/kamailio/modules/app_sqlang.so %changelog +* Wed Apr 26 2017 Carsten Bock <carsten(a)ng-voice.co,> + - added ims_diameter_server module + - added topos_redis module + - added call_obj module + - added evrexec module + - added keepalive module + - added app_sqlang module * Thu Mar 09 2017 Federico Cabiddu <federico.cabiddu(a)gmail.com> - Updated version to 5.1.0-dev1 * Thu Mar 09 2017 Federico Cabiddu <federico.cabiddu(a)gmail.com>

7 years

[kamailio/kamailio] Bug in function replace_body() (#1100)

by Alberto Llamas

### Description  ``` We are using the functions: replace_body("RTP/AVP 96 97 0 101 98", "RTP/AVP 101 96 97 0 98"); msg_apply_changes(); We expect it replace the 'RTP/AVP 96 97 0 101 98' for 'RTP/AVP 101 96 97 0 98' And what kamailio does is append 'RTP/AVP 101 96 97 0 98' to the end of the SDP body. ``` #### Log Messages  ``` We are not getting any error message ``` ### Possible Solutions  ```` We've got the opportunity to test on version 4.0.3 and it does the work properly. ```` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 4.4.5 (x86_64/linux) 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: unknown compiled with gcc 4.9.2 ``` * **Operating System**: ``` Distributor ID: Debian Description: Debian GNU/Linux 8.7 (jessie) Release: 8.7 Codename: jessie Linux devcomphe 3.16.0-4-amd64 #1 SMP Debian 3.16.36-1+deb8u2 (2016-10-19) 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/1100

7 years

git:4.4:e71ed2da: pkg/kamailio/centos/7: Updated dependency lib name (librabbitmq)

by Sergey Safarov

Module: kamailio Branch: 4.4 Commit: e71ed2da08d64acf5156b05dba4db784c2301bb5 URL: https://github.com/kamailio/kamailio/commit/e71ed2da08d64acf5156b05dba4db78… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2017-04-23T00:35:24-04:00 pkg/kamailio/centos/7: Updated dependency lib name (librabbitmq) --- Modified: pkg/kamailio/centos/7/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/e71ed2da08d64acf5156b05dba4db78… Patch: https://github.com/kamailio/kamailio/commit/e71ed2da08d64acf5156b05dba4db78… --- diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index 23dc939..ff0b7a6 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -214,8 +214,8 @@ json string handling and RPC modules for Kamailio. %package kazoo Summary: Kazoo middle layer connector support for Kamailio Group: System Environment/Daemons -Requires: libuuid, rabbitmq-c, json-c, libevent, kamailio = %ver -BuildRequires: libuuid-devel, rabbitmq-c-devel, json-c-devel, libevent-devel +Requires: libuuid, librabbitmq, json-c, libevent, kamailio = %ver +BuildRequires: libuuid-devel, librabbitmq-devel, json-c-devel, libevent-devel %description kazoo Kazoo module for Kamailio.

7 years

git:4.4:9df06be7: Merge pull request #1091 from sergey-safarov/spec_update8-44

by GitHub

Module: kamailio Branch: 4.4 Commit: 9df06be7a5d97154374f2e53b39c47692cda99d0 URL: https://github.com/kamailio/kamailio/commit/9df06be7a5d97154374f2e53b39c476… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-04-27T23:02:50+02:00 Merge pull request #1091 from sergey-safarov/spec_update8-44 pkg/kamailio/centos/7: Updated dependency lib name (librabbitmq) --- Modified: pkg/kamailio/centos/7/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/9df06be7a5d97154374f2e53b39c476… Patch: https://github.com/kamailio/kamailio/commit/9df06be7a5d97154374f2e53b39c476… --- diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index 23dc939..ff0b7a6 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -214,8 +214,8 @@ json string handling and RPC modules for Kamailio. %package kazoo Summary: Kazoo middle layer connector support for Kamailio Group: System Environment/Daemons -Requires: libuuid, rabbitmq-c, json-c, libevent, kamailio = %ver -BuildRequires: libuuid-devel, rabbitmq-c-devel, json-c-devel, libevent-devel +Requires: libuuid, librabbitmq, json-c, libevent, kamailio = %ver +BuildRequires: libuuid-devel, librabbitmq-devel, json-c-devel, libevent-devel %description kazoo Kazoo module for Kamailio.

7 years

[kamailio/kamailio] pkg/kamailio/centos/7: Updated dependency lib name (librabbitmq) (#1091)

by sergey-safarov

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1091 -- Commit Summary -- * pkg/kamailio/centos/7: Updated dependency lib name (librabbitmq) -- File Changes -- M pkg/kamailio/centos/7/kamailio.spec (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1091.patch https://github.com/kamailio/kamailio/pull/1091.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/1091

7 years

git:master:1ad4a08f: Merge pull request #1092 from sergey-safarov/spec_update8

by GitHub

Module: kamailio Branch: master Commit: 1ad4a08fb9a8297209887c77fa026a402060ba74 URL: https://github.com/kamailio/kamailio/commit/1ad4a08fb9a8297209887c77fa026a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-04-27T23:02:35+02:00 Merge pull request #1092 from sergey-safarov/spec_update8 pkg/kamailio/centos/7: Updated dependency lib name (librabbitmq) --- Modified: pkg/kamailio/centos/7/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/1ad4a08fb9a8297209887c77fa026a4… Patch: https://github.com/kamailio/kamailio/commit/1ad4a08fb9a8297209887c77fa026a4… --- diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index 9376953..e4339fa 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -231,8 +231,8 @@ json string handling and RPC modules for Kamailio. %package kazoo Summary: Kazoo middle layer connector support for Kamailio Group: System Environment/Daemons -Requires: libuuid, rabbitmq-c, json-c, libevent, kamailio = %ver -BuildRequires: libuuid-devel, rabbitmq-c-devel, json-c-devel, libevent-devel +Requires: libuuid, librabbitmq, json-c, libevent, kamailio = %ver +BuildRequires: libuuid-devel, librabbitmq-devel, json-c-devel, libevent-devel %description kazoo Kazoo module for Kamailio.

7 years

← Newer
1
...
7
8
9
10
11
12
13
...
43
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2017