sr-dev January 2021

sr-dev@lists.kamailio.org

17 participants
184 discussions

git:master:adccefff: lost: fixed 'for' loop initial declaration in utilities.c

by Wolfgang Kampichler

Module: kamailio Branch: master Commit: adccefff803f210f27df37108fdd260eb63ec1c7 URL: https://github.com/kamailio/kamailio/commit/adccefff803f210f27df37108fdd260… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-01-13T09:43:56+01:00 lost: fixed 'for' loop initial declaration in utilities.c --- Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/adccefff803f210f27df37108fdd260… Patch: https://github.com/kamailio/kamailio/commit/adccefff803f210f27df37108fdd260… --- diff --git a/src/modules/lost/utilities.c b/src/modules/lost/utilities.c index 257c0ee52b..fca503cbf6 100644 --- a/src/modules/lost/utilities.c +++ b/src/modules/lost/utilities.c @@ -629,6 +629,7 @@ p_geolist_t lost_new_geoheader_list(str hdr, int *items) int count = 0; int len = 0; + int i = 0; p_geolist_t list = NULL; p_geolist_t new = NULL; @@ -637,7 +638,7 @@ p_geolist_t lost_new_geoheader_list(str hdr, int *items) /* search the complete header field */ search = hdr.s; - for(int i = 0; i < hdr.len; i++) { + for(i = 0; i < hdr.len; i++) { /* check for cid content */ /* <cid:x> might be the shortest */ if(strlen(search) > 6) {

3 years, 3 months

