sr-dev

sr-dev@lists.kamailio.org

16 participants
45408 discussions

[kamailio/kamailio] rtp_media_server: fix dialog_list_mutex (#2529)
by Julien Chavanton 25 Oct '20

25 Oct '20

#### Description fix issue 2522 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2529 -- Commit Summary -- * rtp_media_server: fix dialog_list_mutex -- File Changes -- M src/modules/rtp_media_server/rms_dialog_info.c (27) M src/modules/rtp_media_server/rms_dialog_info.h (3) M src/modules/rtp_media_server/rtp_media_server.c (10) M src/modules/rtp_media_server/rtp_media_server.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2529.patch https://github.com/kamailio/kamailio/pull/2529.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/2529

1 3

git:master:750cb7fc: rtp_media_server: fix dialog_list_mutex
by Julien Chavanton 25 Oct '20

25 Oct '20

Module: kamailio Branch: master Commit: 750cb7fc131afa254952536bdb200d55e2cc8955 URL: https://github.com/kamailio/kamailio/commit/750cb7fc131afa254952536bdb200d5… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2020-10-24T22:15:50-07:00 rtp_media_server: fix dialog_list_mutex issue 2522 --- Modified: src/modules/rtp_media_server/rms_dialog_info.c Modified: src/modules/rtp_media_server/rms_dialog_info.h Modified: src/modules/rtp_media_server/rtp_media_server.c Modified: src/modules/rtp_media_server/rtp_media_server.h --- Diff: https://github.com/kamailio/kamailio/commit/750cb7fc131afa254952536bdb200d5… Patch: https://github.com/kamailio/kamailio/commit/750cb7fc131afa254952536bdb200d5…

1 0

[kamailio/kamailio] Jchavanton/rtp media server 2524 (#2528)
by Julien Chavanton 25 Oct '20

25 Oct '20

#### Description fix issue #2524 2524 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2528 -- Commit Summary -- * rtp_media_server: update to mediastreamer4.4.0 * rtp_media_server: fix issue 2524 -- File Changes -- M src/modules/rtp_media_server/Makefile (2) M src/modules/rtp_media_server/docker/Dockerfile (26) M src/modules/rtp_media_server/docker/rtp_media_server.sh (6) M src/modules/rtp_media_server/rtp_media_server.c (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2528.patch https://github.com/kamailio/kamailio/pull/2528.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/2528

1 2

git:master:2ea4f685: rtp_media_server: fix issue 2524
by Julien Chavanton 25 Oct '20

25 Oct '20

Module: kamailio Branch: master Commit: 2ea4f685ea8b7dbca13b4fd521441088f8318d1f URL: https://github.com/kamailio/kamailio/commit/2ea4f685ea8b7dbca13b4fd52144108… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2020-10-24T22:13:42-07:00 rtp_media_server: fix issue 2524 - fix completion without failure route - rms_bridge automaticaly append missing ';' is not present --- Modified: src/modules/rtp_media_server/docker/rtp_media_server.sh Modified: src/modules/rtp_media_server/rtp_media_server.c --- Diff: https://github.com/kamailio/kamailio/commit/2ea4f685ea8b7dbca13b4fd52144108… Patch: https://github.com/kamailio/kamailio/commit/2ea4f685ea8b7dbca13b4fd52144108… --- diff --git a/src/modules/rtp_media_server/docker/rtp_media_server.sh b/src/modules/rtp_media_server/docker/rtp_media_server.sh index 02b842ad25..8f31f20623 100755 --- a/src/modules/rtp_media_server/docker/rtp_media_server.sh +++ b/src/modules/rtp_media_server/docker/rtp_media_server.sh @@ -4,7 +4,7 @@ CONTAINER=rtp_media_server IMAGE=rtp_media_server:latest docker stop ${CONTAINER} docker rm ${CONTAINER} -docker run -d --net=host --name=${CONTAINER} ${IMAGE} /bin/sh -c "tail -f /dev/null" +docker run -d --net=host --privileged --name=${CONTAINER} ${IMAGE} /bin/sh -c "tail -f /dev/null" echo "" echo "manual steps required to start Kamailio in the container:" @@ -13,3 +13,8 @@ echo " set the listen IP in /etc/kamailio.cfg" echo " docker exec -it rtp_media_server bash" echo " kamailio -m 64 -D -dd -f /etc/kamailio.cfg" echo "" + +# ulimit -c unlimited +# echo "/tmp/core.%e.sig%s.%p" > /proc/sys/kernel/core_pattern +# sysctl -w kernel.core_pattern=core +# apt-get update && apt-get install -i gdb diff --git a/src/modules/rtp_media_server/rtp_media_server.c b/src/modules/rtp_media_server/rtp_media_server.c index 99eca96484..5913921752 100644 --- a/src/modules/rtp_media_server/rtp_media_server.c +++ b/src/modules/rtp_media_server/rtp_media_server.c @@ -489,6 +489,8 @@ static void bridge_cb(struct cell *ptrans, int ntype, struct tmcb_params *pcbp) return; } else if(ntype == TMCB_LOCAL_COMPLETED) { LM_NOTICE("COMPLETED [%d]\n", pcbp->code); + if (pcbp->code >= 300) + return; } else if(ntype == TMCB_LOCAL_RESPONSE_IN){ LM_NOTICE("RESPONSE [%d]\n", pcbp->code); if (pcbp->code != 180 && pcbp->code != 183) @@ -892,7 +894,13 @@ static int rms_bridge_f(struct sip_msg *msg, char *_target, char *_route) if(!rms_str_dup(&a->param, &target, 1)) { goto error; } - + if (a->param.s[a->param.len-1] != ';') { + a->param.s = shm_realloc(a->param.s, a->param.len + 2); + a->param.s[a->param.len]=';'; + a->param.len++; + a->param.s[a->param.len]= '\0'; + LM_NOTICE("remote >>> target[%.*s]\n", a->param.len, a->param.s); + } a->route.len = route.len; a->route.s = route.s;

1 0

git:master:76bb9bb7: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 23 Oct '20

23 Oct '20

Module: kamailio Branch: master Commit: 76bb9bb7cbdcd900339afa7192eaefd71fc75790 URL: https://github.com/kamailio/kamailio/commit/76bb9bb7cbdcd900339afa7192eaefd… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-23T22:16:12+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/76bb9bb7cbdcd900339afa7192eaefd… Patch: https://github.com/kamailio/kamailio/commit/76bb9bb7cbdcd900339afa7192eaefd… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 2d07fe7669..7f43b5c42b 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1091,7 +1091,7 @@ modparam("dispatcher", "reload_delta", 1) failing distribution will be changed to 33/67/0. Using this algorithm, you can also enable congestion control by setting the attibute 'cc=1', when 'cc' is enabled the - 'rweight' attribute will also be used to control congestion + 'weight' attribute will also be used to control congestion tolerance. When facing congestion the weight of a gateway is lowered by 1 for every ms of estimated congestion, a 'rweight' value of 50 is recommended. See the example "configuring load

1 0

[kamailio/kamailio] dispatcher: congestion control refactoring (#2521)
by Julien Chavanton 23 Oct '20

23 Oct '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) #### Type Of Change - [x] refactoring, and better handling of miss configuration #### Checklist:  - [] Tested changes locally #### Description - decouple latency update with congestion control further - decouple congestion control with weighted congestion control and make sure that miss-configuration (no positive weight and/or no cc attributes) are handle gracefully) - fix an error in the doc You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2521 -- Commit Summary -- * dispatcher: congestion control refactoring -- File Changes -- M src/modules/dispatcher/dispatch.c (72) M src/modules/dispatcher/doc/dispatcher_admin.xml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2521.patch https://github.com/kamailio/kamailio/pull/2521.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/2521

2 9

git:master:b2cd7018: dispatcher: congestion control refactoring
by Julien Chavanton 23 Oct '20

23 Oct '20

Module: kamailio Branch: master Commit: b2cd7018d28569e38d8572d154a2ee1c5c973852 URL: https://github.com/kamailio/kamailio/commit/b2cd7018d28569e38d8572d154a2ee1… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2020-10-23T13:00:18-07:00 dispatcher: congestion control refactoring - decouple latency update with congestion control further - decouple congestion control with weighted congestion control, make sure that miss-configuration (no positive weight and/or no cc attributes) are handle gracefully) - fix an error in the doc --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b2cd7018d28569e38d8572d154a2ee1… Patch: https://github.com/kamailio/kamailio/commit/b2cd7018d28569e38d8572d154a2ee1…

1 0

git:5.4:e93717fe: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 23 Oct '20

23 Oct '20

Module: kamailio Branch: 5.4 Commit: e93717fe95f39c5832e4bc380fe4a1d24a4e977b URL: https://github.com/kamailio/kamailio/commit/e93717fe95f39c5832e4bc380fe4a1d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-23T11:17:14+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/registrar/README Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/e93717fe95f39c5832e4bc380fe4a1d… Patch: https://github.com/kamailio/kamailio/commit/e93717fe95f39c5832e4bc380fe4a1d… --- diff --git a/src/modules/registrar/README b/src/modules/registrar/README index f4f5ccae0d..7df142cb00 100644 --- a/src/modules/registrar/README +++ b/src/modules/registrar/README @@ -959,8 +959,9 @@ kamcmd cfg.set_now_int registrar use_expired_contacts 0 location records (in usrloc) depending on Contact and Expires header fields in the REGISTER message. On success and when called from the REQUEST_ROUTE, “200 OK” will be returned listing all contacts that are - currently in the location database. On an error, an error message will - be sent with a short description in reason phrase. + currently in the location database. As a side effect, also branch flags + are stored in usrloc. On an error, an error message will be sent with a + short description in reason phrase. Meaning of the parameters is as follows: * domain - Logical domain within the registrar. If a database is used @@ -1008,7 +1009,8 @@ save("location", "0x00", "sip:test@kamailio.org"); no such contacts, -1 will be returned. If there are such contacts, Request-URI will be overwritten with the contact that has the highest q value and optionally the rest will be appended to the message - (depending on append_branches parameter value). + (depending on append_branches parameter value). As a side effect, also + branch flags are restored from usrloc. If the method_filtering option is enabled and request is initial request without to-tag, the lookup function will return only the diff --git a/src/modules/secsipid/README b/src/modules/secsipid/README index f2a4bc98e9..a58d511078 100644 --- a/src/modules/secsipid/README +++ b/src/modules/secsipid/README @@ -133,7 +133,7 @@ modparam("secsipid", "timeout", 2) downloading the key using the URL from "info" parameter of the Identity header, using the value od "timeout" parameter to limit the download time. The validity of the JWT body in the Identity header is also - checjed against the "expire" parameter. + checked against the "expire" parameter. The parameters can contain pseudo-variables.

1 0

git:5.4:48df37a2: janssonrpcc: cleanups (#2512)
by Daniel-Constantin Mierla 23 Oct '20

23 Oct '20

Module: kamailio Branch: 5.4 Commit: 48df37a27ae2e42498d1cb44bec8604827a5ed55 URL: https://github.com/kamailio/kamailio/commit/48df37a27ae2e42498d1cb44bec8604… Author: Alex Hermann <alex(a)hexla.nl> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-23T10:58:09+02:00 janssonrpcc: cleanups (#2512) * janssonrpcc: Remove unused variable and redundant assignment * janssonrpc: No need for copying options The address stay valid until free_params is called. And before that happens, mod_jsonrpc_request() makes its own copy. (cherry picked from commit 61771b0595c126d884e8c1eb392a54b5786a8fa8) --- Modified: src/modules/janssonrpcc/janssonrpc_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/48df37a27ae2e42498d1cb44bec8604… Patch: https://github.com/kamailio/kamailio/commit/48df37a27ae2e42498d1cb44bec8604… --- diff --git a/src/modules/janssonrpcc/janssonrpc_funcs.c b/src/modules/janssonrpcc/janssonrpc_funcs.c index 93e62bd53d..70b3e9413e 100644 --- a/src/modules/janssonrpcc/janssonrpc_funcs.c +++ b/src/modules/janssonrpcc/janssonrpc_funcs.c @@ -44,7 +44,6 @@ int jsonrpc_request(struct sip_msg* _m, str params; str options; str route; - param_hooks_t phooks; param_t* pit=NULL; param_t* freeme=NULL; int retry; @@ -85,7 +84,7 @@ int jsonrpc_request(struct sip_msg* _m, options.len--; } - if (parse_params(&options, CLASS_ANY, &phooks, &pit)<0) { + if (parse_params(&options, CLASS_ANY, NULL, &pit)<0) { ERR("failed parsing params value\n"); return -1; } @@ -95,8 +94,7 @@ int jsonrpc_request(struct sip_msg* _m, for (; pit;pit=pit->next) { if PIT_MATCHES("route") { - pkg_str_dup(&route, &pit->body); - CHECK_MALLOC_GOTO(route.s, end); + route = pit->body; } else if PIT_MATCHES("timeout") { timeout = atoi(pit->body.s); @@ -123,8 +121,6 @@ int jsonrpc_request(struct sip_msg* _m, goto end; } - retval = 0; - retval = mod_jsonrpc_request( _m, /* sip_msg */ conn, /* connection group */ @@ -138,7 +134,6 @@ int jsonrpc_request(struct sip_msg* _m, end: if(freeme) free_params(freeme); - if(route.s) pkg_free(route.s); return retval; }

1 0

git:5.4:cbd9c3d2: tm: Fix faked_reply_prio by passing correct reply to get_prio
by Daniel-Constantin Mierla 23 Oct '20

23 Oct '20

Module: kamailio Branch: 5.4 Commit: cbd9c3d2851ece3c8f08b0664b72fca18f6f4f77 URL: https://github.com/kamailio/kamailio/commit/cbd9c3d2851ece3c8f08b0664b72fca… Author: Alex Hermann <alex(a)hexla.nl> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-23T10:58:26+02:00 tm: Fix faked_reply_prio by passing correct reply to get_prio Instead of passing the to be evaluated reply as the "best" reply, pass the actual "best" reply. (cherry picked from commit 5731cc0911ff65bf7efd433a83a25ffbf6073d10) --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/cbd9c3d2851ece3c8f08b0664b72fca… Patch: https://github.com/kamailio/kamailio/commit/cbd9c3d2851ece3c8f08b0664b72fca… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 328c6743d4..2324e29e59 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -1249,17 +1249,19 @@ inline static short int get_prio(unsigned int resp, struct sip_msg *rpl) int t_pick_branch(int inc_branch, int inc_code, struct cell *t, int *res_code) { int best_b, best_s, b; - sip_msg_t *rpl; + sip_msg_t *rpl, *best_rpl; best_b=-1; best_s=0; + best_rpl=NULL; for ( b=0; b<t->nr_of_outgoings ; b++ ) { rpl = t->uac[b].reply; /* "fake" for the currently processed branch */ if (b==inc_branch) { - if (get_prio(inc_code, rpl)<get_prio(best_s, rpl)) { + if (get_prio(inc_code, rpl)<get_prio(best_s, best_rpl)) { best_b=b; best_s=inc_code; + best_rpl=rpl; } continue; } @@ -1275,9 +1277,10 @@ int t_pick_branch(int inc_branch, int inc_code, struct cell *t, int *res_code) return -2; /* if reply is null => t_send_branch "faked" reply, skip over it */ if ( rpl && - get_prio(t->uac[b].last_received, rpl)<get_prio(best_s, rpl) ) { + get_prio(t->uac[b].last_received, rpl)<get_prio(best_s, best_rpl) ) { best_b =b; best_s = t->uac[b].last_received; + best_rpl=rpl; } } /* find lowest branch */

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev