sr-dev September 2019

sr-dev@lists.kamailio.org

24 participants
368 discussions

git:5.1:468403d9: acc: extend documentation related to flag usage
by Henning Westerholt 12 Sep '19

12 Sep '19

Module: kamailio Branch: 5.1 Commit: 468403d98d8aec4a833e3f9a9be1913efe9897c8 URL: https://github.com/kamailio/kamailio/commit/468403d98d8aec4a833e3f9a9be1913… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-12T23:40:58+02:00 acc: extend documentation related to flag usage (cherry picked from commit 40905046baab49fb3baf0f2fdded1307b023d08a) --- Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/468403d98d8aec4a833e3f9a9be1913… Patch: https://github.com/kamailio/kamailio/commit/468403d98d8aec4a833e3f9a9be1913… --- diff --git a/src/modules/acc/doc/acc_admin.xml b/src/modules/acc/doc/acc_admin.xml index 2588243f7c..36753ae10c 100644 --- a/src/modules/acc/doc/acc_admin.xml +++ b/src/modules/acc/doc/acc_admin.xml @@ -489,7 +489,9 @@ modparam("acc", "early_media", 1) <title><varname>failed_transaction_flag</varname> (integer)</title> <para> Per transaction flag which says if the transaction should be - accounted also in case of failure (status>=300). + accounted also in case of failure (SIP status code >= 300). + This flag triggers accouting when the whole transaction fails + (on the server side). </para> <para> Default value is not-set (no flag). @@ -679,12 +681,12 @@ modparam("acc", "log_flag", 2) <para> Request flag which needs to be set to account missed calls via syslog. This can be used to e.g. account failures during the call setup phase - from the callee side, for example if you do forking to several + from the callee (client) side, for example if you do forking to several destinations. </para> <para> - Keep in mind that this flag is reset after processing. Therefore it is - necessary to set it again e.g. in a failure_route if you do serial + Keep in mind that this flag is reset after branch completion. Therefore + it is necessary to set it again e.g. in a failure_route if you do serial forking and want to log all attempts. </para> <para> @@ -775,8 +777,15 @@ modparam("acc", "db_flag", 2) <section id="acc.p.db_missed_flag"> <title><varname>db_missed_flag</varname> (integer)</title> <para> - Request flag which needs to be set to account missed - calls -- database specific. + Request flag which needs to be set to account missed calls via database. + This can be used to e.g. account failures during the call setup phase + from the callee (client) side, for example if you do forking to several + destinations. + </para> + <para> + Keep in mind that this flag is reset after branch completion. Therefore + it is necessary to set it again e.g. in a failure_route if you do serial + forking and want to log all attempts. </para> <para> Default value is not-set (no flag).

1 0

git:master:40905046: acc: extend documentation related to flag usage
by Henning Westerholt 12 Sep '19

12 Sep '19

Module: kamailio Branch: master Commit: 40905046baab49fb3baf0f2fdded1307b023d08a URL: https://github.com/kamailio/kamailio/commit/40905046baab49fb3baf0f2fdded130… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-12T21:53:21+02:00 acc: extend documentation related to flag usage --- Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/40905046baab49fb3baf0f2fdded130… Patch: https://github.com/kamailio/kamailio/commit/40905046baab49fb3baf0f2fdded130… --- diff --git a/src/modules/acc/doc/acc_admin.xml b/src/modules/acc/doc/acc_admin.xml index 61e27a196e..a0794ca562 100644 --- a/src/modules/acc/doc/acc_admin.xml +++ b/src/modules/acc/doc/acc_admin.xml @@ -489,7 +489,9 @@ modparam("acc", "early_media", 1) <title><varname>failed_transaction_flag</varname> (integer)</title> <para> Per transaction flag which says if the transaction should be - accounted also in case of failure (status>=300). + accounted also in case of failure (SIP status code >= 300). + This flag triggers accouting when the whole transaction fails + (on the server side). </para> <para> Default value is not-set (no flag). @@ -679,12 +681,12 @@ modparam("acc", "log_flag", 2) <para> Request flag which needs to be set to account missed calls via syslog. This can be used to e.g. account failures during the call setup phase - from the callee side, for example if you do forking to several + from the callee (client) side, for example if you do forking to several destinations. </para> <para> - Keep in mind that this flag is reset after processing. Therefore it is - necessary to set it again e.g. in a failure_route if you do serial + Keep in mind that this flag is reset after branch completion. Therefore + it is necessary to set it again e.g. in a failure_route if you do serial forking and want to log all attempts. </para> <para> @@ -775,8 +777,15 @@ modparam("acc", "db_flag", 2) <section id="acc.p.db_missed_flag"> <title><varname>db_missed_flag</varname> (integer)</title> <para> - Request flag which needs to be set to account missed - calls -- database specific. + Request flag which needs to be set to account missed calls via database. + This can be used to e.g. account failures during the call setup phase + from the callee (client) side, for example if you do forking to several + destinations. + </para> + <para> + Keep in mind that this flag is reset after branch completion. Therefore + it is necessary to set it again e.g. in a failure_route if you do serial + forking and want to log all attempts. </para> <para> Default value is not-set (no flag).

1 0

git:master:f40df55a: core: tcp - set default local socket for tls when lookup fails
by Daniel-Constantin Mierla 11 Sep '19

11 Sep '19

Module: kamailio Branch: master Commit: f40df55af2f50789ca4a8b89a213f7323b1932f2 URL: https://github.com/kamailio/kamailio/commit/f40df55af2f50789ca4a8b89a213f73… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-11T12:42:58+02:00 core: tcp - set default local socket for tls when lookup fails - GH #2028 --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/f40df55af2f50789ca4a8b89a213f73… Patch: https://github.com/kamailio/kamailio/commit/f40df55af2f50789ca4a8b89a213f73… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 668103e676..e86fc872a8 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1373,18 +1373,31 @@ inline static int tcp_do_connect( union sockaddr_union* server, su2ip_addr(&ip, &my_name); find_socket: #ifdef USE_TLS - if (unlikely(type==PROTO_TLS)) + if (unlikely(type==PROTO_TLS)) { *res_si=find_si(&ip, 0, PROTO_TLS); - else -#endif + } else { *res_si=find_si(&ip, 0, PROTO_TCP); - + } +#else + *res_si=find_si(&ip, 0, PROTO_TCP); +#endif + if (unlikely(*res_si==0)){ LM_WARN("%s: could not find corresponding" " listening socket for %s, using default...\n", su2a(server, sizeof(*server)), ip_addr2a(&ip)); +#ifdef USE_TLS + if (unlikely(type==PROTO_TLS)) { + if (server->s.sa_family==AF_INET) *res_si=sendipv4_tls; + else *res_si=sendipv6_tls; + } else { + if (server->s.sa_family==AF_INET) *res_si=sendipv4_tcp; + else *res_si=sendipv6_tcp; + } +#else if (server->s.sa_family==AF_INET) *res_si=sendipv4_tcp; else *res_si=sendipv6_tcp; +#endif } *res_local_addr=*from; return s;

1 0

git:master:8a678c24: core: main - set default send tcp sockets to tls if no tcp is available
by Daniel-Constantin Mierla 11 Sep '19

11 Sep '19

