sr-dev February 2019

sr-dev@lists.kamailio.org

23 participants
336 discussions

git:master:8b1458e9: kamctl: shift only when expecting more parameters for rpc command

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8b1458e97270a4094085226dce1108d8ea5ca7af URL: https://github.com/kamailio/kamailio/commit/8b1458e97270a4094085226dce1108d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-02-20T11:30:26+01:00 kamctl: shift only when expecting more parameters for rpc command --- Modified: utils/kamctl/kamctl.rpcfifo --- Diff: https://github.com/kamailio/kamailio/commit/8b1458e97270a4094085226dce1108d… Patch: https://github.com/kamailio/kamailio/commit/8b1458e97270a4094085226dce1108d… --- diff --git a/utils/kamctl/kamctl.rpcfifo b/utils/kamctl/kamctl.rpcfifo index 881a8bdf53..0f8f171f48 100644 --- a/utils/kamctl/kamctl.rpcfifo +++ b/utils/kamctl/kamctl.rpcfifo @@ -106,13 +106,13 @@ rpc_cmd() CMD="${CMD}, \"params\": [${RPCVAL}" RPCPARAMS="yes" fi - shift - while [ -n "$1" ] ; do - rpcparamval "${1}" - CMD="${CMD}, ${RPCVAL}" - shift - done if [ "$RPCPARAMS" = "yes" ]; then + shift + while [ -n "$1" ] ; do + rpcparamval "${1}" + CMD="${CMD}, ${RPCVAL}" + shift + done CMD="${CMD}]" fi CMD="${CMD}, \"reply_name\": \"${name}\", \"id\": $$}\n"

5 years, 10 months

git:master:5e772858: core: added latency_limit_cfg global parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5e772858cd85618117837fb65606fcaf27bb85de URL: https://github.com/kamailio/kamailio/commit/5e772858cd85618117837fb65606fca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-02-20T10:22:03+01:00 core: added latency_limit_cfg global parameter - print execution time for configuration script only if it exceeds this value - default is 0 - print allways (behaviour so far) - it is printed to latency_cfg_log level --- 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/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/5e772858cd85618117837fb65606fca… Patch: https://github.com/kamailio/kamailio/commit/5e772858cd85618117837fb65606fca…

5 years, 10 months

git:5.2:dbbced1e: pkg/docker: Updated submodule

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: dbbced1eb31dc984d9d215cea8600aa4f8d1caea URL: https://github.com/kamailio/kamailio/commit/dbbced1eb31dc984d9d215cea8600aa… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-02-19T21:56:56+01:00 pkg/docker: Updated submodule --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/dbbced1eb31dc984d9d215cea8600aa… Patch: https://github.com/kamailio/kamailio/commit/dbbced1eb31dc984d9d215cea8600aa… --- diff --git a/pkg/docker b/pkg/docker index 4dec7be58b..b92a1c899b 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit 4dec7be58bbec6e005141485d3a61cc9b3b055bc +Subproject commit b92a1c899b8c474afadd0cf29dd7cb4ea01a3466

5 years, 10 months

git:5.2:2611968a: pkg/docker: Alpine switched to use openssl. Updated rules for alpine docker container

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: 2611968a3b095351559f646e86d8fe31bfaa67ad URL: https://github.com/kamailio/kamailio/commit/2611968a3b095351559f646e86d8fe3… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-02-19T21:56:56+01: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/2611968a3b095351559f646e86d8fe3… Patch: https://github.com/kamailio/kamailio/commit/2611968a3b095351559f646e86d8fe3… --- 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 975ae10131..29b55a0dbc 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 ruby-dev" install="$pkgname.pre-install $pkgname.pre-upgrade" @@ -253,7 +253,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 - 0004-src_core_tcp_read_c.patch kamailio.initd " @@ -557,5 +556,4 @@ sipdump() { } sha512sums="51ea5fccd27a9d3d1783cfc5596eb28ab27e34faeec3268600363f43c48a3634c3c584c479ba874fdb53b85766a0ce8fe7df0e20954c9c6514b1d9d41d9237e6 kamailio-5.1.0.20171125-991fe9b.tar.gz -af8362201957eae6b66baf7368c9ca884024209a396d77c5c52180c9aabe13772e9c6513e59721d39503e5bb7a8c1030f5c10301ea9055bddafb7f01ee2f3076 0004-src_core_tcp_read_c.patch 321b1b160434150bcde3c0ad7f47ddf259791b68d4ce74ba4c35034026421a2bc6f5e86f26f393f5fcdb523d8cd75f944709473065553ce860b0ea06b3dc2a1b kamailio.initd"

