sr-dev November 2020

sr-dev@lists.kamailio.org

22 participants
312 discussions

git:master:14923a25: sl: new function send_reply_mode(...)
by Daniel-Constantin Mierla 06 Nov '20

06 Nov '20

Module: kamailio Branch: master Commit: 14923a2581113615ad071be407086dcf807a5f67 URL: https://github.com/kamailio/kamailio/commit/14923a2581113615ad071be407086dc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-06T09:38:08+01:00 sl: new function send_reply_mode(...) - similar to send_reply(), but has a 3rd parameter to control the execution mode (for now it can set the flags to not connect on sending or close connection after sending) --- Modified: src/modules/sl/sl.c --- Diff: https://github.com/kamailio/kamailio/commit/14923a2581113615ad071be407086dc… Patch: https://github.com/kamailio/kamailio/commit/14923a2581113615ad071be407086dc… --- diff --git a/src/modules/sl/sl.c b/src/modules/sl/sl.c index 66a16a0f08..a46faab182 100644 --- a/src/modules/sl/sl.c +++ b/src/modules/sl/sl.c @@ -71,6 +71,8 @@ str _sl_event_callback_lres_sent = STR_NULL; static int w_sl_send_reply(struct sip_msg* msg, char* str1, char* str2); static int w_send_reply(struct sip_msg* msg, char* str1, char* str2); +static int w_send_reply_mode(struct sip_msg* msg, char* str1, char* str2, + char *str3); static int w_sl_reply_error(struct sip_msg* msg, char* str1, char* str2); static int w_sl_forward_reply0(sip_msg_t* msg, char* str1, char* str2); static int w_sl_forward_reply1(sip_msg_t* msg, char* str1, char* str2); @@ -80,6 +82,7 @@ static int mod_init(void); static int child_init(int rank); static void mod_destroy(); static int fixup_sl_reply(void** param, int param_no); +static int fixup_sl_reply_mode(void** param, int param_no); static int pv_get_ltt(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); static int pv_parse_ltt_name(pv_spec_p sp, str *in); @@ -99,6 +102,8 @@ static cmd_export_t cmds[]={ REQUEST_ROUTE}, {"send_reply", w_send_reply, 2, fixup_sl_reply, 0, REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE}, + {"send_reply_mode", (cmd_function)w_send_reply_mode, 3, fixup_sl_reply_mode, 0, + REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE}, {"sl_reply_error", w_sl_reply_error, 0, 0, 0, REQUEST_ROUTE}, {"sl_forward_reply", w_sl_forward_reply0, 0, 0, 0, @@ -333,6 +338,53 @@ static int w_send_reply(struct sip_msg* msg, char* p1, char* p2) return send_reply(msg, code, &reason); } +/** + * @brief send stateful reply if transaction was created + * + * Check if transation was created for respective SIP request and reply + * in stateful mode, otherwise send stateless reply + * + * @param msg - SIP message structure + * @param code - reply status code + * @param reason - reply reason phrase + * @param mode - execution mode + * @return 1 for success and -1 for failure + */ +int ki_send_reply_mode(struct sip_msg *msg, int code, str *reason, int mode) +{ + if(mode & SET_RPL_NO_CONNECT_T) { + msg->rpl_send_flags.f|= SND_F_FORCE_CON_REUSE; + } else if(mode & SET_RPL_CLOSE_T) { + msg->rpl_send_flags.f|= SND_F_CON_CLOSE; + } + + return send_reply(msg, code, reason); +} + +/** + * @brief Small wrapper around send_reply + */ +static int w_send_reply_mode(struct sip_msg* msg, char* p1, char* p2, char *p3) +{ + int code; + str reason; + int mode = 0; + + if (get_int_fparam(&code, msg, (fparam_t*)p1) < 0) { + code = default_code; + } + + if (get_str_fparam(&reason, msg, (fparam_t*)p2) < 0) { + reason = default_reason; + } + + if (get_int_fparam(&mode, msg, (fparam_t*)p3) < 0) { + mode = 0; + } + + return ki_send_reply_mode(msg, code, &reason, mode); +} + /** * @brief store To-tag value in totag parameter */ @@ -374,6 +426,21 @@ static int fixup_sl_reply(void** param, int param_no) return 0; } +/** + * @brief fixup for SL reply mode config file functions + */ +static int fixup_sl_reply_mode(void** param, int param_no) +{ + if (param_no == 1) { + return fixup_var_int_12(param, 1); + } else if (param_no == 2) { + return fixup_var_pve_str_12(param, 2); + } else if (param_no == 3) { + return fixup_var_int_12(param, 1); + } + return 0; +} + /** * @brief forward SIP reply statelessly with different code and reason text */ @@ -613,6 +680,11 @@ static sr_kemi_t sl_kemi_exports[] = { { SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("sl"), str_init("send_reply_mode"), + SR_KEMIP_INT, ki_send_reply_mode, + { SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_INT, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("sl"), str_init("sl_reply_error"), SR_KEMIP_INT, sl_reply_error, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

