- sr-dev - kamailio.org

git:master:320af48d: dialog: export new itermodule api functions
by Daniel-Constantin Mierla 26 Sep '22

26 Sep '22

Module: kamailio Branch: master Commit: 320af48dffaa3c9b2c266ad9f68233e3cf48f9f0 URL: https://github.com/kamailio/kamailio/commit/320af48dffaa3c9b2c266ad9f68233e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-26T15:30:51+02:00 dialog: export new itermodule api functions - get duplicate var value and status --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_load.h --- Diff: https://github.com/kamailio/kamailio/commit/320af48dffaa3c9b2c266ad9f68233e… Patch: https://github.com/kamailio/kamailio/commit/320af48dffaa3c9b2c266ad9f68233e… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 2a7fd39948..7fa6bd57c6 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -483,6 +483,8 @@ int load_dlg( struct dlg_binds *dlgb ) dlgb->set_dlg_var = set_dlg_variable; dlgb->get_dlg_varref = get_dlg_varref; dlgb->get_dlg_varval = get_dlg_varval; + dlgb->get_dlg_vardup = get_dlg_vardup; + dlgb->get_dlg_varstatus = get_dlg_varstatus; dlgb->get_dlg = dlg_get_msg_dialog; dlgb->release_dlg = dlg_release; return 1; diff --git a/src/modules/dialog/dlg_load.h b/src/modules/dialog/dlg_load.h index 16fb568ef3..69d78e1ee2 100644 --- a/src/modules/dialog/dlg_load.h +++ b/src/modules/dialog/dlg_load.h @@ -43,14 +43,15 @@ typedef struct dlg_cell *(*get_dlg_f)(struct sip_msg *msg); typedef void (*release_dlg_f)(struct dlg_cell *dlg); struct dlg_binds { - register_dlgcb_f register_dlgcb; - terminate_dlg_f terminate_dlg; - set_dlg_variable_f set_dlg_var; - get_dlg_varref_f get_dlg_varref; - get_dlg_varval_f get_dlg_varval; - get_dlg_vardup_f get_dlg_vardup; - get_dlg_f get_dlg; - release_dlg_f release_dlg; + register_dlgcb_f register_dlgcb; + terminate_dlg_f terminate_dlg; + set_dlg_variable_f set_dlg_var; + get_dlg_varref_f get_dlg_varref; + get_dlg_varval_f get_dlg_varval; + get_dlg_vardup_f get_dlg_vardup; + get_dlg_varstatus_f get_dlg_varstatus; + get_dlg_f get_dlg; + release_dlg_f release_dlg; };

1 0

git:master:c2c3211c: dialog: api function to get the status if dlg var is set or not
by Daniel-Constantin Mierla 26 Sep '22

26 Sep '22

Module: kamailio Branch: master Commit: c2c3211cd31405188891abd16ef770c26a8ddd44 URL: https://github.com/kamailio/kamailio/commit/c2c3211cd31405188891abd16ef770c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-26T12:30:06+02:00 dialog: api function to get the status if dlg var is set or not --- Modified: src/modules/dialog/dlg_cb.h Modified: src/modules/dialog/dlg_var.c Modified: src/modules/dialog/dlg_var.h --- Diff: https://github.com/kamailio/kamailio/commit/c2c3211cd31405188891abd16ef770c… Patch: https://github.com/kamailio/kamailio/commit/c2c3211cd31405188891abd16ef770c… --- diff --git a/src/modules/dialog/dlg_cb.h b/src/modules/dialog/dlg_cb.h index 86a85bb2e1..a685816306 100644 --- a/src/modules/dialog/dlg_cb.h +++ b/src/modules/dialog/dlg_cb.h @@ -63,6 +63,9 @@ typedef int (*get_dlg_varval_f)( struct dlg_cell* dlg, /* method to get a variable value pkg-allocated duplicate from a dialog */ typedef int (*get_dlg_vardup_f)( struct dlg_cell* dlg, str* key, str* val); +/* method to get if a variable value is set or not from a dialog */ +typedef int (*get_dlg_varstatus_f)( struct dlg_cell* dlg, + str* key); #define CONFIRMED_DIALOG_STATE 1 diff --git a/src/modules/dialog/dlg_var.c b/src/modules/dialog/dlg_var.c index 8edde80f1b..473736b437 100644 --- a/src/modules/dialog/dlg_var.c +++ b/src/modules/dialog/dlg_var.c @@ -376,6 +376,31 @@ int get_dlg_vardup(struct dlg_cell *dlg, str *key, str *val) return -2; } +/** + * return the status if the dlg variable value is set or not + * - 1 - variable is set + * - 0 - variable is not set + */ +int get_dlg_varstatus(struct dlg_cell *dlg, str *key) +{ + str* var = NULL; + int ret = 0; + + if( !dlg || !key || key->len<=0) { + LM_ERR("BUG - bad parameters\n"); + return 0; + } + + dlg_lock(d_table, &(d_table->entries[dlg->h_entry])); + var = get_dlg_variable_unsafe(dlg, key); + if(var && var->s) { + ret = 1; + } + dlg_unlock(d_table, &(d_table->entries[dlg->h_entry])); + + return ret; +} + int get_dlg_variable_uintval(struct dlg_cell *dlg, str *key, unsigned int *uval) { str* var = NULL; diff --git a/src/modules/dialog/dlg_var.h b/src/modules/dialog/dlg_var.h index 52f2a01a60..292e9f701b 100644 --- a/src/modules/dialog/dlg_var.h +++ b/src/modules/dialog/dlg_var.h @@ -62,6 +62,7 @@ typedef struct dlg_var { str* get_dlg_varref(dlg_cell_t *dlg, str *key); int get_dlg_varval(dlg_cell_t *dlg, str *key, str *val); int get_dlg_vardup(dlg_cell_t *dlg, str *key, str *val); +int get_dlg_varstatus(dlg_cell_t *dlg, str *key); int set_dlg_variable(dlg_cell_t *dlg, str *key, str *val); int get_dlg_variable_uintval(struct dlg_cell *dlg, str *key, unsigned int *uval);

1 0

git:master:abdb02d3: dialog: updated ki_dlg_var_is_null() to use safer api function
by Daniel-Constantin Mierla 26 Sep '22

26 Sep '22

Module: kamailio Branch: master Commit: abdb02d3d2eec9fb45646f68996da3526c92ef58 URL: https://github.com/kamailio/kamailio/commit/abdb02d3d2eec9fb45646f68996da35… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-26T12:51:50+02:00 dialog: updated ki_dlg_var_is_null() to use safer api function --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/abdb02d3d2eec9fb45646f68996da35… Patch: https://github.com/kamailio/kamailio/commit/abdb02d3d2eec9fb45646f68996da35… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index d4d2df07fa..2a7fd39948 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -2518,14 +2518,14 @@ static int ki_dlg_var_rm(sip_msg_t *msg, str *name) static int ki_dlg_var_is_null(sip_msg_t *msg, str *name) { dlg_cell_t *dlg; - str *pval; + int ret; dlg = dlg_get_msg_dialog(msg); if(dlg==NULL) { return 1; } - pval = get_dlg_varref(dlg, name); - if(pval==NULL || pval->s==NULL) { + ret = get_dlg_varstatus(dlg, name); + if(ret==1) { return 1; } return -1;

1 0

git:master:13512f48: dialog: api function get pkg-allocated duplicate of dlg var value
by Daniel-Constantin Mierla 26 Sep '22

26 Sep '22