5 years, 10 months

git:5.2:b7945ade: pkg/kamailio/alpine: Update APKBUILD

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: b7945ade8190b4f2f3d14c38e397ce8ac6ce2fc2 URL: https://github.com/kamailio/kamailio/commit/b7945ade8190b4f2f3d14c38e397ce8… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-02-19T21:56:56+01: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/b7945ade8190b4f2f3d14c38e397ce8… Patch: https://github.com/kamailio/kamailio/commit/b7945ade8190b4f2f3d14c38e397ce8…

5 years, 10 months

git:5.2:6cd4e5d5: Revert "pkg/kamailio/alpine: Fixed docker image build for 5.2 branch"

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: 6cd4e5d59f90d4a6046ca8f4b2110fa3e358a9ae URL: https://github.com/kamailio/kamailio/commit/6cd4e5d59f90d4a6046ca8f4b2110fa… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-02-19T21:56:56+01:00 Revert "pkg/kamailio/alpine: Fixed docker image build for 5.2 branch" This reverts commit e5bc89e1dffc548e3d309f45b291c87c39f6fb4b. --- Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/6cd4e5d59f90d4a6046ca8f4b2110fa… Patch: https://github.com/kamailio/kamailio/commit/6cd4e5d59f90d4a6046ca8f4b2110fa… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index af041b00e3..02c01d2258 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -273,12 +273,6 @@ snapshot() { } prepare() { - # Workarround for broken hiredis-devel package (0.13.3-r1) - sudo sed -i -e 's:prefix=/usr/local:prefix=/usr:' \ - -e 's:^libdir.*$:libdir=${exec_prefix}/lib:' \ - -e 's:^includedir.*:includedir=${prefix}/include/hiredis:' \ - /usr/lib/pkgconfig/hiredis.pc - default_prepare cd "$builddir"

5 years, 10 months