[kamailio/kamailio] sl: Fix 3xx stats RPC marshalling (#2542)
by Guillem Jover 06 Nov '20

06 Nov '20

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] 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 - [ ] 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 The struct_add() method was getting 4 values but only 3 "d". You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2542 -- Commit Summary -- * sl: Fix 3xx stats RPC marshalling -- File Changes -- M src/modules/sl/sl_stats.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2542.patch https://github.com/kamailio/kamailio/pull/2542.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/2542

2 2

git:master:ac55cc5c: sl: Fix 3xx stats RPC marshalling
by Guillem Jover 06 Nov '20

06 Nov '20

Module: kamailio Branch: master Commit: ac55cc5ce5fcbb50d3a2a6b228585dce8fc1150d URL: https://github.com/kamailio/kamailio/commit/ac55cc5ce5fcbb50d3a2a6b228585dc… Author: Guillem Jover <gjover(a)sipwise.com> Committer: Guillem Jover <gjover(a)sipwise.com> Date: 2020-11-05T18:37:30+01:00 sl: Fix 3xx stats RPC marshalling The struct_add() method was getting 4 values but only 3 "d". --- Modified: src/modules/sl/sl_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/ac55cc5ce5fcbb50d3a2a6b228585dc… Patch: https://github.com/kamailio/kamailio/commit/ac55cc5ce5fcbb50d3a2a6b228585dc… --- diff --git a/src/modules/sl/sl_stats.c b/src/modules/sl/sl_stats.c index dd683eda5b..079786aade 100644 --- a/src/modules/sl/sl_stats.c +++ b/src/modules/sl/sl_stats.c @@ -73,7 +73,7 @@ static void rpc_stats(rpc_t* rpc, void* c) "202", total.err[RT_202], "2xx", total.err[RT_2xx]); - rpc->struct_add(st, "ddd", + rpc->struct_add(st, "dddd", "300", total.err[RT_300], "301", total.err[RT_301], "302", total.err[RT_302],

1 0

git:master:e80fcf42: Merge pull request #2542 from guillemj/pu/rpc-marshalling
by GitHub 06 Nov '20

06 Nov '20

Module: kamailio Branch: master Commit: e80fcf42ebe52fc095016277a4b44d4726d4e9c5 URL: https://github.com/kamailio/kamailio/commit/e80fcf42ebe52fc095016277a4b44d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-11-06T07:50:18+01:00 Merge pull request #2542 from guillemj/pu/rpc-marshalling sl: Fix 3xx stats RPC marshalling --- Modified: src/modules/sl/sl_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/e80fcf42ebe52fc095016277a4b44d4… Patch: https://github.com/kamailio/kamailio/commit/e80fcf42ebe52fc095016277a4b44d4… --- diff --git a/src/modules/sl/sl_stats.c b/src/modules/sl/sl_stats.c index dd683eda5b..079786aade 100644 --- a/src/modules/sl/sl_stats.c +++ b/src/modules/sl/sl_stats.c @@ -73,7 +73,7 @@ static void rpc_stats(rpc_t* rpc, void* c) "202", total.err[RT_202], "2xx", total.err[RT_2xx]); - rpc->struct_add(st, "ddd", + rpc->struct_add(st, "dddd", "300", total.err[RT_300], "301", total.err[RT_301], "302", total.err[RT_302],

1 0

