sr-dev August 2021

sr-dev@lists.kamailio.org

19 participants
267 discussions

git:master:4e5c1ddd: textopsx: kemi functions to get body line iterator value

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4e5c1ddd996d60382fd6a2d549cb18e2a1657b0d URL: https://github.com/kamailio/kamailio/commit/4e5c1ddd996d60382fd6a2d549cb18e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-09T20:54:32+02:00 textopsx: kemi functions to get body line iterator value --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/4e5c1ddd996d60382fd6a2d549cb18e… Patch: https://github.com/kamailio/kamailio/commit/4e5c1ddd996d60382fd6a2d549cb18e… --- diff --git a/src/modules/textopsx/textopsx.c b/src/modules/textopsx/textopsx.c index 8d106a0704..5e62546fcd 100644 --- a/src/modules/textopsx/textopsx.c +++ b/src/modules/textopsx/textopsx.c @@ -2718,6 +2718,32 @@ static int w_bl_iterator_insert(sip_msg_t *msg, char *piname, char *ptext) return ki_bl_iterator_insert(msg, &iname, &text); } +/** + * + */ +static sr_kemi_xval_t _sr_kemi_bl_iterator_xval = {0}; + +/** + * + */ +static sr_kemi_xval_t* ki_bl_iterator_value(sip_msg_t *msg, str *iname) +{ + int k; + + memset(&_sr_kemi_bl_iterator_xval, 0, sizeof(sr_kemi_xval_t)); + k = ki_bl_iterator_index(msg, iname); + if(k<0 || _bl_iterators[k].it.s==NULL || _bl_iterators[k].it.len<=0) { + sr_kemi_xval_null(&_sr_kemi_bl_iterator_xval, 0); + return &_sr_kemi_bl_iterator_xval; + } + if(_bl_iterators[k].it.s==NULL) { + sr_kemi_xval_null(&_sr_kemi_bl_iterator_xval, 0); + return &_sr_kemi_bl_iterator_xval; + } + _sr_kemi_bl_iterator_xval.vtype = SR_KEMIP_STR; + _sr_kemi_bl_iterator_xval.v.s = _bl_iterators[k].it; + return &_sr_kemi_bl_iterator_xval; +} /** * @@ -3351,6 +3377,11 @@ static sr_kemi_t sr_kemi_textopsx_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("textopsx"), str_init("bl_iterator_value"), + SR_KEMIP_XVAL, ki_bl_iterator_value, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

3 years, 4 months

git:master:51a77408: modules: readme files regenerated - ruxc ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 51a774089c59a3861063ee4e9b4e21051c2bf192 URL: https://github.com/kamailio/kamailio/commit/51a774089c59a3861063ee4e9b4e210… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-08-06T09:01:22+02:00 modules: readme files regenerated - ruxc ... [skip ci] --- Modified: src/modules/ruxc/README --- Diff: https://github.com/kamailio/kamailio/commit/51a774089c59a3861063ee4e9b4e210… Patch: https://github.com/kamailio/kamailio/commit/51a774089c59a3861063ee4e9b4e210… --- diff --git a/src/modules/ruxc/README b/src/modules/ruxc/README index e437234139..45b80a85c5 100644 --- a/src/modules/ruxc/README +++ b/src/modules/ruxc/README @@ -131,6 +131,10 @@ modparam("ruxc", "http_tlsmode", 1) (and TLS handshake) when all requests are performed against the same HTTP/S server. + Set to 2 in order to keep connections per base URL (scheme://host:port) + indexed in a hash map. Useful when doing HTTP/S requests to many + servers. + Default value is 0 (new connection for each request). Example 1.3. Set http_reuse parameter

3 years, 4 months

