sr-dev March 2021

sr-dev@lists.kamailio.org

28 participants
489 discussions

git:master:d461ab91: modules: readme files regenerated - usrloc ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: d461ab91f84cffe8c2855e72422415f06233c7ba URL: https://github.com/kamailio/kamailio/commit/d461ab91f84cffe8c2855e72422415f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-03-15T13:01:35+01:00 modules: readme files regenerated - usrloc ... [skip ci] --- Modified: src/modules/usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/d461ab91f84cffe8c2855e72422415f… Patch: https://github.com/kamailio/kamailio/commit/d461ab91f84cffe8c2855e72422415f… --- diff --git a/src/modules/usrloc/README b/src/modules/usrloc/README index d075042834..bcabbe4db2 100644 --- a/src/modules/usrloc/README +++ b/src/modules/usrloc/README @@ -97,6 +97,7 @@ Carsten Bock 3.55. ka_timeout (int) 3.56. ka_loglevel (int) 3.57. ka_logmsg (str) + 3.58. load_rank (int) 4. RPC Commands @@ -201,6 +202,7 @@ Carsten Bock 1.55. Set ka_timeout parameter 1.56. ka_loglevel parameter usage 1.57. ka_logmsg parameter usage + 1.58. load_rank parameter usage Chapter 1. Admin Guide @@ -274,6 +276,7 @@ Chapter 1. Admin Guide 3.55. ka_timeout (int) 3.56. ka_loglevel (int) 3.57. ka_logmsg (str) + 3.58. load_rank (int) 4. RPC Commands @@ -410,6 +413,7 @@ Chapter 1. Admin Guide 3.55. ka_timeout (int) 3.56. ka_loglevel (int) 3.57. ka_logmsg (str) + 3.58. load_rank (int) 3.1. nat_bflag (int) @@ -1215,6 +1219,18 @@ modparam("usrloc", "ka_loglevel", 1) modparam("usrloc", "ka_logmsg", " to-uri: [$tu] remote-addr: [$sas]") ... +3.58. load_rank (int) + + Allows to set the rank of the child SIP worker to load the location + records. + + Default value is “1” (PROC_SIPINIT). + + Example 1.58. load_rank parameter usage +... +modparam("usrloc", "load_rank", 1) +... + 4. RPC Commands 4.1. ul.dump

3 years, 9 months

git:master:551aed1a: usrloc: docs for load_rank parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 551aed1a97a9b8218ba1c5b0234f156ad78c2ffb URL: https://github.com/kamailio/kamailio/commit/551aed1a97a9b8218ba1c5b0234f156… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-15T12:55:25+01:00 usrloc: docs for load_rank parameter --- Modified: src/modules/usrloc/doc/usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/551aed1a97a9b8218ba1c5b0234f156… Patch: https://github.com/kamailio/kamailio/commit/551aed1a97a9b8218ba1c5b0234f156… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index 4b624fb81f..25124abcc1 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -1498,6 +1498,25 @@ modparam("usrloc", "ka_logmsg", " to-uri: [$tu] remote-addr: [$sas]") </example> </section> + <section id="usrloc.p.load_rank"> + <title><varname>load_rank</varname> (int)</title> + <para> + Allows to set the rank of the child SIP worker to load the location + records. + </para> + <para> + Default value is <quote>1</quote> (PROC_SIPINIT). + </para> + <example> + <title><varname>load_rank</varname> parameter usage</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "load_rank", 1) +... + </programlisting> + </example> + </section> + </section> <section>

3 years, 9 months

git:master:8ea264ac: usrloc: new parameter load_rank

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8ea264ac1e804d2d882f2394e85b3c54d52b33cb URL: https://github.com/kamailio/kamailio/commit/8ea264ac1e804d2d882f2394e85b3c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-15T12:48:55+01:00 usrloc: new parameter load_rank - allows to set the rank of the child to load the location records - default: 1 (PROC_SIPINIT) - preserse the current behaviour --- Modified: src/modules/usrloc/usrloc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8ea264ac1e804d2d882f2394e85b3c5… Patch: https://github.com/kamailio/kamailio/commit/8ea264ac1e804d2d882f2394e85b3c5… --- diff --git a/src/modules/usrloc/usrloc_mod.c b/src/modules/usrloc/usrloc_mod.c index 860fb715b5..733c16a3ff 100644 --- a/src/modules/usrloc/usrloc_mod.c +++ b/src/modules/usrloc/usrloc_mod.c @@ -116,6 +116,7 @@ int ul_db_raw_fetch_type = 0; int ul_rm_expired_delay = 0; int ul_version_table = 1; +int ul_load_rank = PROC_SIPINIT; str ul_xavp_contact_name = {0}; str ul_ka_from = str_init("sip:server@kamailio.org"); @@ -261,6 +262,7 @@ static param_export_t params[] = { {"ka_timeout", PARAM_INT, &ul_keepalive_timeout}, {"ka_loglevel", PARAM_INT, &ul_ka_loglevel}, {"ka_logmsg", PARAM_STR, &ul_ka_logmsg}, + {"load_rank", PARAM_INT, &ul_load_rank}, {0, 0, 0} }; @@ -472,7 +474,7 @@ static int child_init(int _rank) return -1; } /* _rank==PROC_SIPINIT is used even when fork is disabled */ - if (_rank==PROC_SIPINIT && ul_db_mode!=DB_ONLY && ul_db_load) { + if (_rank==ul_load_rank && ul_db_mode!=DB_ONLY && ul_db_load) { /* if cache is used, populate domains from DB */ for(ptr=_ksr_ul_root ; ptr ; ptr=ptr->next) { if (preload_udomain(ul_dbh, ptr->d) < 0) {