Module: kamailio Branch: master Commit: 13512f48e03a2ef99847edf639582aaf3b4dfeb3 URL: https://github.com/kamailio/kamailio/commit/13512f48e03a2ef99847edf639582aa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-26T11:57:02+02:00 dialog: api function get pkg-allocated duplicate of dlg var value --- Modified: src/modules/dialog/dlg_cb.h Modified: src/modules/dialog/dlg_load.h Modified: src/modules/dialog/dlg_var.c Modified: src/modules/dialog/dlg_var.h --- Diff: https://github.com/kamailio/kamailio/commit/13512f48e03a2ef99847edf639582aa… Patch: https://github.com/kamailio/kamailio/commit/13512f48e03a2ef99847edf639582aa… --- diff --git a/src/modules/dialog/dlg_cb.h b/src/modules/dialog/dlg_cb.h index d049875308..91064ee9e0 100644 --- a/src/modules/dialog/dlg_cb.h +++ b/src/modules/dialog/dlg_cb.h @@ -42,7 +42,7 @@ struct dlg_cb_params { }; /* callback function prototype */ -typedef void (dialog_cb) (struct dlg_cell* dlg, int type, +typedef void (dialog_cb) (struct dlg_cell* dlg, int type, struct dlg_cb_params * params); /* function to free the callback param */ typedef void (param_free_cb) (void *param); @@ -60,6 +60,9 @@ typedef str* (*get_dlg_varref_f)( struct dlg_cell* dlg, /* method to get a variable from a dialog */ typedef int (*get_dlg_varval_f)( struct dlg_cell* dlg, str* key, str* val); +/* method to get a variable value duplicate from a dialog */ +typedef int (*get_dlg_vardup_f)( struct dlg_cell* dlg, + str* key, str* val); #define CONFIRMED_DIALOG_STATE 1 diff --git a/src/modules/dialog/dlg_load.h b/src/modules/dialog/dlg_load.h index 2a3273ce84..16fb568ef3 100644 --- a/src/modules/dialog/dlg_load.h +++ b/src/modules/dialog/dlg_load.h @@ -48,6 +48,7 @@ struct dlg_binds { set_dlg_variable_f set_dlg_var; get_dlg_varref_f get_dlg_varref; get_dlg_varval_f get_dlg_varval; + get_dlg_vardup_f get_dlg_vardup; get_dlg_f get_dlg; release_dlg_f release_dlg; }; diff --git a/src/modules/dialog/dlg_var.c b/src/modules/dialog/dlg_var.c index 0a16d18296..8edde80f1b 100644 --- a/src/modules/dialog/dlg_var.c +++ b/src/modules/dialog/dlg_var.c @@ -342,6 +342,40 @@ int get_dlg_varval(struct dlg_cell *dlg, str *key, str *val) return -2; } +/** + * set *val to a pkg-allocated buffer where the dlg value is cloned + * - val->s has to be pkg-freed after use + */ +int get_dlg_vardup(struct dlg_cell *dlg, str *key, str *val) +{ + str *var = NULL; + + val->s = NULL; + val->len = 0; + + if( !dlg || !key || key->len<=0) { + LM_ERR("BUG - bad parameters\n"); + return -1; + } + + dlg_lock(d_table, &(d_table->entries[dlg->h_entry])); + var = get_dlg_variable_unsafe(dlg, key); + if(var && var->s) { + val->s = (char*)pkg_malloc(var->len + 1); + if(val->s!=NULL) { + memcpy(val->s, var->s, var->len); + val->len = var->len; + val->s[val->len] = '\0'; + } + } + dlg_unlock(d_table, &(d_table->entries[dlg->h_entry])); + + if(val->s) { + return 0; + } + return -2; +} + int get_dlg_variable_uintval(struct dlg_cell *dlg, str *key, unsigned int *uval) { str* var = NULL; diff --git a/src/modules/dialog/dlg_var.h b/src/modules/dialog/dlg_var.h index 05060997f0..52f2a01a60 100644 --- a/src/modules/dialog/dlg_var.h +++ b/src/modules/dialog/dlg_var.h @@ -61,6 +61,7 @@ typedef struct dlg_var { str* get_dlg_varref(dlg_cell_t *dlg, str *key); int get_dlg_varval(dlg_cell_t *dlg, str *key, str *val); +int get_dlg_vardup(dlg_cell_t *dlg, str *key, str *val); int set_dlg_variable(dlg_cell_t *dlg, str *key, str *val); int get_dlg_variable_uintval(struct dlg_cell *dlg, str *key, unsigned int *uval);

1 0

git:master:8548aaa8: dialog: updated comments for api functions to get dlg var value
by Daniel-Constantin Mierla 26 Sep '22

26 Sep '22

Module: kamailio Branch: master Commit: 8548aaa8a798b939e041821848b2f05b963451d8 URL: https://github.com/kamailio/kamailio/commit/8548aaa8a798b939e041821848b2f05… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-26T12:04:29+02:00 dialog: updated comments for api functions to get dlg var value --- Modified: src/modules/dialog/dlg_cb.h --- Diff: https://github.com/kamailio/kamailio/commit/8548aaa8a798b939e041821848b2f05… Patch: https://github.com/kamailio/kamailio/commit/8548aaa8a798b939e041821848b2f05… --- diff --git a/src/modules/dialog/dlg_cb.h b/src/modules/dialog/dlg_cb.h index 91064ee9e0..86a85bb2e1 100644 --- a/src/modules/dialog/dlg_cb.h +++ b/src/modules/dialog/dlg_cb.h @@ -54,13 +54,13 @@ typedef int (*register_dlgcb_f)(struct dlg_cell* dlg, int cb_types, typedef int (*set_dlg_variable_f)( struct dlg_cell* dlg, str* key, str* val); -/* method to get a variable from a dialog */ +/* method to get a variable value reference from a dialog */ typedef str* (*get_dlg_varref_f)( struct dlg_cell* dlg, str* key); -/* method to get a variable from a dialog */ +/* method to get a variable value static-buffer duplicate from a dialog */ typedef int (*get_dlg_varval_f)( struct dlg_cell* dlg, str* key, str* val); -/* method to get a variable value duplicate from a dialog */ +/* method to get a variable value pkg-allocated duplicate from a dialog */ typedef int (*get_dlg_vardup_f)( struct dlg_cell* dlg, str* key, str* val);

1 0

git:master:a7571233: dialog: update check on dialog var key length
by Daniel-Constantin Mierla 26 Sep '22

26 Sep '22

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 0

git:master:cc521654: Revert "lrkproxy: Add new features : TURN support, behind_nat support, subset of range ports"
by Mojtaba Esfandiari.S 24 Sep '22

24 Sep '22

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 0

Re: [sr-dev] git:master:f2b07f23: lrkproxy: Add new features : TURN support, behind_nat support, subset of range ports
by Henning Westerholt 24 Sep '22

24 Sep '22

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

2 1

Re: [sr-dev] [kamailio/kamailio] lrkproxy: Add new features : TURN support, behind_nat support, subset of range ports (f2b07f2)
by Mojtaba Esfandiari.S 24 Sep '22

24 Sep '22

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 0

git:master:f2b07f23: lrkproxy: Add new features : TURN support, behind_nat support, subset of range ports
by Mojtaba Esfandiari.S 24 Sep '22

24 Sep '22

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

2 1

New feature: #!ifexp - conditional preprocessor blocks
by Daniel-Constantin Mierla 23 Sep '22

23 Sep '22

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

3 2

git:master:a2d9a2f9: pua_dialoginfo: use dlg api function get_dlg_varval()
by Daniel-Constantin Mierla 23 Sep '22

23 Sep '22

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 0

git:master:fb7c4978: acc: use get_dlg_varval() to get values for dialog variables
by Daniel-Constantin Mierla 23 Sep '22

23 Sep '22

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 0

git:master:cd4e2259: uac: use dlg api functions get_dlg_varval() and get_dlg_varref()
by Daniel-Constantin Mierla 23 Sep '22

23 Sep '22

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 0

git:master:a7cecdcb: dialog: internal api functions to get dlg variable reference or value
by Daniel-Constantin Mierla 23 Sep '22

23 Sep '22

Module: kamailio Branch: master Commit: a7cecdcbc3c1d53fce22a33a3768da2a1907d64e URL: https://github.com/kamailio/kamailio/commit/a7cecdcbc3c1d53fce22a33a3768da2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-23T13:17:02+02:00 dialog: internal api functions to get dlg variable reference or value --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_cb.h Modified: src/modules/dialog/dlg_load.h Modified: src/modules/dialog/dlg_var.c Modified: src/modules/dialog/dlg_var.h --- Diff: https://github.com/kamailio/kamailio/commit/a7cecdcbc3c1d53fce22a33a3768da2… Patch: https://github.com/kamailio/kamailio/commit/a7cecdcbc3c1d53fce22a33a3768da2…

1 0

git:master:ce3cd426: dialog: init output dlg var value param eariler
by Daniel-Constantin Mierla 23 Sep '22

23 Sep '22

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 0

git:master:023af516: acc_json: moved global vars declaration to .c file
by Daniel-Constantin Mierla 23 Sep '22

23 Sep '22

Module: kamailio Branch: master Commit: 023af516f4ede3742f2e1836474978b596a4a3a8 URL: https://github.com/kamailio/kamailio/commit/023af516f4ede3742f2e1836474978b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-22T20:30:52+02:00 acc_json: moved global vars declaration to .c file - made them static --- Modified: src/modules/acc_json/acc_json_mod.c Modified: src/modules/acc_json/acc_json_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/023af516f4ede3742f2e1836474978b… Patch: https://github.com/kamailio/kamailio/commit/023af516f4ede3742f2e1836474978b… --- diff --git a/src/modules/acc_json/acc_json_mod.c b/src/modules/acc_json/acc_json_mod.c index accd054de6..ab6f9b4498 100644 --- a/src/modules/acc_json/acc_json_mod.c +++ b/src/modules/acc_json/acc_json_mod.c @@ -37,6 +37,26 @@ MODULE_VERSION +static str acc_method_key = str_init("method"); +static str acc_fromtag_key = str_init("from_tag"); +static str acc_totag_key = str_init("to_tag"); +static str acc_callid_key = str_init("callid"); +static str acc_sipcode_key = str_init("sip_code"); +static str acc_sipreason_key = str_init("sip_reason"); +static str acc_time_key = str_init("time"); + +static str cdr_start_str = str_init("start_time"); +static str cdr_end_str = str_init("end_time"); +static str cdr_duration_str = str_init("duration"); + +static char acc_time_format_buf[ACC_TIME_FORMAT_SIZE]; +static char *acc_time_format = "%Y-%m-%d %H:%M:%S"; + +static int acc_log_level = L_NOTICE; +static int acc_log_facility = LOG_DAEMON; +static int cdr_log_level = L_NOTICE; +static int cdr_log_facility = LOG_DAEMON; + static int mod_init(void); static void destroy(void); static int child_init(int rank); diff --git a/src/modules/acc_json/acc_json_mod.h b/src/modules/acc_json/acc_json_mod.h index 25a3ac120e..62c3350faa 100644 --- a/src/modules/acc_json/acc_json_mod.h +++ b/src/modules/acc_json/acc_json_mod.h @@ -24,25 +24,6 @@ #ifndef _ACC_JSON_MOD_H_ #define _ACC_JSON_MOD_H_ -str acc_method_key = str_init("method"); -str acc_fromtag_key = str_init("from_tag"); -str acc_totag_key = str_init("to_tag"); -str acc_callid_key = str_init("callid"); -str acc_sipcode_key = str_init("sip_code"); -str acc_sipreason_key = str_init("sip_reason"); -str acc_time_key = str_init("time"); - -str cdr_start_str = str_init("start_time"); -str cdr_end_str = str_init("end_time"); -str cdr_duration_str = str_init("duration"); - #define ACC_TIME_FORMAT_SIZE 128 -static char acc_time_format_buf[ACC_TIME_FORMAT_SIZE]; -char *acc_time_format = "%Y-%m-%d %H:%M:%S"; - -int acc_log_level = L_NOTICE; -int acc_log_facility = LOG_DAEMON; -int cdr_log_level = L_NOTICE; -int cdr_log_facility = LOG_DAEMON; #endif

