sr-dev February 2020

sr-dev@lists.kamailio.org

17 participants
324 discussions

git:master:9e1e7d4d: pua_dialoginfo: add missing module parameter from docs

by Victor Seva

Module: kamailio Branch: master Commit: 9e1e7d4d3f7eb2e08d092c9b0b772fc76cf09376 URL: https://github.com/kamailio/kamailio/commit/9e1e7d4d3f7eb2e08d092c9b0b772fc… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-02-28T09:31:57+01:00 pua_dialoginfo: add missing module parameter from docs intruduced at 09d1bdc38b51619c65c6a9ec8f293cf9c395c6c1 back in 2009 --- Modified: src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9e1e7d4d3f7eb2e08d092c9b0b772fc… Patch: https://github.com/kamailio/kamailio/commit/9e1e7d4d3f7eb2e08d092c9b0b772fc… --- diff --git a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml index eda556245f..b3422ef12c 100644 --- a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml +++ b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml @@ -314,6 +314,25 @@ modparam("pua_dialoginfo", "override_lifetime", 300) </example> </section> + <section> + <title><varname>include_req_uri</varname> (int)</title> + <para> + controls if R-URI is going to be used instead of To header value in + the PUBLISH as "identity" on "remote" node. + </para> + <para> + <emphasis>Default value is <quote>0</quote>. Disabled</emphasis> + </para> + <example> + <title>Set <varname>include_req_uri</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("pua_dialoginfo", "include_req_uri", 1) +... +</programlisting> + </example> + </section> + <section> <title><varname>caller_confirmed</varname> (int)</title> <para>

4 years, 9 months

git:master:5bc7bd99: pv: exported functions for $var(...) management

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5bc7bd99305b1341c6d0a6a4d2d3138432b14819 URL: https://github.com/kamailio/kamailio/commit/5bc7bd99305b1341c6d0a6a4d2d3138… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-27T10:07:42+01:00 pv: exported functions for $var(...) management --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_svar.c Modified: src/modules/pv/pv_svar.h --- Diff: https://github.com/kamailio/kamailio/commit/5bc7bd99305b1341c6d0a6a4d2d3138… Patch: https://github.com/kamailio/kamailio/commit/5bc7bd99305b1341c6d0a6a4d2d3138… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 78f7398b0b..a233a684cf 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -1811,6 +1811,21 @@ static sr_kemi_t sr_kemi_pvx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("pvx"), str_init("var_seti"), + SR_KEMIP_INT, ki_var_seti, + { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("pvx"), str_init("var_sets"), + SR_KEMIP_INT, ki_var_sets, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("pvx"), str_init("var_get"), + SR_KEMIP_XVAL, ki_var_get, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("pvx"), str_init("shv_seti"), SR_KEMIP_INT, ki_shv_seti, { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, diff --git a/src/modules/pv/pv_svar.c b/src/modules/pv/pv_svar.c index 1245cef7f5..255f9f2040 100644 --- a/src/modules/pv/pv_svar.c +++ b/src/modules/pv/pv_svar.c @@ -239,3 +239,84 @@ void destroy_vars(void) destroy_vars_list(script_vars); destroy_vars_list(script_vars_null); } + +/** + * + */ +int ki_var_seti(sip_msg_t *msg, str *vname, int ival) +{ + int_str isv; + script_var_t *var = NULL; + + var = add_var(vname, VAR_TYPE_ZERO); + + if(var==NULL) { + LM_ERR("$var(%.*s) is not defined\n", vname->len, vname->s); + return -1; + } + + isv.n = ival; + if(set_var_value(var, &isv, 0)==NULL) { + LM_ERR("error - cannot set $var(%.*s) to ival\n", vname->len, vname->s); + return -1; + } + + return 1; +} + +/** + * + */ +int ki_var_sets(sip_msg_t *msg, str *vname, str *sval) +{ + int_str isv; + script_var_t *var = NULL; + + var = add_var(vname, VAR_TYPE_ZERO); + + if(var==NULL) { + LM_ERR("$var(%.*s) is not defined\n", vname->len, vname->s); + return -1; + } + + isv.s = *sval; + if(set_var_value(var, &isv, VAR_VAL_STR)==NULL) { + LM_ERR("error - cannot set $var(%.*s) to sval\n", vname->len, vname->s); + return -1; + } + return 1; +} + +/** + * + */ +static sr_kemi_xval_t _sr_kemi_var_xval = {0}; + +/** + * + */ +sr_kemi_xval_t* ki_var_get(sip_msg_t *msg, str *vname) +{ + script_var_t *var = NULL; + + memset(&_sr_kemi_var_xval, 0, sizeof(sr_kemi_xval_t)); + + var = get_var_by_name(vname); + if(var==NULL) { + LM_WARN("$var(%.*s) is not defined - return value 0\n", + vname->len, vname->s); + _sr_kemi_var_xval.vtype = SR_KEMIP_INT; + _sr_kemi_var_xval.v.n = 0; + return &_sr_kemi_var_xval; + } + + if(var->v.flags&VAR_VAL_STR) { + _sr_kemi_var_xval.vtype = SR_KEMIP_STR; + _sr_kemi_var_xval.v.s = var->v.value.s; + return &_sr_kemi_var_xval; + } else { + _sr_kemi_var_xval.v.n = var->v.value.n; + _sr_kemi_var_xval.vtype = SR_KEMIP_INT; + return &_sr_kemi_var_xval; + } +} diff --git a/src/modules/pv/pv_svar.h b/src/modules/pv/pv_svar.h index 9e2e9d6e8d..b9f78ab749 100644 --- a/src/modules/pv/pv_svar.h +++ b/src/modules/pv/pv_svar.h @@ -27,6 +27,7 @@ #ifndef _PV_SVAR_H_ #define _PV_SVAR_H_ +#include "../../core/kemi.h" #include "../../core/usr_avp.h" #define VAR_VAL_INT (0) /* value is INT (other flags not set) */ @@ -57,5 +58,9 @@ void reset_vars(void); void destroy_vars(void); void destroy_vars_list(script_var_t *svl); +int ki_var_seti(sip_msg_t *msg, str *vname, int ival); +int ki_var_sets(sip_msg_t *msg, str *vname, str *sval); +sr_kemi_xval_t* ki_var_get(sip_msg_t *msg, str *vname); + #endif