3 years, 9 months

git:master:699d208a: core: global parameters to enable waiting for child one worker initialization

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 699d208adcae14565c1af289a9668aede5adaa72 URL: https://github.com/kamailio/kamailio/commit/699d208adcae14565c1af289a9668ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-15T12:29:08+01:00 core: global parameters to enable waiting for child one worker initialization - new paramters: - wait_child1_mode=[0|1] - set to wait or not - wait_child1_time=1000000 (micro-seconds) - how long to wait over all - wait_child1_usleep=100000 (micro-seconds) - step to wait before checking if initialization completed --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/globals.h Modified: src/core/tcp_main.c Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/699d208adcae14565c1af289a9668ae… Patch: https://github.com/kamailio/kamailio/commit/699d208adcae14565c1af289a9668ae…

3 years, 9 months

git:master:e6bad5f9: Merge remote-tracking branch 'origin/master'

by mojtaba

Module: kamailio Branch: master Commit: e6bad5f9b4625da6014f2d4e0767056dffa1719c URL: https://github.com/kamailio/kamailio/commit/e6bad5f9b4625da6014f2d4e0767056… Author: mojtaba <mespio(a)gmail.com> Committer: mojtaba <mespio(a)gmail.com> Date: 2021-03-14T13:15:03+03:30 Merge remote-tracking branch 'origin/master' --- Added: src/modules/jwt/Makefile Added: src/modules/jwt/README Added: src/modules/jwt/doc/Makefile Added: src/modules/jwt/doc/jwt.xml Added: src/modules/jwt/doc/jwt_admin.xml Added: src/modules/jwt/jwt_mod.c Modified: etc/kamailio.cfg Modified: src/Makefile.groups Modified: src/core/tcp_init.h Modified: src/core/tcp_main.c Modified: src/main.c Modified: src/modules/carrierroute/cr_data.c Modified: src/modules/carrierroute/cr_db.c Modified: src/modules/carrierroute/cr_db.h Modified: src/modules/carrierroute/cr_domain.h Modified: src/modules/cplc/cpl_run.c Modified: src/modules/dialplan/dp_db.c Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatcher.c Modified: src/modules/presence/presence_dmq.c Modified: src/modules/pv_headers/pvh_func.c Modified: src/modules/pv_headers/pvh_hash.c Modified: src/modules/pv_headers/pvh_str.c Modified: src/modules/pv_headers/pvh_str.h Modified: src/modules/registrar/README Modified: src/modules/registrar/doc/registrar_admin.xml Modified: src/modules/tm/t_cancel.c Modified: src/modules/uac/README Modified: src/modules/uac/doc/uac_admin.xml Modified: src/modules/uac/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/e6bad5f9b4625da6014f2d4e0767056… Patch: https://github.com/kamailio/kamailio/commit/e6bad5f9b4625da6014f2d4e0767056…

3 years, 9 months

Errored: kamailio/kamailio#9959 (master - e6bad5f)

by Travis CI

Build Update for kamailio/kamailio ------------------------------------- Build: #9959 Status: Errored Duration: 6 mins and 15 secs Commit: e6bad5f (master) Author: mojtaba Message: Merge remote-tracking branch 'origin/master' View the changeset: https://github.com/kamailio/kamailio/compare/dc6d44b603b1...e6bad5f9b462 View the full build log and details: https://travis-ci.org/github/kamailio/kamailio/builds/762810353?utm_medium=… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

3 years, 9 months

git:master:2a36a99e: lrkproxy: code optimization

by mojtaba

Module: kamailio Branch: master Commit: 2a36a99e1f4a737db548adb5cefe428418f366f9 URL: https://github.com/kamailio/kamailio/commit/2a36a99e1f4a737db548adb5cefe428… Author: mojtaba <mespio(a)gmail.com> Committer: mojtaba <mespio(a)gmail.com> Date: 2021-03-14T13:14:08+03:30 lrkproxy: code optimization Fix some potential issues after running Coverity static code analyser over lrkproxy code, --- Modified: src/modules/lrkproxy/lrkproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/2a36a99e1f4a737db548adb5cefe428… Patch: https://github.com/kamailio/kamailio/commit/2a36a99e1f4a737db548adb5cefe428…

3 years, 9 months

