sr-dev September 2022

sr-dev@lists.kamailio.org

16 participants
274 discussions

git:master:a7571233: dialog: update check on dialog var key length

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a7571233bc7dee0381e8ed7e44408f63fa45c156 URL: https://github.com/kamailio/kamailio/commit/a7571233bc7dee0381e8ed7e44408f6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-26T11:46:59+02:00 dialog: update check on dialog var key length --- Modified: src/modules/dialog/dlg_var.c --- Diff: https://github.com/kamailio/kamailio/commit/a7571233bc7dee0381e8ed7e44408f6… Patch: https://github.com/kamailio/kamailio/commit/a7571233bc7dee0381e8ed7e44408f6… --- diff --git a/src/modules/dialog/dlg_var.c b/src/modules/dialog/dlg_var.c index 04a645309b..0a16d18296 100644 --- a/src/modules/dialog/dlg_var.c +++ b/src/modules/dialog/dlg_var.c @@ -287,8 +287,7 @@ str* get_dlg_varref(struct dlg_cell *dlg, str *key) { str* var = NULL; - if( !dlg || !key || key->len > strlen(key->s)) - { + if( !dlg || !key || key->len<=0) { LM_ERR("BUG - bad parameters\n"); return NULL; @@ -313,7 +312,7 @@ int get_dlg_varval(struct dlg_cell *dlg, str *key, str *val) val->s = NULL; val->len = 0; - if( !dlg || !key || key->len > strlen(key->s)) { + if( !dlg || !key || key->len<=0) { LM_ERR("BUG - bad parameters\n"); return -1; }

1 year, 7 months

git:master:cc521654: Revert "lrkproxy: Add new features : TURN support, behind_nat support, subset of range ports"

by Mojtaba Esfandiari.S

Module: kamailio Branch: master Commit: cc5216540f2240b7fc47adf66f380a00cf408aa0 URL: https://github.com/kamailio/kamailio/commit/cc5216540f2240b7fc47adf66f380a0… Author: Mojtaba Esfandiari.S <mespio(a)gmail.com> Committer: Mojtaba Esfandiari.S <mespio(a)gmail.com> Date: 2022-09-24T16:10:10+03:30 Revert "lrkproxy: Add new features : TURN support, behind_nat support, subset of range ports" This reverts commit f2b07f2321980e74247cb0c968b98925172f6874. --- Added: misc/external/wolfssl/wolfssl --- Diff: https://github.com/kamailio/kamailio/commit/cc5216540f2240b7fc47adf66f380a0… Patch: https://github.com/kamailio/kamailio/commit/cc5216540f2240b7fc47adf66f380a0… --- diff --git a/misc/external/wolfssl/wolfssl b/misc/external/wolfssl/wolfssl new file mode 160000 index 00000000000..57aac1c50b4 --- /dev/null +++ b/misc/external/wolfssl/wolfssl @@ -0,0 +1 @@ +Subproject commit 57aac1c50b45275c7a99eca32ad985998b292dc8

1 year, 7 months

Re: [sr-dev] git:master:f2b07f23: lrkproxy: Add new features : TURN support, behind_nat support, subset of range ports

by Henning Westerholt