git:master:21b187f5: ruxc: docs for reuse mode 2

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 21b187f57a092f8ed9f51a62786a98c910b1febf URL: https://github.com/kamailio/kamailio/commit/21b187f57a092f8ed9f51a62786a98c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-06T08:54:29+02:00 ruxc: docs for reuse mode 2 --- Modified: src/modules/ruxc/doc/ruxc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/21b187f57a092f8ed9f51a62786a98c… Patch: https://github.com/kamailio/kamailio/commit/21b187f57a092f8ed9f51a62786a98c… --- diff --git a/src/modules/ruxc/doc/ruxc_admin.xml b/src/modules/ruxc/doc/ruxc_admin.xml index e07c05c9f1..794301bc06 100644 --- a/src/modules/ruxc/doc/ruxc_admin.xml +++ b/src/modules/ruxc/doc/ruxc_admin.xml @@ -106,6 +106,11 @@ modparam("ruxc", "http_tlsmode", 1) handshake) when all requests are performed against the same HTTP/S server. </para> <para> + Set to 2 in order to keep connections per base URL (scheme://host:port) + indexed in a hash map. Useful when doing HTTP/S requests to many + servers. + </para> + <para> <emphasis> Default value is 0 (new connection for each request). </emphasis>

3 years, 4 months

git:master:fa728b90: ruxc: Makefile - set local paths for include and libs

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: fa728b906ec2667891fb964e21785b12a68c0173 URL: https://github.com/kamailio/kamailio/commit/fa728b906ec2667891fb964e21785b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-06T08:26:29+02:00 ruxc: Makefile - set local paths for include and libs --- Modified: src/modules/ruxc/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/fa728b906ec2667891fb964e21785b1… Patch: https://github.com/kamailio/kamailio/commit/fa728b906ec2667891fb964e21785b1… --- diff --git a/src/modules/ruxc/Makefile b/src/modules/ruxc/Makefile index ae33b008bb..d11e7758e2 100644 --- a/src/modules/ruxc/Makefile +++ b/src/modules/ruxc/Makefile @@ -18,8 +18,8 @@ endif endif ifeq ($(BUILDER),) - DEFS+= -I. - LIBS = -L. -lruxc + DEFS+= -I. -I$(LOCALBASE)/include -I$(SYSBASE)/include + LIBS = -L. -L$(LOCALBASE)/lib -lruxc else DEFS+= $(shell pkg-config --cflags libruxc) LIBS = $(shell pkg-config --libs libruxc)

3 years, 4 months

Usage of /proc/net/tcp

by Helio

