sr-dev February 2020

sr-dev@lists.kamailio.org

17 participants
325 discussions

[kamailio/kamailio] Adding CDR as JSON functionality (#2107)
by Lucian Balaceanu 26 Feb '20

26 Feb '20

#### 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

5 15

[kamailio/kamailio] Error building Kamailio in Gitlab.com cloud environment (#2228)
by Ivan Ribakov 25 Feb '20

25 Feb '20

### Description We're considering migrating our Kamailio-based product to Gitlab and attempted to setup a PoC of a build pipeline using Gitlab's CI capabilities. We used the same Docker build image but ran into some unexpected problems when running `make`. In short, sequence of steps can be summarised like this: ``` # 1. Generating build config files make Q=0 cfg PREFIX=/usr/local LOCALBASE=/usr/local cfg_prefix=/tmp doc_prefix=/tmp modules_dirs=modules group_include=standard 'include_modules=inesrp inkeepalive sanity json sctp htable avpops uac uac_redirect rtimer dialog tls' 'skip_modules=stun sipt rtpproxy auth_diameter msrp qos seas siptrace sipcapture xhttp xhttp_rpc acc_diameter call_control mediaproxy topoh topos nat_traversal sms smsops jsonrpcs ss7ops ctl dmq dmq_usrloc mqueue rtpengine malloc_test mangler nosip blst app_sqlang app_jsdt auth_xkeys cfg_rpc sca sctp evrexec exec sdpops sipdump nathelper path pike' # 2. Since MY_CUSTOM_FLAG variable is custom and is not set by default, injecting it into src/Makefile.defs sed -i 's/C_DEFS=.*/&\n\o011 -DMY_CUSTOM_FLAG \\/' src/Makefile.defs # 3. should succeed make Q=0 ``` At this point we expected build to succeed since it's exactly the same sequence of steps as we have been running for almost a year now, but what we got was build failures due to `MY_CUSTOM_FLAG` not being visible: ``` core/dprint.h:301:19: error: 'MY_CUSTOM_FLAG' undeclared (first use in this function) ``` (we're using patched Kamailio sources so don't get sidetracked by `MY_CUSTOM_FLAG` not being actually present in `core/dprint.h:301`) Although clues seem to be pointing in the direction of new cloud CI environment being the culprit, we're not really sure how to approach this issue and where to start debugging from. Any suggestions? ### Troubleshooting #### Reproduction  For the record, [here is the Gitlab ticket](https://gitlab.com/gitlab-org/gitlab/issues/198551#note_293261974) with further reproduction details and examples of successful and failing builds ### Additional Information * **Kamailio Version** - output of `kamailio -v` Running the code from this repo's `5.1` branch: `git checkout -b 5.1 origin/5.1` * **Operating System**:  Official Docker `centos:7` image -- 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/2228

4 5

[kamailio/kamailio] update example using IP address reserved for documentation (#2230)
by Mathias WOLFF 25 Feb '20

25 Feb '20

#### 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/2230 -- Commit Summary -- * update example using IP address reserved for documentation -- File Changes -- M src/modules/rtjson/doc/rtjson_admin.xml (88) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2230.patch https://github.com/kamailio/kamailio/pull/2230.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/2230

2 3

git:master:8bbb97d1: modules: readme files regenerated - rtjson ... [skip ci]
by Kamailio Dev 25 Feb '20

25 Feb '20

Module: kamailio Branch: master Commit: 8bbb97d152d45deff483a77dc869f82858fc6fcc URL: https://github.com/kamailio/kamailio/commit/8bbb97d152d45deff483a77dc869f82… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-02-25T20:46:08+01:00 modules: readme files regenerated - rtjson ... [skip ci] --- Modified: src/modules/rtjson/README --- Diff: https://github.com/kamailio/kamailio/commit/8bbb97d152d45deff483a77dc869f82… Patch: https://github.com/kamailio/kamailio/commit/8bbb97d152d45deff483a77dc869f82…

1 0

git:master:abecca7f: update example using IP address reserved for documentation
by Henning Westerholt 25 Feb '20

25 Feb '20

Module: kamailio Branch: master Commit: abecca7f6515a454b3394ec0df7f535a6a52e1e9 URL: https://github.com/kamailio/kamailio/commit/abecca7f6515a454b3394ec0df7f535… Author: Mathias WOLFF <mathias(a)celea.org> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-25T20:37:57+01:00 update example using IP address reserved for documentation --- Modified: src/modules/rtjson/doc/rtjson_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/abecca7f6515a454b3394ec0df7f535… Patch: https://github.com/kamailio/kamailio/commit/abecca7f6515a454b3394ec0df7f535… --- diff --git a/src/modules/rtjson/doc/rtjson_admin.xml b/src/modules/rtjson/doc/rtjson_admin.xml index e2240f03f3..1492e82d5a 100644 --- a/src/modules/rtjson/doc/rtjson_admin.xml +++ b/src/modules/rtjson/doc/rtjson_admin.xml @@ -280,50 +280,50 @@ branch_route[OUTGOING] { <programlisting format="linespecific"> ... { - "version": "1.0", - "routing": "serial", - "routes": [ - { - "uri": "sip:127.0.0.1:5080", - "dst_uri": "sip:127.0.0.1:5082", - "path": "<sip:127.0.0.1:5084>, <sip:127.0.0.1:5086>", - "socket": "udp:127.0.0.1:5060", - "headers": { - "from": { - "display": "Alice", - "uri": "sip:alice@127.0.0.1" - }, - "to": { - "display": "Alice", - "uri": "sip:alice@127.0.0.1" - }, - "extra": "X-Hdr-A: abc\r\nX-Hdr-B: bcd\r\n" - }, - "branch_flags": 8, - "fr_timer": 5000, - "fr_inv_timer": 30000 - }, - { - "uri": "sip:127.0.0.1:5080", - "dst_uri": "sip:127.0.0.1:5082", - "path": "<sip:127.0.0.1:5084>, <sip:127.0.0.1:5086>", - "socket": "udp:127.0.0.1:5060", - "headers": { - "from": { - "display": "Alice", - "uri": "sip:alice@127.0.0.1" - }, - "to": { - "display": "Alice", - "uri": "sip:alice@127.0.0.1" - }, - "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" + }, + "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: \u003csip:alice@a.example.org\u003e\r\n" + }, + "branch_flags": 8, + "fr_timer": 5000, + "fr_inv_timer": 30000 + }, + ] } ... </programlisting>

1 0

kamcli postgres support
by Daniel-Constantin Mierla 25 Feb '20

25 Feb '20

Hello, anyone in the community with Python knowledge using Postgres that can spend a bit of time to add support in kamcli? * https://github.com/kamailio/kamcli It should be mainly about the content of the code corresponding to db subcommand: * https://github.com/kamailio/kamcli/blob/master/kamcli/commands/cmd_db.py The target for it is to replace kamdbctl and has some command line variants for couple of its functions, now being implemented for MySQL. The rest of the code relies on sqlalchemy, which should have transparent support for both mysql and postgress (even more). Testing the other commands connecting to database with postgres would be good, though. With more and more diversity in the default shell by main Linux/Unix distros, we hope to be able to replace in the near future the kamctl and kamdbctl tools, which are more like bash scripting (a few issue being reported and fixed lately). Besides that, using python allows better input/parameter checking/validation as well as more options for formatted output. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - March 9-11, 2020, Berlin - www.asipto.com Kamailio World Conference - April 27-29, 2020, in Berlin -- www.kamailioworld.com

1 1

git:5.3:467354de: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 25 Feb '20

25 Feb '20

Module: kamailio Branch: 5.3 Commit: 467354de17c83b6c47d06e020060a0bf788c2d39 URL: https://github.com/kamailio/kamailio/commit/467354de17c83b6c47d06e020060a0b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-02-25T08:46:32+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/rtpengine/README Modified: src/modules/rtpproxy/README --- Diff: https://github.com/kamailio/kamailio/commit/467354de17c83b6c47d06e020060a0b… Patch: https://github.com/kamailio/kamailio/commit/467354de17c83b6c47d06e020060a0b… --- diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index e1d2e082c7..29f3ac0811 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -2204,7 +2204,7 @@ rtpengine_query(); 5.7. rtpengine_manage([flags]) - Manage the RTPProxy session - it combines the functionality of + Manage the RTPEngine session - it combines the functionality of rtpengine_offer(), rtpengine_answer() and rtpengine_delete(), detecting internally based on message type and method which one to execute. @@ -2223,7 +2223,9 @@ rtpengine_query(); resuming a suspended transaction (e.g., after t_continue()), because the context of executed route is FAILURE ROUTE (in other words, rtpengine_manage() in the route block of t_continue() does - the same as in failure_route). + the same as in failure_route; use a branch route to engage + rtpengine for a forwarded branch after resuming the transaction). + * It does nothing if used inside event_route[tm:branch-failure:...] * If reply to INVITE with code >= 300 do rtpengine_delete() * If reply with SDP to INVITE having code 1xx and 2xx, then do rtpengine_answer() if the request had SDP or tm is not loaded, diff --git a/src/modules/rtpproxy/README b/src/modules/rtpproxy/README index ea6fe92e3a..a3bd709124 100644 --- a/src/modules/rtpproxy/README +++ b/src/modules/rtpproxy/README @@ -636,7 +636,9 @@ rtpproxy_destroy(); resuming a suspended transaction (e.g., after t_continue()), because the context of executed route is FAILURE ROUTE (in other words, rtpproxy_manage() in the route block of t_continue() does - the same as in failure_route). + the same as in failure_route; use a branch route to engage + rtpengine for a forwarded branch after resuming the transaction). + * It does nothing if used inside event_route[tm:branch-failure:...] * If reply to INVITE with code >= 300 do unforce_rtpproxy() * If reply with SDP to INVITE having code 1xx and 2xx, then do rtpproxy_answer() if the request had SDP or tm is not loaded,

1 0

git:5.3:e9f20919: dmq: use PROC_RPC rank to init the worker process
by Daniel-Constantin Mierla 25 Feb '20

25 Feb '20

Module: kamailio Branch: 5.3 Commit: e9f20919f1e0b4a396d771255ce86a4e2f9a29c8 URL: https://github.com/kamailio/kamailio/commit/e9f20919f1e0b4a396d771255ce86a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-25T08:41:11+01:00 dmq: use PROC_RPC rank to init the worker process (cherry picked from commit f2a4fd419c27b99ce4ff6f93dc3f235d4f74a33c) --- Modified: src/modules/dmq/dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/e9f20919f1e0b4a396d771255ce86a4… Patch: https://github.com/kamailio/kamailio/commit/e9f20919f1e0b4a396d771255ce86a4… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index ebfa021119..9414e94e84 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -280,7 +280,7 @@ static int child_init(int rank) for(i = 0; i < num_workers; i++) { init_worker(&workers[i]); LM_DBG("starting worker process %d\n", i); - newpid = fork_process(PROC_NOCHLDINIT, "DMQ WORKER", 0); + newpid = fork_process(PROC_RPC, "DMQ WORKER", 0); if(newpid < 0) { LM_ERR("failed to form process\n"); return -1;

1 0

git:5.3:35cd520b: auth: safety check for auth header pointer in pv_auth_check()
by Daniel-Constantin Mierla 25 Feb '20

25 Feb '20

Module: kamailio Branch: 5.3 Commit: 35cd520bfe29d63555aebf64717f602948773280 URL: https://github.com/kamailio/kamailio/commit/35cd520bfe29d63555aebf64717f602… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-25T08:41:01+01:00 auth: safety check for auth header pointer in pv_auth_check() (cherry picked from commit ea2ea2f8274eda9d8d7055b22fab8910cd773a19) --- Modified: src/modules/auth/auth_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/35cd520bfe29d63555aebf64717f602… Patch: https://github.com/kamailio/kamailio/commit/35cd520bfe29d63555aebf64717f602… --- diff --git a/src/modules/auth/auth_mod.c b/src/modules/auth/auth_mod.c index b77be70b76..f9b7097c14 100644 --- a/src/modules/auth/auth_mod.c +++ b/src/modules/auth/auth_mod.c @@ -744,6 +744,13 @@ static int pv_auth_check(sip_msg_t *msg, str *srealm, str *spasswd, int vflags, if(ret==AUTH_OK && (vchecks&AUTH_CHECK_ID_F)) { hdr = (msg->proxy_auth==0)?msg->authorization:msg->proxy_auth; + if(hdr==NULL) { + if (msg->REQ_METHOD & (METHOD_ACK|METHOD_CANCEL|METHOD_PRACK)) { + return AUTH_OK; + } else { + return AUTH_ERROR; + } + } suser = ((auth_body_t*)(hdr->parsed))->digest.username.user; if((furi=parse_from_uri(msg))==NULL)

1 0

git:5.3:64c92f2b: usrloc: log database table if use_table() fails
by Daniel-Constantin Mierla 25 Feb '20

25 Feb '20

Module: kamailio Branch: 5.3 Commit: 64c92f2bbb9739725256d0b6dd5ceb47fe2688ea URL: https://github.com/kamailio/kamailio/commit/64c92f2bbb9739725256d0b6dd5ceb4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-25T08:40:51+01:00 usrloc: log database table if use_table() fails (cherry picked from commit 3843ae18599bfc1806ccb62df44bbc8ad41d60dd) --- Modified: src/modules/usrloc/ucontact.c --- Diff: https://github.com/kamailio/kamailio/commit/64c92f2bbb9739725256d0b6dd5ceb4… Patch: https://github.com/kamailio/kamailio/commit/64c92f2bbb9739725256d0b6dd5ceb4… --- diff --git a/src/modules/usrloc/ucontact.c b/src/modules/usrloc/ucontact.c index fe04d2af3d..45ab20f728 100644 --- a/src/modules/usrloc/ucontact.c +++ b/src/modules/usrloc/ucontact.c @@ -666,7 +666,13 @@ int db_insert_ucontact(ucontact_t* _c) } if (ul_dbf.use_table(ul_dbh, _c->domain) < 0) { - LM_ERR("sql use_table failed\n"); + if(_c->domain) { + LM_ERR("sql use_table failed for: %.*s\n", + (_c->domain->s)?_c->domain->len:0, + (_c->domain->s)?_c->domain->s:""); + } else { + LM_ERR("sql use_table failed - null\n"); + } return -1; }

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2020