sr-dev December 2020

sr-dev@lists.kamailio.org

18 participants
205 discussions

[kamailio/kamailio] modules/siptrace: fix regression preventing variables to be used (#2588)

by tsearle

Commit fa7eb2a switched the 2 parameter version of sip_trace from using the builtin fixup_spve_spve to the custom fixup method to using the custom fixup_siptrace. As it is a custom fixup method, the corresponding free method can not be auto-detected causing the config parser to require the parameters to be a constant. This patch adds a free method, allowing variables to be once again passed as the 2nd parameter of this method (as well as fixing a memory leak for the 3rd parameter).   #### 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 - [x] 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/2588 -- Commit Summary -- * modules/siptrace: fix regression preventing variables to be used -- File Changes -- M src/modules/siptrace/siptrace.c (18) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2588.patch https://github.com/kamailio/kamailio/pull/2588.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/2588

3 years, 11 months

git:master:4a2c1ea8: rtpengine: fix param mos_min_roundtrip_B_pv

by Julien Chavanton

Module: kamailio Branch: master Commit: 4a2c1ea81dcb58a5b31ad3d090d5694366b8fde0 URL: https://github.com/kamailio/kamailio/commit/4a2c1ea81dcb58a5b31ad3d090d5694… Author: Julien Chavanton <jchavanton(a)subspace.com> Committer: Julien Chavanton <jchavanton(a)subspace.com> Date: 2020-12-16T13:08:59-08:00 rtpengine: fix param mos_min_roundtrip_B_pv --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/4a2c1ea81dcb58a5b31ad3d090d5694… Patch: https://github.com/kamailio/kamailio/commit/4a2c1ea81dcb58a5b31ad3d090d5694… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index f69ca4b255..fb736b2f10 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -508,7 +508,7 @@ static param_export_t params[] = { {"mos_min_packetloss_B_pv", PARAM_STR, &side_B_mos_stats.min.packetloss_param }, {"mos_min_jitter_B_pv", PARAM_STR, &side_B_mos_stats.min.jitter_param }, {"mos_min_roundtrip_B_pv", PARAM_STR, &side_B_mos_stats.min.roundtrip_param }, - {"mos_min_roundtrip_B_pv", PARAM_STR, &side_B_mos_stats.min.roundtrip_param }, + {"mos_min_roundtrip_leg_B_pv", PARAM_STR, &side_B_mos_stats.min.roundtrip_leg_param }, {"mos_max_B_pv", PARAM_STR, &side_B_mos_stats.max.mos_param }, {"mos_max_at_B_pv", PARAM_STR, &side_B_mos_stats.max.at_param }, {"mos_max_packetloss_B_pv", PARAM_STR, &side_B_mos_stats.max.packetloss_param },

3 years, 11 months

git:master:7c98d547: modules/siptrace: fix regression preventing variables to be used (#2588)

by GitHub

Module: kamailio Branch: master Commit: 7c98d547996637a7bf1c7025c93142f574fe3ac9 URL: https://github.com/kamailio/kamailio/commit/7c98d547996637a7bf1c7025c93142f… Author: tsearle <tsearle(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-12-16T21:47:11+01:00 modules/siptrace: fix regression preventing variables to be used (#2588) * modules/siptrace: fix regression preventing variables to be used Commit fa7eb2a switched the 2 parameter version of sip_trace from using the builtin fixup_spve_spve to the custom fixup method to using the custom fixup_siptrace. As it is a custom fixup method, the corresponding free method can not be auto-detected causing the config parser to require the parameters to be a constant. This patch adds a free method, allowing variables to be once again passed as the 2nd parameter of this method (as well as fixing a memory leak for the 3rd parameter). * change free for parameter 3 Co-authored-by: Torrey Searle <tsearle(a)voxbone.com> --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/7c98d547996637a7bf1c7025c93142f… Patch: https://github.com/kamailio/kamailio/commit/7c98d547996637a7bf1c7025c93142f… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 2e8e690ac0..e9c44ec548 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -91,6 +91,7 @@ static int w_sip_trace1(struct sip_msg *, char *dest, char *p2); static int w_sip_trace2(struct sip_msg *, char *dest, char *correlation_id); static int w_sip_trace3(struct sip_msg *, char *dest, char *correlation_id, char *trace_type); static int fixup_siptrace(void **param, int param_no); +static int fixup_free_siptrace(void **param, int param_no); static int w_sip_trace_mode(sip_msg_t *msg, char *pmode, char *p2); static int siptrace_parse_uri(str* duri, dest_info_t* dst); @@ -203,9 +204,9 @@ static cmd_export_t cmds[] = { ANY_ROUTE}, {"sip_trace", (cmd_function)w_sip_trace1, 1, fixup_siptrace, 0, ANY_ROUTE}, - {"sip_trace", (cmd_function)w_sip_trace2, 2, fixup_siptrace, 0, + {"sip_trace", (cmd_function)w_sip_trace2, 2, fixup_siptrace, fixup_free_siptrace, ANY_ROUTE}, - {"sip_trace", (cmd_function)w_sip_trace3, 3, fixup_siptrace, 0, + {"sip_trace", (cmd_function)w_sip_trace3, 3, fixup_siptrace, fixup_free_siptrace, ANY_ROUTE}, {"hlog", (cmd_function)w_hlog1, 1, fixup_spve_null, 0, ANY_ROUTE}, @@ -785,6 +786,21 @@ static int fixup_siptrace(void **param, int param_no) return 0; } +static int fixup_free_siptrace(void **param, int param_no) +{ + if (param_no == 1 || param_no == 2) { + /* correlation id */ + return fixup_free_spve_all(param, param_no); + } if (param_no == 3) { + /* tracing type; string only */ + if (*param) { + pkg_free(*param); + } + } + + return 0; +} + /** *

3 years, 11 months

[kamailio/kamailio] textops: added functions to manipulate the body in the exported api (#2586)

by Daniel Martínez Ruiz

Functions added: - set_body - set_body_multipart - append_body_part   #### 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:  - [x] PR should be backported to stable branches - [x] 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/2586 -- Commit Summary -- * textops: added functions to manipulate the body in the exported api -- File Changes -- M src/modules/textops/api.c (18) M src/modules/textops/api.h (6) M src/modules/textops/textops.c (19) M src/modules/textops/textops.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2586.patch https://github.com/kamailio/kamailio/pull/2586.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/2586

3 years, 11 months

git:master:67f74139: Merge pull request #2586 from danielmartinezruiz/textops_add_body_functions_to_api

by GitHub

Module: kamailio Branch: master Commit: 67f741395d5a8dbd4a0a8e50aaffefbc0a72e414 URL: https://github.com/kamailio/kamailio/commit/67f741395d5a8dbd4a0a8e50aaffefb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-12-16T21:30:49+01:00 Merge pull request #2586 from danielmartinezruiz/textops_add_body_functions_to_api textops: added functions to manipulate the body in the exported api --- Modified: src/modules/textops/api.c Modified: src/modules/textops/api.h Modified: src/modules/textops/textops.c Modified: src/modules/textops/textops.h --- Diff: https://github.com/kamailio/kamailio/commit/67f741395d5a8dbd4a0a8e50aaffefb… Patch: https://github.com/kamailio/kamailio/commit/67f741395d5a8dbd4a0a8e50aaffefb…

3 years, 11 months

git:master:ed8c3605: textops: added functions to manipulate the body in the exported api

by Daniel MartÃnez Ruiz

Module: kamailio Branch: master Commit: ed8c360544b86061b7a517dc256e85089079fe02 URL: https://github.com/kamailio/kamailio/commit/ed8c360544b86061b7a517dc256e850… Author: Daniel MartÃnez Ruiz <d.martinez(a)zaleos.net> Committer: Daniel MartÃnez Ruiz <d.martinez(a)zaleos.net> Date: 2020-12-16T11:02:52+01:00 textops: added functions to manipulate the body in the exported api Functions added: - set_body - set_body_multipart - append_body_part --- Modified: src/modules/textops/api.c Modified: src/modules/textops/api.h Modified: src/modules/textops/textops.c Modified: src/modules/textops/textops.h --- Diff: https://github.com/kamailio/kamailio/commit/ed8c360544b86061b7a517dc256e850… Patch: https://github.com/kamailio/kamailio/commit/ed8c360544b86061b7a517dc256e850…

3 years, 11 months

[kamailio/kamailio] evapi: export async_multicast() to kemi (#2582)

by Balajee SV

#### 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) - [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  Evapi: added KEMI function for evapi_async_multicast You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2582 -- Commit Summary -- * evapi: export async_multicast() to kemi -- File Changes -- M src/modules/evapi/evapi_mod.c (58) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2582.patch https://github.com/kamailio/kamailio/pull/2582.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/2582

3 years, 11 months

git:master:d5c8ac5d: Merge pull request #2582 from balajeesv/kemi_evapi_multicast

by GitHub

Module: kamailio Branch: master Commit: d5c8ac5daabbe354a267f24ee1e3fe704bccb048 URL: https://github.com/kamailio/kamailio/commit/d5c8ac5daabbe354a267f24ee1e3fe7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-12-16T21:29:52+01:00 Merge pull request #2582 from balajeesv/kemi_evapi_multicast evapi: export async_multicast() to kemi --- Modified: src/modules/evapi/evapi_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d5c8ac5daabbe354a267f24ee1e3fe7… Patch: https://github.com/kamailio/kamailio/commit/d5c8ac5daabbe354a267f24ee1e3fe7… --- diff --git a/src/modules/evapi/evapi_mod.c b/src/modules/evapi/evapi_mod.c index bcc582f6e3..a9c4d9ad37 100644 --- a/src/modules/evapi/evapi_mod.c +++ b/src/modules/evapi/evapi_mod.c @@ -756,6 +756,59 @@ static int ki_evapi_async_unicast(sip_msg_t *msg, str *sdata, str *stag) return 1; } +static int ki_evapi_async_multicast(sip_msg_t *msg, str *sdata, str *stag) +{ + unsigned int tindex; + unsigned int tlabel; + tm_cell_t *t = 0; + + if(tmb.t_suspend==NULL) { + LM_ERR("evapi async relay is disabled - tm module not loaded\n"); + return -1; + } + + t = tmb.t_gett(); + if (t==NULL || t==T_UNDEFINED) + { + if(tmb.t_newtran(msg)<0) + { + LM_ERR("cannot create the transaction\n"); + return -1; + } + t = tmb.t_gett(); + if (t==NULL || t==T_UNDEFINED) + { + LM_ERR("cannot lookup the transaction\n"); + return -1; + } + } + if(tmb.t_suspend(msg, &tindex, &tlabel)<0) + { + LM_ERR("failed to suspend request processing\n"); + return -1; + } + + LM_DBG("transaction suspended [%u:%u]\n", tindex, tlabel); + + + if(sdata->s==NULL || sdata->len == 0) { + LM_ERR("invalid data parameter\n"); + return -1; + } + + if(stag->s==NULL || stag->len == 0) { + LM_ERR("invalid tag parameter\n"); + return -1; + } + + if(evapi_relay_multicast(sdata, stag)<0) { + LM_ERR("failed to relay event: [[%.*s]] to [%.*s] \n", + sdata->len, sdata->s, stag->len, stag->s); + return -2; + } + return 1; +} + /** * */ @@ -824,6 +877,11 @@ static sr_kemi_t sr_kemi_evapi_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("evapi"), str_init("async_multicast"), + SR_KEMIP_INT, ki_evapi_async_multicast, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } }; /* clang-format on */

3 years, 11 months

git:master:ccaba976: evapi: export async_multicast() to kemi

by balajeesv

Module: kamailio Branch: master Commit: ccaba976cd1c599ba64067df0896fdd4888af00f URL: https://github.com/kamailio/kamailio/commit/ccaba976cd1c599ba64067df0896fdd… Author: balajeesv <balajee.sv(a)gmail.com> Committer: balajeesv <balajee.sv(a)gmail.com> Date: 2020-12-11T21:31:27+05:30 evapi: export async_multicast() to kemi --- Modified: src/modules/evapi/evapi_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ccaba976cd1c599ba64067df0896fdd… Patch: https://github.com/kamailio/kamailio/commit/ccaba976cd1c599ba64067df0896fdd… --- diff --git a/src/modules/evapi/evapi_mod.c b/src/modules/evapi/evapi_mod.c index bcc582f6e3..a9c4d9ad37 100644 --- a/src/modules/evapi/evapi_mod.c +++ b/src/modules/evapi/evapi_mod.c @@ -756,6 +756,59 @@ static int ki_evapi_async_unicast(sip_msg_t *msg, str *sdata, str *stag) return 1; } +static int ki_evapi_async_multicast(sip_msg_t *msg, str *sdata, str *stag) +{ + unsigned int tindex; + unsigned int tlabel; + tm_cell_t *t = 0; + + if(tmb.t_suspend==NULL) { + LM_ERR("evapi async relay is disabled - tm module not loaded\n"); + return -1; + } + + t = tmb.t_gett(); + if (t==NULL || t==T_UNDEFINED) + { + if(tmb.t_newtran(msg)<0) + { + LM_ERR("cannot create the transaction\n"); + return -1; + } + t = tmb.t_gett(); + if (t==NULL || t==T_UNDEFINED) + { + LM_ERR("cannot lookup the transaction\n"); + return -1; + } + } + if(tmb.t_suspend(msg, &tindex, &tlabel)<0) + { + LM_ERR("failed to suspend request processing\n"); + return -1; + } + + LM_DBG("transaction suspended [%u:%u]\n", tindex, tlabel); + + + if(sdata->s==NULL || sdata->len == 0) { + LM_ERR("invalid data parameter\n"); + return -1; + } + + if(stag->s==NULL || stag->len == 0) { + LM_ERR("invalid tag parameter\n"); + return -1; + } + + if(evapi_relay_multicast(sdata, stag)<0) { + LM_ERR("failed to relay event: [[%.*s]] to [%.*s] \n", + sdata->len, sdata->s, stag->len, stag->s); + return -2; + } + return 1; +} + /** * */ @@ -824,6 +877,11 @@ static sr_kemi_t sr_kemi_evapi_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("evapi"), str_init("async_multicast"), + SR_KEMIP_INT, ki_evapi_async_multicast, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } }; /* clang-format on */

3 years, 11 months

git:5.4:d9df74d4: http_client: do not set empty headers and body

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: d9df74d43d736dd330f4f9aa364a9f0560717e1a URL: https://github.com/kamailio/kamailio/commit/d9df74d43d736dd330f4f9aa364a9f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-16T21:03:23+01:00 http_client: do not set empty headers and body (cherry picked from commit ce58411c462231d6ea1fc3b4acbf50520c2962ce) --- Modified: src/modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/d9df74d43d736dd330f4f9aa364a9f0… Patch: https://github.com/kamailio/kamailio/commit/d9df74d43d736dd330f4f9aa364a9f0… --- diff --git a/src/modules/http_client/http_client.c b/src/modules/http_client/http_client.c index 177e50eb14..e34dae58fd 100644 --- a/src/modules/http_client/http_client.c +++ b/src/modules/http_client/http_client.c @@ -894,8 +894,9 @@ static int ki_http_query_helper(sip_msg_t *_m, str *url, str *post, str *hdrs, LM_ERR("invalid url parameter\n"); return -1; } - ret = http_client_query(_m, url->s, &result, (post && post->s)?post->s:NULL, - (hdrs && hdrs->s)?hdrs->s:NULL); + ret = http_client_query(_m, url->s, &result, + (post && post->s && post->len>0)?post->s:NULL, + (hdrs && hdrs->s && hdrs->len>0)?hdrs->s:NULL); val.rs = result; val.flags = PV_VAL_STR;

3 years, 11 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2020