sr-dev January 2024

sr-dev@lists.kamailio.org

19 participants
315 discussions

git:master:987e21a9: xhttp: prefix for global variable
by Daniel-Constantin Mierla 12 Jan '24

12 Jan '24

Module: kamailio Branch: master Commit: 987e21a914edcebc9eafe21af19c8a476bf73b06 URL: https://github.com/kamailio/kamailio/commit/987e21a914edcebc9eafe21af19c8a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-12T19:50:28+01:00 xhttp: prefix for global variable --- Modified: src/modules/xhttp/xhttp_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/987e21a914edcebc9eafe21af19c8a4… Patch: https://github.com/kamailio/kamailio/commit/987e21a914edcebc9eafe21af19c8a4… --- diff --git a/src/modules/xhttp/xhttp_mod.c b/src/modules/xhttp/xhttp_mod.c index 0660d409af6..af27baffa41 100644 --- a/src/modules/xhttp/xhttp_mod.c +++ b/src/modules/xhttp/xhttp_mod.c @@ -65,7 +65,7 @@ static char *xhttp_url_skip = NULL; static regex_t xhttp_url_skip_regexp; /** SL API structure */ -sl_api_t slb; +static sl_api_t _xhttp_slb; static str xhttp_event_callback = STR_NULL; @@ -149,7 +149,7 @@ static int mod_init(void) } /* bind the SL API */ - if(sl_load_api(&slb) != 0) { + if(sl_load_api(&_xhttp_slb) != 0) { LM_ERR("cannot bind to SL API\n"); return -1; } @@ -424,7 +424,7 @@ static int xhttp_send_reply( LM_DBG("response with body: %.*s\n", body->len, body->s); } LM_DBG("sending out response: %d %.*s\n", code, reason->len, reason->s); - if(slb.sreply(msg, code, reason) < 0) { + if(_xhttp_slb.sreply(msg, code, reason) < 0) { LM_ERR("Error while sending reply\n"); return -1; }

1 0

git:master:0479c40f: mohqueue: rename local variables to prevent shadowing the global
by Daniel-Constantin Mierla 12 Jan '24

12 Jan '24

Module: kamailio Branch: master Commit: 0479c40fe6fd6765de92eea8f9e0bf04dea8cbd0 URL: https://github.com/kamailio/kamailio/commit/0479c40fe6fd6765de92eea8f9e0bf0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-12T14:37:02+01:00 mohqueue: rename local variables to prevent shadowing the global --- Modified: src/modules/mohqueue/mohq_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/0479c40fe6fd6765de92eea8f9e0bf0… Patch: https://github.com/kamailio/kamailio/commit/0479c40fe6fd6765de92eea8f9e0bf0… --- diff --git a/src/modules/mohqueue/mohq_funcs.c b/src/modules/mohqueue/mohq_funcs.c index 75130381746..599e5eb8a1a 100644 --- a/src/modules/mohqueue/mohq_funcs.c +++ b/src/modules/mohqueue/mohq_funcs.c @@ -1278,17 +1278,17 @@ int form_rtp_SDP(str *pstr, call_lst *pcall, char *pSDP) **********/ char *pfncname = "form_rtp_SDP: "; - rtpmap **pmohfiles = + rtpmap **lpmohfiles = find_MOH(pcall->pmohq->mohq_mohdir, pcall->pmohq->mohq_mohfile); - if(!pmohfiles[0]) { + if(!lpmohfiles[0]) { LM_ERR("%sUnable to find any MOH files for queue (%s)!\n", pfncname, pcall->pmohq->mohq_name); return 0; } int nsize = strlen(pSDP) + 2; int nidx; - for(nidx = 0; pmohfiles[nidx]; nidx++) { - nsize += strlen(pmohfiles[nidx]->pencode) // encode length + for(nidx = 0; lpmohfiles[nidx]; nidx++) { + nsize += strlen(lpmohfiles[nidx]->pencode) // encode length + 19; // space, type number, "a=rtpmap:%d ", EOL } @@ -1707,7 +1707,7 @@ void reinvite_msg(sip_msg_t *pmsg, call_lst *pcall) * o look for hold condition and matching payload type **********/ - rtpmap **pmohfiles = + rtpmap **lpmohfiles = find_MOH(pcall->pmohq->mohq_mohdir, pcall->pmohq->mohq_mohfile); int bhold = 0; int bmatch = 0; @@ -1749,8 +1749,8 @@ void reinvite_msg(sip_msg_t *pmsg, call_lst *pcall) ppayload = ppayload->next) { int ntype = atoi(ppayload->rtp_payload.s); int nidx; - for(nidx = 0; pmohfiles[nidx]; nidx++) { - if(pmohfiles[nidx]->ntype == ntype) { + for(nidx = 0; lpmohfiles[nidx]; nidx++) { + if(lpmohfiles[nidx]->ntype == ntype) { bmatch = 1; break; }