Module: kamailio Branch: master Commit: 8a678c244aa34cf352fb614693c6e6d505ce2dfe URL: https://github.com/kamailio/kamailio/commit/8a678c244aa34cf352fb614693c6e6d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-11T12:05:18+02:00 core: main - set default send tcp sockets to tls if no tcp is available --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/8a678c244aa34cf352fb614693c6e6d… Patch: https://github.com/kamailio/kamailio/commit/8a678c244aa34cf352fb614693c6e6d… --- diff --git a/src/main.c b/src/main.c index ba64af67db..5af5284c55 100644 --- a/src/main.c +++ b/src/main.c @@ -1567,12 +1567,20 @@ int main_loop(void) /* get first ipv4/ipv6 socket*/ if ((si->address.af==AF_INET)&& ((sendipv4_tls==0) || - (sendipv4_tls->flags&(SI_IS_LO|SI_IS_MCAST)))) + (sendipv4_tls->flags&(SI_IS_LO|SI_IS_MCAST)))) { sendipv4_tls=si; + if(sendipv4_tcp==0) { + sendipv4_tcp=si; + } + } if( ((sendipv6_tls==0) || (sendipv6_tls->flags&(SI_IS_LO|SI_IS_MCAST))) && - (si->address.af==AF_INET6)) + (si->address.af==AF_INET6)) { sendipv6_tls=si; + if(sendipv6_tcp==0) { + sendipv6_tcp=si; + } + } } } #endif /* USE_TLS */

1 0

git:master:9d8f6e25: core: safety protection on handing incoming messages without setting local socket
by Daniel-Constantin Mierla 11 Sep '19

11 Sep '19

Module: kamailio Branch: master Commit: 9d8f6e25e30a48e6a1c55cfa112317b3da42207a URL: https://github.com/kamailio/kamailio/commit/9d8f6e25e30a48e6a1c55cfa112317b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-11T09:37:00+02:00 core: safety protection on handing incoming messages without setting local socket --- Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/9d8f6e25e30a48e6a1c55cfa112317b… Patch: https://github.com/kamailio/kamailio/commit/9d8f6e25e30a48e6a1c55cfa112317b… --- diff --git a/src/core/receive.c b/src/core/receive.c index 33dd7f17eb..b780440030 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -221,7 +221,7 @@ int ksr_evrt_received(char *buf, unsigned int len, receive_info_t *rcv_info) * WARNING: buf must be 0 terminated (buf[len]=0) or some things might * break (e.g.: modules/textops) */ -int receive_msg(char *buf, unsigned int len, struct receive_info *rcv_info) +int receive_msg(char *buf, unsigned int len, receive_info_t *rcv_info) { struct sip_msg *msg; struct run_act_ctx ctx; @@ -239,6 +239,12 @@ int receive_msg(char *buf, unsigned int len, struct receive_info *rcv_info) int errsipmsg = 0; int exectime = 0; + if(rcv_info->bind_address==NULL) { + LM_ERR("critical - incoming message without local socket [%.*s ...]\n", + (len>128)?128:len, buf); + return -1; + } + if(ksr_evrt_received_mode!=0) { if(ksr_evrt_received(buf, len, rcv_info)<0) { LM_DBG("dropping the received message\n");

1 0

git:master:ab0a69eb: pkg/kamailio: added rpm spec version and release configuration [skip ci]
by Sergey Safarov 10 Sep '19

10 Sep '19