[kamailio/kamailio] 5.2 (#1857)

by sergey-safarov

#### 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 - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] 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 Fixes build `kamailio/kamailio-ci` docker image after released `alpine:3.9` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1857 -- Commit Summary -- * Revert "pkg/kamailio/alpine: Fixed docker image build for 5.2 branch" * pkg/kamailio/alpine: Update APKBUILD * pkg/docker: Alpine switched to use openssl. Updated rules for alpine docker container * pkg/docker: Updated submodule -- File Changes -- M pkg/docker (2) D pkg/kamailio/alpine/0004-src_core_tcp_read_c.patch (20) M pkg/kamailio/alpine/APKBUILD (18) M pkg/kamailio/alpine/kamailio.initd (2) D pkg/kamailio/alpine/kamctl_build.patch (236) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1857.patch https://github.com/kamailio/kamailio/pull/1857.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/1857

5 years, 10 months

git:master:409cb202: kamailio.cfg: explicitely set the tcp/tls connections upper limits

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 409cb202057c89e87d910a1877ce719c6335ebdb URL: https://github.com/kamailio/kamailio/commit/409cb202057c89e87d910a1877ce719… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-02-19T17:37:40+01:00 kamailio.cfg: explicitely set the tcp/tls connections upper limits - notes about tcp_children and relation with children parameter --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/409cb202057c89e87d910a1877ce719… Patch: https://github.com/kamailio/kamailio/commit/409cb202057c89e87d910a1877ce719… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index db58f98fcb..7462c9cdfd 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -158,12 +158,16 @@ memlog=5 log_facility=LOG_LOCAL0 log_prefix="{$mt $hdr(CSeq) $ci} " -/* number of SIP routing processes */ +/* number of SIP routing processes for each UDP socket + * - value inherited by tcp_children and sctp_children when not set explicitely */ children=8 /* uncomment the next line to disable TCP (default on) */ # disable_tcp=yes +/* number of SIP routing processes for all TCP/TLS sockets */ +# tcp_children=8 + /* uncomment the next line to disable the auto discovery of local aliases * based on reverse DNS on IPs (default on) */ # auto_aliases=no @@ -175,14 +179,20 @@ children=8 * bind on a specific interface/port/proto (default bind on all available) */ # listen=udp:10.0.0.10:5060 -#!ifdef WITH_TLS -enable_tls=yes -#!endif - /* life time of TCP connection when there is no traffic * - a bit higher than registration expires to cope with UA behind NAT */ tcp_connection_lifetime=3605 +/* upper limit for TCP connections (it includes the TLS connections) */ +tcp_max_connections=2048 + +#!ifdef WITH_TLS +enable_tls=yes + +/* upper limit for TLS connections */ +tls_max_connections=2048 +#!endif + ####### Custom Parameters ######### /* These parameters can be modified runtime via RPC interface

5 years, 10 months

[kamailio/kamailio] sipt: $sipt(redirection_number) evaluates the value as a numerical value (#1859)

by Sergey Basov

#### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] 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 - [x] Related to issue #1789 #### Description  Small fix to proper handling A-F in $sipt(redirection_number) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1859 -- Commit Summary -- * sipt: $sipt(redirection_number) evaluates the value as a numerical value -- File Changes -- M src/modules/sipt/ss7_parser.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1859.patch https://github.com/kamailio/kamailio/pull/1859.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/1859

5 years, 10 months

git:master:30a17aeb: Merge pull request #1859 from sergey-vb/sergey-vb-fix-redirection_number

by GitHub

Module: kamailio Branch: master Commit: 30a17aeb598f65d44d4a28407f52e4f60a64978c URL: https://github.com/kamailio/kamailio/commit/30a17aeb598f65d44d4a28407f52e4f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-02-19T08:32:32+01:00 Merge pull request #1859 from sergey-vb/sergey-vb-fix-redirection_number sipt: $sipt(redirection_number) evaluates the value as a numerical value --- Modified: src/modules/sipt/ss7_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/30a17aeb598f65d44d4a28407f52e4f… Patch: https://github.com/kamailio/kamailio/commit/30a17aeb598f65d44d4a28407f52e4f… --- diff --git a/src/modules/sipt/ss7_parser.c b/src/modules/sipt/ss7_parser.c index 90ff897d01..4d390c8341 100644 --- a/src/modules/sipt/ss7_parser.c +++ b/src/modules/sipt/ss7_parser.c @@ -384,8 +384,8 @@ int isup_get_redirection_number(unsigned char *buf, int len, char* sb_buf) sbparamlen = (buf[offset+1] & 0xFF) - 2; while ((sbparamlen > 0) && (buf[offset] != 0)) { - sb_buf[sb_i]=(buf[offset+4+sb_j] & 0x0F) + '\x30'; - sb_buf[sb_i+1]=(buf[offset+4+sb_j]>>4 & 0x0F) + '\x30'; + sb_buf[sb_i]="0123456789ABCDEF"[(buf[offset+4+sb_j] & 0x0F)]; + sb_buf[sb_i+1]="0123456789ABCDEF"[(buf[offset+4+sb_j] >>4 & 0x0F)]; sb_i=sb_i+2; sbparamlen--; sb_j++;

5 years, 10 months

← Newer
1
...
16
17
18
19
20
21
22
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2019