1 0

git:master:3e2b5d9e: acc_json: use the variable for the time key
by Daniel-Constantin Mierla 23 Sep '22

23 Sep '22

Module: kamailio Branch: master Commit: 3e2b5d9ed6a0f18199359444c5ae33a1d6b94eb2 URL: https://github.com/kamailio/kamailio/commit/3e2b5d9ed6a0f18199359444c5ae33a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-22T20:32:52+02:00 acc_json: use the variable for the time key --- Modified: src/modules/acc_json/acc_json_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3e2b5d9ed6a0f18199359444c5ae33a… Patch: https://github.com/kamailio/kamailio/commit/3e2b5d9ed6a0f18199359444c5ae33a… --- diff --git a/src/modules/acc_json/acc_json_mod.c b/src/modules/acc_json/acc_json_mod.c index ab6f9b4498..97b1c666bd 100644 --- a/src/modules/acc_json/acc_json_mod.c +++ b/src/modules/acc_json/acc_json_mod.c @@ -311,9 +311,9 @@ int acc_json_send_request(struct sip_msg *req, acc_info_t *inf) <= 0) { acc_time_format_buf[0] = '\0'; } - json_object_set_new(object, "time", json_string(acc_time_format_buf)); + json_object_set_new(object, acc_time_key.s, json_string(acc_time_format_buf)); } else { // default acc_time_mode==1 - json_object_set_new(object, "time", json_integer(inf->env->ts)); + json_object_set_new(object, acc_time_key.s, json_integer(inf->env->ts)); } LM_DBG("text[%.*s]\n", inf->env->text.len, inf->env->text.s);

1 0

git:master:bcb3970d: acc_json: code formatting updates
by Daniel-Constantin Mierla 23 Sep '22

23 Sep '22

Module: kamailio Branch: master Commit: bcb3970d7a89ab27b43f86aee5b93a473a8b790b URL: https://github.com/kamailio/kamailio/commit/bcb3970d7a89ab27b43f86aee5b93a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-22T20:41:32+02:00 acc_json: code formatting updates --- Modified: src/modules/acc_json/acc_json_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/bcb3970d7a89ab27b43f86aee5b93a4… Patch: https://github.com/kamailio/kamailio/commit/bcb3970d7a89ab27b43f86aee5b93a4… --- diff --git a/src/modules/acc_json/acc_json_mod.c b/src/modules/acc_json/acc_json_mod.c index 97b1c666bd..7e0698f18c 100644 --- a/src/modules/acc_json/acc_json_mod.c +++ b/src/modules/acc_json/acc_json_mod.c @@ -101,37 +101,41 @@ str cdr_json_pre_encoded_prefix = {0, 0}; static cmd_export_t cmds[] = {{0, 0, 0, 0, 0, 0}}; -static param_export_t params[] = {{"acc_flag", INT_PARAM, &acc_flag}, - {"acc_missed_flag", INT_PARAM, &acc_missed_flag}, - {"acc_extra", PARAM_STRING, &acc_extra_str}, - {"acc_pre_encoded_prefix", PARAM_STRING, &acc_json_pre_encoded_prefix_str}, - {"acc_time_mode", INT_PARAM, &acc_time_mode}, - {"acc_time_format", PARAM_STRING, &acc_time_format}, - {"acc_log_level", INT_PARAM, &acc_log_level}, - {"acc_log_facility", PARAM_STRING, &acc_log_facility_str}, - {"acc_output_mqueue", PARAM_STRING, &acc_output_mqueue_str}, - {"acc_output_syslog", INT_PARAM, &acc_output_syslog}, - {"cdr_extra", PARAM_STRING, &cdr_extra_str}, - {"cdr_pre_encoded_prefix", PARAM_STRING, &cdr_json_pre_encoded_prefix_str}, - {"cdr_enable", INT_PARAM, &cdr_enable}, - {"cdr_expired_dlg_enable", INT_PARAM, &cdr_expired_dlg_enable}, - {"cdr_log_level", INT_PARAM, &cdr_log_level}, - {"cdr_log_facility", PARAM_STRING, &cdr_log_facility_str}, - {"cdr_output_mqueue", PARAM_STRING, &cdr_output_mqueue_str}, - {"cdr_output_syslog", INT_PARAM, &cdr_output_syslog}, {0, 0, 0}}; +static param_export_t params[] = { + {"acc_flag", INT_PARAM, &acc_flag}, + {"acc_missed_flag", INT_PARAM, &acc_missed_flag}, + {"acc_extra", PARAM_STRING, &acc_extra_str}, + {"acc_pre_encoded_prefix", PARAM_STRING, &acc_json_pre_encoded_prefix_str}, + {"acc_time_mode", INT_PARAM, &acc_time_mode}, + {"acc_time_format", PARAM_STRING, &acc_time_format}, + {"acc_log_level", INT_PARAM, &acc_log_level}, + {"acc_log_facility", PARAM_STRING, &acc_log_facility_str}, + {"acc_output_mqueue", PARAM_STRING, &acc_output_mqueue_str}, + {"acc_output_syslog", INT_PARAM, &acc_output_syslog}, + {"cdr_extra", PARAM_STRING, &cdr_extra_str}, + {"cdr_pre_encoded_prefix", PARAM_STRING, &cdr_json_pre_encoded_prefix_str}, + {"cdr_enable", INT_PARAM, &cdr_enable}, + {"cdr_expired_dlg_enable", INT_PARAM, &cdr_expired_dlg_enable}, + {"cdr_log_level", INT_PARAM, &cdr_log_level}, + {"cdr_log_facility", PARAM_STRING, &cdr_log_facility_str}, + {"cdr_output_mqueue", PARAM_STRING, &cdr_output_mqueue_str}, + {"cdr_output_syslog", INT_PARAM, &cdr_output_syslog}, + + {0, 0, 0} +}; struct module_exports exports = { - "acc_json", - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported params */ - 0, /* exported RPC methods */ - 0, /* exported pseudo-variables */ - 0, /* response function */ - mod_init, /* initialization module */ - child_init, /* per-child init function */ - destroy /* destroy function */ + "acc_json", + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported params */ + 0, /* exported RPC methods */ + 0, /* exported pseudo-variables */ + 0, /* response function */ + mod_init, /* initialization module */ + child_init, /* per-child init function */ + destroy /* destroy function */ }; @@ -306,8 +310,7 @@ int acc_json_send_request(struct sip_msg *req, acc_info_t *inf) } else { t = gmtime(&inf->env->ts); } - if(strftime(acc_time_format_buf, ACC_TIME_FORMAT_SIZE, acc_time_format, - t) + if(strftime(acc_time_format_buf, ACC_TIME_FORMAT_SIZE, acc_time_format, t) <= 0) { acc_time_format_buf[0] = '\0'; }

1 0

git:master:41babc99: core: added #!defexps preprocessor directive
by Daniel-Constantin Mierla 22 Sep '22

22 Sep '22