[kamailio/kamailio] Kamailio freezes with DMQ and dialog (#2535)
by pwakano 06 Nov '20

06 Nov '20

### Description When running a load test Kamailio eventually becames unresponsive and stops processing calls. Kamilio is configured to use the DMQ replication for dialog and usrloc. Also the dialog keepalived is enabled. ### Troubleshooting >From investigation, the problem happens faster and easier when there is some network degradation causing packet loss and/or retransmissions but even without any noticeable network issue the freeze eventually happens. #### Reproduction Run a simple load test making calls at a rate of ~5 cps and keep around ~2000 calls connected all the time. A higher cps seems to make it easier to reproduce the problem. Adding network degradation to the environment makes the problem happens, but when running a tool such as SIPp for the load test, the retransmission can be forced by simply killing the SIPp instance receiving calls which will then force Kamailio to retransmit. #### Debugging Data  Output of kamct trap: [gdb_kamailio_20201028_213030.txt](https://github.com/kamailio/kamailio/file… #### Log Messages Local generated requests shows up in the log, but are not sent in the network ### Possible Solutions Not found so far ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` # kamailio -v version: kamailio 5.4.2 (x86_64/linux) c3b91f 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: c3b91f compiled on 13:50:37 Oct 27 2020 with gcc 4.8.5 ``` * **Operating System**:  ``` # cat /etc/centos-release CentOS Linux release 7.8.2003 (Core) # uname -a Linux hostname 3.10.0-1127.19.1.el7.x86_64 #1 SMP Tue Aug 25 17:23:54 UTC 2020 x86_64 x86_64 x86_64 GNU/Linux ``` -- 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/2535

3 20

[kamailio/kamailio] add rtpproxy in kamailio/kamailio-ci:master-alpine (#2109)
by Gaurav Bmotra 05 Nov '20

05 Nov '20

hi can any one help me to add rtpproxy in kamailio/kamailio-ci:master-alpine thank you -- 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/2109

3 12

[kamailio/kamailio] ACK not forwarded in kamailio 5.4.x (#2539)
by Julien Chavanton 05 Nov '20

05 Nov '20

### Description I notice a test failure when validating Kamailio 5.4.x, and after looking at the SIP traces, Kamailio is does not forwarding the first ACK. However, it does it after receiving a 200 OK re-transmission . ``` 192.0.2.12:5062 192.0.2.24:5060 ──────────┬───────── ──────────┬───────── │ │ │ │ │ │ 200 coco (SDP │ │ <<<──────────────── 200 coco (SDP) │ <───────────────────────────────────────────── │ ACK │ ─────────────────────────────────────────────> │ ACK │ ───────────────────────────────────────────>>> │ │ │ 200 coco (SDP │ │ <<<──────────────── 200 coco (SDP) │ <───────────────────────────────────────────── │ │ │ ACK │ ─────────────────────────────────────────────> │ │ │ ACK │ │ ──────────────────> ``` ### Troubleshooting I did proceed by isolation and ended up concluding that this commit was triggering this behavior. Simply, reverting this commit is fixing the problem. ``` commit 28049aafc8dd06c160ce5e7b8d5e4fc728441b0c Author: Semen Darienko <semen.darienko(a)wildix.com> Date: Sun May 3 12:26:45 2020 +0200 core: dns - use all NAPTR records - enable using of all NAPTR records instead of the first one ordered by priority - GH #2290 ``` I did not look at the code modification and/or anything config specific yet, I will try to find some time to debug. -- 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/2539

2 18

git:5.4:a9720603: core: DNS stop resolving NAPTR for IP addresses (#2541)
by Julien Chavanton 05 Nov '20

05 Nov '20

Module: kamailio Branch: 5.4 Commit: a97206031ff0c28f791a5789f6dfc37707a4b59d URL: https://github.com/kamailio/kamailio/commit/a97206031ff0c28f791a5789f6dfc37… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2020-11-05T07:14:44-08:00 core: DNS stop resolving NAPTR for IP addresses (#2541) (cherry picked from commit 37f06f031c4ce93bcf4494744282c17f7a2d157c) --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/a97206031ff0c28f791a5789f6dfc37… Patch: https://github.com/kamailio/kamailio/commit/a97206031ff0c28f791a5789f6dfc37… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index 923c65049d..e383786de2 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -3292,6 +3292,9 @@ inline static int dns_naptr_sip_resolve(struct dns_srv_handle* h, str* name, } try_lookup_naptr = 1; } + /* check if it's an ip address, dns_srv_sip_resolve will return the right failure */ + if (str2ip(name) || str2ip6(name)) + goto naptr_not_found; /* do naptr lookup */ if ((e=dns_get_entry(name, T_NAPTR))==0) goto naptr_not_found;

1 0

[kamailio/kamailio] core: DNS stop resolving NAPTR for IP addresses (#2541)
by Julien Chavanton 05 Nov '20

05 Nov '20

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] 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) #### Checklist:  - [x] PR should be backported to stable branches - [ ] Tested changes locally - [x] Related to issue #2539 #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2541 -- Commit Summary -- * core: DNS stop resolving NAPTR for IP addresses -- File Changes -- M src/core/dns_cache.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2541.patch https://github.com/kamailio/kamailio/pull/2541.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/2541

2 5

git:master:37f06f03: core: DNS stop resolving NAPTR for IP addresses (#2541)
by GitHub 05 Nov '20

05 Nov '20

Module: kamailio Branch: master Commit: 37f06f031c4ce93bcf4494744282c17f7a2d157c URL: https://github.com/kamailio/kamailio/commit/37f06f031c4ce93bcf4494744282c17… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-11-05T07:09:38-08:00 core: DNS stop resolving NAPTR for IP addresses (#2541) --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/37f06f031c4ce93bcf4494744282c17… Patch: https://github.com/kamailio/kamailio/commit/37f06f031c4ce93bcf4494744282c17… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index 926dbfef76..9a4b90fba3 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -3292,6 +3292,9 @@ inline static int dns_naptr_sip_resolve(struct dns_srv_handle* h, str* name, } try_lookup_naptr = 1; } + /* check if it's an ip address, dns_srv_sip_resolve will return the right failure */ + if (str2ip(name) || str2ip6(name)) + goto naptr_not_found; /* do naptr lookup */ if ((e=dns_get_entry(name, T_NAPTR))==0) goto naptr_not_found;

1 0

← Newer
1
...
24
25
26
27
28
29
30
31
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2020