Module: kamailio Branch: master Commit: ab0a69eb01953be97ccdfdb230e5af06bac9649c URL: https://github.com/kamailio/kamailio/commit/ab0a69eb01953be97ccdfdb230e5af0… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-09-10T13:43:39+03:00 pkg/kamailio: added rpm spec version and release configuration [skip ci] --- Modified: pkg/kamailio/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/ab0a69eb01953be97ccdfdb230e5af0… Patch: https://github.com/kamailio/kamailio/commit/ab0a69eb01953be97ccdfdb230e5af0… --- diff --git a/pkg/kamailio/Makefile b/pkg/kamailio/Makefile index 63c024c158..a221ff085c 100644 --- a/pkg/kamailio/Makefile +++ b/pkg/kamailio/Makefile @@ -6,8 +6,10 @@ else ifneq ($(MAKECMDGOALS),cfg) $(error Please start "make cfg" first) endif -RPMBUILD_TOP := /tmp/rpmbuild -DIST_ARCHIVE = ${shell echo "kamailio-$(RELEASE)_src.tar.gz" | sed -e "s/-dev[0-9]//" } +RPMBUILD_TOP := /tmp/kamailio_rpmbuild +RPM_VER = ${shell echo "$(RELEASE)" | sed -e "s/-dev[0-9]//" } +RPM_REL = ${shell echo "$(RELEASE)." | grep -o -P "dev[0-9]\." } +DIST_ARCHIVE = ${shell echo "kamailio-$(RPM_VER)_src.tar.gz"} APK_VERSION = ${shell echo "$(RELEASE)" | grep -o "^[0-9.]*"} RPMBUILD_OPT= --define "_topdir $(RPMBUILD_TOP)" GIT_TAG = ${shell git rev-parse HEAD 2> /dev/null} @@ -38,7 +40,10 @@ apk: src.rpm: tar mkdir -p ${RPMBUILD_TOP}/SOURCES mv ../../kamailio-$(RELEASE)_src.tar.gz ${RPMBUILD_TOP}/SOURCES/${DIST_ARCHIVE} - sed -i -e 's/setup -n %{name}-%{ver}/setup -n kamailio-$(RELEASE)/' obs/kamailio.spec + sed -e 's/%define ver .*/%define ver ${RPM_VER}/' \ + -e 's/%define rel .*/%define rel ${RPM_REL}0%{dist}/' \ + -e 's/setup -n %{name}-%{ver}/setup -n kamailio-$(RELEASE)/' \ + -i obs/kamailio.spec rpmbuild ${RPMBUILD_OPT} -bs obs/kamailio.spec mv ${RPMBUILD_TOP}/SRPMS/kamailio-$(RELEASE)*.src.rpm ../.. rm -Rf ${RPMBUILD_TOP}

1 0

[kamailio/kamailio] cfg parse error behaviour on a mismatch of #!ifdef/#!endif statements (#2057)
by Henning Westerholt 10 Sep '19

10 Sep '19

The #!ifdef/#endif statement parsing of the kamailio.cfg does not work correctly on a mismatch of #!ifdef/#!define statements. In some cases will just ignore the #!defines and parses the cfg file without the statements. version: kamailio 5.3.0-pre0 (x86_64/linux) ed10d7 > henning@linux:~/repositories/kamailio/src> ./kamailio -c -f ../etc/test-define.cfg > 0(9501) CRITICAL: <core> [core/cfg.y:3539]: yyerror_at(): parse error in config file /home/henning/repositories/kamailio/src/../etc/test-define.cfg, line 12, column 8: syntax error > 0(9501) CRITICAL: <core> [core/cfg.y:3539]: yyerror_at(): parse error in config file /home/henning/repositories/kamailio/src/../etc/test-define.cfg, line 12, column 8: unknown config variable > 0(9501) CRITICAL: <core> [core/cfg.y:3536]: yyerror_at(): parse error in config file /home/henning/repositories/kamailio/src/../etc/test-define.cfg, line 12, column 9-11: > ERROR: bad config file (3 errors) Test cfg to show the problem: ``` henning@linux:~/repositories/kamailio/etc> cat test-define.cfg #!KAMAILIO #!define foo #!ifdef foobar1 #!ifdef foobar2 #!endif #!endif #!endif #!ifdef bar invalid=123 #else children=8 #!endif request_route { ; } ``` The "bar" condition is parsed, even if the #!define was not set. The WARN message is also not shown in this error case. Probably the easist fix would be to stop kamailio startup on a mismatch of #!ifdef/#endif statements and output ERROR instead of the current WARN. -- 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/2057

2 10

git:5.1:26da74e4: core: ensure index of preprocessor directive conditions is not negative
by Henning Westerholt 10 Sep '19

10 Sep '19