4 years, 9 months

git:master:10b38842: pv: exporte xavp copy variants to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 10b388423c8e60e1b0b7d625239a0df0afcfac0e URL: https://github.com/kamailio/kamailio/commit/10b388423c8e60e1b0b7d625239a0df… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-27T09:46:34+01:00 pv: exporte xavp copy variants to kemi framework --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/10b388423c8e60e1b0b7d625239a0df… Patch: https://github.com/kamailio/kamailio/commit/10b388423c8e60e1b0b7d625239a0df…

4 years, 9 months

git:master:8538a8c8: pv: formatted the very long lines in w_xavp_copy_dst()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8538a8c884adb0d844b0da7804711ceb8f427304 URL: https://github.com/kamailio/kamailio/commit/8538a8c884adb0d844b0da7804711ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-27T09:17:59+01:00 pv: formatted the very long lines in w_xavp_copy_dst() --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/8538a8c884adb0d844b0da7804711ce… Patch: https://github.com/kamailio/kamailio/commit/8538a8c884adb0d844b0da7804711ce…

4 years, 9 months

git:master:a8f60be7: pv: kemi functions for $shv(...) management

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a8f60be7e3467611f0329198e3a1c4e4196b280f URL: https://github.com/kamailio/kamailio/commit/a8f60be7e3467611f0329198e3a1c4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-27T09:14:24+01:00 pv: kemi functions for $shv(...) management --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_shv.c Modified: src/modules/pv/pv_shv.h --- Diff: https://github.com/kamailio/kamailio/commit/a8f60be7e3467611f0329198e3a1c4e… Patch: https://github.com/kamailio/kamailio/commit/a8f60be7e3467611f0329198e3a1c4e…

4 years, 9 months

