sr-dev June 2022

sr-dev@lists.kamailio.org

20 participants
282 discussions

git:master:398e8087: pkg/kamailio/deb: rework rules [skip ci]
by Victor Seva 17 Jun '22

17 Jun '22

Module: kamailio Branch: master Commit: 398e808719520b054fce25a722b9b794ebab2744 URL: https://github.com/kamailio/kamailio/commit/398e808719520b054fce25a722b9b79… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-06-17T11:53:24+02:00 pkg/kamailio/deb: rework rules [skip ci] * define list elements per line. It helps to remove/add them in backports scripts * remove unused definitions * include dpkg-dev helper makefile files with definitions * rework backports scripts --- Modified: pkg/kamailio/deb/bionic/rules Modified: pkg/kamailio/deb/bookworm/rules Modified: pkg/kamailio/deb/bullseye/rules Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/debian/backports/bionic Modified: pkg/kamailio/deb/debian/backports/bookworm Modified: pkg/kamailio/deb/debian/backports/bullseye Modified: pkg/kamailio/deb/debian/backports/buster Modified: pkg/kamailio/deb/debian/backports/focal Modified: pkg/kamailio/deb/debian/backports/jessie Modified: pkg/kamailio/deb/debian/backports/precise Modified: pkg/kamailio/deb/debian/backports/sid Modified: pkg/kamailio/deb/debian/backports/stretch Modified: pkg/kamailio/deb/debian/backports/trusty Modified: pkg/kamailio/deb/debian/backports/wheezy Modified: pkg/kamailio/deb/debian/backports/xenial Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/focal/rules Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/control Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/398e808719520b054fce25a722b9b79… Patch: https://github.com/kamailio/kamailio/commit/398e808719520b054fce25a722b9b79…

1 0

git:master:41ab78ed: core: added domain and auto_domains as variants for alias and auto_aliases
by Daniel-Constantin Mierla 17 Jun '22

17 Jun '22

Module: kamailio Branch: master Commit: 41ab78edff1677fc1a575b84e275bfc525978efa URL: https://github.com/kamailio/kamailio/commit/41ab78edff1677fc1a575b84e275bfc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-17T09:53:01+02:00 core: added domain and auto_domains as variants for alias and auto_aliases --- Modified: src/core/cfg.lex Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/41ab78edff1677fc1a575b84e275bfc… Patch: https://github.com/kamailio/kamailio/commit/41ab78edff1677fc1a575b84e275bfc… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 8e7b3d60cb..a5a595f98c 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -308,7 +308,9 @@ ADVERTISE advertise|ADVERTISE VIRTUAL virtual STRNAME name|NAME ALIAS alias +DOMAIN domain SR_AUTO_ALIASES auto_aliases +SR_AUTO_DOMAINS auto_domains DNS dns REV_DNS rev_dns DNS_TRY_IPV6 dns_try_ipv6 @@ -750,8 +752,11 @@ IMPORTFILE "import_file" <INITIAL>{VIRTUAL} { count(); yylval.strval=yytext; return VIRTUAL; } <INITIAL>{STRNAME} { count(); yylval.strval=yytext; return STRNAME; } <INITIAL>{ALIAS} { count(); yylval.strval=yytext; return ALIAS; } +<INITIAL>{DOMAIN} { count(); yylval.strval=yytext; return DOMAIN; } <INITIAL>{SR_AUTO_ALIASES} { count(); yylval.strval=yytext; return SR_AUTO_ALIASES; } +<INITIAL>{SR_AUTO_DOMAINS} { count(); yylval.strval=yytext; + return SR_AUTO_DOMAINS; } <INITIAL>{DNS} { count(); yylval.strval=yytext; return DNS; } <INITIAL>{REV_DNS} { count(); yylval.strval=yytext; return REV_DNS; } <INITIAL>{DNS_TRY_IPV6} { count(); yylval.strval=yytext; diff --git a/src/core/cfg.y b/src/core/cfg.y index acf5e8c490..dd93f5f98b 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -333,6 +333,8 @@ extern char *default_routename; %token STRNAME %token ALIAS %token SR_AUTO_ALIASES +%token DOMAIN +%token SR_AUTO_DOMAINS %token DNS %token REV_DNS %token DNS_TRY_IPV6 @@ -1737,8 +1739,22 @@ assign_stm: free_socket_id_lst($3); } | ALIAS EQUAL error { yyerror("hostname expected"); } + | DOMAIN EQUAL id_lst { + for(lst_tmp=$3; lst_tmp; lst_tmp=lst_tmp->next){ + add_alias( lst_tmp->addr_lst->name, + strlen(lst_tmp->addr_lst->name), + lst_tmp->port, lst_tmp->proto); + for (nl_tmp=lst_tmp->addr_lst->next; nl_tmp; nl_tmp=nl_tmp->next) + add_alias(nl_tmp->name, strlen(nl_tmp->name), + lst_tmp->port, lst_tmp->proto); + } + free_socket_id_lst($3); + } + | DOMAIN EQUAL error { yyerror("hostname expected"); } | SR_AUTO_ALIASES EQUAL NUMBER { sr_auto_aliases=$3; } | SR_AUTO_ALIASES EQUAL error { yyerror("boolean value expected"); } + | SR_AUTO_DOMAINS EQUAL NUMBER { sr_auto_aliases=$3; } + | SR_AUTO_DOMAINS EQUAL error { yyerror("boolean value expected"); } | ADVERTISED_ADDRESS EQUAL listen_id { if ($3){ default_global_address.s=$3;

