sr-dev February 2019

sr-dev@lists.kamailio.org

23 participants
336 discussions

git:master:9a69321c: core: dns slow queries reporting

by Julien Chavanton

Module: kamailio Branch: master Commit: 9a69321c5cc1f69b1c62d0d0190d6e79a41647e3 URL: https://github.com/kamailio/kamailio/commit/9a69321c5cc1f69b1c62d0d0190d6e7… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2019-01-31T20:39:08Z core: dns slow queries reporting --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/cfg_core.c Modified: src/core/cfg_core.h Modified: src/core/resolve.c Modified: src/core/resolve.h --- Diff: https://github.com/kamailio/kamailio/commit/9a69321c5cc1f69b1c62d0d0190d6e7… Patch: https://github.com/kamailio/kamailio/commit/9a69321c5cc1f69b1c62d0d0190d6e7…

5 years, 10 months

Re: [sr-dev] [kamailio/kamailio] dialog: do not require dlg_flag parameter to be set (404f403)

by PICCORO Lenz McKAY

this fix are need by 5.1 and 5.2 to property wrok the BLF feature... -- 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/commit/404f403786478a917637186446bb285…

5 years, 10 months

git:5.1:82aad65c: Merge pull request #1826 from sergey-safarov/5.1

by GitHub

Module: kamailio Branch: 5.1 Commit: 82aad65cb991c4690076ad44df5449662a2b683a URL: https://github.com/kamailio/kamailio/commit/82aad65cb991c4690076ad44df54496… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-02-01T19:42:18+01:00 Merge pull request #1826 from sergey-safarov/5.1 [5.1] set of cherry-pick to properly package on alpine dists --- Modified: pkg/docker Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/alpine/kamailio.initd Removed: pkg/kamailio/alpine/0004-src_core_tcp_read_c.patch Removed: pkg/kamailio/alpine/kamctl_build.patch --- Diff: https://github.com/kamailio/kamailio/commit/82aad65cb991c4690076ad44df54496… Patch: https://github.com/kamailio/kamailio/commit/82aad65cb991c4690076ad44df54496…

5 years, 10 months