Module: kamailio Branch: 5.1 Commit: 26da74e4f8af192d876ac1d78eee9319f378c154 URL: https://github.com/kamailio/kamailio/commit/26da74e4f8af192d876ac1d78eee931… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-10T09:52:15+02:00 core: ensure index of preprocessor directive conditions is not negative - avoid accessing the array at negative index for else processing (cherry picked from commit 8f6e826576e52270f21c22a7d94b3026cc22c172) --- Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/26da74e4f8af192d876ac1d78eee931… Patch: https://github.com/kamailio/kamailio/commit/26da74e4f8af192d876ac1d78eee931… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index cd6808d063..c470232067 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -1896,14 +1896,24 @@ static void pp_ifdef() static void pp_else() { + if(pp_sptr==0) { + LM_WARN("invalid position for preprocessor directive 'else'" + " - at %s line %d\n", (finame)?finame:"cfg", line); + return; + } pp_ifdef_stack[pp_sptr-1] ^= 1; pp_update_state(); } static void pp_endif() { - pp_sptr--; pp_ifdef_level_update(-1); + if(pp_sptr==0) { + LM_WARN("invalid position for preprocessor directive 'else'" + " - at %s line %d\n", (finame)?finame:"cfg", line); + return; + } + pp_sptr--; pp_update_state(); }

1 0

git:5.2:71efcfbb: core: ensure index of preprocessor directive conditions is not negative
by Henning Westerholt 10 Sep '19

10 Sep '19

Module: kamailio Branch: 5.2 Commit: 71efcfbb059e72cb05572ef7d3f58ac2e7dba397 URL: https://github.com/kamailio/kamailio/commit/71efcfbb059e72cb05572ef7d3f58ac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-10T09:52:11+02:00 core: ensure index of preprocessor directive conditions is not negative - avoid accessing the array at negative index for else processing (cherry picked from commit 8f6e826576e52270f21c22a7d94b3026cc22c172) --- Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/71efcfbb059e72cb05572ef7d3f58ac… Patch: https://github.com/kamailio/kamailio/commit/71efcfbb059e72cb05572ef7d3f58ac… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 6a0d23d76f..6aa890f155 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -1922,14 +1922,24 @@ static void pp_ifdef() static void pp_else() { + if(pp_sptr==0) { + LM_WARN("invalid position for preprocessor directive 'else'" + " - at %s line %d\n", (finame)?finame:"cfg", line); + return; + } pp_ifdef_stack[pp_sptr-1] ^= 1; pp_update_state(); } static void pp_endif() { - pp_sptr--; pp_ifdef_level_update(-1); + if(pp_sptr==0) { + LM_WARN("invalid position for preprocessor directive 'else'" + " - at %s line %d\n", (finame)?finame:"cfg", line); + return; + } + pp_sptr--; pp_update_state(); }

1 0

git:5.1:ee4f8d48: nathelper: Fixed memory leak in nathelper fetch contact timer (GH #2062)
by Henning Westerholt 10 Sep '19

10 Sep '19

Module: kamailio Branch: 5.1 Commit: ee4f8d48806c5f9ad324de1c121b73222a4ef783 URL: https://github.com/kamailio/kamailio/commit/ee4f8d48806c5f9ad324de1c121b732… Author: Pintu Lohar <plohar(a)sk.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-10T09:17:46+02:00 nathelper: Fixed memory leak in nathelper fetch contact timer (GH #2062) - Allocated buffer is not freed when contact fetch is failed - Leak frequently occur when database disconnect and reconnect (cherry picked from commit 79fecc643d0a17b4de25f54ae269d1bee1f0cb00) --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/ee4f8d48806c5f9ad324de1c121b732… Patch: https://github.com/kamailio/kamailio/commit/ee4f8d48806c5f9ad324de1c121b732… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c old mode 100644 new mode 100755 index c616aa42eb..47584d2ac8 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1953,6 +1953,8 @@ static void nh_timer(unsigned int ticks, void *timer_idx) + iteration, natping_processes * natping_interval, options); if(rval < 0) { + if(buf != NULL) + pkg_free(buf); LM_ERR("failed to fetch contacts\n"); goto done; }

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
37
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2019