sr-dev March 2021

sr-dev@lists.kamailio.org

28 participants
489 discussions

git:master:38acfb59: ctl: info log messages made debug

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 38acfb59dde232b1a9f0ffc206fb46b320cd8e10 URL: https://github.com/kamailio/kamailio/commit/38acfb59dde232b1a9f0ffc206fb46b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-05T07:32:47+01:00 ctl: info log messages made debug - used to troubleshoot infite loop on shut down phase - GH #2661 --- Modified: src/modules/ctl/io_listener.c --- Diff: https://github.com/kamailio/kamailio/commit/38acfb59dde232b1a9f0ffc206fb46b… Patch: https://github.com/kamailio/kamailio/commit/38acfb59dde232b1a9f0ffc206fb46b… --- diff --git a/src/modules/ctl/io_listener.c b/src/modules/ctl/io_listener.c index 93ce89c948..ac8f64fc90 100644 --- a/src/modules/ctl/io_listener.c +++ b/src/modules/ctl/io_listener.c @@ -495,7 +495,7 @@ static int handle_stream_read(struct stream_connection* s_c, int idx) DBG("handle_stream read: eof on %s\n", s_c->parent->name); goto close_connection; } - LM_INFO("bytes read: %d\n", bytes_read); + LM_DBG("bytes read: %d\n", bytes_read); r->end+=bytes_read; if (bytes_read && (bytes_read<r->bytes_to_go)){ r->bytes_to_go-=bytes_read; @@ -515,7 +515,7 @@ static int handle_stream_read(struct stream_connection* s_c, int idx) /* error while processing the packet => close the connection */ goto close_connection; } - LM_INFO("bytes processed: %d\n", bytes_processed); + LM_DBG("bytes processed: %d\n", bytes_processed); r->proc+=bytes_processed; r->bytes_to_go=bytes_needed; if (bytes_needed>0){

3 years, 9 months

[CRON] Failed: dbank888/kamailio#126 (master - 491e19e)

by Travis CI

Build Update for dbank888/kamailio ------------------------------------- Build: #126 Status: Failed Duration: 5 mins and 14 secs Commit: 491e19e (master) Author: Daniel-Constantin Mierla Message: tls: update to default session id value to reflect major version View the changeset: https://github.com/dbank888/kamailio/compare/9e13c9512b48ab9522f508465c6031… View the full build log and details: https://travis-ci.org/github/dbank888/kamailio/builds/761500783?utm_medium=… -- You can unsubscribe from build emails from the dbank888/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=21197393&u…. 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, 9 months

[kamailio/kamailio] If the topos.so module support handling "update" message ？ (#2655)

by zhangyang

**Description** We use below config to test the topology hiding function，when kamailio receive “update” message，doesn't send out，it will send to itself with destination port 5060； **Troubleshooting** loadmodule "ndb_redis.so" loadmodule "topos_redis.so" loadmodule "topos.so" modparam("ndb_redis", "server", "name=srv8;addr=127.0.0.1;port=6381;db=2") modparam("topos", "storage", "redis") modparam("topos", "db_url", "redis://127.0.0.1:6381/2") modparam("topos_redis", "serverid", "srv8") -------- Call flow UE-----------------PROXY-------------B2bua invite-------------->|------------------>invite 183<----------------|<------------------183 Prack------------ ->|------------------>Prack 200ok<-------------|<-----------------200ok update1---------->|-------------| |update2<---| 404<---------------| **update1:** UPDATE sip:atpsh-5fc1a2c3-5749-2@172.18.67.40 SIP/2.0 Via: SIP/2.0/UDP 172.18.67.34:5062;branch=z9hG4bK-15000-1-0 From: <tel:+8618768860000>;tag=1 To: <tel:32001232;phone-context=ims.mnc002.mcc460.3gppnetwork.org>;tag=BH83c9DQXKgvp Call-ID: 1-15000(a)172.18.67.34 CSeq: 1002 UPDATE Allow: INVITE,ACK,OPTIONS,BYE,CANCEL,UPDATE,INFO,PRACK,NOTIFY,MESSAGE,REFER Contact: <sip:+8618768860000@172.18.67.34:5062;zte-did=8-11-20481-2871-12-666-65535;Hpt=8ec8_16;CxtId=4;TRC=ffffff-ffffffff>;audio;vid ;+sip.instance="<urn:gsma:imei:86183004-974965-0>";+g.3gpp.mid-call;+g.3gpp.srvcc-alerting;+g.3gpp.pss-srvcc-orig-pre-alerting;+g.3gpp csi-ref="urn%3Aurn-7%3A3gpp-service.ims.icsi.mmtel" **update2:** UPDATE sip:172.18.67.50;r2=on;lr=on;ftag=1;did=874.5af1;vsf=BwwcABoAAQcADwAICAYAcAEHMi4xOC42Ny4zNA-- SIP/2.0 Via: SIP/2.0/UDP 172.18.67.40:55067;branch=z9hG4bK296a.feb7a8004f743a745739026289e0010e.0 From: <tel:+8618768860000>;tag=1 To: <tel:32001232;phone-context=ims.mnc002.mcc460.3gppnetwork.org>;tag=BH83c9DQXKgvp Call-ID: 1-15000(a)172.18.67.34 CSeq: 1002 UPDATE Allow: INVITE,ACK,OPTIONS,BYE,CANCEL,UPDATE,INFO,PRACK,NOTIFY,MESSAGE,REFER Max-Forwards: 70 Require: precondition Supported: histinfo,replaces,precondition,100rel,timer User-Agent: IM-client/OMA1.0 HW-Rto/V1.0 P-Access-Network-Info: 3GPP-E-UTRAN;utran-cell-id-3gpp=4600039c6b98855b;network-provided;sbc-domain=luypsbc22bzx.0371.101.ha.chinamobi .com P-Charging-Vector: icid-value=No1ZR2PilD-0000a442-0d-0000816e-001;orig-ioi=chinamobile Content-Type: application/sdp Content-Disposition: session Content-Length: 743 Contact: <sip:btpsh-5fc1a2c3-5749-2@172.18.67.50> below ip and port are configured for kamailio; 172.18.67.40:55067 172.18.67.50:5060 **Additional Information** version: kamailio 5.4.2 (x86_64/linux) 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: compiled on 20:13:39 Nov 9 2020 with gcc 4.8.5 -- 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/2655

3 years, 9 months

git:master:e3686fcc: modules: readme files regenerated - textops ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: e3686fcc84385f0dd94f7209dd63639392faa60c URL: https://github.com/kamailio/kamailio/commit/e3686fcc84385f0dd94f7209dd63639… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-03-03T18:01:15+01:00 modules: readme files regenerated - textops ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/e3686fcc84385f0dd94f7209dd63639… Patch: https://github.com/kamailio/kamailio/commit/e3686fcc84385f0dd94f7209dd63639…

3 years, 9 months

git:master:0cbee552: textops: docs - note about search() doing posix regex matching

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0cbee55284c4f4d5fef09a3185de31d04776e569 URL: https://github.com/kamailio/kamailio/commit/0cbee55284c4f4d5fef09a3185de31d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-03T17:49:32+01:00 textops: docs - note about search() doing posix regex matching --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0cbee55284c4f4d5fef09a3185de31d… Patch: https://github.com/kamailio/kamailio/commit/0cbee55284c4f4d5fef09a3185de31d… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index c05522e037..479b8f1cd1 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -90,6 +90,10 @@ From: medabeda </para> </listitem> </itemizedlist> + <para> + Note: it performs Posix regex matching and the 're' parameter + is compiled with the flags REG_EXTENDED|REG_ICASE|REG_NEWLINE. + </para> <para> This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, FAILURE_ROUTE, BRANCH_ROUTE.

3 years, 9 months

git:master:b1899526: topos: docs for search_str() function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b18995265685517af446d54979668b6240193f32 URL: https://github.com/kamailio/kamailio/commit/b18995265685517af446d54979668b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-03T17:44:46+01:00 topos: docs for search_str() function --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b18995265685517af446d54979668b6… Patch: https://github.com/kamailio/kamailio/commit/b18995265685517af446d54979668b6… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index e9acba3869..c05522e037 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -128,6 +128,42 @@ if ( search("[Ss][Ii][Pp]") ) { /*....*/ }; ... if ( search_body("[Ss][Ii][Pp]") ) { /*....*/ }; ... +</programlisting> + </example> + </section> + + <section id="textops.f.search_str"> + <title> + <function moreinfo="none">search_str(text. re)</function> + </title> + <para> + Searches for the re in the body of the message. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>text</emphasis> - text to perform regex searching + over it. + </para> + </listitem> + <listitem> + <para><emphasis>re</emphasis> - regular expression to match over + the 'text' parameter. + </para> + </listitem> + </itemizedlist> + <para> + Both parameters can contain variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>search_str</function> usage</title> + <programlisting format="linespecific"> +... +if ( search_str("$ru", ";transport=tcp") ) { /*....*/ }; +... </programlisting> </example> </section>

3 years, 9 months

git:master:ecf6610d: textops: added search_str(text, re)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ecf6610d5e4505f20062a2d39674b1e77630844a URL: https://github.com/kamailio/kamailio/commit/ecf6610d5e4505f20062a2d39674b1e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-03T17:39:12+01:00 textops: added search_str(text, re) - similar to search(re), but performs the regex match over the parameter 'text' instead of sip message buffer --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/ecf6610d5e4505f20062a2d39674b1e… Patch: https://github.com/kamailio/kamailio/commit/ecf6610d5e4505f20062a2d39674b1e… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 6f3c6f9b5e..1b045dc89c 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -148,6 +148,7 @@ static int is_present_hf_re_pv_f(sip_msg_t* msg, char* key, char* foo); static int is_audio_on_hold_f(struct sip_msg *msg, char *str1, char *str2 ); static int regex_substring_f(struct sip_msg *msg, char *input, char *regex, char *matched_index, char *match_count, char *dst); +static int w_search_str(sip_msg_t *msg, char *ptext, char *pre); static int fixup_substre(void**, int); static int hname_fixup(void** param, int param_no); static int free_hname_fixup(void** param, int param_no); @@ -314,6 +315,9 @@ static cmd_export_t cmds[]={ {"cmp_istr", (cmd_function)cmp_istr_f, 2, fixup_spve_spve, 0, ANY_ROUTE}, + {"search_str", (cmd_function)w_search_str, 2, + fixup_spve_spve, 0, + ANY_ROUTE}, {"starts_with", (cmd_function)starts_with_f, 2, fixup_spve_spve, 0, ANY_ROUTE}, @@ -4593,6 +4597,61 @@ static int fixup_subst_hf(void** param, int param_no) return 0; } +/** + * + */ +static int ki_search_str(sip_msg_t *msg, str *stext, str *sre) +{ + int ret; + regex_t re; + regmatch_t pmatch; + + + if(sre==NULL || sre->len<=0) { + return 2; + } + + if(stext==NULL || stext->len<=0) { + return -2; + } + + memset(&re, 0, sizeof(regex_t)); + if (regcomp(&re, sre->s, REG_EXTENDED|REG_ICASE|REG_NEWLINE)!=0) { + LM_ERR("failed to compile regex: %.*s\n", sre->len, sre->s); + return -2; + } + + if (regexec(&re, stext->s, 1, &pmatch, 0)!=0) { + ret = -1; + } else { + ret = 1; + } + + regfree(&re); + + return ret; +} + +/** + * + */ +static int w_search_str(sip_msg_t *msg, char *ptext, char *pre) +{ + str stext; + str sre; + + if(fixup_get_svalue(msg, (gparam_t*)ptext, &stext)!=0) { + LM_ERR("cannot get first parameter\n"); + return -2; + } + if(fixup_get_svalue(msg, (gparam_t*)pre, &sre)!=0) { + LM_ERR("cannot get second parameter\n"); + return -2; + } + + return ki_search_str(msg, &stext, &sre); +} + /** * */ @@ -4945,6 +5004,11 @@ static sr_kemi_t sr_kemi_textops_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("textops"), str_init("search_str"), + SR_KEMIP_INT, ki_search_str, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("textops"), str_init("starts_with"), SR_KEMIP_INT, ki_starts_with, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE,

3 years, 9 months

[kamailio/kamailio] lreproxy module (#2208)

by mojtabaesfandiari

lreproxy: add new lreproxy module   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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 - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2208 -- Commit Summary -- * lreproxy module -- File Changes -- A src/modules/lreproxy/README.md (1) A src/modules/lreproxy/lreproxy.c (1976) A src/modules/lreproxy/lreproxy.h (120) A src/modules/lreproxy/lreproxy_funcs.c (460) A src/modules/lreproxy/lreproxy_funcs.h (41) A src/modules/lreproxy/lreproxy_hash.c (521) A src/modules/lreproxy/lreproxy_hash.h (70) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2208.patch https://github.com/kamailio/kamailio/pull/2208.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/2208

3 years, 9 months

[kamailio/kamailio] ims_diameter_server: fix errors (#2649)

by Riccardo-78

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2649 -- Commit Summary -- * ims_diameter_server: check response is not null before json conversion * ims_diameter_server: fix initialization of s_message * ims_diameter_server: drop cdp session to avoid deadlock * ims_diameter_server: fix check for addAVPsfromJSON return code -- File Changes -- M src/modules/ims_diameter_server/ims_diameter_server.c (15) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2649.patch https://github.com/kamailio/kamailio/pull/2649.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/2649

3 years, 9 months

git:master:88d38bd3: ims_diameter_server: fix check for addAVPsfromJSON return code

by Riccardo Villa

Module: kamailio Branch: master Commit: 88d38bd306f595585af6e972ac529b40d7a93b58 URL: https://github.com/kamailio/kamailio/commit/88d38bd306f595585af6e972ac529b4… Author: Riccardo Villa <riccardo.villa(a)netaxis.be> Committer: Riccardo Villa <riccardo.villa(a)netaxis.be> Date: 2021-02-24T09:56:44+01:00 ims_diameter_server: fix check for addAVPsfromJSON return code --- Modified: src/modules/ims_diameter_server/ims_diameter_server.c --- Diff: https://github.com/kamailio/kamailio/commit/88d38bd306f595585af6e972ac529b4… Patch: https://github.com/kamailio/kamailio/commit/88d38bd306f595585af6e972ac529b4… --- diff --git a/src/modules/ims_diameter_server/ims_diameter_server.c b/src/modules/ims_diameter_server/ims_diameter_server.c index 5b69c8973c..fae5f58ce9 100644 --- a/src/modules/ims_diameter_server/ims_diameter_server.c +++ b/src/modules/ims_diameter_server/ims_diameter_server.c @@ -317,7 +317,7 @@ int diameter_request(struct sip_msg * msg, char* peer, char* appid, char* comman if (!req) goto error1; - if (addAVPsfromJSON(req, &s_message)) { + if (!addAVPsfromJSON(req, &s_message)) { LM_ERR("Failed to parse JSON Request\n"); return -1; }

3 years, 9 months

← Newer
1
...
41
42
43
44
45
46
47
48
49
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2021