Hi Mojtaba, no worries, you can just revert it with “git revert $commit-ID” for the specific commit. I can also do it later today, no problem. Cheers, Henning -- Henning Westerholt – https://skalatan.de/blog/ Kamailio services – https://gilawa.com<https://gilawa.com/> From: Mojtaba <mespio(a)gmail.com> Sent: Saturday, September 24, 2022 1:35 PM To: Henning Westerholt <hw(a)gilawa.com> Subject: Re: [sr-dev] git:master:f2b07f23: lrkproxy: Add new features : TURN support, behind_nat support, subset of range ports Hello Henning, After I pushed it, I got this issue. Please rollback this commit, then I will push the changes related to LRKProxy again. Thanks On Sat, Sep 24, 2022 at 2:58 PM Henning Westerholt <hw(a)gilawa.com<mailto:hw@gilawa.com>> wrote: Hello Mojtaba, There seems to be an issue with this commit, you've removed something related to the tls_wolfssl module. Cheers, Henning -----Original Message----- From: sr-dev <sr-dev-bounces(a)lists.kamailio.org<mailto:sr-dev-bounces@lists.kamailio.org>> On Behalf Of Mojtaba Esfandiari.S Sent: Saturday, September 24, 2022 12:56 PM To: sr-dev(a)lists.kamailio.org<mailto:sr-dev@lists.kamailio.org> Subject: [sr-dev] git:master:f2b07f23: lrkproxy: Add new features : TURN support, behind_nat support, subset of range ports Module: kamailio Branch: master Commit: f2b07f2321980e74247cb0c968b98925172f6874 URL: https://github.com/kamailio/kamailio/commit/f2b07f2321980e74247cb0c968b9892… Author: Mojtaba Esfandiari.S <mespio(a)gmail.com<mailto:mespio@gmail.com>> Committer: Mojtaba Esfandiari.S <mespio(a)gmail.com<mailto:mespio@gmail.com>> Date: 2022-09-24T14:25:24+03:30 lrkproxy: Add new features : TURN support, behind_nat support, subset of range ports --- Removed: misc/external/wolfssl/wolfssl --- Diff: https://github.com/kamailio/kamailio/commit/f2b07f2321980e74247cb0c968b9892… Patch: https://github.com/kamailio/kamailio/commit/f2b07f2321980e74247cb0c968b9892… --- diff --git a/misc/external/wolfssl/wolfssl b/misc/external/wolfssl/wolfssl deleted file mode 160000 index 57aac1c50b4..00000000000 --- a/misc/external/wolfssl/wolfssl +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 57aac1c50b45275c7a99eca32ad985998b292dc8 _______________________________________________ Kamailio (SER) - Development Mailing List sr-dev(a)lists.kamailio.org<mailto:sr-dev@lists.kamailio.org> https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev -- --Mojtaba Esfandiari.S

1 year, 7 months

Re: [sr-dev] [kamailio/kamailio] lrkproxy: Add new features : TURN support, behind_nat support, subset of range ports (f2b07f2)

by Mojtaba Esfandiari.S

After I pushed it, I got a issue. Please roll back this commit, then I will push the changes related to LRKProxy again. Thanks -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/f2b07f2321980e74247cb0c968b9892… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/f2b07f2321980e74247cb0c968b98925172f6874/84890546(a)github.com>

1 year, 7 months

git:master:f2b07f23: lrkproxy: Add new features : TURN support, behind_nat support, subset of range ports

by Mojtaba Esfandiari.S

Module: kamailio Branch: master Commit: f2b07f2321980e74247cb0c968b98925172f6874 URL: https://github.com/kamailio/kamailio/commit/f2b07f2321980e74247cb0c968b9892… Author: Mojtaba Esfandiari.S <mespio(a)gmail.com> Committer: Mojtaba Esfandiari.S <mespio(a)gmail.com> Date: 2022-09-24T14:25:24+03:30 lrkproxy: Add new features : TURN support, behind_nat support, subset of range ports --- Removed: misc/external/wolfssl/wolfssl --- Diff: https://github.com/kamailio/kamailio/commit/f2b07f2321980e74247cb0c968b9892… Patch: https://github.com/kamailio/kamailio/commit/f2b07f2321980e74247cb0c968b9892… --- diff --git a/misc/external/wolfssl/wolfssl b/misc/external/wolfssl/wolfssl deleted file mode 160000 index 57aac1c50b4..00000000000 --- a/misc/external/wolfssl/wolfssl +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 57aac1c50b45275c7a99eca32ad985998b292dc8

1 year, 7 months

New feature: #!ifexp - conditional preprocessor blocks

by Daniel-Constantin Mierla

