sr-dev February 2020

sr-dev@lists.kamailio.org

17 participants
324 discussions

git:5.3:8922f773: rtpengine: docs updated for rtpengine_manage()

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: 8922f7733e49c3bf39df0846ae2d1c74668b0e4f URL: https://github.com/kamailio/kamailio/commit/8922f7733e49c3bf39df0846ae2d1c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-25T08:40:16+01:00 rtpengine: docs updated for rtpengine_manage() (cherry picked from commit bdba22bb9b573c7b32a7de45154f9159c725715f) --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8922f7733e49c3bf39df0846ae2d1c7… Patch: https://github.com/kamailio/kamailio/commit/8922f7733e49c3bf39df0846ae2d1c7… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index 367d9bf7f9..d4cd2e4fc1 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2560,7 +2560,7 @@ rtpengine_query(); <function moreinfo="none">rtpengine_manage([flags])</function> </title> <para> - 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. </para> @@ -2597,7 +2597,14 @@ rtpengine_query(); this function after 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). + t_continue() does the same as in failure_route; use a branch route + to engage rtpengine for a forwarded branch after resuming the + transaction). + </para> + </listitem> + <listitem> + <para> + It does nothing if used inside event_route[tm:branch-failure:...] </para> </listitem> <listitem>

4 years, 4 months

git:5.3:855acfc6: rtpproxy: do nothing in rtpproxy_manage() when used in event_route[tm:branch-failure:...]

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: 855acfc670bc814a9d42c5c2a6fdfc19bb93e99a URL: https://github.com/kamailio/kamailio/commit/855acfc670bc814a9d42c5c2a6fdfc1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-25T08:39:35+01:00 rtpproxy: do nothing in rtpproxy_manage() when used in event_route[tm:branch-failure:...] - avoid duplicating sdp operations (cherry picked from commit 4305c501128a0d37453a39795bd00314d7f60e4f) --- Modified: src/modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/855acfc670bc814a9d42c5c2a6fdfc1… Patch: https://github.com/kamailio/kamailio/commit/855acfc670bc814a9d42c5c2a6fdfc1… --- diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c index 972c6b1148..8aef20019f 100644 --- a/src/modules/rtpproxy/rtpproxy.c +++ b/src/modules/rtpproxy/rtpproxy.c @@ -1814,9 +1814,14 @@ rtpproxy_manage(struct sip_msg *msg, char *flags, char *ip) int method; int nosdp; + if(route_type==BRANCH_FAILURE_ROUTE) { + /* do nothing in branch failure event route + * - delete done on transaction failure route */ + return 1; + } + if(msg->cseq==NULL && ((parse_headers(msg, HDR_CSEQ_F, 0)==-1) - || (msg->cseq==NULL))) - { + || (msg->cseq==NULL))) { LM_ERR("no CSEQ header\n"); return -1; } @@ -1831,8 +1836,7 @@ rtpproxy_manage(struct sip_msg *msg, char *flags, char *ip) if(method==METHOD_CANCEL || method==METHOD_BYE) return unforce_rtp_proxy(msg, flags); - if(ip==NULL) - { + if(ip==NULL) { cp = ip_addr2a(&msg->rcv.dst_ip); strcpy(newip, cp); }

4 years, 4 months

git:5.3:289e35cf: rtpengine: do nothing in rtpengine_manage() when used in event_route[tm:branch-failure:...]

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: 289e35cff83aa0fd4fc7123e26c18dce9053bb03 URL: https://github.com/kamailio/kamailio/commit/289e35cff83aa0fd4fc7123e26c18dc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-25T08:39:22+01:00 rtpengine: do nothing in rtpengine_manage() when used in event_route[tm:branch-failure:...] - avoid duplicating sdp operations (cherry picked from commit 387de23a5c9252ee8409d378ea452bfd52e416d4) --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/289e35cff83aa0fd4fc7123e26c18dc… Patch: https://github.com/kamailio/kamailio/commit/289e35cff83aa0fd4fc7123e26c18dc… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 4435825a3f..20df725d2e 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3589,9 +3589,14 @@ rtpengine_manage(struct sip_msg *msg, const char *flags) int nosdp; tm_cell_t *t = NULL; + if(route_type==BRANCH_FAILURE_ROUTE) { + /* do nothing in branch failure event route + * - delete done on transaction failure route */ + return 1; + } + if (msg->cseq==NULL && ((parse_headers(msg, HDR_CSEQ_F, 0)==-1) || - (msg->cseq==NULL))) - { + (msg->cseq==NULL))) { LM_ERR("no CSEQ header\n"); return -1; } @@ -3599,7 +3604,7 @@ rtpengine_manage(struct sip_msg *msg, const char *flags) method = get_cseq(msg)->method_id; if (!(method==METHOD_INVITE || method==METHOD_ACK || method==METHOD_CANCEL - || method==METHOD_BYE || method==METHOD_UPDATE)) + || method==METHOD_BYE || method==METHOD_UPDATE)) return -1; if (method==METHOD_CANCEL || method==METHOD_BYE)

4 years, 4 months