Module: kamailio Branch: master Commit: 41babc99c83c74ca3d1494698455394dd8458e87 URL: https://github.com/kamailio/kamailio/commit/41babc99c83c74ca3d1494698455394… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-22T09:35:04+02:00 core: added #!defexps preprocessor directive - similar to #!defexp but the resulted value is enclosed in double quotes --- Modified: src/core/cfg.lex Modified: src/core/ppcfg.c Modified: src/core/ppcfg.h --- Diff: https://github.com/kamailio/kamailio/commit/41babc99c83c74ca3d1494698455394… Patch: https://github.com/kamailio/kamailio/commit/41babc99c83c74ca3d1494698455394… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index e508d420e3..cc0afb8f22 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -576,6 +576,7 @@ ENDIF endif TRYDEF "trydefine"|"trydef" REDEF "redefine"|"redef" DEFEXP defexp +DEFEXPS defexps DEFENV defenv DEFENVS defenvs TRYDEFENV trydefenv @@ -1344,6 +1345,10 @@ IMPORTFILE "import_file" ksr_cfg_print_part(yytext); pp_define_set_type(KSR_PPDEF_DEFEXP); state = DEFINE_S; BEGIN(DEFINE_ID); } +<INITIAL,CFGPRINTMODE>{PREP_START}{DEFEXPS}{EAT_ABLE}+ { count(); + ksr_cfg_print_part(yytext); + pp_define_set_type(KSR_PPDEF_DEFEXPS); + state = DEFINE_S; BEGIN(DEFINE_ID); } <DEFINE_ID>{ID}{MINUS} { count(); ksr_cfg_print_part(yytext); LM_CRIT( @@ -2150,8 +2155,13 @@ int pp_define_set(int len, char *text, int mode) return -1; } - if(pp_defines[ppos].dtype == KSR_PPDEF_DEFEXP) { - sval = pp_defexp_eval(text, len); + if(pp_defines[ppos].dtype == KSR_PPDEF_DEFEXP + || pp_defines[ppos].dtype == KSR_PPDEF_DEFEXPS) { + if(pp_defines[ppos].dtype == KSR_PPDEF_DEFEXP) { + sval = pp_defexp_eval(text, len, 0); + } else { + sval = pp_defexp_eval(text, len, 1); + } if(sval==NULL) { LM_NOTICE("no value returned to set the defexp [%.*s]\n", pp_defines[ppos].name.len, pp_defines[ppos].name.s); diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index 8e43e9722d..e8aac78233 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -461,7 +461,7 @@ void pp_ifexp_eval(char *exval, int exlen) snexpr_destroy(e, &vars); } -char *pp_defexp_eval(char *exval, int exlen) +char *pp_defexp_eval(char *exval, int exlen, int qmode) { str exstr; struct snexpr_var_list vars = {0}; @@ -505,13 +505,25 @@ char *pp_defexp_eval(char *exval, int exlen) sval.len = strlen(result->param.stz.sval); } - res = (char*)pkg_malloc(sval.len + 1); + if(qmode==1) { + res = (char*)pkg_malloc(sval.len + 3); + } else { + res = (char*)pkg_malloc(sval.len + 1); + } if(res==NULL) { PKG_MEM_ERROR; goto done; } - memcpy(res, sval.s, sval.len); - res[sval.len] = '\0'; + if(qmode==1) { + res[0] = '"'; + memcpy(res, sval.s+1, sval.len); + res[sval.len+1] = '"'; + res[sval.len+2] = '\0'; + LM_DBG("expression quoted string result: [%s]\n", res); + } else { + memcpy(res, sval.s, sval.len); + res[sval.len] = '\0'; + } done: snexpr_result_free(result); diff --git a/src/core/ppcfg.h b/src/core/ppcfg.h index 7b5b016c08..f461535ed8 100644 --- a/src/core/ppcfg.h +++ b/src/core/ppcfg.h @@ -35,6 +35,7 @@ #define KSR_PPDEF_TRYDEF 1 #define KSR_PPDEF_REDEF 2 #define KSR_PPDEF_DEFEXP 3 +#define KSR_PPDEF_DEFEXPS 4 typedef struct ksr_ppdefine { str name; @@ -68,7 +69,7 @@ void ksr_cfg_print_initial_state(void); void pp_ifexp_eval(char *exval, int exlen); void pp_ifexp_state(int state); -char *pp_defexp_eval(char *exval, int exlen); +char *pp_defexp_eval(char *exval, int exlen, int qmode); #endif /*_PPCFG_H_*/

1 0

git:master:e241f7b8: kex: add additional safety checks for printing, based on PR #3250 from bensly-shanmugam
by Henning Westerholt 21 Sep '22

21 Sep '22

Module: kamailio Branch: master Commit: e241f7b8a07b24fba6d6ecf2c344a39d2b2b5859 URL: https://github.com/kamailio/kamailio/commit/e241f7b8a07b24fba6d6ecf2c344a39… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-09-21T18:34:04Z kex: add additional safety checks for printing, based on PR #3250 from bensly-shanmugam --- Modified: src/modules/kex/mod_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/e241f7b8a07b24fba6d6ecf2c344a39… Patch: https://github.com/kamailio/kamailio/commit/e241f7b8a07b24fba6d6ecf2c344a39… --- diff --git a/src/modules/kex/mod_stats.c b/src/modules/kex/mod_stats.c index 25e3285c780..dd73bec522a 100644 --- a/src/modules/kex/mod_stats.c +++ b/src/modules/kex/mod_stats.c @@ -86,7 +86,14 @@ static const char* rpc_mod_mem_statsx_doc[2] = { /* test if the current mod info was already printed */ static int rpc_mod_is_printed_one(mem_counter *stats, mem_counter *current) { - mem_counter *iter = stats; + mem_counter *iter; + + if ( stats == NULL || current == NULL ) + { + LM_ERR("invalid parameter\n"); + return 1; + } + iter = stats; while (iter && iter != current) { if (strcmp(iter->mname, current->mname) == 0) {

1 0

