sr-dev September 2018

sr-dev@lists.kamailio.org

24 participants
331 discussions

[kamailio/kamailio] KEMI: add htable's sht_rm_* functions (#1614)
by Enrico Bandiera 04 Sep '18

04 Sep '18

Hi, currently htable module's sht_rm_* functions are not exported to KEMI, could anyone please export them to KEMI? Thanks, Enrico -- 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/1614

4 9

git:master:28068310: htable: exported sht_rm_name() and sht_rm_value() to KEMI
by Daniel-Constantin Mierla 04 Sep '18

04 Sep '18

Module: kamailio Branch: master Commit: 2806831045cdb8f110737a87470382c28c5ce094 URL: https://github.com/kamailio/kamailio/commit/2806831045cdb8f110737a87470382c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-04T10:08:12+02:00 htable: exported sht_rm_name() and sht_rm_value() to KEMI --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/2806831045cdb8f110737a87470382c… Patch: https://github.com/kamailio/kamailio/commit/2806831045cdb8f110737a87470382c… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 43c58d1942..834583fa0c 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -525,6 +525,17 @@ static int w_ht_rm_value(sip_msg_t* msg, char* hname, char* op, char *val) return w_ht_rm_items(msg, hname, op, val, 1); } +static int ki_ht_rm_name(sip_msg_t* msg, str* sname, str* sop, str *sval) +{ + return ht_rm_items(msg, sname, sop, sval, 0); + +} + +static int ki_ht_rm_value(sip_msg_t* msg, str* sname, str* sop, str *sval) +{ + return ht_rm_items(msg, sname, sop, sval, 1); +} + static int ht_reset_by_name(str *hname) { ht_t *ht; @@ -1321,6 +1332,16 @@ static sr_kemi_t sr_kemi_htable_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("htable"), str_init("sht_rm_name"), + SR_KEMIP_INT, ki_ht_rm_name, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("htable"), str_init("sht_rm_value"), + SR_KEMIP_INT, ki_ht_rm_value, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:d68c1bcb: pv: increased transformation buffer slots from 4 to 8
by Daniel-Constantin Mierla 04 Sep '18

04 Sep '18

Module: kamailio Branch: master Commit: d68c1bcb350bce2f1951b604f97e246734e43b84 URL: https://github.com/kamailio/kamailio/commit/d68c1bcb350bce2f1951b604f97e246… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-04T09:48:02+02:00 pv: increased transformation buffer slots from 4 to 8 --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/d68c1bcb350bce2f1951b604f97e246… Patch: https://github.com/kamailio/kamailio/commit/d68c1bcb350bce2f1951b604f97e246… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 30c6379a7f..79e31a9ded 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -59,7 +59,7 @@ static param_t* _tr_uri_params = NULL; /*! transformation buffer size */ #define TR_BUFFER_SIZE 65536 -#define TR_BUFFER_SLOTS 4 +#define TR_BUFFER_SLOTS 8 /*! transformation buffer */ static char **_tr_buffer_list = NULL;

1 0

git:master:533e8f5c: pv: new transformation {s.unquote}
by Daniel-Constantin Mierla 04 Sep '18

04 Sep '18