1 0

git:master:2620a22d: etc/kamailio.cfg: use of htable guarded by own ifdef
by Daniel-Constantin Mierla 17 Jun '22

17 Jun '22

Module: kamailio Branch: master Commit: 2620a22d8793f7e40b10765d46dba952adb677bf URL: https://github.com/kamailio/kamailio/commit/2620a22d8793f7e40b10765d46dba95… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-17T09:15:27+02:00 etc/kamailio.cfg: use of htable guarded by own ifdef - allows independent loading for extending (e.g., store items to fix in-dialog routing) --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/2620a22d8793f7e40b10765d46dba95… Patch: https://github.com/kamailio/kamailio/commit/2620a22d8793f7e40b10765d46dba95… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 2333eacacc3..eb41c14d41f 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -93,6 +93,9 @@ # block if more than 16 requests in 2 seconds and ban for 300 seconds) # - define WITH_ANTIFLOOD # +# *** To load htable module execute: +# - define WITH_HTABLE +# # *** To block 3XX redirect replies execute: # - define WITH_BLOCK3XX # @@ -148,6 +151,11 @@ import_file "kamailio-local.cfg" #!define MULTIDOMAIN 0 #!endif +#!ifdef WITH_ANTIFLOOD +# - hash table 'ipban' used to store blocked IP addresses +#!trydef WITH_HTABLE +#!endif + # - flags # FLT_ - per transaction (message) flags #!define FLT_ACC 1 @@ -315,8 +323,11 @@ loadmodule "rtpproxy.so" loadmodule "tls.so" #!endif -#!ifdef WITH_ANTIFLOOD +#!ifdef WITH_HTABLE loadmodule "htable.so" +#!endif + +#!ifdef WITH_ANTIFLOOD loadmodule "pike.so" #!endif @@ -482,11 +493,15 @@ modparam("tls", "config", "/usr/local/etc/kamailio/tls.cfg") modparam("pike", "sampling_time_unit", 2) modparam("pike", "reqs_density_per_unit", 16) modparam("pike", "remove_latency", 4) +#!endif +#!ifdef WITH_HTABLE # ----- htable params ----- +#!ifdef WITH_ANTIFLOOD /* ip ban htable with autoexpire after 5 minutes */ modparam("htable", "htable", "ipban=>size=8;autoexpire=300;") #!endif +#!endif #!ifdef WITH_DEBUG # ----- debugger params -----

1 0