Hello, a new feature has landed to Kamailio devel version, bringing in more flexibility for preprocessing of the kamailio.cfg file. It is about #!ifexp, which allows to evaluate an expression created with defined IDs, string and number values. Based on evaluation result, being true or false, parts of the config file can be enabled or disabled. An extensive number of operators can be used in expressions, such as: +, -, *, /, ==, !=, <, >, <=, >=, ||, &&, etc. The evaluation is done using snexpr (https://github.com/miconda/snexpr), which was embedded inside Kamailio code. Here are some simple kamailio.cfg examples: #!ifexp KAMAILIO_VERSION >= 5006000 loadmodule "tlsa.so" #!else loadmodule "tls.so" #!endif #!ifexp MOD_xlog && (OS_NAME == "darwin") xlog("running on MacOS\n"); #!endif Documentation and more examples can be found on the wiki portal at: - https://www.kamailio.org/wikidocs/cookbooks/devel/core/#ifexp Testing would be appreciated, feedback can be addressed to sr-users mailing list! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 year, 7 months

git:master:a2d9a2f9: pua_dialoginfo: use dlg api function get_dlg_varval()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a2d9a2f95e2212a9f5538ac25ac241206eff06a0 URL: https://github.com/kamailio/kamailio/commit/a2d9a2f95e2212a9f5538ac25ac2412… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-23T14:07:41+02:00 pua_dialoginfo: use dlg api function get_dlg_varval() --- Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/a2d9a2f95e2212a9f5538ac25ac2412… Patch: https://github.com/kamailio/kamailio/commit/a2d9a2f95e2212a9f5538ac25ac2412… --- diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c index 10aa5b467d..50a1029289 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -315,11 +315,13 @@ void refresh_pubruri_avps(struct dlginfo_cell *dlginfo, str *uri) } void refresh_local_identity(struct dlg_cell *dlg, str *uri) { - str *s = dlg_api.get_dlg_var(dlg, &local_identity_dlg_var); + str s = {0}; - if(s != NULL) { - uri->s = s->s; - uri->len = s->len; + dlg_api.get_dlg_varval(dlg, &local_identity_dlg_var, &s); + + if(s.s != NULL) { + uri->s = s.s; + uri->len = s.len; LM_DBG("Found local_identity in dialog '%.*s'\n", uri->len, uri->s); } @@ -576,7 +578,7 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type, int disable { struct dlginfo_cell *dlginfo; int len; - str* s=NULL; + str dval = {0}; // generate new random uuid if(sruid_next_safe(&_puadi_sruid) < 0) { @@ -652,9 +654,10 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type, int disable } else { if(caller_dlg_var.len>0 - && (s = dlg_api.get_dlg_var(dlg, &caller_dlg_var))!=0) { + && (dlg_api.get_dlg_varval(dlg, &caller_dlg_var, &dval)==0) + && dval.s!=NULL) { dlginfo->pubruris_caller = - (struct str_list*)shm_malloc(sizeof(struct str_list) + s->len + 1); + (struct str_list*)shm_malloc(sizeof(struct str_list) + dval.len + 1); if (dlginfo->pubruris_caller==0) { SHM_MEM_ERROR; free_dlginfo_cell(dlginfo); @@ -663,17 +666,18 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type, int disable memset(dlginfo->pubruris_caller, 0, sizeof(struct str_list)); dlginfo->pubruris_caller->s.s = (char*)dlginfo->pubruris_caller + sizeof(sizeof(struct str_list)); - memcpy(dlginfo->pubruris_caller->s.s, s->s, s->len); - dlginfo->pubruris_caller->s.s[s->len] = '\0'; - dlginfo->pubruris_caller->s.len = s->len; + memcpy(dlginfo->pubruris_caller->s.s, dval.s, dval.len); + dlginfo->pubruris_caller->s.s[dval.len] = '\0'; + dlginfo->pubruris_caller->s.len = dval.len; LM_DBG("Found pubruris_caller in dialog '%.*s'\n", dlginfo->pubruris_caller->s.len, dlginfo->pubruris_caller->s.s); } if(callee_dlg_var.len>0 - && (s = dlg_api.get_dlg_var(dlg, &callee_dlg_var))!=0) { + && (dlg_api.get_dlg_varval(dlg, &callee_dlg_var, &dval)==0) + && dval.s!=NULL) { dlginfo->pubruris_callee = - (struct str_list*)shm_malloc(sizeof(struct str_list) + s->len + 1); + (struct str_list*)shm_malloc(sizeof(struct str_list) + dval.len + 1); if (dlginfo->pubruris_callee==0) { SHM_MEM_ERROR; free_dlginfo_cell(dlginfo); @@ -682,9 +686,9 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type, int disable memset(dlginfo->pubruris_callee, 0, sizeof(struct str_list)); dlginfo->pubruris_callee->s.s = (char*)dlginfo->pubruris_callee + sizeof(sizeof(struct str_list)); - memcpy(dlginfo->pubruris_callee->s.s, s->s, s->len); - dlginfo->pubruris_callee->s.s[s->len] = '\0'; - dlginfo->pubruris_callee->s.len = s->len; + memcpy(dlginfo->pubruris_callee->s.s, dval.s, dval.len); + dlginfo->pubruris_callee->s.s[dval.len] = '\0'; + dlginfo->pubruris_callee->s.len = dval.len; LM_DBG("Found pubruris_callee in dialog '%.*s'\n", dlginfo->pubruris_callee->s.len, dlginfo->pubruris_callee->s.s); }

1 year, 7 months

git:master:cd4e2259: uac: use dlg api functions get_dlg_varval() and get_dlg_varref()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cd4e2259526bc4642259201ee96b00624f300437 URL: https://github.com/kamailio/kamailio/commit/cd4e2259526bc4642259201ee96b006… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-23T13:59:36+02:00 uac: use dlg api functions get_dlg_varval() and get_dlg_varref() --- Modified: src/modules/uac/replace.c --- Diff: https://github.com/kamailio/kamailio/commit/cd4e2259526bc4642259201ee96b006… Patch: https://github.com/kamailio/kamailio/commit/cd4e2259526bc4642259201ee96b006… --- diff --git a/src/modules/uac/replace.c b/src/modules/uac/replace.c index 6e77eafe94..513623ba26 100644 --- a/src/modules/uac/replace.c +++ b/src/modules/uac/replace.c @@ -391,7 +391,7 @@ int replace_uri( struct sip_msg *msg, str *display, str *uri, if (dlg) { dlgvar_names = (uac_flag==FL_USE_UAC_FROM)?from_dlgvar:to_dlgvar; - if(dlg_api.get_dlg_var(dlg, &dlgvar_names[0])) { + if(dlg_api.get_dlg_varref(dlg, &dlgvar_names[0])) { LM_INFO("Already called uac_replace for this dialog\n"); /* delete the from_new dlg var */ @@ -873,8 +873,8 @@ static void replace_callback(struct dlg_cell *dlg, int type, struct hdr_field *hdr; struct to_body *body; str old_uri; - str* new_uri; - str* new_display; + str new_uri = {0}; + str new_display = {0}; str buf = STR_NULL; char *p; unsigned int uac_flag; @@ -927,20 +927,22 @@ static void replace_callback(struct dlg_cell *dlg, int type, " with the original uri\n"); } - if ((new_uri = dlg_api.get_dlg_var(dlg, &dlgvar_names[dlgvar_index])) == 0) { + dlg_api.get_dlg_varval(dlg, &dlgvar_names[dlgvar_index], &new_uri); + if (new_uri.s == NULL) { LM_DBG("<%.*s> param not found\n", dlgvar_names[dlgvar_index].len, dlgvar_names[dlgvar_index].s); return; } - if ((new_display = dlg_api.get_dlg_var(dlg, &dlgvar_names[dlgvar_dpindex])) == 0) { + dlg_api.get_dlg_varval(dlg, &dlgvar_names[dlgvar_dpindex], &new_display); + if (new_display.s == NULL) { LM_DBG("<%.*s> param not found\n", dlgvar_names[dlgvar_dpindex].len, dlgvar_names[dlgvar_dpindex].s); return; } LM_DBG("Replace [%.*s %.*s] with [%.*s %.*s]\n", body->display.len, body->display.s, - old_uri.len, old_uri.s, new_display->len, new_display->s, - new_uri->len, new_uri->s); + old_uri.len, old_uri.s, new_display.len, new_display.s, + new_uri.len, new_uri.s); /* deal with display name */ l = 0; @@ -955,17 +957,17 @@ static void replace_callback(struct dlg_cell *dlg, int type, return; } } - if (new_display->s && new_display->len > 0) { + if (new_display.s && new_display.len > 0) { LM_DBG("inserting display [%.*s]\n", - new_display->len, new_display->s); + new_display.len, new_display.s); /* add the new display exactly over the deleted one */ - buf.s = pkg_malloc(new_display->len + 2); + buf.s = pkg_malloc(new_display.len + 2); if (buf.s==0) { PKG_MEM_ERROR; return; } - memcpy( buf.s, new_display->s, new_display->len); - buf.len = new_display->len; + memcpy(buf.s, new_display.s, new_display.len); + buf.len = new_display.len; if (l==0 && (l=get_display_anchor(msg, hdr, body, &buf)) == 0) { LM_ERR("failed to insert anchor\n"); pkg_free(buf.s); @@ -979,12 +981,12 @@ static void replace_callback(struct dlg_cell *dlg, int type, } /* uri update - duplicate the decoded value */ - p = pkg_malloc( new_uri->len); + p = pkg_malloc(new_uri.len); if (!p) { PKG_MEM_ERROR; return; } - memcpy(p, new_uri->s, new_uri->len); + memcpy(p, new_uri.s, new_uri.len); /* build del/add lumps */ l = del_lump(msg, old_uri.s-msg->buf, old_uri.len, 0); @@ -994,7 +996,7 @@ static void replace_callback(struct dlg_cell *dlg, int type, return; } - if (insert_new_lump_after( l, p, new_uri->len, 0)==0) { + if (insert_new_lump_after(l, p, new_uri.len, 0)==0) { LM_ERR("insert new lump failed\n"); pkg_free(p); return;

1 year, 7 months

git:master:fb7c4978: acc: use get_dlg_varval() to get values for dialog variables

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: fb7c497893f05587bda1c37e09d73a7ebb522715 URL: https://github.com/kamailio/kamailio/commit/fb7c497893f05587bda1c37e09d73a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-23T13:42:18+02:00 acc: use get_dlg_varval() to get values for dialog variables --- Modified: src/modules/acc/acc_cdr.c Modified: src/modules/acc/acc_extra.c --- Diff: https://github.com/kamailio/kamailio/commit/fb7c497893f05587bda1c37e09d73a7… Patch: https://github.com/kamailio/kamailio/commit/fb7c497893f05587bda1c37e09d73a7…

1 year, 7 months

git:master:ce3cd426: dialog: init output dlg var value param eariler

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ce3cd42631ac06a6a20892bd308901c6acd58f7a URL: https://github.com/kamailio/kamailio/commit/ce3cd42631ac06a6a20892bd308901c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-23T13:33:03+02:00 dialog: init output dlg var value param eariler --- Modified: src/modules/dialog/dlg_var.c --- Diff: https://github.com/kamailio/kamailio/commit/ce3cd42631ac06a6a20892bd308901c… Patch: https://github.com/kamailio/kamailio/commit/ce3cd42631ac06a6a20892bd308901c… --- diff --git a/src/modules/dialog/dlg_var.c b/src/modules/dialog/dlg_var.c index 4db8d84c35..04a645309b 100644 --- a/src/modules/dialog/dlg_var.c +++ b/src/modules/dialog/dlg_var.c @@ -310,14 +310,14 @@ int get_dlg_varval(struct dlg_cell *dlg, str *key, str *val) { str *var = NULL; + val->s = NULL; + val->len = 0; + if( !dlg || !key || key->len > strlen(key->s)) { LM_ERR("BUG - bad parameters\n"); return -1; } - val->s = NULL; - val->len = 0; - dlg_lock(d_table, &(d_table->entries[dlg->h_entry])); var = get_dlg_variable_unsafe(dlg, key); if(var) {

1 year, 7 months

← Newer
1
...
12
13
14
15
16
17
18
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2022