git:5.3:83357250: topoh: skip http reply handling

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: 833572502f016f6be83eaa7f7317ac7e0f154039 URL: https://github.com/kamailio/kamailio/commit/833572502f016f6be83eaa7f7317ac7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-25T08:39:11+01:00 topoh: skip http reply handling (cherry picked from commit 345d6f67006e4254300209742a2778b925cafaf7) --- Modified: src/modules/topoh/topoh_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/833572502f016f6be83eaa7f7317ac7… Patch: https://github.com/kamailio/kamailio/commit/833572502f016f6be83eaa7f7317ac7… --- diff --git a/src/modules/topoh/topoh_mod.c b/src/modules/topoh/topoh_mod.c index 0eb5345598..b4c3649f3b 100644 --- a/src/modules/topoh/topoh_mod.c +++ b/src/modules/topoh/topoh_mod.c @@ -249,8 +249,14 @@ int th_prepare_msg(sip_msg_t *msg) LM_DBG("non sip request message\n"); return 1; } - } else if(msg->first_line.type!=SIP_REPLY) { - LM_DBG("non sip message\n"); + } else if(msg->first_line.type==SIP_REPLY) { + if(!IS_SIP_REPLY(msg)) + { + LM_DBG("non sip reply message\n"); + return 1; + } + } else { + LM_DBG("unknown sip message type %d\n", msg->first_line.type); return 1; }

4 years, 4 months

git:5.3:ec02a63f: topos: skip http reply handling

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: ec02a63f63780d538b5f766d720df1208c2b98af URL: https://github.com/kamailio/kamailio/commit/ec02a63f63780d538b5f766d720df12… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-25T08:38:55+01:00 topos: skip http reply handling (cherry picked from commit fad795648f8cbf12cc099dea18092ff7beee9c75) --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ec02a63f63780d538b5f766d720df12… Patch: https://github.com/kamailio/kamailio/commit/ec02a63f63780d538b5f766d720df12… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index fa70d06bb9..d698b90cc1 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -269,8 +269,13 @@ int tps_prepare_msg(sip_msg_t *msg) LM_DBG("non sip request message\n"); return 1; } - } else if(msg->first_line.type!=SIP_REPLY) { - LM_DBG("non sip message\n"); + } else if(msg->first_line.type==SIP_REPLY) { + if(!IS_SIP_REPLY(msg)) { + LM_DBG("non sip reply message\n"); + return 1; + } + } else { + LM_DBG("unknown sip message type %d\n", msg->first_line.type); return 1; }

4 years, 4 months

git:master:f2a4fd41: dmq: use PROC_RPC rank to init the worker process

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f2a4fd419c27b99ce4ff6f93dc3f235d4f74a33c URL: https://github.com/kamailio/kamailio/commit/f2a4fd419c27b99ce4ff6f93dc3f235… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-25T08:36:40+01:00 dmq: use PROC_RPC rank to init the worker process --- Modified: src/modules/dmq/dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/f2a4fd419c27b99ce4ff6f93dc3f235… Patch: https://github.com/kamailio/kamailio/commit/f2a4fd419c27b99ce4ff6f93dc3f235… --- 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;

4 years, 4 months

git:master:ea2ea2f8: auth: safety check for auth header pointer in pv_auth_check()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ea2ea2f8274eda9d8d7055b22fab8910cd773a19 URL: https://github.com/kamailio/kamailio/commit/ea2ea2f8274eda9d8d7055b22fab891… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-24T20:27:14+01:00 auth: safety check for auth header pointer in pv_auth_check() --- Modified: src/modules/auth/auth_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ea2ea2f8274eda9d8d7055b22fab891… Patch: https://github.com/kamailio/kamailio/commit/ea2ea2f8274eda9d8d7055b22fab891… --- 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)

4 years, 4 months

[kamailio/kamailio] rtpengine: rtpengine_manage does offer instead of delete in event_route[tm:branch-failure:id] (#2222)

by George Diamantopoulos

### Description When called from within an event_route[tm:branch-failure:id], rtpengine_manage() will do an offer instead of a delete, resulting in duplicated sdp lines in body. Is this an omission or is it intentional?  ### Troubleshooting #### Reproduction ``` event_route[tm:branch-failure:DISPATCH_PROVIDER_FAILOVER] { rtpengine_manage("trust-address replace-origin replace-session-connection"); # next DST - only for 5xx or local timeout if ( t_check_status("5[[:digit:]]+") || (t_branch_timeout() && !t_branch_replied()) ) { if ( ds_next_dst() ) { xlog("L_NOTICE", "--- SCRIPT_DISPATCH_PROVIDER_FAILOVER: A failover destination was selected: Forwarding to $du\n"); t_on_branch("PROVIDER_BRANCH"); t_on_branch_failure("DISPATCH_PROVIDER_FAILOVER"); t_on_failure("NEXT_PROVIDER"); route(RELAY); exit; } else { xlog("L_NOTICE", "--- DISPATCH_PROVIDER_FAILOVER: PROVIDER DOWN! Failed to route request to provider! Giving Up. Negative response will be sent upstream.\n"); } } } ```  ### Possible Solutions Explicitly use rtpengine_delete() instead.  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.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, 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: unknown compiled with gcc 8.3.0 ``` * **Operating System**:  ``` Debian 10.3 Linux #1 SMP Debian 4.19.67-2+deb10u2 (2019-11-11) 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/2222

4 years, 4 months

[kamailio/kamailio] update example using IP address reserved for documentation (#2229)

by Mathias WOLFF

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

4 years, 4 months

[kamailio/kamailio] core: log parser error messages with debug level (#2226)

by Nuno Ferreira

#### 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 * Make parser error logs as debug avoiding excessive logging for negative HTTP replies. The issue was discussed here: https://lists.kamailio.org/pipermail/sr-users/2020-February/108232.html You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2226 -- Commit Summary -- * Merge branch 'master' of github.com:nferreyra/kamailio * Merge remote-tracking branch 'upstream/master' * Merge remote-tracking branch 'upstream/master' * core: log parser error messages with debug level -- File Changes -- M src/core/parser/msg_parser.c (2) M src/core/parser/parse_fline.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2226.patch https://github.com/kamailio/kamailio/pull/2226.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/2226

4 years, 4 months

← Newer
1
...
12
13
14
15
16
17
18
...
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