[kamailio/kamailio] Need to handle a rejected REFER (#2601)

by jgajardo

Actually we have installed kamailio 5.4.2 and rtpengine like load balancer in a NAT environmet. behind the nat we have 2 identycal nodes using REFER for transfer calls to another destiny. This nodes does not have another SIP message. in the other NAT side we have our public carrier. When some nodes send to kamailio the REFER message and kamailio reroute this message to the carrier. The call is rejected due company policies. We want know how can we do for convert or modify the REFER message into INVITE for finally transfer the call. thank you in advance. kamailio -v: version: kamailio 5.4.2 (x86_64/linux) 4fdc21 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, 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_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 4fdc21 compiled on 20:43:45 Dec 1 2020 with unknown Uname -a: Linux proxy 4.15.0-124-generic #127-Ubuntu SMP Fri Nov 6 10:54:43 UTC 2020 x86_64 x86_64 x86_64 GNU/Linux rtpengine -v: Version: 9.2.0.0+0~mr9.2.0.0 git-master-aa5e0244 -- 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/2601

3 years, 3 months

git:master:0f962dca: modules: readme files regenerated - lost ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 0f962dca0953ef4461d1c82e229df0eb3efd9b99 URL: https://github.com/kamailio/kamailio/commit/0f962dca0953ef4461d1c82e229df0e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-01-12T12:01:20+01:00 modules: readme files regenerated - lost ... [skip ci] --- Modified: src/modules/lost/README --- Diff: https://github.com/kamailio/kamailio/commit/0f962dca0953ef4461d1c82e229df0e… Patch: https://github.com/kamailio/kamailio/commit/0f962dca0953ef4461d1c82e229df0e… --- diff --git a/src/modules/lost/README b/src/modules/lost/README index 81a4fa4833..07c5835483 100644 --- a/src/modules/lost/README +++ b/src/modules/lost/README @@ -27,6 +27,8 @@ Wolfgang Kampichler 3.1. exact_type (int) 3.2. response_time (int) 3.3. location_type (string) + 3.4. geoheader_type (int) + 3.5. geoheader_order (int) 4. Functions @@ -41,8 +43,10 @@ Wolfgang Kampichler 1.1. Set exact_type parameter 1.2. Set response_time parameter 1.3. Set location_type parameter - 1.4. lost_held_query() usage - 1.5. lost() usage + 1.4. Set geoheader_type parameter + 1.5. Set geoheader_order parameter + 1.6. lost_held_query() usage + 1.7. lost() usage Chapter 1. Admin Guide @@ -59,6 +63,8 @@ Chapter 1. Admin Guide 3.1. exact_type (int) 3.2. response_time (int) 3.3. location_type (string) + 3.4. geoheader_type (int) + 3.5. geoheader_order (int) 4. Functions @@ -131,6 +137,8 @@ Chapter 1. Admin Guide 3.1. exact_type (int) 3.2. response_time (int) 3.3. location_type (string) + 3.4. geoheader_type (int) + 3.5. geoheader_order (int) Besides parameters listed, this module uses http_client therefore according parameters may apply. @@ -182,6 +190,40 @@ Chapter 1. Admin Guide modparam("lost", "location_type, "civic geodetic locationURI") ... +3.4. geoheader_type (int) + + A Geolocation header may include a list of locationValues pointing to + either a Presence Information Data Format Location Object (PIDF-LO) in + the SIP body using a content-indirection (cid:) URI per RFC4483 + (https://tools.ietf.org/html/rfc4483), or an http(s) URI pointing to an + external source. This parameter supports filtering of the following + types: + * 0 (any) - any URI (first or last) + * 1 (cid) - cid URI (aka Location-by-Value) + * 2 (http) - http URI (aka Location-by-Reference) + * 3 (https) - https URI (aka Location-by-Reference) + + Default: 0 (any) + + Example 1.4. Set geoheader_type parameter + ... + modparam("lost", "geoheader_type", 1) + ... + +3.5. geoheader_order (int) + + A Geolocation header may include a list of locationValues. This + parameter sets the order of the URI used to retrieve location + information, either the first element of a certain type or the last. + Values are 0 (first) or 1 (last). + + Default: 0 (first) + + Example 1.5. Set geoheader_order parameter + ... + modparam("lost", "geoheader_order", 0) + ... + 4. Functions 4.1. lost_held_query(con, [id,] pidf-lo, url, error) @@ -210,7 +252,7 @@ Chapter 1. Admin Guide This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, FAILURE_ROUTE, and BRANCH_ROUTE. - Example 1.4. lost_held_query() usage + Example 1.6. lost_held_query() usage ... modparam("http_client", "httpcon", "heldsrv=>http://service.org/api/held"); ... @@ -246,7 +288,7 @@ r(pidf)\n"); This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, FAILURE_ROUTE, and BRANCH_ROUTE. - Example 1.5. lost() usage + Example 1.7. lost() usage ... modparam("http_client", "httpcon", "heldsrv=>http://service.org/api/held"); modparam("http_client", "httpcon", "lostsrv=>http://service.org/api/lost"); @@ -307,3 +349,6 @@ var(name)\n"); Note: to test the module with a mapping service (LOST), an API key may be requested under the following link (search for "GET ACCESS"): https://gridgears.at/. + + Note: in case modparam "geoheader_type" is set to 2 (http), the module + may use 3 (https) as fallback and vice versa.

3 years, 3 months

git:master:f9f26adc: lost: added Geolocation header value list support

by Wolfgang Kampichler

Module: kamailio Branch: master Commit: f9f26adc11d96367a40947642b20bfdda246875e URL: https://github.com/kamailio/kamailio/commit/f9f26adc11d96367a40947642b20bfd… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-01-12T11:56:47+01:00 lost: added Geolocation header value list support - the Geolocation header value parsing now supports a list of location URIs of type (cid, http and https). - types may be filtered and the list sequence may be changed via new module parameters. - besides: README update and code refactoring. --- Modified: src/modules/lost/doc/lost_admin.xml Modified: src/modules/lost/functions.c Modified: src/modules/lost/lost.c Modified: src/modules/lost/pidf.c Modified: src/modules/lost/pidf.h Modified: src/modules/lost/utilities.c Modified: src/modules/lost/utilities.h --- Diff: https://github.com/kamailio/kamailio/commit/f9f26adc11d96367a40947642b20bfd… Patch: https://github.com/kamailio/kamailio/commit/f9f26adc11d96367a40947642b20bfd…

3 years, 3 months

git:master:b4f43930: misc/examples/kemi: use local variable instead of many function calls for js

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b4f439301c2dffbfc6a389354e840142fc3b965b URL: https://github.com/kamailio/kamailio/commit/b4f439301c2dffbfc6a389354e84014… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-01-12T10:05:32+01:00 misc/examples/kemi: use local variable instead of many function calls for js --- Modified: misc/examples/kemi/kamailio-basic-kemi-jsdt.js --- Diff: https://github.com/kamailio/kamailio/commit/b4f439301c2dffbfc6a389354e84014… Patch: https://github.com/kamailio/kamailio/commit/b4f439301c2dffbfc6a389354e84014… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-jsdt.js b/misc/examples/kemi/kamailio-basic-kemi-jsdt.js index cedbf098b0..9949739d94 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-jsdt.js +++ b/misc/examples/kemi/kamailio-basic-kemi-jsdt.js @@ -116,18 +116,19 @@ function ksr_route_relay() function ksr_route_reqinit() { if (!KSR.is_myself_srcip()) { + var srcip = KSR.kx.get_srcip(); if (KSR.htable.sht_match_name("ipban", "eq", srcip) > 0) { // ip is already blocked KSR.dbg("request from blocked IP - " + KSR.kx.get_method() + " from " + KSR.kx.get_furi() + " (IP:" - + KSR.kx.get_srcip() + ":" + KSR.kx.get_srcport() + ")\n"); + + srcip + ":" + KSR.kx.get_srcport() + ")\n"); KSR.x.exit(); } if (KSR.pike.pike_check_req()<0) { KSR.err("ALERT: pike blocking " + KSR.kx.get_method() + " from " + KSR.kx.get_furi() + " (IP:" - + KSR.kx.get_srcip() + ":" + KSR.kx.get_srcport() + ")\n"); - KSR.htable.sht_seti("ipban", KSR.kx.get_srcip(), 1); + + srcip + ":" + KSR.kx.get_srcport() + ")\n"); + KSR.htable.sht_seti("ipban", srcip, 1); KSR.x.exit(); } }

3 years, 3 months

git:master:6e541feb: misc/examples/kemi: use kx functions instead of pv

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6e541feb9184e193f9c486c8f97d73360c69250d URL: https://github.com/kamailio/kamailio/commit/6e541feb9184e193f9c486c8f97d733… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-01-12T09:52:31+01:00 misc/examples/kemi: use kx functions instead of pv --- Modified: misc/examples/kemi/kamailio-basic-kemi-jsdt.js --- Diff: https://github.com/kamailio/kamailio/commit/6e541feb9184e193f9c486c8f97d733… Patch: https://github.com/kamailio/kamailio/commit/6e541feb9184e193f9c486c8f97d733… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-jsdt.js b/misc/examples/kemi/kamailio-basic-kemi-jsdt.js index ab3799fdc9..cedbf098b0 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-jsdt.js +++ b/misc/examples/kemi/kamailio-basic-kemi-jsdt.js @@ -116,23 +116,23 @@ function ksr_route_relay() function ksr_route_reqinit() { if (!KSR.is_myself_srcip()) { - if (!KSR.pv.is_null("$sht(ipban=>$si)")) { + if (KSR.htable.sht_match_name("ipban", "eq", srcip) > 0) { // ip is already blocked - KSR.dbg("request from blocked IP - " + KSR.pv.get("$rm") - + " from " + KSR.pv.get("$fu") + " (IP:" - + KSR.pv.get("$si") + ":" + KSR.pv.get("$sp") + ")\n"); + KSR.dbg("request from blocked IP - " + KSR.kx.get_method() + + " from " + KSR.kx.get_furi() + " (IP:" + + KSR.kx.get_srcip() + ":" + KSR.kx.get_srcport() + ")\n"); KSR.x.exit(); } if (KSR.pike.pike_check_req()<0) { - KSR.err("ALERT: pike blocking " + KSR.pv.get("$rm") - + " from " + KSR.pv.get("$fu") + " (IP:" - + KSR.pv.get("$si") + ":" + KSR.pv.get("$sp") + ")\n"); - KSR.pv.seti("$sht(ipban=>$si)", 1); + KSR.err("ALERT: pike blocking " + KSR.kx.get_method() + + " from " + KSR.kx.get_furi() + " (IP:" + + KSR.kx.get_srcip() + ":" + KSR.kx.get_srcport() + ")\n"); + KSR.htable.sht_seti("ipban", KSR.kx.get_srcip(), 1); KSR.x.exit(); } } if (KSR.corex.has_user_agent()>0) { - var UA = KSR.pv.gete("$ua"); + var UA = KSR.kx.gete_ua(); if (UA.indexOf("friendly")>=0 || UA.indexOf("scanner")>=0 || UA.indexOf("sipcli")>=0 || UA.indexOf("sipvicious")>=0) { KSR.sl.sl_send_reply(200, "OK"); @@ -154,7 +154,7 @@ function ksr_route_reqinit() if (KSR.sanity.sanity_check(1511, 7)<0) { KSR.err("Malformed SIP message from " - + KSR.pv.get("$si") + ":" + KSR.pv.get("$sp") + "\n"); + + KSR.kx.get_srcip() + ":" + KSR.kx.get_srcport() + "\n"); KSR.x.exit(); } } @@ -238,7 +238,7 @@ function ksr_route_location() } -// IP authorization and user uthentication +// IP authorization and user authentication function ksr_route_auth() { if (!KSR.is_REGISTER()) { @@ -250,8 +250,8 @@ function ksr_route_auth() if (KSR.is_REGISTER() || KSR.is_myself_furi()) { // authenticate requests - if (KSR.auth_db.auth_check(KSR.pv.get("$fd"), "subscriber", 1)<0) { - KSR.auth.auth_challenge(KSR.pv.get("$fd"), 0); + if (KSR.auth_db.auth_check(KSR.kx.gete_fhost(), "subscriber", 1)<0) { + KSR.auth.auth_challenge(KSR.kx.gete_fhost(), 0); KSR.x.exit(); } // user authenticated - remove auth header @@ -340,8 +340,8 @@ function ksr_route_sipout() // equivalent of branch_route[...]{} function ksr_branch_manage() { - KSR.dbg("new branch [" + KSR.pv.get("$T_branch_idx") - + "] to " + KSR.pv.get("$ru") + "\n"); + KSR.dbg("new branch [" + KSR.tm.t_get_branch_index() + + "] to " + KSR.kx.get_ruri() + "\n"); ksr_route_natmanage(); return; } @@ -351,7 +351,7 @@ function ksr_branch_manage() function ksr_onreply_manage() { KSR.dbg("incoming reply\n"); - var scode = KSR.pv.get("$rs"); + var scode = KSR.kx.gets_status(); if (scode>100 && scode<=299) { ksr_route_natmanage(); }

3 years, 3 months

git:master:2590165e: app_jsdt: duktape interpreter upgraded to v2.6.0

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2590165e278efb947edb9cb5a75104f2f760c4c2 URL: https://github.com/kamailio/kamailio/commit/2590165e278efb947edb9cb5a75104f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-01-12T08:52:00+01:00 app_jsdt: duktape interpreter upgraded to v2.6.0 --- Modified: src/modules/app_jsdt/duk_config.h Modified: src/modules/app_jsdt/duktape.c Modified: src/modules/app_jsdt/duktape.h --- Diff: https://github.com/kamailio/kamailio/commit/2590165e278efb947edb9cb5a75104f… Patch: https://github.com/kamailio/kamailio/commit/2590165e278efb947edb9cb5a75104f…

3 years, 3 months

git:master:bcb3fc59: secsipid: sync header file with upstream project

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: bcb3fc59d4b18d71603e6614e20bc86df39a39b5 URL: https://github.com/kamailio/kamailio/commit/bcb3fc59d4b18d71603e6614e20bc86… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-01-11T10:36:49+01:00 secsipid: sync header file with upstream project --- Modified: src/modules/secsipid/secsipid.h --- Diff: https://github.com/kamailio/kamailio/commit/bcb3fc59d4b18d71603e6614e20bc86… Patch: https://github.com/kamailio/kamailio/commit/bcb3fc59d4b18d71603e6614e20bc86… --- diff --git a/src/modules/secsipid/secsipid.h b/src/modules/secsipid/secsipid.h index 050bfe97d9..81f9ad0b48 100644 --- a/src/modules/secsipid/secsipid.h +++ b/src/modules/secsipid/secsipid.h @@ -5,4 +5,12 @@ #include "libsecsipid.h" +/** + * SECSIPID_VERSION = 0xAABBCC00 + * - corresponds to version AA.BB.CC + * - last two hexdigits are left for patch extensions + * - example: 0x1010000 corresponds to version 1.1.0 + */ +#define SECSIPID_VERSION 0x1010000 + #endif

3 years, 3 months

Errored: kamailio/kamailio#9800 (5.4 - 06bd17a)

by Travis CI

Build Update for kamailio/kamailio ------------------------------------- Build: #9800 Status: Errored Duration: 5 mins and 33 secs Commit: 06bd17a (5.4) Author: Daniel-Constantin Mierla Message: secsipid: include secsipid.h from standard path (cherry picked from commit c1a3443b09cee8a923f8801f8f3034f078034bf5) View the changeset: https://github.com/kamailio/kamailio/compare/b0a629ef9b36...06bd17a83870 View the full build log and details: https://travis-ci.org/github/kamailio/kamailio/builds/753907192?utm_medium=… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

3 years, 3 months

git:5.4:b7cff8de: secsipid: Makefile - detect of pkg-config knows about libsecsipid

by Victor Seva

Module: kamailio Branch: 5.4 Commit: b7cff8de3b3d26b1120678fac331ca52424e6c01 URL: https://github.com/kamailio/kamailio/commit/b7cff8de3b3d26b1120678fac331ca5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-01-11T09:48:46+01:00 secsipid: Makefile - detect of pkg-config knows about libsecsipid (cherry picked from commit 664542adf42a4d829ddf9b9e482aba81f30883d8) --- Modified: src/modules/secsipid/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/b7cff8de3b3d26b1120678fac331ca5… Patch: https://github.com/kamailio/kamailio/commit/b7cff8de3b3d26b1120678fac331ca5… --- diff --git a/src/modules/secsipid/Makefile b/src/modules/secsipid/Makefile index 13012cd248..2b97061d31 100644 --- a/src/modules/secsipid/Makefile +++ b/src/modules/secsipid/Makefile @@ -7,7 +7,16 @@ include ../../Makefile.defs auto_gen= NAME=secsipid.so -BUILDER = $(shell which pkg-config) +ifeq ($(CROSS_COMPILE),) + BUILDER = $(shell which pkg-config) +ifneq ($(BUILDER),) + PKGLIBSECSIPID = $(shell $(BUILDER) --exists secsipid-1 > /dev/null 2>&1 ; echo $$? ) +ifneq ($(PKGLIBSECSIPID),0) + BUILDER = +endif +endif +endif + ifeq ($(BUILDER),) DEFS+= -I. LIBS = -L. -lsecsipid

3 years, 3 months

← Newer
1
...
12
13
14
15
16
17
18
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2021