git:5.1:78e948d9: kamdbctl: Merged patch from alpine packaging (#1786)

by Sergey Safarov

Module: kamailio Branch: 5.1 Commit: 78e948d9e8003c716ed67ff82cf8c7803e35e7df URL: https://github.com/kamailio/kamailio/commit/78e948d9e8003c716ed67ff82cf8c78… Author: sergey-safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-01-31T16:19:03+03:00 kamdbctl: Merged patch from alpine packaging (#1786) - kamdbctl: Merged patch from alpine packaging (#1786) - add proper quoting for DB table and module definitions (cherry picked from commit c6e62f932495af188c89bf06b468d1bb19579267) --- Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/78e948d9e8003c716ed67ff82cf8c78… Patch: https://github.com/kamailio/kamailio/commit/78e948d9e8003c716ed67ff82cf8c78… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 5e2b11d035..acf61eb249 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -250,7 +250,6 @@ for _i in db postgres sqlite dbtext mysql \ done source="${pkgname}-${pkgver}${_suffix}.tar.gz::https://github.com/kamailio/$pkgname/archive/$_gitcommit.tar.gz - 0001-kamdbctl.base.patch kamailio.initd " @@ -549,5 +548,4 @@ sipdump() { } sha512sums="51ea5fccd27a9d3d1783cfc5596eb28ab27e34faeec3268600363f43c48a3634c3c584c479ba874fdb53b85766a0ce8fe7df0e20954c9c6514b1d9d41d9237e6 kamailio-5.1.0.20171125-991fe9b.tar.gz -6badfb611c02ffcb4c2e9937731162ea1a4b737f042ed52120e2f96ebb80b5b7d240b5612c9ca565e693eec9b8c52c1ee5db04dfc47d204501021f984b4b11db 0001-kamdbctl.base.patch 321b1b160434150bcde3c0ad7f47ddf259791b68d4ce74ba4c35034026421a2bc6f5e86f26f393f5fcdb523d8cd75f944709473065553ce860b0ea06b3dc2a1b kamailio.initd"

5 years, 10 months

git:5.1:889b9295: pkg/docker: Alpine switched to use openssl. Updated rules for alpine docker container

by Sergey Safarov

Module: kamailio Branch: 5.1 Commit: 889b929539a2fe2e44bc61f82c8fd407e8eae643 URL: https://github.com/kamailio/kamailio/commit/889b929539a2fe2e44bc61f82c8fd40… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-01-31T15:01:52+03:00 pkg/docker: Alpine switched to use openssl. Updated rules for alpine docker container (cherry picked from commit 37bff4588803a70873babdb483804e3734b42900) --- Modified: pkg/kamailio/alpine/APKBUILD Removed: pkg/kamailio/alpine/0004-src_core_tcp_read_c.patch --- Diff: https://github.com/kamailio/kamailio/commit/889b929539a2fe2e44bc61f82c8fd40… Patch: https://github.com/kamailio/kamailio/commit/889b929539a2fe2e44bc61f82c8fd40… --- diff --git a/pkg/kamailio/alpine/0004-src_core_tcp_read_c.patch b/pkg/kamailio/alpine/0004-src_core_tcp_read_c.patch deleted file mode 100644 index 08308f77b1..0000000000 --- a/pkg/kamailio/alpine/0004-src_core_tcp_read_c.patch +++ /dev/null @@ -1,20 +0,0 @@ -$OpenBSD: patch-src_core_tcp_read_c,v 1.1 2017/07/03 22:14:20 sthen Exp $ - -Index: a/src/core/tcp_read.c ---- a/src/core/tcp_read.c.orig -+++ a/src/core/tcp_read.c -@@ -1497,6 +1497,14 @@ void release_tcpconn(struct tcp_connection* c, long st - ip_addr2a(&c->rcv.src_ip), c->rcv.src_port, - ip_addr2a(&c->rcv.dst_ip), c->rcv.dst_port); - LM_DBG("extra_data %p\n", c->extra_data); -+ -+ /* experimental fix tls crash with libressl */ -+ /* add cleanup SSL structure in child process, in parent process SSL structure is empty */ -+ if ((c->type==PROTO_TLS || c->type==PROTO_WSS) && (c->extra_data) && c->fd != -1) { -+ tls_close(c, c->fd); -+ tls_tcpconn_clean(c); -+ } -+ - /* release req & signal the parent */ - c->reader_pid=0; /* reset it */ - if (c->fd!=-1){ diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 9d1497b3f9..5e2b11d035 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -27,7 +27,7 @@ depends="gawk" options="!check" makedepends="bison db-dev flex freeradius-client-dev expat-dev lksctp-tools-dev perl-dev postgresql-dev python2-dev pcre-dev mariadb-dev libxml2-dev curl-dev unixodbc-dev confuse-dev ncurses-dev sqlite-dev - lua-dev openldap-dev libressl-dev net-snmp-dev libuuid libev-dev + lua-dev openldap-dev openssl-dev net-snmp-dev libuuid libev-dev jansson-dev json-c-dev libevent-dev linux-headers libmemcached-dev rabbitmq-c-dev hiredis-dev libmaxminddb-dev libunistring-dev" install="$pkgname.pre-install $pkgname.pre-upgrade" @@ -250,7 +250,7 @@ for _i in db postgres sqlite dbtext mysql \ done source="${pkgname}-${pkgver}${_suffix}.tar.gz::https://github.com/kamailio/$pkgname/archive/$_gitcommit.tar.gz - 0004-src_core_tcp_read_c.patch + 0001-kamdbctl.base.patch kamailio.initd " @@ -549,5 +549,5 @@ sipdump() { } sha512sums="51ea5fccd27a9d3d1783cfc5596eb28ab27e34faeec3268600363f43c48a3634c3c584c479ba874fdb53b85766a0ce8fe7df0e20954c9c6514b1d9d41d9237e6 kamailio-5.1.0.20171125-991fe9b.tar.gz -af8362201957eae6b66baf7368c9ca884024209a396d77c5c52180c9aabe13772e9c6513e59721d39503e5bb7a8c1030f5c10301ea9055bddafb7f01ee2f3076 0004-src_core_tcp_read_c.patch +6badfb611c02ffcb4c2e9937731162ea1a4b737f042ed52120e2f96ebb80b5b7d240b5612c9ca565e693eec9b8c52c1ee5db04dfc47d204501021f984b4b11db 0001-kamdbctl.base.patch 321b1b160434150bcde3c0ad7f47ddf259791b68d4ce74ba4c35034026421a2bc6f5e86f26f393f5fcdb523d8cd75f944709473065553ce860b0ea06b3dc2a1b kamailio.initd"

5 years, 10 months

git:5.1:d56615e7: pkg/kamailio/alpine: Update APKBUILD

by Sergey Safarov

Module: kamailio Branch: 5.1 Commit: d56615e76622c428985d6fc9a3d31bf9e4943543 URL: https://github.com/kamailio/kamailio/commit/d56615e76622c428985d6fc9a3d31bf… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-01-31T14:59:20+03:00 pkg/kamailio/alpine: Update APKBUILD (cherry picked from commit 6aca6c0ddc201882d1ab75e662299450f578aa32) --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/alpine/kamailio.initd Removed: pkg/kamailio/alpine/kamctl_build.patch --- Diff: https://github.com/kamailio/kamailio/commit/d56615e76622c428985d6fc9a3d31bf… Patch: https://github.com/kamailio/kamailio/commit/d56615e76622c428985d6fc9a3d31bf…

5 years, 10 months

git:5.1:08161fe7: pkg/docker: Updated submodule

by Sergey Safarov

Module: kamailio Branch: 5.1 Commit: 08161fe70a0dc25d7aaf377f7c362f81984ce068 URL: https://github.com/kamailio/kamailio/commit/08161fe70a0dc25d7aaf377f7c362f8… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-01-31T14:55:03+03:00 pkg/docker: Updated submodule --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/08161fe70a0dc25d7aaf377f7c362f8… Patch: https://github.com/kamailio/kamailio/commit/08161fe70a0dc25d7aaf377f7c362f8… --- diff --git a/pkg/docker b/pkg/docker index 3c8a156abe..b92a1c899b 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit 3c8a156abef2a034d9a21df5bf73f4b5cc4d3e05 +Subproject commit b92a1c899b8c474afadd0cf29dd7cb4ea01a3466

5 years, 10 months

[kamailio/kamailio] [5.1] set of cherry-pick to properly package on alpine dists (#1826)

by sergey-safarov

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1826 -- Commit Summary -- * pkg/docker: Updated submodule * pkg/kamailio/alpine: Update APKBUILD * pkg/docker: Alpine switched to use openssl. Updated rules for alpine docker container * kamdbctl: Merged patch from alpine packaging (#1786) -- File Changes -- M pkg/docker (2) D pkg/kamailio/alpine/0004-src_core_tcp_read_c.patch (20) M pkg/kamailio/alpine/APKBUILD (12) M pkg/kamailio/alpine/kamailio.initd (2) D pkg/kamailio/alpine/kamctl_build.patch (236) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1826.patch https://github.com/kamailio/kamailio/pull/1826.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/1826

5 years, 10 months

git:master:ec993297: modules: readme files regenerated - rr ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: ec993297b38b5d90e88d838f7d126317d6ab4641 URL: https://github.com/kamailio/kamailio/commit/ec993297b38b5d90e88d838f7d12631… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-02-01T19:31:45+01:00 modules: readme files regenerated - rr ... [skip ci] --- Modified: src/modules/rr/README --- Diff: https://github.com/kamailio/kamailio/commit/ec993297b38b5d90e88d838f7d12631… Patch: https://github.com/kamailio/kamailio/commit/ec993297b38b5d90e88d838f7d12631… --- diff --git a/src/modules/rr/README b/src/modules/rr/README index 9feab35738..4fe696ee3a 100644 --- a/src/modules/rr/README +++ b/src/modules/rr/README @@ -408,6 +408,7 @@ modparam("rr", "ignore_sips", 1) * 2 - route calculation based on flow-token has been successful * -1 - route calculation has been unsuccessful * -2 - outbound flow-token shows evidence of tampering + * -3 - next hop is taken from a preloaded route set This function can be used from REQUEST_ROUTE.

5 years, 10 months

git:master:98056258: Merge pull request #1830 from gaaf/rr-lr-retval

by GitHub

Module: kamailio Branch: master Commit: 98056258b7ebdc65c8147d9d057bc350a38e55f8 URL: https://github.com/kamailio/kamailio/commit/98056258b7ebdc65c8147d9d057bc35… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-02-01T19:25:34+01:00 Merge pull request #1830 from gaaf/rr-lr-retval rr: Add new return value for preloaded route set to loose_route() --- Modified: src/modules/rr/doc/rr_admin.xml Modified: src/modules/rr/loose.c --- Diff: https://github.com/kamailio/kamailio/commit/98056258b7ebdc65c8147d9d057bc35… Patch: https://github.com/kamailio/kamailio/commit/98056258b7ebdc65c8147d9d057bc35… --- diff --git a/src/modules/rr/doc/rr_admin.xml b/src/modules/rr/doc/rr_admin.xml index 7dd1868e2a..74e59abe82 100644 --- a/src/modules/rr/doc/rr_admin.xml +++ b/src/modules/rr/doc/rr_admin.xml @@ -364,7 +364,7 @@ modparam("rr", "ignore_sips", 1) <listitem> <para><emphasis>2</emphasis> - route calculation based on - flow-token has been successful</para> + flow-token has been successful</para> </listitem> <listitem> @@ -376,6 +376,11 @@ modparam("rr", "ignore_sips", 1) <para><emphasis>-2</emphasis> - outbound flow-token shows evidence of tampering</para> </listitem> + + <listitem> + <para><emphasis>-3</emphasis> - next hop is taken from + a preloaded route set</para> + </listitem> </itemizedlist> <para>This function can be used from REQUEST_ROUTE.</para> diff --git a/src/modules/rr/loose.c b/src/modules/rr/loose.c index 6e9e888a2b..efe428a1cd 100644 --- a/src/modules/rr/loose.c +++ b/src/modules/rr/loose.c @@ -48,6 +48,7 @@ #define RR_OB_DRIVEN 2 /*!< The next hop is determined from the route set based on flow-token */ #define NOT_RR_DRIVEN -1 /*!< The next hop is not determined from the route set */ #define FLOW_TOKEN_BROKEN -2 /*!< Outbound flow-token shows evidence of tampering */ +#define RR_PRELOADED -3 /*!< The next hop is determined from a preloaded route set */ #define RR_ROUTE_PREFIX ROUTE_PREFIX "<" #define RR_ROUTE_PREFIX_LEN (sizeof(RR_ROUTE_PREFIX)-1) @@ -840,7 +841,7 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) } if (res > 0) { /* No next route found */ LM_DBG("No next URI found\n"); - status = (preloaded ? NOT_RR_DRIVEN : RR_DRIVEN); + status = (preloaded ? RR_PRELOADED : RR_DRIVEN); goto done; } rt = (rr_t*)hdr->parsed; @@ -873,7 +874,7 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) } if (res > 0) { /* No next route found */ LM_DBG("no next URI found\n"); - status = (preloaded ? NOT_RR_DRIVEN : RR_DRIVEN); + status = (preloaded ? RR_PRELOADED : RR_DRIVEN); goto done; } rt = (rr_t*)hdr->parsed;

5 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2019