git:master:dc6d44b6: core: execute event_route[core:worker-one-init] for sctp or tcp

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: dc6d44b603b126c43757a53560d692e5f5f147a7 URL: https://github.com/kamailio/kamailio/commit/dc6d44b603b126c43757a53560d692e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-12T18:15:34+01:00 core: execute event_route[core:worker-one-init] for sctp or tcp - if no udp worker is started, the event route is executed by next available transport, in the order: sctp, tcp (or tls) --- Modified: src/core/tcp_init.h Modified: src/core/tcp_main.c Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/dc6d44b603b126c43757a53560d692e… Patch: https://github.com/kamailio/kamailio/commit/dc6d44b603b126c43757a53560d692e… --- diff --git a/src/core/tcp_init.h b/src/core/tcp_init.h index ddabbc5fce..70a193a0e2 100644 --- a/src/core/tcp_init.h +++ b/src/core/tcp_init.h @@ -13,8 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -54,7 +54,7 @@ struct tcp_child{ int init_tcp(void); void destroy_tcp(void); int tcp_init(struct socket_info* sock_info); -int tcp_init_children(void); +int tcp_init_children(int *woneinit); void tcp_main_loop(void); void tcp_receive_loop(int unix_sock); int tcp_fix_child_sockets(int* fd); diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index aecf3a88c1..1fda94ec27 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -5034,16 +5034,16 @@ int tcp_fix_child_sockets(int* fd) /* starts the tcp processes */ -int tcp_init_children() +int tcp_init_children(int *woneinit) { int r, i; int reader_fd_1; /* for comm. with the tcp children read */ pid_t pid; char si_desc[MAX_PT_DESC]; struct socket_info *si; - + /* estimate max fd. no: - * 1 tcp send unix socket/all_proc, + * 1 tcp send unix socket/all_proc, * + 1 udp sock/udp proc + 1 tcp_child sock/tcp child* * + no_listen_tcp */ for(r=0, si=tcp_listen; si; si=si->next, r++); @@ -5051,12 +5051,12 @@ int tcp_init_children() if (! tls_disable) for (si=tls_listen; si; si=si->next, r++); #endif - + register_fds(r+tcp_max_connections+get_max_procs()-1 /* tcp main */); #if 0 tcp_max_fd_no=get_max_procs()*2 +r-1 /* timer */ +3; /* stdin/out/err*/ /* max connections can be temporarily exceeded with estimated_process_count - * - tcp_main (tcpconn_connect called simultaneously in all all the + * - tcp_main (tcpconn_connect called simultaneously in all all the * processes) */ tcp_max_fd_no+=tcp_max_connections+get_max_procs()-1 /* tcp main */; #endif @@ -5095,7 +5095,7 @@ int tcp_init_children() /* create the tcp sock_info structures */ /* copy the sockets --moved to main_loop*/ - + /* fork children & create the socket pairs*/ for(r=0; r<tcp_children_no; r++){ child_rank++; @@ -5108,10 +5108,16 @@ int tcp_init_children() goto error; }else if (pid>0){ /* parent */ + *woneinit = 1; }else{ /* child */ bind_address=0; /* force a SEGFAULT if someone uses a non-init. bind address on tcp */ + if(*woneinit==0) { + if(run_child_one_init_route()<0) + goto error; + } + tcp_receive_loop(reader_fd_1); } } diff --git a/src/main.c b/src/main.c index 6f8b354d22..e9d66ed449 100644 --- a/src/main.c +++ b/src/main.c @@ -1720,8 +1720,14 @@ int main_loop(void) /* child */ bind_address=si; /* shortcut */ + if(woneinit==0) { + if(run_child_one_init_route()<0) + goto error; + } + return sctp_core_rcv_loop(); } + woneinit = 1; } /*parent*/ /*close(sctp_sock)*/; /*if closed=>sendto invalid fd errors?*/ @@ -1777,7 +1783,7 @@ int main_loop(void) #ifdef USE_TCP if (!tcp_disable){ /* start tcp & tls receivers */ - if (tcp_init_children()<0) goto error; + if (tcp_init_children(&woneinit)<0) goto error; /* start tcp+tls main attendant proc */ pid = fork_process(PROC_TCP_MAIN, "tcp main process", 0); if (pid<0){

3 years, 9 months

Errored: kamailio/kamailio#9958 (master - dc6d44b)

by Travis CI

Build Update for kamailio/kamailio ------------------------------------- Build: #9958 Status: Errored Duration: 6 mins and 4 secs Commit: dc6d44b (master) Author: Daniel-Constantin Mierla Message: core: execute event_route[core:worker-one-init] for sctp or tcp - if no udp worker is started, the event route is executed by next available transport, in the order: sctp, tcp (or tls) View the changeset: https://github.com/kamailio/kamailio/compare/087c00a27662...dc6d44b603b1 View the full build log and details: https://travis-ci.org/github/kamailio/kamailio/builds/762637254?utm_medium=… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

3 years, 9 months

Issue with commit 087c00a2766

by Lucian Balaceanu

Hello Daniel, I see my recent commit https://github.com/kamailio/kamailio/commit/087c00a276623adad6b87242bc58f7c… fails CI. However, https://travis-ci.org/github/kamailio/kamailio/jobs/762621150 suggests it is some Docker problem. Do I need to take some action? Thank you, Lucian

3 years, 9 months

← Newer
1
...
33
34
35
36
37
38
39
...
49
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2021