[kamailio/kamailio] tls_wolfssl: new module TLS stack based on wolfSSL (PR #3144)
by space88man 16 Jun '22

16 Jun '22

New module: add wolfSSL as alternate TLS stack.   #### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description This a new module: an alternate TLS implementation based on wolfSSL. The current tls module based on OpenSSL has many multi-process workarounds and can be quite fragile. This is the initial code dump which is a copy of `tls/` and edited to compile with wolfSSL by using the OpenSSL compatibility layer. The `doc/` directory has not been changed. The proposal is to get it into the code base as soon as possible so as to sync up with any ongoing changes in the `tls/` module. Any shared features can be extracted out into a common module: like certificate and configuration. In the short-term the steps are: * testing * use native wolfSSL APIs (remove OpenSSL compatibility layer) * remove OpenSSL multi-process hacks in this module This module is inspired by the `tls_wolfssl` module in the sister SIP project. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3144 -- Commit Summary -- * tls_wolfssl: new module TLS stack based on wolfSSL -- File Changes -- A src/modules/tls_wolfssl/Makefile (81) A src/modules/tls_wolfssl/README (1713) A src/modules/tls_wolfssl/TODO.md (7) A src/modules/tls_wolfssl/doc/Makefile (4) A src/modules/tls_wolfssl/doc/certs_howto.xml (154) A src/modules/tls_wolfssl/doc/functions.xml (63) A src/modules/tls_wolfssl/doc/history.xml (38) A src/modules/tls_wolfssl/doc/hsm_howto.xml (64) A src/modules/tls_wolfssl/doc/params.xml (1410) A src/modules/tls_wolfssl/doc/rpc.xml (69) A src/modules/tls_wolfssl/doc/tls.xml (367) A src/modules/tls_wolfssl/fixed_c_zlib.h (258) A src/modules/tls_wolfssl/sbufq.h (283) A src/modules/tls_wolfssl/tls.cfg (106) A src/modules/tls_wolfssl/tls_bio.c (314) A src/modules/tls_wolfssl/tls_bio.h (69) A src/modules/tls_wolfssl/tls_cert.sh (201) A src/modules/tls_wolfssl/tls_cfg.c (289) A src/modules/tls_wolfssl/tls_cfg.h (111) A src/modules/tls_wolfssl/tls_config.c (536) A src/modules/tls_wolfssl/tls_config.h (53) A src/modules/tls_wolfssl/tls_ct_q.h (133) A src/modules/tls_wolfssl/tls_ct_wrq.c (205) A src/modules/tls_wolfssl/tls_ct_wrq.h (98) A src/modules/tls_wolfssl/tls_domain.c (1585) A src/modules/tls_wolfssl/tls_domain.h (238) A src/modules/tls_wolfssl/tls_dump_vf.c (150) A src/modules/tls_wolfssl/tls_dump_vf.h (41) A src/modules/tls_wolfssl/tls_init.c (589) A src/modules/tls_wolfssl/tls_init.h (85) A src/modules/tls_wolfssl/tls_locking.c (59) A src/modules/tls_wolfssl/tls_locking.h (34) A src/modules/tls_wolfssl/tls_map.c (195) A src/modules/tls_wolfssl/tls_map.h (77) A src/modules/tls_wolfssl/tls_mod.c (733) A src/modules/tls_wolfssl/tls_mod.h (45) A src/modules/tls_wolfssl/tls_rand.c (375) A src/modules/tls_wolfssl/tls_rand.h (32) A src/modules/tls_wolfssl/tls_rpc.c (263) A src/modules/tls_wolfssl/tls_rpc.h (33) A src/modules/tls_wolfssl/tls_select.c (1707) A src/modules/tls_wolfssl/tls_select.h (52) A src/modules/tls_wolfssl/tls_server.c (1557) A src/modules/tls_wolfssl/tls_server.h (101) A src/modules/tls_wolfssl/tls_util.c (99) A src/modules/tls_wolfssl/tls_util.h (87) A src/modules/tls_wolfssl/tls_verify.c (135) A src/modules/tls_wolfssl/tls_verify.h (42) A src/modules/tls_wolfssl/todo.txt (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3144.patch https://github.com/kamailio/kamailio/pull/3144.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3144 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3144(a)github.com>

3 14

git:master:a21bf23c: modules: readme files regenerated - pua_dialoginfo ... [skip ci]
by Kamailio Dev 16 Jun '22

16 Jun '22

Module: kamailio Branch: master Commit: a21bf23c1299a15a538de9883082e1d075b7f7e0 URL: https://github.com/kamailio/kamailio/commit/a21bf23c1299a15a538de9883082e1d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-06-16T12:31:15+02:00 modules: readme files regenerated - pua_dialoginfo ... [skip ci] --- Modified: src/modules/pua_dialoginfo/README --- Diff: https://github.com/kamailio/kamailio/commit/a21bf23c1299a15a538de9883082e1d… Patch: https://github.com/kamailio/kamailio/commit/a21bf23c1299a15a538de9883082e1d…

1 0

[kamailio/kamailio] pua dialoginfo: improvements (PR #3143)
by Victor Seva 16 Jun '22

16 Jun '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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally #### Description Changes from Sipwise flavor: - refresh_pubruri_avps_flag: if enabled, this message flag indicates whether to refresh R-Uri from avps before sending the PUBLISH requests. - improvement for use_pubruri_avps: use locking to avoid crashes since we are using shared memory - local_identity_dlg_var: reporting dialog-information will use the value of the dialog variable if exists You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3143 -- Commit Summary -- * pua_dialoginfo: refresh_pubruri_avps_flag * pua_dialoginfo: use lock when use_puburi_avps is set * pua_dialoginfo: local_identity_dlg_var -- File Changes -- M src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml (39) M src/modules/pua_dialoginfo/pua_dialoginfo.c (113) M src/modules/pua_dialoginfo/pua_dialoginfo.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3143.patch https://github.com/kamailio/kamailio/pull/3143.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3143 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3143(a)github.com>

2 3

git:master:8ac31370: pua_dialoginfo: local_identity_dlg_var
by Victor Seva 16 Jun '22

16 Jun '22

Module: kamailio Branch: master Commit: 8ac3137057d07f42eb8845ae4fb29cd9c4021165 URL: https://github.com/kamailio/kamailio/commit/8ac3137057d07f42eb8845ae4fb29cd… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-06-16T12:17:32+02:00 pua_dialoginfo: local_identity_dlg_var --- Modified: src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/8ac3137057d07f42eb8845ae4fb29cd… Patch: https://github.com/kamailio/kamailio/commit/8ac3137057d07f42eb8845ae4fb29cd… --- diff --git a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml index f6e544c832..676201cad4 100644 --- a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml +++ b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml @@ -620,6 +620,25 @@ modparam("pua_dialoginfo", "publish_dialog_req_within", 0) </example> </section> + <section id="pua_dialoginfo.p.local_identity_dlg_var"> + <title><varname>local_identity_dlg_var</varname> (str)</title> + <para> + PUBLISH-requests reporting dialog-information will use the value of + the dialog variable if exists + </para> + <para> + <emphasis>Default value is <quote>NULL</quote>.</emphasis> + </para> + <example> + <title>Set <varname>local_identity_dlg_var</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("pua_dialoginfo", "local_identity_dlg_var", "local_identity") +... +</programlisting> + </example> + </section> + <section id="pua_dialoginfo.p.attribute_display"> <title><varname>attribute_display</varname> (int)</title> <para> diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c index 83c4f2c3f8..1e4f17110d 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -87,6 +87,7 @@ static str caller_dlg_var = {0, 0}; /* pubruri_caller */ static str callee_dlg_var = {0, 0}; /* pubruri_callee */ static str caller_entity_when_publish_disabled = {0, 0}; /* pubruri_caller */ static str callee_entity_when_publish_disabled = {0, 0}; /* pubruri_callee */ +static str local_identity_dlg_var = STR_NULL; /* Module parameter variables */ int include_callid = DEF_INCLUDE_CALLID; @@ -132,6 +133,7 @@ static param_export_t params[]={ {"pubruri_callee_avp", PARAM_STRING, &pubruri_callee_avp }, {"pubruri_caller_dlg_var", PARAM_STR, &caller_dlg_var }, {"pubruri_callee_dlg_var", PARAM_STR, &callee_dlg_var }, + {"local_identity_dlg_var", PARAM_STR, &local_identity_dlg_var }, {"callee_trying", INT_PARAM, &callee_trying }, {"disable_caller_publish_flag", INT_PARAM, &disable_caller_publish_flag }, {"disable_callee_publish_flag", INT_PARAM, &disable_callee_publish_flag }, @@ -312,6 +314,17 @@ 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); + + if(s != NULL) { + uri->s = s->s; + uri->len = s->len; + LM_DBG("Found local_identity in dialog '%.*s'\n", + uri->len, uri->s); + } +} + static void __dialog_sendpublish(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) { @@ -357,6 +370,10 @@ __dialog_sendpublish(struct dlg_cell *dlg, int type, struct dlg_cb_params *_para refresh_pubruri_avps(dlginfo, &uri); } + if(local_identity_dlg_var.len > 0) { + refresh_local_identity(dlg, &uri); + } + switch (type) { case DLGCB_FAILED: case DLGCB_TERMINATED:

1 0

git:master:bd7261a5: pua_dialoginfo: use lock when use_puburi_avps is set
by Victor Seva 16 Jun '22

16 Jun '22

Module: kamailio Branch: master Commit: bd7261a5f656a8e723bb6999633c55864b46f1b6 URL: https://github.com/kamailio/kamailio/commit/bd7261a5f656a8e723bb6999633c558… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-06-16T12:17:32+02:00 pua_dialoginfo: use lock when use_puburi_avps is set --- Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c Modified: src/modules/pua_dialoginfo/pua_dialoginfo.h --- Diff: https://github.com/kamailio/kamailio/commit/bd7261a5f656a8e723bb6999633c558… Patch: https://github.com/kamailio/kamailio/commit/bd7261a5f656a8e723bb6999633c558… --- diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c index a705ed3e69..83c4f2c3f8 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -353,6 +353,7 @@ __dialog_sendpublish(struct dlg_cell *dlg, int type, struct dlg_cb_params *_para if(use_pubruri_avps && (refresh_pubruri_avps_flag > -1 || (request->flags & (1<<refresh_pubruri_avps_flag)))) { + lock_get(&dlginfo->lock); refresh_pubruri_avps(dlginfo, &uri); } @@ -496,6 +497,12 @@ __dialog_sendpublish(struct dlg_cell *dlg, int type, struct dlg_cb_params *_para send_publish_flag==-1?1:0,&(dlginfo->uuid)); } } + + if(use_pubruri_avps && (refresh_pubruri_avps_flag > -1 + || (request->flags & (1<<refresh_pubruri_avps_flag)))) + { + lock_release(&dlginfo->lock); + } } /* @@ -577,6 +584,12 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type, int disable } memset( dlginfo, 0, len); + if(use_pubruri_avps && lock_init(&dlginfo->lock) == 0) { + LM_ERR("cannot init the lock\n"); + free_dlginfo_cell(dlginfo); + return NULL; + } + /* copy from dlg structure to dlginfo structure */ dlginfo->lifetime = override_lifetime ? override_lifetime : dlg->lifetime; dlginfo->disable_caller_publish = disable_caller_publish; @@ -756,20 +769,24 @@ __dialog_created(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) if ((!disable_caller_publish) && (disable_caller_publish_flag == -1 || !(request && (request->flags & (1<<disable_caller_publish_flag))))) { + if(use_pubruri_avps) lock_get(&dlginfo->lock); dialog_publish_multi("Trying", dlginfo->pubruris_caller, &identity_local, &identity_remote, &(dlg->callid), 1, dlginfo->lifetime, 0, 0, 0, 0, (send_publish_flag==-1)?1:0,&(dlginfo->uuid)); + if(use_pubruri_avps) lock_release(&dlginfo->lock); } if (callee_trying && ((!disable_callee_publish) && (disable_callee_publish_flag == -1 || !(request && (request->flags & (1<<disable_callee_publish_flag)))))) { + if(use_pubruri_avps) lock_get(&dlginfo->lock); dialog_publish_multi("Trying", dlginfo->pubruris_callee, &identity_remote, &identity_local, &(dlg->callid), 0, dlginfo->lifetime, 0, 0, 0, 0, (send_publish_flag==-1)?1:0,&(dlginfo->uuid)); + if(use_pubruri_avps) lock_release(&dlginfo->lock); } } @@ -939,9 +956,7 @@ void free_dlginfo_cell(void *param) { free_str_list_all(cell->pubruris_caller); free_str_list_all(cell->pubruris_callee); - /*if (cell->to_tag) { - shm_free(cell->to_tag); - }*/ + if(use_pubruri_avps) lock_destroy(cell->lock); shm_free(param); } diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.h b/src/modules/pua_dialoginfo/pua_dialoginfo.h index d86799adee..04875536f3 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.h +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.h @@ -23,6 +23,7 @@ #ifndef _PUA_DLGINFO_H #define _PUA_DLGINFO_H +#include "../../core/locking.h" #include "../pua/pua_bind.h" extern send_publish_t pua_send_publish; @@ -35,6 +36,7 @@ void dialog_publish_multi(char *state, struct str_list* ruris, str *entity, str * dlg_cell during the callback (as this could create a race condition * if the dlg_cell gets meanwhile deleted) */ struct dlginfo_cell { + gen_lock_t lock; str from_uri; str to_uri; str callid;

1 0

git:master:a5c0d5fe: pua_dialoginfo: refresh_pubruri_avps_flag
by Victor Seva 16 Jun '22

16 Jun '22

Module: kamailio Branch: master Commit: a5c0d5fe890a243e648d0de7463da63b910c2a81 URL: https://github.com/kamailio/kamailio/commit/a5c0d5fe890a243e648d0de7463da63… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-06-16T12:17:32+02:00 pua_dialoginfo: refresh_pubruri_avps_flag --- Modified: src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/a5c0d5fe890a243e648d0de7463da63… Patch: https://github.com/kamailio/kamailio/commit/a5c0d5fe890a243e648d0de7463da63…

1 0

git:5.6:d456f07c: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 16 Jun '22

16 Jun '22

Module: kamailio Branch: 5.6 Commit: d456f07cd14b8f3bf7a4eae229a8e1ba46be45c4 URL: https://github.com/kamailio/kamailio/commit/d456f07cd14b8f3bf7a4eae229a8e1b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-06-16T09:46:34+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/auth_identity/README Modified: src/modules/db_cluster/README Modified: src/modules/sipdump/README --- Diff: https://github.com/kamailio/kamailio/commit/d456f07cd14b8f3bf7a4eae229a8e1b… Patch: https://github.com/kamailio/kamailio/commit/d456f07cd14b8f3bf7a4eae229a8e1b… --- diff --git a/src/modules/auth_identity/README b/src/modules/auth_identity/README index 5ffdd5d9b1b..acbac172dd2 100644 --- a/src/modules/auth_identity/README +++ b/src/modules/auth_identity/README @@ -25,7 +25,7 @@ Gergely Kovacs 5.6. callid_cache_limit (integer) 5.7. certificate_cache_limit (integer) 5.8. cainfo_path (string) - 5.9. accept_pem_certs ([0|1]) + 5.9. accept_pem_certs (int) 6. Functions @@ -91,7 +91,7 @@ Chapter 1. Admin Guide 5.6. callid_cache_limit (integer) 5.7. certificate_cache_limit (integer) 5.8. cainfo_path (string) - 5.9. accept_pem_certs ([0|1]) + 5.9. accept_pem_certs (int) 6. Functions @@ -174,7 +174,7 @@ Chapter 1. Admin Guide 5.6. callid_cache_limit (integer) 5.7. certificate_cache_limit (integer) 5.8. cainfo_path (string) - 5.9. accept_pem_certs ([0|1]) + 5.9. accept_pem_certs (int) 5.1. privatekey_path (string) @@ -296,11 +296,12 @@ modparam("auth_identity","certificate_cache_limit",4096) modparam("auth_identity","cainfo_path","/etc/ssl/certs/ca-certificates.crt") ... -5.9. accept_pem_certs ([0|1]) +5.9. accept_pem_certs (int) Note: this parameter is for verifier service. Enables the acquired certificate processing if it is in PEM format. + Value can be 0 or 1. This parameter is optional. The default value is "0". diff --git a/src/modules/db_cluster/README b/src/modules/db_cluster/README index 7260f0f1aa8..5b4962e0025 100644 --- a/src/modules/db_cluster/README +++ b/src/modules/db_cluster/README @@ -213,7 +213,8 @@ modparam("db_cluster", "max_query_length", 5) modparam("db_cluster", "connection", "c1=>mysql://kamailio:kamailiorw@localhost/kamailio1") modparam("db_cluster", "connection", - "c2=>mysql://kamailio:kamailiorw@localhost/kamailio2") + "c2=>mysql://kamailio:kamailiorw@remotehost/kamailio2") + modparam("db_cluster", "cluster", "k1=>c1=9r9p;c2=9r9p") modparam("acc", "db_url", "cluster://k1") diff --git a/src/modules/sipdump/README b/src/modules/sipdump/README index 8b03c3849f3..e5ba03d8fbd 100644 --- a/src/modules/sipdump/README +++ b/src/modules/sipdump/README @@ -320,7 +320,7 @@ modparam("rtimer", "timer", "name=tjobs;interval=300;mode=1;") modparam("rtimer", "exec", "timer=tjobs;route=TCLEAN") ... route[TCLEAN] { - exec_cmd("find /tmp -type f -name kamailio-sipdump-* -mtime +1 -delete &"); + exec_cmd("find /tmp -type f -name kamailio-sipdump-* -mtime +2 -delete &"); } ...

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
29
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2022