1 0

git:master:0ea60341: avp: rename local variable to prevent shadowing the global structure
by Daniel-Constantin Mierla 12 Jan '24

12 Jan '24

Module: kamailio Branch: master Commit: 0ea603413de9505b5312e5930168102e816dced3 URL: https://github.com/kamailio/kamailio/commit/0ea603413de9505b5312e5930168102… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-12T13:10:33+01:00 avp: rename local variable to prevent shadowing the global structure --- Modified: src/modules/avp/avp.c --- Diff: https://github.com/kamailio/kamailio/commit/0ea603413de9505b5312e5930168102… Patch: https://github.com/kamailio/kamailio/commit/0ea603413de9505b5312e5930168102… --- diff --git a/src/modules/avp/avp.c b/src/modules/avp/avp.c index 38fa08fe1cb..d04fe47f880 100644 --- a/src/modules/avp/avp.c +++ b/src/modules/avp/avp.c @@ -1454,7 +1454,7 @@ static int attr_hdr_body2attrs2( static int attr_hdr_body2attrs_fixup(void **param, int param_no) { - char *c, *params; + char *c, *sparams; hdr_name_t *h = NULL; int n; str *s; @@ -1467,9 +1467,9 @@ static int attr_hdr_body2attrs_fixup(void **param, int param_no) c); return E_CFG; } else { - params = strchr(c, PARAM_DELIM); - if(params) - n = params - c; + sparams = strchr(c, PARAM_DELIM); + if(sparams) + n = sparams - c; else n = strlen(c); if(n == 0) { @@ -1486,10 +1486,10 @@ static int attr_hdr_body2attrs_fixup(void **param, int param_no) h->name.s.s = (char *)h + sizeof(hdr_name_t); memcpy(h->name.s.s, c, n + 1); } - if(params) { + if(sparams) { h->val_types = 0; - while(*params) { - switch(*params) { + while(*sparams) { + switch(*sparams) { case 'i': case 'I': h->val_types = VAL_TYPE_INT; @@ -1504,11 +1504,11 @@ static int attr_hdr_body2attrs_fixup(void **param, int param_no) LOG(L_ERR, "attr_hdr_body2attrs_fixup: bad field param " "modifier near '%s'\n", - params); + sparams); pkg_free(h); return E_CFG; } - params++; + sparams++; } if(!h->val_types) { LOG(L_ERR, "attr_hdr_body2attrs_fixup: no field param modifier "

1 0