Module: kamailio Branch: master Commit: 533e8f5cca940652f8507a272b076d51161432bd URL: https://github.com/kamailio/kamailio/commit/533e8f5cca940652f8507a272b076d5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-04T09:46:01+02:00 pv: new transformation {s.unquote} - return the value without surrounding double/single quotes (" or ') --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/533e8f5cca940652f8507a272b076d5… Patch: https://github.com/kamailio/kamailio/commit/533e8f5cca940652f8507a272b076d5… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index f93a5e3d6f..30c6379a7f 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1156,6 +1156,30 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, val->ri = 0; break; + case TR_S_UNQUOTE: + if(!(val->flags&PV_VAL_STR)) { + val->rs.s = int2str(val->ri, &val->rs.len); + break; + } + if(val->rs.len<2) { + break; + } + if(val->rs.len>TR_BUFFER_SIZE-2) { + LM_ERR("value too large: %d\n", val->rs.len); + return -1; + } + if((val->rs.s[0] == val->rs.s[val->rs.len-1]) + && (val->rs.s[0] == '"' || val->rs.s[0] == '\'')) { + memcpy(_tr_buffer, val->rs.s+1, val->rs.len-2); + val->rs.len -= 2; + } else { + memcpy(_tr_buffer, val->rs.s, val->rs.len); + } + val->flags = PV_VAL_STR; + val->rs.s = _tr_buffer; + val->rs.s[val->rs.len] = '\0'; + break; + default: LM_ERR("unknown subtype %d (cfg line: %d)\n", subtype, get_cfg_crt_line()); @@ -2508,6 +2532,9 @@ char* tr_parse_string(str* in, trans_t *t) } else if(name.len==15 && strncasecmp(name.s, "urldecode.param", 15)==0) { t->subtype = TR_S_URLDECODEPARAM; goto done; + } else if(name.len==7 && strncasecmp(name.s, "unquote", 7)==0) { + t->subtype = TR_S_UNQUOTE; + goto done; } LM_ERR("unknown transformation: %.*s/%.*s/%d!\n", in->len, in->s, diff --git a/src/modules/pv/pv_trans.h b/src/modules/pv/pv_trans.h index a4bc0759e8..ca24a3c108 100644 --- a/src/modules/pv/pv_trans.h +++ b/src/modules/pv/pv_trans.h @@ -41,7 +41,7 @@ enum _tr_s_subtype { TR_S_STRIP, TR_S_STRIPTAIL, TR_S_PREFIXES, TR_S_PREFIXES_QUOT, TR_S_REPLACE, TR_S_TIMEFORMAT, TR_S_TRIM, TR_S_RTRIM, TR_S_LTRIM, TR_S_RM, TR_S_STRIPTO, TR_S_URLENCODEPARAM, TR_S_URLDECODEPARAM, TR_S_NUMERIC, TR_S_ESCAPECSV, - TR_S_ENCODEBASE58, TR_S_DECODEBASE58, TR_S_COREHASH + TR_S_ENCODEBASE58, TR_S_DECODEBASE58, TR_S_COREHASH, TR_S_UNQUOTE }; enum _tr_uri_subtype { TR_URI_NONE=0, TR_URI_USER, TR_URI_HOST, TR_URI_PASSWD, TR_URI_PORT,

1 0

[kamailio] support usrloc handle_lost_tcp variable also in DB-Only scheme (#171)
by juha-h 04 Sep '18

04 Sep '18

--- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/171

2 3

[kamailio/kamailio] auth_db Deprecate email_address in database schemas (#858)
by Olle E. Johansson 03 Sep '18

03 Sep '18

I suggest we delete the "email_address" field in database schemas for auth_db. I think it was put there as an example of extendability but a lot of users seems confused about this and Kamailio by default does not use that field at all. Any opinions? If we reach an agreement we'll produce patches and clean up the various schemas. -- 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/858

3 8

git:master:01045cc2: lib/srdb1: schema - removed rpid and email_address columns from subscriber
by Daniel-Constantin Mierla 03 Sep '18

03 Sep '18

Module: kamailio Branch: master Commit: 01045cc2e2f2b86e109c661ca1748809cda68b7a URL: https://github.com/kamailio/kamailio/commit/01045cc2e2f2b86e109c661ca174880… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-03T20:48:39+02:00 lib/srdb1: schema - removed rpid and email_address columns from subscriber - they are not used by auth_db module - version number not needed to be updated, no default queries being affected - GH #858 --- Modified: src/lib/srdb1/schema/subscriber.xml --- Diff: https://github.com/kamailio/kamailio/commit/01045cc2e2f2b86e109c661ca174880… Patch: https://github.com/kamailio/kamailio/commit/01045cc2e2f2b86e109c661ca174880… --- diff --git a/src/lib/srdb1/schema/subscriber.xml b/src/lib/srdb1/schema/subscriber.xml index 39575719ed..8aaa03976e 100644 --- a/src/lib/srdb1/schema/subscriber.xml +++ b/src/lib/srdb1/schema/subscriber.xml @@ -75,24 +75,6 @@ <description>md5(username@domain:realm:password)</description> </column> - <column> - <name>email_address</name> - <type>string</type> - <size>&uri_len;</size> - <null/> - <default><null/></default> - <description>Email address</description> - </column> - - <column> - <name>rpid</name> - <type>string</type> - <size>&uri_len;</size> - <null/> - <default><null/></default> - <description>The SIP Remote-Party-ID header identifies the calling party and includes user, party, screen and privacy headers that specify how a call is presented and screened.</description> - </column> - <index> <name>account_idx</name> <colref linkend="username"/>

1 0

git:master:5e0440aa: kamctl: regenerated db schema files
by Daniel-Constantin Mierla 03 Sep '18

03 Sep '18

Module: kamailio Branch: master Commit: 5e0440aa27154c263fc883f3a7cb9680805af6c3 URL: https://github.com/kamailio/kamailio/commit/5e0440aa27154c263fc883f3a7cb968… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-03T20:51:59+02:00 kamctl: regenerated db schema files --- Modified: utils/kamctl/db_berkeley/kamailio/subscriber Modified: utils/kamctl/db_redis/kamailio/location Modified: utils/kamctl/db_redis/kamailio/subscriber Modified: utils/kamctl/db_sqlite/auth_db-create.sql Modified: utils/kamctl/dbtext/kamailio/subscriber Modified: utils/kamctl/mongodb/kamailio/subscriber.json Modified: utils/kamctl/mysql/auth_db-create.sql Modified: utils/kamctl/oracle/auth_db-create.sql Modified: utils/kamctl/postgres/auth_db-create.sql Modified: utils/kamctl/xhttp_pi/auth_db-mod Modified: utils/kamctl/xhttp_pi/auth_db-table Modified: utils/kamctl/xhttp_pi/pi_framework.xml --- Diff: https://github.com/kamailio/kamailio/commit/5e0440aa27154c263fc883f3a7cb968… Patch: https://github.com/kamailio/kamailio/commit/5e0440aa27154c263fc883f3a7cb968…

1 0

[kamailio] add GnuTLS support (#371)
by zabbal 03 Sep '18

03 Sep '18

OpenSSL is well known for huge amount of deadly security vulnerabilities, even before heartbleed. It would be nice if I could avoid bringing in such a library just because of Kamailio - having support for GnuTLS will let the user to make such a choice. --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/371

4 6

[kamailio/kamailio] ims_isc module does not deliver to AS after asynchronous SAR to HSS (distinct PSI) (#1168)
by Christoph VALENTIN 03 Sep '18

03 Sep '18

### Description This is the same test case as I used for bug Report #1160 I used kamailio as an scscf (based on the configuration files from kamailio/examples/scscf) I did some changes according to my needs I did some Basic tests - the results were satisfying --> OK I configured a distinct PSI on the HSS (sip:04321234501@vict-ims.net) --> OK I registered some user from a Zoiper Client --> OK I told zoiper to call sip:04321234501@vict-ims.net --> I received 555 AS Contacting Failed - iFC terminated dialog ### Troubleshooting For some reason, the ims_isc module cannot deliver the Initial INVITE to the AS. First I thought, there was a bug in TM module, however there was no bug in TM module (please find the Explanation in issue #1160) The ims_isc module issues a CRITICAL log: File 2017_06_20_distinct_psi_03_scscf_kamailio.log: Line 642 - 660: Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: INFO: ims_registrar_scscf [cxdx_avp.c:138]: cxdx_get_avp(): cxdx_get_experimental_result_code: Failed finding avp Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: INFO: ims_registrar_scscf [cxdx_sar.c:84]: create_return_code(): created AVP successfully : [saa_return_code] - [1] Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[UNREG_SAR_REPLY] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=127 a=26 n=xlog Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[UNREG_SAR_REPLY] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=143 a=21 n=switch Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[UNREG_SAR_REPLY] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=130 a=26 n=xlog Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[UNREG_SAR_REPLY] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=131 a=5 n=route Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=673 a=26 n=xlog Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=675 a=24 n=t_newtran Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: tm [tm.c:1316]: w_t_newtran(): ERROR: t_newtran: transaction already in process 0x7ff2a6e66a58 Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=677 a=25 n=set_dlg_profile Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=692 a=16 n=if Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=685 a=25 n=is_method Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=686 a=63 n=assign Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=687 a=63 n=assign Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=688 a=24 n=record_route Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=698 a=16 n=if Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=692 a=26 n=isc_match_filter Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: INFO: ims_isc [mod.c:233]: isc_match_filter(): Checking triggers Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: CRITICAL: ims_isc [mod.c:284]: isc_match_filter(): SKIP: 0 #### Reproduction I can help to reproduce the issue. mailto:christoph.valentin@kapsch.net Currently I have got an experimental test setup using Zoiper Clients. After week 27 I should have simulated test cases to repeat the Scenario "per mouse-click" #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` [logs-tshark-routes_2017_06_21.zip](https://github.com/kamailio/kamailio/fil… ``` #### SIP Traffic  ``` sip || diameter traffic at the s-cscf (172.29.21.23) [logs-tshark-routes_2017_06_21.zip](https://github.com/kamailio/kamailio/fil… ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` [root@vict-ims ~]# kamailio -v version: kamailio 4.4.5 (x86_64/linux) b0945e-dirty flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, 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_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: b0945e -dirty compiled on 20:06:13 Jun 7 2017 with gcc 4.8.5 [root@vict-ims ~]# ``` * **Operating System**:  ``` [root@vict-ims ~]# uname -a Linux vict-ims 3.10.0-229.el7.x86_64 #1 SMP Thu Jan 29 18:37:38 EST 2015 x86_64 x86_64 x86_64 GNU/Linux [root@vict-ims ~]# ``` -- 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/1168

2 8

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2018