[kamailio/kamailio] configure apns push notification in kamailio (#2232)

by masterhydra

Hello, I need to configure apns push notification in kamailio kindly help. I have a file push.php It is capable to push notification on ios device know i want to implement in kamailio when the user is offline then push notification fire kindly help in this. Think Out of the Box -- 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/2232

4 years, 9 months

[kamailio/kamailio] Sending OPTIONS using uac module fails after first attempt in a NATed scenario (#2231)

by Supreeth Herle

### Setup Description + Problem Description I am running a open5gs (4G Core network) in an OpenStack VM with internal IP 10.4.128.6 and Floating IP 172.24.15.10 and entire (Kamailio IMS + FoHSS) system in another OpenStack VM with internal IP 10.4.128.21 and Floating IP 172.24.15.30. eNB (srslte) is running on a physical machine with IP 192.168.49.125. Kamailio is built from the sources using the forked repo in this [link](https://github.com/herlesupreeth/kamailio/tree/5.3). This forked repo has a fix for handling IMS registration when 4G Core Network is behind a NAT among other fixes. IMS config files - [Kamailio_IMS_Config.zip](https://github.com/kamailio/kamailio/files/4255538… PCSCF, SCSCF, ICSCF are run as separate systemctl process LTE UEs are configured with two APNs - "internet" APN for best effort traffic - IP range 192.168.100.0/24 - "ims" APN for IMS - IP range 192.168.101.0/24. Upon performing the IMS registration, uac module is being used to achieve NATPING by sending OPTIONS message as per the PCSCF script. However, I observe a strange behaviour where the first OPTIONS message sent by the PCSCF is replied with 200 OK and the subsequent message times out with 408 (most of the times even the first OPTIONS message does'nt gets a 200 OK) !!! IMPORTANT NOTE !! This behaviour is not seen if I run the 4G Core Network and Kamailio IMS + FoHSS is run in a single VM i.e. CN not behind a NAT #### Reproduction Upon performing the IMS registration, uac module is being used to achieve NATPING by sending OPTIONS message as per the PCSCF script. However, I observe a strange behaviour where the first OPTIONS message sent by the PCSCF is replied with 200 OK and the subsequent message times out with 408 (most of the times even the first OPTIONS message does'nt gets a 200 OK) #### Debugging Data PCAP at eNB machine and VM running (Kamailio IMS + FoHSS) attached below - [pcaps.zip](https://github.com/kamailio/kamailio/files/4255628/pcaps.zip) #### Log Messages Since the log message from PCSCF, SCSCF and ICSCF is too long I am attaching it as file below. Following is the log from journalctl for PCSCF, SCSCF and ICSCF combined [kamailio_log.txt](https://github.com/kamailio/kamailio/files/4255561/kamail… ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.2 (x86_64/linux) 842fef 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, TLS_PTHREAD_MUTEX_SHARED 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: 842fef compiled on 11:43:39 Feb 26 2020 with gcc 7.4.0 ``` * **Operating System**: ``` NAME="Ubuntu" VERSION="18.04.3 LTS (Bionic Beaver)" ID=ubuntu ID_LIKE=debian PRETTY_NAME="Ubuntu 18.04.3 LTS" VERSION_ID="18.04" HOME_URL="https://www.ubuntu.com/" SUPPORT_URL="https://help.ubuntu.com/" BUG_REPORT_URL="https://bugs.launchpad.net/ubuntu/" PRIVACY_POLICY_URL="https://www.ubuntu.com/legal/terms-and-policies/privacy-policy" VERSION_CODENAME=bionic UBUNTU_CODENAME=bionic ``` I am not sure where to start looking for debugging this strange behaviour, any hints or pointer would be really helpful. Many thanks in advance. Regards, Supreeth -- 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/2231

4 years, 9 months

git:master:3d7b3b1e: modules: readme files regenerated - rtjson ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 3d7b3b1eeace71cc35aead54a5a1e2de42fd8505 URL: https://github.com/kamailio/kamailio/commit/3d7b3b1eeace71cc35aead54a5a1e2d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-02-26T10:46:24+01:00 modules: readme files regenerated - rtjson ... [skip ci] --- Modified: src/modules/rtjson/README --- Diff: https://github.com/kamailio/kamailio/commit/3d7b3b1eeace71cc35aead54a5a1e2d… Patch: https://github.com/kamailio/kamailio/commit/3d7b3b1eeace71cc35aead54a5a1e2d…

4 years, 9 months

git:master:a2347660: rtjson: fixed the updated example

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a23476600666d0cf0604a6a7e3212fa5b1223af8 URL: https://github.com/kamailio/kamailio/commit/a23476600666d0cf0604a6a7e3212fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-26T10:38:23+01:00 rtjson: fixed the updated example - included invalid characters for xml text, rendering empty readme --- Modified: src/modules/rtjson/doc/rtjson_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a23476600666d0cf0604a6a7e3212fa… Patch: https://github.com/kamailio/kamailio/commit/a23476600666d0cf0604a6a7e3212fa… --- diff --git a/src/modules/rtjson/doc/rtjson_admin.xml b/src/modules/rtjson/doc/rtjson_admin.xml index 1492e82d5a..835b520ca4 100644 --- a/src/modules/rtjson/doc/rtjson_admin.xml +++ b/src/modules/rtjson/doc/rtjson_admin.xml @@ -278,54 +278,56 @@ branch_route[OUTGOING] { <example> <title>JSON Routing Structure</title> <programlisting format="linespecific"> +<![CDATA[ ... { - "version": "1.0", - "routing": "serial", - "routes": [ - { - "uri": "sip:bob@b.example.org:5060", - "dst_uri": "sip:192.0.2.1:5060", - "path": "<sip:192.0.2.2:5084>, <sip:192.0.2.2:5086>", - "socket": "udp:192.0.2.20:5060", - "headers": { - "from": { - "display": "Alice", - "uri": "sip:alice@a.example.org" - }, - "to": { - "display": "Bob", - "uri": "sip:bob@b.example.org" - }, - "extra": "X-Hdr-A: abc\r\nX-Hdr-B: bcd\r\n" - }, - "branch_flags": 8, - "fr_timer": 5000, - "fr_inv_timer": 30000 + "version": "1.0", + "routing": "serial", + "routes": [ + { + "uri": "sip:bob@b.example.org:5060", + "dst_uri": "sip:192.0.2.1:5060", + "path": "<sip:192.0.2.2:5084>, <sip:192.0.2.2:5086>", + "socket": "udp:192.0.2.20:5060", + "headers": { + "from": { + "display": "Alice", + "uri": "sip:alice@a.example.org" }, - { - "uri": "sip:bob@b.example.org:5060", - "dst_uri": "sip:192.0.2.10:5060", - "path": "<sip:192.0.2.2:5084>, <sip:192.0.2.2:5086>", - "socket": "udp:192.0.2.20:5060", - "headers": { - "from": { - "display": "Alice", - "uri": "sip:alice@a.example.org" - }, - "to": { - "display": "Bob", - "uri": "sip:bob@b.example.org" - }, - "extra": "P-Asserted-Identity: \u003csip:alice@a.example.org\u003e\r\n" - }, - "branch_flags": 8, - "fr_timer": 5000, - "fr_inv_timer": 30000 + "to": { + "display": "Bob", + "uri": "sip:bob@b.example.org" }, - ] + "extra": "X-Hdr-A: abc\r\nX-Hdr-B: bcd\r\n" + }, + "branch_flags": 8, + "fr_timer": 5000, + "fr_inv_timer": 30000 + }, + { + "uri": "sip:bob@b.example.org:5060", + "dst_uri": "sip:192.0.2.10:5060", + "path": "<sip:192.0.2.2:5084>, <sip:192.0.2.2:5086>", + "socket": "udp:192.0.2.20:5060", + "headers": { + "from": { + "display": "Alice", + "uri": "sip:alice@a.example.org" + }, + "to": { + "display": "Bob", + "uri": "sip:bob@b.example.org" + }, + "extra": "P-Asserted-Identity: <sip:alice@a.example.org>\r\n" + }, + "branch_flags": 8, + "fr_timer": 5000, + "fr_inv_timer": 30000 + }, + ] } ... +]]> </programlisting> </example>

4 years, 9 months

[kamailio/kamailio] Adding CDR as JSON functionality (#2107)

by Lucian Balaceanu

#### 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  These commits create a CDR addressed engine, similar to the one that acc module exports for acc message accounting. Such an engine made an extension module like acc_json possible. This CDR engine is then used in acc_json to write the functionality for logging CDRs in JSON format. I have added functions to the API exported by acc module instead of creating another separate CDR API, as I thought this is cleaner. I only implemented the acc_json logging to syslog (no message queue support yet). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2107 -- Commit Summary -- * acc: adding CDR engine functionality * acc_json: adding CDR as JSON functionality -- File Changes -- M src/modules/acc/acc_api.h (38) M src/modules/acc/acc_cdr.c (41) M src/modules/acc/acc_cdr.h (6) M src/modules/acc/acc_logic.c (10) M src/modules/acc/acc_logic.h (2) M src/modules/acc/acc_mod.c (93) M src/modules/acc_json/acc_json_mod.c (131) M src/modules/acc_json/acc_json_mod.h (4) M src/modules/acc_json/doc/acc_json_admin.xml (54) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2107.patch https://github.com/kamailio/kamailio/pull/2107.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/2107

4 years, 9 months

← Newer
1
...
10
11
12
13
14
15
16
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2020