Hello, I noticed that some Kamailio modules use /proc/net/tcp for statistics (ratelimit, pipelimit, snmpstats) but it seems to be deprecated (See https://www.kernel.org/doc/html/latest/networking/proc_net_tcp.html). Is the data from that reliable? My question is because we used the module ratelimit for a long time and after Kernel upgrades it was verified that the network limit is triggering with low traffic. Thanks

3 years, 4 months

git:master:e3875c01: misc/tools/protoshoot: removed svn id and history

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e3875c01adf576f179374a926e69e99c0094e5b4 URL: https://github.com/kamailio/kamailio/commit/e3875c01adf576f179374a926e69e99… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-04T14:15:38+02:00 misc/tools/protoshoot: removed svn id and history --- Modified: misc/tools/protoshoot/protoshoot.c --- Diff: https://github.com/kamailio/kamailio/commit/e3875c01adf576f179374a926e69e99… Patch: https://github.com/kamailio/kamailio/commit/e3875c01adf576f179374a926e69e99… --- diff --git a/misc/tools/protoshoot/protoshoot.c b/misc/tools/protoshoot/protoshoot.c index 352e1018a6..6eced5fc2b 100644 --- a/misc/tools/protoshoot/protoshoot.c +++ b/misc/tools/protoshoot/protoshoot.c @@ -1,4 +1,3 @@ -/* $Id$ */ /* * * Copyright (C) 2001-2003 FhG Fokus @@ -20,14 +19,10 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* - * History: - * 2005-09-09 basic tcp support added (andrei) - */ @@ -50,7 +45,6 @@ #include <signal.h> -static char *id="$Id$"; static char *version="protoshoot 0.4"; static char* help_msg="\ Usage: protoshoot -f file -d address -p port -c count [-v]\n\ @@ -87,7 +81,7 @@ int main (int argc, char** argv) char buf[BUF_SIZE]; struct hostent* he; struct sockaddr_in addr; - + int count; int verbose; char *fname; @@ -104,7 +98,7 @@ int main (int argc, char** argv) struct linger t_linger; int k; int err; - + /* init */ count=1; verbose=0; @@ -190,7 +184,6 @@ int main (int argc, char** argv) break; case 'V': printf("version: %s\n", version); - printf("%s\n",id); exit(0); break; case 'h': @@ -213,7 +206,7 @@ int main (int argc, char** argv) abort(); } } - + /* check if all the required params are present */ if (fname==0){ fprintf(stderr, "Missing -f file\n"); @@ -238,13 +231,13 @@ int main (int argc, char** argv) exit(-1); } if (proto==PROTO_UDP || (proto==PROTO_SCTP && !sctp_o2o)) con_no=1; - + /* ignore sigpipe */ if (signal(SIGPIPE, SIG_IGN)==SIG_ERR){ fprintf(stderr, "failed to ignore SIGPIPE: %s\n", strerror(errno)); exit(-1); } - + /* open packet file */ fd=open(fname, O_RDONLY); if (fd<0){ @@ -274,7 +267,7 @@ int main (int argc, char** argv) addr.sin_len=sizeof(struct sockaddr_in); #endif memcpy(&addr.sin_addr.s_addr, he->h_addr_list[0], he->h_length); - + for (k=0; k<con_no; k++){ switch(proto){ case PROTO_UDP: @@ -285,7 +278,7 @@ int main (int argc, char** argv) break; #ifdef USE_SCTP case PROTO_SCTP: - sock = socket(he->h_addrtype, + sock = socket(he->h_addrtype, sctp_o2o?SOCK_STREAM:SOCK_SEQPACKET, IPPROTO_SCTP); break; @@ -333,8 +326,7 @@ int main (int argc, char** argv) fprintf(stderr, "ERROR: connect: %s\n", strerror(errno)); goto error; } - - + /* flood loop */ t=throttle; for (r=0; r<count; r++){ @@ -366,7 +358,7 @@ int main (int argc, char** argv) } } } - + close(sock); if ((verbose) && (k%1000==999)) { putchar('#'); fflush(stdout); } }

3 years, 4 months

new master branch compiler warnings (Debian Buster)

by Juha Heinanen

C (gcc) [M outbound.so] outbound_mod.o outbound_mod.c: In function 'mod_init': outbound_mod.c:112:25: warning: pointer targets in passing argument 1 of 'SHA1' differ in signedness [-Wpointer-sign] SHA1(flow_token_secret.s, flow_token_secret.len, ob_key.s); ~~~~~~~~~~~~~~~~~^~ In file included from outbound_mod.c:28: /usr/include/openssl/sha.h:44:16: note: expected 'const unsigned char *' but argument is of type 'char *' unsigned char *SHA1(const unsigned char *d, size_t n, unsigned char *md); ^~~~ outbound_mod.c:112:58: warning: pointer targets in passing argument 3 of 'SHA1' differ in signedness [-Wpointer-sign] SHA1(flow_token_secret.s, flow_token_secret.len, ob_key.s); ~~~~~~^~ In file included from outbound_mod.c:28: /usr/include/openssl/sha.h:44:16: note: expected 'unsigned char *' but argument is of type 'char *' unsigned char *SHA1(const unsigned char *d, size_t n, unsigned char *md); ^~~~

3 years, 4 months

[kamailio/kamailio] outbound: fix compiler warning on SHA1() call (#2812)

by Michael Furmur

#### 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 explicit types cast to fix compiler warning: https://lists.kamailio.org/pipermail/sr-dev/2021-August/063482.html You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2812 -- Commit Summary -- * outbound: fix compiler warning on SHA1() call -- File Changes -- M src/modules/outbound/outbound_mod.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2812.patch https://github.com/kamailio/kamailio/pull/2812.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/2812

3 years, 4 months

git:master:3297e99c: outbound: fix compiler warning on SHA1() call

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3297e99c1ed5d3cbd2ada5597ab2a123dce4b44d URL: https://github.com/kamailio/kamailio/commit/3297e99c1ed5d3cbd2ada5597ab2a12… Author: Michael Furmur <furmur(a)pm.me> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-04T10:35:46+02:00 outbound: fix compiler warning on SHA1() call --- Modified: src/modules/outbound/outbound_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3297e99c1ed5d3cbd2ada5597ab2a12… Patch: https://github.com/kamailio/kamailio/commit/3297e99c1ed5d3cbd2ada5597ab2a12… --- diff --git a/src/modules/outbound/outbound_mod.c b/src/modules/outbound/outbound_mod.c index ada7062454..df9538aace 100644 --- a/src/modules/outbound/outbound_mod.c +++ b/src/modules/outbound/outbound_mod.c @@ -109,7 +109,7 @@ static int mod_init(void) if(flow_token_secret.s) { assert(ob_key.len == SHA_DIGEST_LENGTH); LM_DBG("flow_token_secret mod param set. use persistent ob_key"); - SHA1(flow_token_secret.s, flow_token_secret.len, ob_key.s); + SHA1((const unsigned char *)flow_token_secret.s, flow_token_secret.len, (unsigned char *)ob_key.s); } else { if (RAND_bytes((unsigned char *) ob_key.s, ob_key.len) == 0) {

3 years, 4 months

git:master:fc313c17: modules: readme files regenerated - textopsx ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: fc313c17e5846ab0e9e594dd50ca156a2bd71534 URL: https://github.com/kamailio/kamailio/commit/fc313c17e5846ab0e9e594dd50ca156… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-08-04T09:31:21+02:00 modules: readme files regenerated - textopsx ... [skip ci] --- Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/fc313c17e5846ab0e9e594dd50ca156… Patch: https://github.com/kamailio/kamailio/commit/fc313c17e5846ab0e9e594dd50ca156… --- diff --git a/src/modules/textopsx/README b/src/modules/textopsx/README index a805644ef1..0712afd04a 100644 --- a/src/modules/textopsx/README +++ b/src/modules/textopsx/README @@ -45,6 +45,8 @@ Daniel-Constantin Mierla 2.24. bl_iterator_end(iname) 2.25. textopsx.f.bl_iterator_next(iname) 2.26. bl_iterator_rm(iname) + 2.27. bl_iterator_append(iname, text) + 2.28. bl_iterator_insert(iname, text) 3. Selects @@ -80,7 +82,9 @@ Daniel-Constantin Mierla 1.24. bl_iterator_end usage 1.25. bl_iterator_next usage 1.26. bl_iterator_rm usage - 1.27. @hf_value select usage + 1.27. bl_iterator_append usage + 1.28. bl_iterator_insert usage + 1.29. @hf_value select usage Chapter 1. Admin Guide @@ -115,6 +119,8 @@ Chapter 1. Admin Guide 2.24. bl_iterator_end(iname) 2.25. textopsx.f.bl_iterator_next(iname) 2.26. bl_iterator_rm(iname) + 2.27. bl_iterator_append(iname, text) + 2.28. bl_iterator_insert(iname, text) 3. Selects @@ -160,6 +166,8 @@ Chapter 1. Admin Guide 2.24. bl_iterator_end(iname) 2.25. textopsx.f.bl_iterator_next(iname) 2.26. bl_iterator_rm(iname) + 2.27. bl_iterator_append(iname, text) + 2.28. bl_iterator_insert(iname, text) 2.1. msg_apply_changes() @@ -653,6 +661,46 @@ bl_iterator_end("b1"); bl_iterator_end("b1"); ... +2.27. bl_iterator_append(iname, text) + + Add text after the line at the current iterator possition. + + The parameters can be dynamic strings with variables. + + This function can be used from ANY_ROUTE. + + Example 1.27. bl_iterator_append usage +... + bl_iterator_start("b1"); + while(bl_iterator_next("b1")) { + if($blitval(b1)=~"^a=info:xyz") { + bl_iterator_append("b1", "a=info:abc\r\n"); + break; + } + } + bl_iterator_end("b1"); +... + +2.28. bl_iterator_insert(iname, text) + + Add text before the line at the current iterator possition. + + The parameters can be dynamic strings with variables. + + This function can be used from ANY_ROUTE. + + Example 1.28. bl_iterator_insert usage +... + bl_iterator_start("b1"); + while(bl_iterator_next("b1")) { + if($blitval(b1)=~"^a=info:xyz") { + bl_iterator_insert("b1", "a=info:abc\r\n"); + break; + } + } + bl_iterator_end("b1"); +... + 3. Selects 3.1. @hf_value @@ -688,7 +736,7 @@ bl_iterator_end("b1"); * IDX - Value index, negative value counts from bottom * PARAM_NAME - name of parameter - Example 1.27. @hf_value select usage + Example 1.29. @hf_value select usage ... $a = @hf_value.my_header[1].my_param; xplog("L_ERR", "$sel((a)hf_value.via[-1]), $sel((a)hf_value.from.tag)\n");

3 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2021