[kamailio/kamailio] Rtpengine fixes (PR #3710)
by Xenofon Karamanos 11 Jan '24

11 Jan '24

#### 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) - [x] 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR add support for the `codec-accept` and `codec-consume` flags of rtpengine (supported since [mr9.2.1](https://github.com/sipwise/rtpengine/commit/336cb5b280079b0e7b2412…). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3710 -- Commit Summary -- * rtpengine: Add support for codec-accept and codec-consume * rtpengine/docs: Add codec-consume docs -- File Changes -- M src/modules/rtpengine/doc/rtpengine_admin.xml (5) M src/modules/rtpengine/rtpengine.c (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3710.patch https://github.com/kamailio/kamailio/pull/3710.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3710 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3710(a)github.com>

4 7

git:master:1671c964: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 11 Jan '24

11 Jan '24

Module: kamailio Branch: master Commit: 1671c96462f76d902b4c331c2f51e99cd2e33af1 URL: https://github.com/kamailio/kamailio/commit/1671c96462f76d902b4c331c2f51e99… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-01-11T17:17:12+01:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/1671c96462f76d902b4c331c2f51e99… Patch: https://github.com/kamailio/kamailio/commit/1671c96462f76d902b4c331c2f51e99… --- diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index 96693dcd018..7cfc4772863 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -2419,6 +2419,9 @@ rtpengine_offer(); still be accepted towards the original offerer and then used for transcoding. It is a more selective version of what the `always transcode` flag does. + + codec-consume=... - Identical to mask but enables the + transcoding engine even if no other transcoding related + options are given. + T.38=decode - If the offered SDP contains a media section advertising T.38 over UDPTL, translate it to a regular audio media section over RTP. By default, PCMU and PCMA will be used

1 0

git:master:1aec0c13: rtpengine/docs: Add codec-consume docs
by Victor Seva 11 Jan '24

11 Jan '24

Module: kamailio Branch: master Commit: 1aec0c1397e4230e52f2b9427fdb32b10f649ecb URL: https://github.com/kamailio/kamailio/commit/1aec0c1397e4230e52f2b9427fdb32b… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-01-11T17:04:07+01:00 rtpengine/docs: Add codec-consume docs --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1aec0c1397e4230e52f2b9427fdb32b… Patch: https://github.com/kamailio/kamailio/commit/1aec0c1397e4230e52f2b9427fdb32b… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index 1e394453493..fea67a665a2 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2746,6 +2746,11 @@ rtpengine_offer(); version of what the `always transcode` flag does. </para></listitem> + <listitem><para> + <emphasis>codec-consume=...</emphasis> - Identical to mask but enables the transcoding engine even if no other transcoding + related options are given. + </para></listitem> + <listitem><para> <emphasis>T.38=decode</emphasis> - If the offered &sdp; contains a media section advertising T.38 over UDPTL, translate it to a regular audio media section

1 0

git:master:a40d5b7d: rtpengine: Add support for codec-accept and codec-consume
by Victor Seva 11 Jan '24

11 Jan '24

Module: kamailio Branch: master Commit: a40d5b7d65394606f2200a5932284b874e196063 URL: https://github.com/kamailio/kamailio/commit/a40d5b7d65394606f2200a5932284b8… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-01-11T17:04:07+01:00 rtpengine: Add support for codec-accept and codec-consume --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/a40d5b7d65394606f2200a5932284b8… Patch: https://github.com/kamailio/kamailio/commit/a40d5b7d65394606f2200a5932284b8… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 11745d6b863..e3e4c6e1d50 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -126,7 +126,8 @@ struct ng_flags_parse { int via, to, packetize, transport, directional; bencode_item_t *dict, *flags, *direction, *replace, *rtcp_mux, *sdes, *t38, *received_from, *codec, *codec_strip, *codec_offer, - *codec_transcode, *codec_mask, *codec_set, *codec_except; + *codec_transcode, *codec_mask, *codec_set, *codec_except, *codec_accept, + *codec_consume; str call_id, from_tag, to_tag; }; @@ -2735,6 +2736,12 @@ static int parse_flags(struct ng_flags_parse *ng_flags, struct sip_msg *msg, if(parse_codec_flag(ng_flags, &key, &val, "codec-except", NULL, "except", &ng_flags->codec_except)) goto next; + if(parse_codec_flag(ng_flags, &key, &val, "codec-accept", NULL, + "accept", &ng_flags->codec_accept)) + goto next; + if(parse_codec_flag(ng_flags, &key, &val, "codec-consume", NULL, + "consume", &ng_flags->codec_consume)) + goto next; /* check for specially handled items */ switch(key.len) {

1 0

[kamailio/kamailio] UAC module ：uac_reg_tm_callback(): got sip response 408 (Issue #3707)
by QWERTY 11 Jan '24

11 Jan '24

Register with remote，if there is no response to request，get in the logs an error message like: ERROR: uac [uac_reg.c:1001]: uac_reg_tm_callback(): got sip response 408 while registering How to get this timeout information in routing ? event_route[ ] ？ -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3707 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3707(a)github.com>

2 2

git:master:b678e66a: p_usrloc: rename short global variable
by Daniel-Constantin Mierla 11 Jan '24

11 Jan '24

Module: kamailio Branch: master Commit: b678e66a974f3f88f5ed05e57e5d898e4715fe0a URL: https://github.com/kamailio/kamailio/commit/b678e66a974f3f88f5ed05e57e5d898… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-11T15:34:33+01:00 p_usrloc: rename short global variable --- Modified: src/modules/p_usrloc/ul_db_handle.c --- Diff: https://github.com/kamailio/kamailio/commit/b678e66a974f3f88f5ed05e57e5d898… Patch: https://github.com/kamailio/kamailio/commit/b678e66a974f3f88f5ed05e57e5d898…

1 0

git:master:302231bf: ratelimit: rename variables to prevent global structure shadowing
by Daniel-Constantin Mierla 11 Jan '24

11 Jan '24

Module: kamailio Branch: master Commit: 302231bf2262ef73a6aad4a2f476df7c9a3c05f0 URL: https://github.com/kamailio/kamailio/commit/302231bf2262ef73a6aad4a2f476df7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-11T15:23:55+01:00 ratelimit: rename variables to prevent global structure shadowing --- Modified: src/modules/ratelimit/ratelimit.c --- Diff: https://github.com/kamailio/kamailio/commit/302231bf2262ef73a6aad4a2f476df7… Patch: https://github.com/kamailio/kamailio/commit/302231bf2262ef73a6aad4a2f476df7… --- diff --git a/src/modules/ratelimit/ratelimit.c b/src/modules/ratelimit/ratelimit.c index 4e327460044..5cac92464db 100644 --- a/src/modules/ratelimit/ratelimit.c +++ b/src/modules/ratelimit/ratelimit.c @@ -924,7 +924,7 @@ static int init_params(void) * parses a "pipe_no:algorithm:bandwidth" line * \return 0 on success */ -static int parse_pipe_params(char *line, pipe_params_t *params) +static int parse_pipe_params(char *line, pipe_params_t *pparams) { regmatch_t m[4]; str algo_str; @@ -938,12 +938,12 @@ static int parse_pipe_params(char *line, pipe_params_t *params) LM_DBG("pipe: [%.*s|%.*s|%.*s]\n", RXLS(m, line, 1), RXLS(m, line, 2), RXLS(m, line, 3)); - params->no = atoi(RXS(m, line, 1)); - params->limit = atoi(RXS(m, line, 3)); + pparams->no = atoi(RXS(m, line, 1)); + pparams->limit = atoi(RXS(m, line, 3)); algo_str.s = RXS(m, line, 2); algo_str.len = RXL(m, line, 2); - if(str_map_str(algo_names, &algo_str, &params->algo)) + if(str_map_str(algo_names, &algo_str, &pparams->algo)) return -1; return 0; @@ -953,7 +953,7 @@ static int parse_pipe_params(char *line, pipe_params_t *params) * parses a "pipe_no:method" line * \return 0 on success */ -static int parse_queue_params(char *line, rl_queue_params_t *params) +static int parse_queue_params(char *line, rl_queue_params_t *qparams) { regmatch_t m[3]; int len; @@ -966,16 +966,16 @@ static int parse_queue_params(char *line, rl_queue_params_t *params) } LM_DBG("queue: [%.*s|%.*s]\n", RXLS(m, line, 1), RXLS(m, line, 2)); - params->pipe = atoi(RXS(m, line, 1)); + qparams->pipe = atoi(RXS(m, line, 1)); len = RXL(m, line, 2); - params->method.s = (char *)pkg_malloc(len + 1); - if(params->method.s == 0) { + qparams->method.s = (char *)pkg_malloc(len + 1); + if(qparams->method.s == 0) { LM_ERR("no memory left for method in params\n"); return -1; } - params->method.len = len; - memcpy(params->method.s, RXS(m, line, 2), len + 1); + qparams->method.len = len; + memcpy(qparams->method.s, RXS(m, line, 2), len + 1); return 0; } @@ -1017,19 +1017,19 @@ static int check_feedback_setpoints(int modparam) static int add_pipe_params(modparam_t type, void *val) { char *param_line = val; - pipe_params_t params; + pipe_params_t pparams; - if(parse_pipe_params(param_line, &params)) + if(parse_pipe_params(param_line, &pparams)) return -1; - if(params.no < 0 || params.no >= MAX_PIPES) { + if(pparams.no < 0 || pparams.no >= MAX_PIPES) { LM_ERR("pipe number %d not allowed (MAX_PIPES=%d, 0-based)\n", - params.no, MAX_PIPES); + pparams.no, MAX_PIPES); return -1; } - pipes[params.no].algo_mp = params.algo; - pipes[params.no].limit_mp = params.limit; + pipes[pparams.no].algo_mp = pparams.algo; + pipes[pparams.no].limit_mp = pparams.limit; return check_feedback_setpoints(1); } @@ -1037,24 +1037,24 @@ static int add_pipe_params(modparam_t type, void *val) static int add_queue_params(modparam_t type, void *val) { char *param_line = val; - rl_queue_params_t params; + rl_queue_params_t qparams; if(nqueues_mp >= MAX_QUEUES) { LM_ERR("MAX_QUEUES reached (%d)\n", MAX_QUEUES); return -1; } - if(parse_queue_params(param_line, &params)) + if(parse_queue_params(param_line, &qparams)) return -1; - if(params.pipe >= MAX_PIPES) { + if(qparams.pipe >= MAX_PIPES) { LM_ERR("pipe number %d not allowed (MAX_PIPES=%d, 0-based)\n", - params.pipe, MAX_PIPES); + qparams.pipe, MAX_PIPES); return -1; } - queues[nqueues_mp].pipe_mp = params.pipe; - queues[nqueues_mp].method_mp = params.method; + queues[nqueues_mp].pipe_mp = qparams.pipe; + queues[nqueues_mp].method_mp = qparams.method; nqueues_mp++; return 0;

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
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 January 2024