[kamailio/kamailio] GitHub Workflows security hardening (PR #3248)
by Alex 21 Sep '22

21 Sep '22

This PR adds explicit [permissions section](https://docs.github.com/en/actions/using-workflows/workflow-syntax… to workflows. This is a security best practice because by default workflows run with [extended set of permissions](https://docs.github.com/en/actions/security-guides/automatic-t… (except from `on: pull_request` [from external forks](https://securitylab.github.com/research/github-actions-preventing-pw…). By specifying any permission explicitly all others are set to none. By using the principle of least privilege the damage a compromised workflow can do (because of an [injection](https://securitylab.github.com/research/github-actions-untrusted… or compromised third party tool or action) is restricted. It is recommended to have [most strict permissions on the top level](https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-per… and grant write permissions on [job level](https://docs.github.com/en/actions/using-jobs/assigning-permissions-… case by case. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3248 -- Commit Summary -- * build: harden main.yml permissions * build: harden pull_request.yml permissions -- File Changes -- M .github/workflows/main.yml (2) M .github/workflows/pull_request.yml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3248.patch https://github.com/kamailio/kamailio/pull/3248.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3248 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3248(a)github.com>

2 2

git:master:8064a1d3: build: harden pull_request.yml permissions
by Victor Seva 21 Sep '22

21 Sep '22

Module: kamailio Branch: master Commit: 8064a1d3cd35e76f0e563fa401c181632f33b43a URL: https://github.com/kamailio/kamailio/commit/8064a1d3cd35e76f0e563fa401c1816… Author: Alex <aleksandrosansan(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-09-21T09:29:31+02:00 build: harden pull_request.yml permissions Signed-off-by: Alex <aleksandrosansan(a)gmail.com> --- Modified: .github/workflows/pull_request.yml --- Diff: https://github.com/kamailio/kamailio/commit/8064a1d3cd35e76f0e563fa401c1816… Patch: https://github.com/kamailio/kamailio/commit/8064a1d3cd35e76f0e563fa401c1816… --- diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 2633e7e29e..e2f6416ce4 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -6,6 +6,8 @@ name: checks_pr - master # Allows you to run this workflow manually from the Actions tab workflow_dispatch: +permissions: + contents: read # to fetch code (actions/checkout) jobs: build: runs-on: ubuntu-latest

1 0

git:master:ddb39dd0: build: harden main.yml permissions
by Victor Seva 21 Sep '22

21 Sep '22

Module: kamailio Branch: master Commit: ddb39dd0f4fae470083006a7965d21512cd759b1 URL: https://github.com/kamailio/kamailio/commit/ddb39dd0f4fae470083006a7965d215… Author: Alex <aleksandrosansan(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-09-21T09:29:31+02:00 build: harden main.yml permissions Signed-off-by: Alex <aleksandrosansan(a)gmail.com> --- Modified: .github/workflows/main.yml --- Diff: https://github.com/kamailio/kamailio/commit/ddb39dd0f4fae470083006a7965d215… Patch: https://github.com/kamailio/kamailio/commit/ddb39dd0f4fae470083006a7965d215… --- diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8704cda5e84..10acce3a6e1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,6 +8,8 @@ name: build - '5.5' # Allows you to run this workflow manually from the Actions tab workflow_dispatch: +permissions: + contents: read # to fetch code (actions/checkout) jobs: build: runs-on: ubuntu-latest

1 0

git:master:411fb392: core: added #!defexp ID STM preprocessor directive
by Daniel-Constantin Mierla 20 Sep '22

20 Sep '22

Module: kamailio Branch: master Commit: 411fb392fc3f2b399857dde2fb717ec2286e7fee URL: https://github.com/kamailio/kamailio/commit/411fb392fc3f2b399857dde2fb717ec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-20T17:41:36+02:00 core: added #!defexp ID STM preprocessor directive - abity to set a defined it to the result of snexpr statement - example: #!define ADDR 127.0.0.1 #!defexp SIPURI "sip:" + ADDR + ":5060" --- Modified: src/core/cfg.lex Modified: src/core/ppcfg.c Modified: src/core/ppcfg.h --- Diff: https://github.com/kamailio/kamailio/commit/411fb392fc3f2b399857dde2fb717ec… Patch: https://github.com/kamailio/kamailio/commit/411fb392fc3f2b399857dde2fb717ec…

1 0

git:master:b7a0d8a0: core: use defines for types of preprocessor defs
by Daniel-Constantin Mierla 20 Sep '22

20 Sep '22

Module: kamailio Branch: master Commit: b7a0d8a084a25a1b02e2c9845ef4e3b19f988c02 URL: https://github.com/kamailio/kamailio/commit/b7a0d8a084a25a1b02e2c9845ef4e3b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-20T10:52:42+02:00 core: use defines for types of preprocessor defs --- Modified: src/core/cfg.lex Modified: src/core/ppcfg.c Modified: src/core/ppcfg.h Modified: src/core/sr_module.c Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/b7a0d8a084a25a1b02e2c9845ef4e3b… Patch: https://github.com/kamailio/kamailio/commit/b7a0d8a084a25a1b02e2c9845ef4e3b…

1 0

git:master:1fd075c4: core: clone values for defines
by Daniel-Constantin Mierla 20 Sep '22

20 Sep '22

Module: kamailio Branch: master Commit: 1fd075c4e7db180c61fcb2838e9e817ddd623003 URL: https://github.com/kamailio/kamailio/commit/1fd075c4e7db180c61fcb2838e9e817… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-20T11:01:56+02:00 core: clone values for defines --- Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/1fd075c4e7db180c61fcb2838e9e817… Patch: https://github.com/kamailio/kamailio/commit/1fd075c4e7db180c61fcb2838e9e817… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index abaaba3974..97ce62f1eb 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -2144,8 +2144,17 @@ int pp_define_set(int len, char *text, int mode) return -1; } + pp_defines[ppos].value.s = (char*)pkg_malloc(len+1); + if (pp_defines[ppos].value.s == NULL) { + LM_ERR("no more memory to define %.*s [%d]\n", + pp_defines[ppos].name.len, + pp_defines[ppos].name.s, ppos); + return -1; + } + + memcpy(pp_defines[ppos].value.s, text, len); + pp_defines[ppos].value.s[len] = '\0'; pp_defines[ppos].value.len = len; - pp_defines[ppos].value.s = text; LM_DBG("### setting define ID [%.*s] value [%.*s] (mode: %d)\n", pp_defines[ppos].name.len, pp_defines[ppos].name.s,

1 0

git:master:abe04ea0: core: snexpr - updated to version supporting escaped chars in string values
by Daniel-Constantin Mierla 20 Sep '22

20 Sep '22

Module: kamailio Branch: master Commit: abe04ea06c68c7df180831bba1f4e73f53512db5 URL: https://github.com/kamailio/kamailio/commit/abe04ea06c68c7df180831bba1f4e73… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-20T08:43:05+02:00 core: snexpr - updated to version supporting escaped chars in string values --- Modified: src/core/utils/snexpr.h --- Diff: https://github.com/kamailio/kamailio/commit/abe04ea06c68c7df180831bba1f4e73… Patch: https://github.com/kamailio/kamailio/commit/abe04ea06c68c7df180831bba1f4e73… --- diff --git a/src/core/utils/snexpr.h b/src/core/utils/snexpr.h index 8cebdf8614..d6e853ffb4 100644 --- a/src/core/utils/snexpr.h +++ b/src/core/utils/snexpr.h @@ -799,6 +799,7 @@ static int snexpr_next_token(const char *s, size_t len, int *flags) { unsigned int i = 0; char b; + int bsf = 0; if(len == 0) { return 0; } @@ -845,7 +846,12 @@ static int snexpr_next_token(const char *s, size_t len, int *flags) b = c; i++; c = s[i]; - while(c != b && i < len) { + while(i < len && (bsf==1 || c != b)) { + if(bsf == 0 && c == '\\') { + bsf = 1; + } else { + bsf = 0; + } i++; c = s[i]; } @@ -956,6 +962,9 @@ static struct snexpr snexpr_varref(struct snexpr_var *v) static struct snexpr snexpr_conststr(const char *value, int len) { struct snexpr e = snexpr_init(); + char *p; + int i; + int bsf = 0; if(len < 2) { len = 0; } else { @@ -966,9 +975,34 @@ static struct snexpr snexpr_conststr(const char *value, int len) e.param.stz.sval = malloc(len + 1); if(e.param.stz.sval) { if(len > 0) { - /* do not copy the quotes */ - memcpy(e.param.stz.sval, value + 1, len); - e.param.stz.sval[len] = '\0'; + /* do not copy the quotes - start from value[1] */ + p = e.param.stz.sval; + for(i=0; i<len; i++) { + if(bsf==0 && value[i+1]=='\\') { + bsf = 1; + } else if(bsf==1) { + bsf = 0; + switch(value[i+1]) { + case 'n': + *p = '\n'; + break; + case 'r': + *p = '\r'; + break; + case 't': + *p = '\t'; + break; + default: + *p = value[i+1]; + } + p++; + } else { + bsf = 0; + *p = value[i+1]; + p++; + } + } + *p = '\0'; } else { e.param.stz.sval[0] = '\0'; }

1 0

[kamailio/kamailio] WebSocket Module memory leak (Issue #3236)
by iliesh 19 Sep '22

19 Sep '22

### Description By using the WebSocket module we noticed that the memory on the server keeps increasing daily even if the number of registered devices is decreasing ### Troubleshooting #### Reproduction Connect to the server through the wss and then disable the network adapter. #### Debugging Data If the TCP connection is closed forcefully (tested by disabling network adapter) then the number of current wss connections is not decreasing: ``` kamcmd stats.get_statistics all | grep "ws_current_connections" ``` The same happens with the allocated shared memory: ``` kamcmd mod.stats all shm | grep 'wsconn_' ``` wsconn_add(198) - this value is not decreasing. Everything is working properly if the TCP connection is properly closed. * **Operating System**: ``` CentOS 7 X64 3.10.0-1160.76.1.el7.x86_64 version: kamailio 5.6.1 (x86_64/linux) d8f98b ``` XHTTP Request Route: ``` event_route[xhttp:request] { set_reply_close(); set_reply_no_connect(); if (ws_handle_handshake()) { xlog("L_INFO", "[$cfg(route)] websocket|log|handled HTTP request $rm from $si:$sp\n"); exit; } } ``` TCP Settings: ``` tcp_connection_lifetime=3605 tcp_accept_no_cl=yes tcp_rd_buf_size=16384 tcp_connect_timeout=10 tcp_crlf_ping=yes tcp_delayed_ack = yes tcp_fd_cache = yes tcp_keepalive = yes tcp_keepcnt = 3 tcp_keepidle = 30 tcp_keepintvl = 10 tcp_accept_aliases=no tcp_async=yes tcp_linger2=30 tcp_max_connections=4096 tcp_send_timeout = 10 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3236 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3236(a)github.com>

2 6

Jenkins build is back to stable : kamailio55-binaries » amd64,focal #9
by kamailio＠sipwise.com 19 Sep '22

19 Sep '22

See <https://kamailio.sipwise.com/job/kamailio55-binaries/architecture=amd64,dis…>

1 0

Jenkins build is back to stable : kamailio55-binaries » amd64,bullseye #9
by kamailio＠sipwise.com 19 Sep '22

19 Sep '22

See <https://kamailio.sipwise.com/job/kamailio55-binaries/architecture=amd64,dis…>

1 0

Jenkins build is back to stable : kamailio55-binaries » amd64,bionic #9
by kamailio＠sipwise.com 19 Sep '22

19 Sep '22

See <https://kamailio.sipwise.com/job/kamailio55-binaries/architecture=amd64,dis…>

1 0

Kamailio v5.5.5 Released
by Daniel-Constantin Mierla 19 Sep '22

19 Sep '22

Hello, Kamailio SIP Server v5.5.5 stable release is out. This is a maintenance release of the stable branch 5.5 that includes fixes since the release of v5.5.4. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.5.x. Deployments running previous v5.5.x versions are strongly recommended to be upgraded to v5.5.5. Note that 5.5 is the second last stable branch, still officially maintained by Kamailio development team. The latest stable branch is 5.6, with v5.6.1 being release out of it. For more details about version 5.5.5 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2022/09/kamailio-v5-5-5-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online Oct 10-13, 2022 (Europe Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 0

git:5.5:c26b6d0b: ChangeLog: content updated for v5.5.5
by Daniel-Constantin Mierla 19 Sep '22

19 Sep '22

Module: kamailio Branch: 5.5 Commit: c26b6d0b2d38aee1f541dde3b522cf507db8a32b URL: https://github.com/kamailio/kamailio/commit/c26b6d0b2d38aee1f541dde3b522cf5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-19T11:28:32+02:00 ChangeLog: content updated for v5.5.5 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/c26b6d0b2d38aee1f541dde3b522cf5… Patch: https://github.com/kamailio/kamailio/commit/c26b6d0b2d38aee1f541dde3b522cf5…

1 0

git:5.5:8e388fc0: pkg/kamailio/deb: version set 5.5.5
by Daniel-Constantin Mierla 19 Sep '22

19 Sep '22

Module: kamailio Branch: 5.5 Commit: 8e388fc0d8077ea8eed2c97c2f12a34f4a371fe8 URL: https://github.com/kamailio/kamailio/commit/8e388fc0d8077ea8eed2c97c2f12a34… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-19T10:20:43+02:00 pkg/kamailio/deb: version set 5.5.5 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/8e388fc0d8077ea8eed2c97c2f12a34… Patch: https://github.com/kamailio/kamailio/commit/8e388fc0d8077ea8eed2c97c2f12a34…

1 0

git:5.5:b92a8a0d: Makefile.defs: version set to 5.5.5
by Daniel-Constantin Mierla 19 Sep '22

19 Sep '22

Module: kamailio Branch: 5.5 Commit: b92a8a0db4cfa25f6c9231c4bc855ff3fb3a5845 URL: https://github.com/kamailio/kamailio/commit/b92a8a0db4cfa25f6c9231c4bc855ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-19T10:21:25+02:00 Makefile.defs: version set to 5.5.5 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/b92a8a0db4cfa25f6c9231c4bc855ff… Patch: https://github.com/kamailio/kamailio/commit/b92a8a0db4cfa25f6c9231c4bc855ff… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 5fdc880c31..0e49c6f0c4 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 5 -SUBLEVEL = 4 +SUBLEVEL = 5 EXTRAVERSION = # memory manager switcher

1 0

git:5.5:75a4adb1: pkg: version set to 5.5.5 for rpm and alpine specs
by Daniel-Constantin Mierla 19 Sep '22

19 Sep '22

Module: kamailio Branch: 5.5 Commit: 75a4adb1a5f2b99951f2519bc2513d2d2842e273 URL: https://github.com/kamailio/kamailio/commit/75a4adb1a5f2b99951f2519bc2513d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-19T10:19:40+02:00 pkg: version set to 5.5.5 for rpm and alpine specs --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/75a4adb1a5f2b99951f2519bc2513d2… Patch: https://github.com/kamailio/kamailio/commit/75a4adb1a5f2b99951f2519bc2513d2… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 7d276753249..e35b095c359 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.5.4 +pkgver=5.5.5 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 1833f6086ee..63d6edbc0d1 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.5.4 +%define ver 5.5.5 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

Releasing Kamailio v5.5.5
by Daniel-Constantin Mierla 19 Sep '22

19 Sep '22

Hello, I am considering to release Kamailio v5.5.5 soon, likely on Monday or Tuesday next week (Sep 19 or 20, 2022). This is the usual heads up notification to see if anyone is aware of issues not yet reported to bug tracker and if yes, do it as soon as possible to give them a chance to be fixed. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online Oct 10-13, 2022 (Europe Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

2 4

git:master:d616dc46: acc: clone dlg core attributes
by Daniel-Constantin Mierla 19 Sep '22

19 Sep '22

Module: kamailio Branch: master Commit: d616dc46b5373b1474bf855afde4c5687d2a2d09 URL: https://github.com/kamailio/kamailio/commit/d616dc46b5373b1474bf855afde4c56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-19T08:40:36+02:00 acc: clone dlg core attributes - GH #3243 --- Modified: src/modules/acc/acc_cdr.c --- Diff: https://github.com/kamailio/kamailio/commit/d616dc46b5373b1474bf855afde4c56… Patch: https://github.com/kamailio/kamailio/commit/d616dc46b5373b1474bf855afde4c56… --- diff --git a/src/modules/acc/acc_cdr.c b/src/modules/acc/acc_cdr.c index 8c51881dd7..1efa6515e6 100644 --- a/src/modules/acc/acc_cdr.c +++ b/src/modules/acc/acc_cdr.c @@ -96,9 +96,8 @@ int cdr_core2strar( struct dlg_cell* dlg, int* unused, char* types) { - str* start = NULL; - str* end = NULL; - str* duration = NULL; + str* dlgvals[MAX_CDR_CORE]; /* start, end, duration */ + int i; if( !dlg || !values || !types) { @@ -106,18 +105,40 @@ int cdr_core2strar( struct dlg_cell* dlg, return 0; } - start = dlgb.get_dlg_var( dlg, (str*)&cdr_start_str); - end = dlgb.get_dlg_var( dlg, (str*)&cdr_end_str); - duration = dlgb.get_dlg_var( dlg, (str*)&cdr_duration_str); - - values[0] = ( start != NULL ? *start : empty_string); - types[0] = ( start != NULL ? TYPE_DATE : TYPE_NULL); - - values[1] = ( end != NULL ? *end : empty_string); - types[1] = ( end != NULL ? TYPE_DATE : TYPE_NULL); - - values[2] = ( duration != NULL ? *duration : empty_string); - types[2] = ( duration != NULL ? TYPE_DOUBLE : TYPE_NULL); + dlgvals[0] = dlgb.get_dlg_var( dlg, (str*)&cdr_start_str); /* start */ + dlgvals[1] = dlgb.get_dlg_var( dlg, (str*)&cdr_end_str); /* end */ + dlgvals[2] = dlgb.get_dlg_var( dlg, (str*)&cdr_duration_str); /* duration */ + + for(i=0; i<MAX_CDR_CORE; i++) { + if (dlgvals[i]!=NULL) { + values[i].s = (char *)pkg_malloc(dlgvals[i]->len + 1); + if (values[i].s == NULL ) { + PKG_MEM_ERROR; + /* cleanup already allocated memory and + * return that we didn't do anything */ + for (i = i-1; i >= 0; i--) { + if (NULL != values[i].s){ + pkg_free(values[i].s); + values[i].s = NULL; + } + } + return 0; + } + memcpy(values[i].s, dlgvals[i]->s, dlgvals[i]->len); + values[i].s[dlgvals[i]->len] = '\0'; + values[i].len = dlgvals[i]->len; + if(i!=2) { + /* [0] - start; [1] - end */ + types[i] = TYPE_DATE; + } else { + /* [2] - duration */ + types[i] = TYPE_DOUBLE; + } + } else { + values[i] = empty_string; + types[i] = TYPE_NULL; + } + } return MAX_CDR_CORE; } @@ -272,15 +293,15 @@ static int db_write_cdr( struct dlg_cell* dialog, } } - /* Free memory allocated by acc_extra.c/extra2strar */ - free_strar_mem( &(cdr_type_array[core_cnt]), &(cdr_value_array[core_cnt]), - extra_cnt, attr_cnt); + /* Free memory allocated by core+extra attrs */ + free_strar_mem( &(cdr_type_array[0]), &(cdr_value_array[0]), + attr_cnt, attr_cnt); return 0; error: - /* Free memory allocated by acc_extra.c/extra2strar */ - free_strar_mem( &(cdr_type_array[core_cnt]), &(cdr_value_array[core_cnt]), - extra_cnt, attr_cnt); + /* Free memory allocated by core+extra attrs */ + free_strar_mem( &(cdr_type_array[0]), &(cdr_value_array[0]), + attr_cnt, attr_cnt); return -1; }

1 0

git:master:f7b35f05: acc_json: update to free cdr core attrs
by Daniel-Constantin Mierla 19 Sep '22

19 Sep '22

Module: kamailio Branch: master Commit: f7b35f05f31bd7cc01aea4572c79ba48d84d8123 URL: https://github.com/kamailio/kamailio/commit/f7b35f05f31bd7cc01aea4572c79ba4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-19T08:40:37+02:00 acc_json: update to free cdr core attrs --- Modified: src/modules/acc_json/acc_json_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f7b35f05f31bd7cc01aea4572c79ba4… Patch: https://github.com/kamailio/kamailio/commit/f7b35f05f31bd7cc01aea4572c79ba4… --- diff --git a/src/modules/acc_json/acc_json_mod.c b/src/modules/acc_json/acc_json_mod.c index 42d29c8ae54..accd054de64 100644 --- a/src/modules/acc_json/acc_json_mod.c +++ b/src/modules/acc_json/acc_json_mod.c @@ -452,14 +452,13 @@ int cdr_json_write(struct dlg_cell *dlg, struct sip_msg *req, cdr_info_t *inf) inf->tarr + attr_cnt); attr_cnt += extra_cnt; } else if (cdr_expired_dlg_enable){ - int dlg_index = 0; - dlg_index += accb.get_extra_dlg_attrs( cdr_extra, + extra_cnt += accb.get_extra_dlg_attrs( cdr_extra, dlg, inf->varr + attr_cnt, inf->iarr + attr_cnt, inf->tarr + attr_cnt, &dlgb); - attr_cnt += dlg_index; + attr_cnt += extra_cnt; } struct acc_extra *extra = cdr_extra; @@ -516,7 +515,7 @@ int cdr_json_write(struct dlg_cell *dlg, struct sip_msg *req, cdr_info_t *inf) json_object_clear(object); json_decref(object); } - /* free memory allocated by get_extra_attrs */ - free_strar_mem(&(inf->tarr[core_cnt]), &(inf->varr[core_cnt]), extra_cnt, attr_cnt); + /* free memory allocated by cdr core+extra attrs */ + free_strar_mem(&(inf->tarr[0]), &(inf->varr[0]), attr_cnt, attr_cnt); return 1; }

1 0

git:master:c5f71a45: acc: more meaningful array index names for building cdr attributes
by Daniel-Constantin Mierla 19 Sep '22

19 Sep '22

Module: kamailio Branch: master Commit: c5f71a45c7c55af0cf4a6aa482d8a57018af7900 URL: https://github.com/kamailio/kamailio/commit/c5f71a45c7c55af0cf4a6aa482d8a57… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-19T08:40:36+02:00 acc: more meaningful array index names for building cdr attributes --- Modified: src/modules/acc/acc_cdr.c --- Diff: https://github.com/kamailio/kamailio/commit/c5f71a45c7c55af0cf4a6aa482d8a57… Patch: https://github.com/kamailio/kamailio/commit/c5f71a45c7c55af0cf4a6aa482d8a57… --- diff --git a/src/modules/acc/acc_cdr.c b/src/modules/acc/acc_cdr.c index d3009c8538..8c51881dd7 100644 --- a/src/modules/acc/acc_cdr.c +++ b/src/modules/acc/acc_cdr.c @@ -130,8 +130,9 @@ static db_val_t *db_cdr_vals = NULL; static int db_write_cdr( struct dlg_cell* dialog, struct sip_msg* message) { - int m = 0; - int n = 0; + int attr_cnt = 0; + int core_cnt = 0; + int extra_cnt = 0; int i; db_func_t *df=NULL; db1_con_t *dh=NULL; @@ -155,12 +156,13 @@ static int db_write_cdr( struct dlg_cell* dialog, dh = (db1_con_t*)vh; /* get default values */ - m = cdr_core2strar( dialog, + core_cnt = cdr_core2strar( dialog, cdr_value_array, cdr_int_array, cdr_type_array); + attr_cnt += core_cnt; - for(i=0; i<m; i++) { + for(i=0; i<core_cnt; i++) { db_cdr_keys[i] = &cdr_attrs[i]; /* reset errno, some strtoX don't reset it */ errno = 0; @@ -219,24 +221,24 @@ static int db_write_cdr( struct dlg_cell* dialog, /* get extra values */ if (message) { - n += extra2strar( cdr_extra, + extra_cnt = extra2strar( cdr_extra, message, - cdr_value_array + m, - cdr_int_array + m, - cdr_type_array + m); - m += n; + cdr_value_array + attr_cnt, + cdr_int_array + attr_cnt, + cdr_type_array + attr_cnt); + attr_cnt += extra_cnt;; } else if (cdr_expired_dlg_enable){ LM_WARN( "fallback to dlg_only search because of message doesn't exist.\n"); - n += extra2strar_dlg_only( cdr_extra, + extra_cnt = extra2strar_dlg_only( cdr_extra, dialog, - cdr_value_array + m, - cdr_int_array + m, - cdr_type_array +m, + cdr_value_array + attr_cnt, + cdr_int_array + attr_cnt, + cdr_type_array + attr_cnt, &dlgb); - m += n; + attr_cnt += extra_cnt; } - for( ; i<m; i++) { + for( ; i<attr_cnt; i++) { db_cdr_keys[i] = &cdr_attrs[i]; if (cdr_extra_nullable == 1 && cdr_type_array[i] == TYPE_NULL) { @@ -254,29 +256,31 @@ static int db_write_cdr( struct dlg_cell* dialog, } if(acc_db_insert_mode==1 && df->insert_delayed!=NULL) { - if (df->insert_delayed(dh, db_cdr_keys, db_cdr_vals, m) < 0) { + if (df->insert_delayed(dh, db_cdr_keys, db_cdr_vals, attr_cnt) < 0) { LM_ERR("failed to insert delayed into database\n"); goto error; } } else if(acc_db_insert_mode==2 && df->insert_async!=NULL) { - if (df->insert_async(dh, db_cdr_keys, db_cdr_vals, m) < 0) { + if (df->insert_async(dh, db_cdr_keys, db_cdr_vals, attr_cnt) < 0) { LM_ERR("failed to insert async into database\n"); goto error; } } else { - if (df->insert(dh, db_cdr_keys, db_cdr_vals, m) < 0) { + if (df->insert(dh, db_cdr_keys, db_cdr_vals, attr_cnt) < 0) { LM_ERR("failed to insert into database\n"); goto error; } } /* Free memory allocated by acc_extra.c/extra2strar */ - free_strar_mem( &(cdr_type_array[m-n]), &(cdr_value_array[m-n]), n, m); + free_strar_mem( &(cdr_type_array[core_cnt]), &(cdr_value_array[core_cnt]), + extra_cnt, attr_cnt); return 0; error: /* Free memory allocated by acc_extra.c/extra2strar */ - free_strar_mem( &(cdr_type_array[m-n]), &(cdr_value_array[m-n]), n, m); + free_strar_mem( &(cdr_type_array[core_cnt]), &(cdr_value_array[core_cnt]), + extra_cnt, attr_cnt); return -1; }

1 0

[kamailio/kamailio] 5.5 (PR #3244)
by Atanas Bakalov 19 Sep '22

19 Sep '22

#### 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 - [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: - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description rx_aar: unreference dialog in case of aar update release the dialog reference even for aar updates as the dialog was already referenced when issuing the aar request You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3244 -- Commit Summary -- * rx_aar: unreference dialog in case of aar update (#3104) * ims_qos: fix compilation warning -- File Changes -- M src/modules/ims_qos/rx_aar.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3244.patch https://github.com/kamailio/kamailio/pull/3244.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3244 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3244(a)github.com>

2 2

git:5.5:45ef2fab: rx_aar: unreference dialog in case of aar update (#3104)
by Daniel-Constantin Mierla 19 Sep '22

19 Sep '22

Module: kamailio Branch: 5.5 Commit: 45ef2fab63eaae18c4a0e41ffc0487829105b481 URL: https://github.com/kamailio/kamailio/commit/45ef2fab63eaae18c4a0e41ffc04878… Author: Atanas Bakalov <atanas.bakalov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-19T08:22:50+02:00 rx_aar: unreference dialog in case of aar update (#3104) - release the dialog reference even for aar updates as the dialog was already referenced when issuing the aar request Co-authored-by: Atanas Bakalov <atanas(a)wgtwo.com> (cherry picked from commit ab8cb43c83f8c9528e45a5b57fbb1440360f201e) --- Modified: src/modules/ims_qos/rx_aar.c --- Diff: https://github.com/kamailio/kamailio/commit/45ef2fab63eaae18c4a0e41ffc04878… Patch: https://github.com/kamailio/kamailio/commit/45ef2fab63eaae18c4a0e41ffc04878… --- diff --git a/src/modules/ims_qos/rx_aar.c b/src/modules/ims_qos/rx_aar.c index 6a2d60c9012..148224b4cce 100644 --- a/src/modules/ims_qos/rx_aar.c +++ b/src/modules/ims_qos/rx_aar.c @@ -177,6 +177,8 @@ void async_aar_callback(int is_timeout, void *param, AAAMessage *aaa, long elaps STR_SHM_DUP(*passed_rx_session_id, aaa->sessionId->data, "cb_passed_rx_session_id"); LM_DBG("passed rx session id [%.*s]", passed_rx_session_id->len, passed_rx_session_id->s); dlgb.register_dlgcb_nodlg( data->dlg, DLGCB_TERMINATED | DLGCB_DESTROY | DLGCB_EXPIRED | DLGCB_RESPONSE_WITHIN | DLGCB_CONFIRMED | DLGCB_FAILED, callback_dialog, (void*) (passed_rx_session_id), free_dialog_data); + } else { + unref_dlg(data->dlg, 1); } result = CSCF_RETURN_TRUE; } else {

1 0

git:5.5:32bd4d53: ims_qos: fix compilation warning
by Daniel-Constantin Mierla 19 Sep '22

19 Sep '22

Module: kamailio Branch: 5.5 Commit: 32bd4d5370b9342d2df09269087b47d94e7f4ca5 URL: https://github.com/kamailio/kamailio/commit/32bd4d5370b9342d2df09269087b47d… Author: Atanas Bakalov <atanas(a)wgtwo.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-19T08:22:50+02:00 ims_qos: fix compilation warning (cherry picked from commit bd4cc486879616d502362dd464b04d7d3c2865c4) --- Modified: src/modules/ims_qos/rx_aar.c --- Diff: https://github.com/kamailio/kamailio/commit/32bd4d5370b9342d2df09269087b47d… Patch: https://github.com/kamailio/kamailio/commit/32bd4d5370b9342d2df09269087b47d… --- diff --git a/src/modules/ims_qos/rx_aar.c b/src/modules/ims_qos/rx_aar.c index 148224b4cc..efe3ffdf8b 100644 --- a/src/modules/ims_qos/rx_aar.c +++ b/src/modules/ims_qos/rx_aar.c @@ -53,6 +53,7 @@ #include "../cdp_avp/cdp_avp_mod.h" #include "../../modules/ims_dialog/dlg_load.h" +#include "../../modules/ims_dialog/dlg_hash.h" #include "../../modules/tm/tm_load.h" #include "../ims_usrloc_pcscf/usrloc.h" #include "rx_authdata.h"

1 0

[kamailio/kamailio] rx_aar: unreference dialog in case of aar update (#3104) (PR #3245)
by Atanas Bakalov 19 Sep '22

19 Sep '22

#### 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 - [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: - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description rx_aar: unreference dialog in case of aar update release the dialog reference even for aar updates as the dialog was already referenced when issuing the aar request You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3245 -- Commit Summary -- * rx_aar: unreference dialog in case of aar update (#3104) -- File Changes -- M src/modules/ims_qos/rx_aar.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3245.patch https://github.com/kamailio/kamailio/pull/3245.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3245 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3245(a)github.com>

2 2

git:5.6:a290ab58: rx_aar: unreference dialog in case of aar update (#3104)
by Daniel-Constantin Mierla 19 Sep '22

19 Sep '22

Module: kamailio Branch: 5.6 Commit: a290ab58f81d540d3613bcd536d7e411b29e2e9c URL: https://github.com/kamailio/kamailio/commit/a290ab58f81d540d3613bcd536d7e41… Author: Atanas Bakalov <atanas.bakalov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-19T08:22:04+02:00 rx_aar: unreference dialog in case of aar update (#3104) - release the dialog reference even for aar updates as the dialog was already referenced when issuing the aar request Co-authored-by: Atanas Bakalov <atanas(a)wgtwo.com> (cherry picked from commit ab8cb43c83f8c9528e45a5b57fbb1440360f201e) --- Modified: src/modules/ims_qos/rx_aar.c --- Diff: https://github.com/kamailio/kamailio/commit/a290ab58f81d540d3613bcd536d7e41… Patch: https://github.com/kamailio/kamailio/commit/a290ab58f81d540d3613bcd536d7e41… --- diff --git a/src/modules/ims_qos/rx_aar.c b/src/modules/ims_qos/rx_aar.c index 9ebca2ecf1e..da4a0e42dd7 100644 --- a/src/modules/ims_qos/rx_aar.c +++ b/src/modules/ims_qos/rx_aar.c @@ -181,6 +181,8 @@ void async_aar_callback(int is_timeout, void *param, AAAMessage *aaa, long elaps STR_SHM_DUP(*passed_rx_session_id, aaa->sessionId->data, "cb_passed_rx_session_id"); LM_DBG("passed rx session id [%.*s]", passed_rx_session_id->len, passed_rx_session_id->s); dlgb.register_dlgcb_nodlg( data->dlg, DLGCB_TERMINATED | DLGCB_DESTROY | DLGCB_EXPIRED | DLGCB_RESPONSE_WITHIN | DLGCB_CONFIRMED | DLGCB_FAILED, callback_dialog, (void*) (passed_rx_session_id), free_dialog_data); + } else { + unref_dlg(data->dlg, 1); } result = CSCF_RETURN_TRUE; } else {

1 0

git:5.5:cef41599: dispatcher: fix alog13 gateway selections
by Henning Westerholt 18 Sep '22

18 Sep '22

Module: kamailio Branch: 5.5 Commit: cef415993b5763278f1ce13f839b615daa7f18c8 URL: https://github.com/kamailio/kamailio/commit/cef415993b5763278f1ce13f839b615… Author: Julien Chavanton <jchavanton(a)subspace.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-09-18T22:33:57Z dispatcher: fix alog13 gateway selections (cherry picked from commit d56d65b8daac072a4726d9124072151d0d3fbb79) --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/cef415993b5763278f1ce13f839b615… Patch: https://github.com/kamailio/kamailio/commit/cef415993b5763278f1ce13f839b615…

1 0

git:5.6:a4472c08: dispatcher: fix alog13 gateway selections
by Henning Westerholt 18 Sep '22

18 Sep '22

Module: kamailio Branch: 5.6 Commit: a4472c083cc0b79fb449412425169aa3f3d2c875 URL: https://github.com/kamailio/kamailio/commit/a4472c083cc0b79fb449412425169aa… Author: Julien Chavanton <jchavanton(a)subspace.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-09-18T22:33:38Z dispatcher: fix alog13 gateway selections (cherry picked from commit d56d65b8daac072a4726d9124072151d0d3fbb79) --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/a4472c083cc0b79fb449412425169aa… Patch: https://github.com/kamailio/kamailio/commit/a4472c083cc0b79fb449412425169aa…

1 0

[kamailio/kamailio] dispatcher: fix alog13 gateway selections (PR #3232)
by Julien Chavanton 18 Sep '22

18 Sep '22

#### 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 - [x] Small bug fix (non-breaking change which fixes an issue) #### 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  I found how the indexes could get mixed up between the call to ds_sorted_by_priority() and ds_manage_routes_fill_reordered_xavp() resulting in invalid gateway list selection. ``` // TEST logs I made some tests with 3 and 6 gateways, disabling one and then two. Some test data : INSERT INTO dispatcher VALUES(1,1,'sip:[192.168.0.1:5060](http://192.168.0.1:5060/)',0,12,'',''); INSERT INTO dispatcher VALUES(2,1,'sip:[192.168.0.2:5060](http://192.168.0.2:5060/)',0,12,'',''); INSERT INTO dispatcher VALUES(3,1,'sip:[192.168.0.3:5060](http://192.168.0.3:5060/)',0,12,'',''); INSERT INTO dispatcher VALUES(4,1,'sip:[192.168.0.4:5060](http://192.168.0.4:5060/)',0,12,'',''); INSERT INTO dispatcher VALUES(5,1,'sip:[192.168.0.5:5060](http://192.168.0.5:5060/)',0,12,'',''); INSERT INTO dispatcher VALUES(6,1,'sip:[192.168.0.6:5060](http://192.168.0.6:5060/)',0,12,'',''); Then disabling 2 gateways : dispatcher.set_state i 1 sip:[192.168.0.1:5060](http://192.168.0.1:5060/) dispatcher.set_state i 1 sip:[192.168.0.3:5060](http://192.168.0.3:5060/) // ----------------- Routing Logic ----------------- // route { xinfo("[MAIN][$rm][$ci]from[$fU]to[$tU]ruri[$ru]Rp[$Rp]Ri[$Ri]\n"); if (!ds_select_dst("1","13", "-1")) { xinfo("[MAIN] no gateway available !\n"); } while (defined $xavp(_dsdst_)) { xinfo("[MAIN] URI : $xavp(_dsdst_=>uri) \n"); pv_unset("$xavp(_dsdst_)"); } return; } // Logs showing the gateways returned. 0(398491) DEBUG: dispatcher [dispatch.c:2263]: ds_manage_route_algo13(): [active][0]idx[1]uri[sip:[192.168.0.5:5060](http://192.168.0.5:5060/)]priority[12-0=12]latency[0ms]flag[0] 0(398491) DEBUG: dispatcher [dispatch.c:2263]: ds_manage_route_algo13(): [active][1]idx[2]uri[sip:192.168.0.4:5060]priority[12-0=12]latency[0ms]flag[0] 0(398491) DEBUG: dispatcher [dispatch.c:2270]: ds_manage_route_algo13(): [inactive][2]idx[-1]uri[sip:192.168.0.3:5060]priority[12]latency[0ms]flag[1] 0(398491) DEBUG: dispatcher [dispatch.c:2263]: ds_manage_route_algo13(): [active][3]idx[4]uri[sip:192.168.0.2:5060]priority[12-0=12]latency[0ms]flag[0] 0(398491) DEBUG: dispatcher [dispatch.c:2270]: ds_manage_route_algo13(): [inactive][4]idx[-1]uri[sip:192.168.0.1:5060]priority[12]latency[0ms]flag[1] 0(398491) DEBUG: dispatcher [dispatch.c:2263]: ds_manage_route_algo13(): [active][5]idx[0]uri[sip:192.168.0.6:5060]priority[12-0=12]latency[0ms]flag[0] 0(398491) DEBUG: dispatcher [dispatch.c:2128]: ds_manage_routes_fill_reordered_xavp(): [4|sip:192.168.0.3:5060|idx:-1]skipped 1 || 1 0(398491) DEBUG: dispatcher [dispatch.c:2128]: ds_manage_routes_fill_reordered_xavp(): [5|sip:192.168.0.1:5060|idx:-1]skipped 1 || 1 0(398491) DEBUG: dispatcher [dispatch.c:2300]: ds_manage_route_algo13(): priority[12]gateway_selected[1]next_index[2] 0(398491) DEBUG: dispatcher [dispatch.c:2465]: ds_manage_routes(): using alg [13] hash [1] 0(398491) DEBUG: dispatcher [dispatch.c:2512]: ds_manage_routes(): selected [13-1-0/1] <sip:[192.168.0.5:5060](http://192.168.0.5:5060/)> 0(398491) DEBUG: dispatcher [dispatch.c:2107]: ds_select_dst_limit(): selected target destinations: 4 0(398491) INFO: <script>: [MAIN][sip:[192.168.0.5:5060](http://192.168.0.5:5060/)] 0(398491) INFO: <script>: [MAIN] URI : sip:192.168.0.5:5060 0(398491) INFO: <script>: [MAIN] URI : sip:[192.168.0.4:5060](http://192.168.0.4:5060/) 0(398491) INFO: <script>: [MAIN] URI : sip:[192.168.0.2:5060](http://192.168.0.2:5060/) 0(398491) INFO: <script>: [MAIN] URI : sip:[192.168.0.6:5060](http://192.168.0.6:5060/) ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3232 -- Commit Summary -- * dispatcher: fix alog13 gateway selections -- File Changes -- M src/modules/dispatcher/dispatch.c (32) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3232.patch https://github.com/kamailio/kamailio/pull/3232.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3232 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3232(a)github.com>

2 4

git:master:d56d65b8: dispatcher: fix alog13 gateway selections
by Henning Westerholt 18 Sep '22

18 Sep '22

Module: kamailio Branch: master Commit: d56d65b8daac072a4726d9124072151d0d3fbb79 URL: https://github.com/kamailio/kamailio/commit/d56d65b8daac072a4726d9124072151… Author: Julien Chavanton <jchavanton(a)subspace.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-09-19T00:28:39+02:00 dispatcher: fix alog13 gateway selections --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/d56d65b8daac072a4726d9124072151… Patch: https://github.com/kamailio/kamailio/commit/d56d65b8daac072a4726d9124072151…

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev