sr-dev January 2022

sr-dev@lists.kamailio.org

13 participants
260 discussions

git:master:461ec0a7: http_async_module: check return for event_base_dispatch()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 461ec0a79ae365729c11efcbd96fc158c50a2891 URL: https://github.com/kamailio/kamailio/commit/461ec0a79ae365729c11efcbd96fc15… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-10T18:38:00+01:00 http_async_module: check return for event_base_dispatch() - exit if it fails - part of GH #2999 --- Modified: src/modules/http_async_client/async_http.c Modified: src/modules/http_async_client/http_async_client_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/461ec0a79ae365729c11efcbd96fc15… Patch: https://github.com/kamailio/kamailio/commit/461ec0a79ae365729c11efcbd96fc15… --- diff --git a/src/modules/http_async_client/async_http.c b/src/modules/http_async_client/async_http.c index a1b7215fc9..bb5ff69db9 100644 --- a/src/modules/http_async_client/async_http.c +++ b/src/modules/http_async_client/async_http.c @@ -48,6 +48,7 @@ #include "../../core/receive.h" #include "../../core/fmsg.h" #include "../../core/kemi.h" +#include "../../core/daemonize.h" #include "../../modules/tm/tm_load.h" #include "async_http.h" @@ -89,8 +90,12 @@ int async_http_init_worker(int prank, async_http_worker_t* worker) void async_http_run_worker(async_http_worker_t* worker) { + int ret; init_http_multi(worker->evbase, worker->g); - event_base_dispatch(worker->evbase); + ret = event_base_dispatch(worker->evbase); + LM_ERR("event base dispatch failed - ret: %d (errno: %d - %s)\n", ret, errno, + strerror(errno)); + ksr_exit(-1); } int async_http_init_sockets(async_http_worker_t *worker) diff --git a/src/modules/http_async_client/http_async_client_mod.c b/src/modules/http_async_client/http_async_client_mod.c index 8be4747c1d..5829f22b70 100644 --- a/src/modules/http_async_client/http_async_client_mod.c +++ b/src/modules/http_async_client/http_async_client_mod.c @@ -325,7 +325,7 @@ static int child_init(int rank) int pid; int i; - LM_DBG("child initializing async http\n"); + LM_DBG("child initializing async http (rank: %d)\n", rank); if(num_workers<=0) return 0; @@ -336,7 +336,7 @@ static int child_init(int rank) if (rank==PROC_INIT) { for(i=0; i<num_workers; i++) { - LM_DBG("initializing worker notification socket: %d\n", i); + LM_DBG("initializing worker notification socket: %d (rank: %d)\n", i, rank); if(async_http_init_sockets(&workers[i])<0) { LM_ERR("failed to initialize tasks sockets\n"); return -1;

2 years, 3 months

git:master:52cad0a3: db_text: rename is_main to _ksr_is_main

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 52cad0a39b224add8ff7eb6dd253f00122e93704 URL: https://github.com/kamailio/kamailio/commit/52cad0a39b224add8ff7eb6dd253f00… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-10T18:38:00+01:00 db_text: rename is_main to _ksr_is_main --- Modified: src/modules/db_text/dbt_lib.c --- Diff: https://github.com/kamailio/kamailio/commit/52cad0a39b224add8ff7eb6dd253f00… Patch: https://github.com/kamailio/kamailio/commit/52cad0a39b224add8ff7eb6dd253f00… --- diff --git a/src/modules/db_text/dbt_lib.c b/src/modules/db_text/dbt_lib.c index 0735c04c2e..7c6bb9f2c0 100644 --- a/src/modules/db_text/dbt_lib.c +++ b/src/modules/db_text/dbt_lib.c @@ -40,7 +40,7 @@ static gen_lock_t *_dbt_cachesem = NULL; static dbt_tbl_cachel_p _dbt_cachetbl = NULL; -extern int is_main; +extern int _ksr_is_main; #define DBT_CACHETBL_SIZE 16 @@ -267,7 +267,7 @@ dbt_table_p dbt_db_get_table(dbt_cache_p _dc, const str *_s) hash = core_hash(&_dc->name, _s, DBT_CACHETBL_SIZE); hashidx = hash % DBT_CACHETBL_SIZE; - if(!is_main) + if(!_ksr_is_main) lock_get(&_dbt_cachetbl[hashidx].sem); _tbc = _dbt_cachetbl[hashidx].dtp; @@ -429,8 +429,8 @@ int dbt_cache_print2(int _f, int _lock) int dbt_cache_print(int _f) { - return dbt_cache_print2(_f, !is_main); -} + return dbt_cache_print2(_f, !_ksr_is_main); +} int dbt_is_neq_type(db_type_t _t0, db_type_t _t1) {

2 years, 3 months

git:master:f3454dd9: core: renamed global is_main to _ksr_is_main

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f3454dd9f2d065e7757e9d9680b815481d08269c URL: https://github.com/kamailio/kamailio/commit/f3454dd9f2d065e7757e9d9680b8154… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-10T18:37:59+01:00 core: renamed global is_main to _ksr_is_main - safer to avoid conflicts with other libs --- Modified: src/core/globals.h Modified: src/core/pt.c Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/f3454dd9f2d065e7757e9d9680b8154… Patch: https://github.com/kamailio/kamailio/commit/f3454dd9f2d065e7757e9d9680b8154… --- diff --git a/src/core/globals.h b/src/core/globals.h index f3777d37a8..3a10439142 100644 --- a/src/core/globals.h +++ b/src/core/globals.h @@ -159,7 +159,7 @@ extern char *avp_db_url; /* db url used by user preferences (AVPs) */ extern int reply_to_via; -extern int is_main; +extern int _ksr_is_main; extern int fixup_complete; /* debugging level for dumping memory status */ diff --git a/src/core/pt.c b/src/core/pt.c index a3094a29fb..e3dc94d5a3 100644 --- a/src/core/pt.c +++ b/src/core/pt.c @@ -262,7 +262,7 @@ int fork_process(int child_id, char *desc, int make_sock) #ifdef USE_TCP sockfd[0]=sockfd[1]=-1; if(make_sock && !tcp_disable){ - if (!is_main){ + if (!_ksr_is_main){ LM_CRIT("called from a non " "\"main\" process! If forking from a module's " "child_init() fork only if rank==PROC_MAIN or" @@ -297,7 +297,7 @@ int fork_process(int child_id, char *desc, int make_sock) goto error; }else if (pid==0){ /* child */ - is_main=0; /* a forked process cannot be the "main" one */ + _ksr_is_main=0; /* a forked process cannot be the "main" one */ process_no=child_process_no; daemon_status_on_fork_cleanup(); /* close tcp unix sockets if this is not tcp main */ @@ -401,8 +401,8 @@ int fork_tcp_process(int child_id, char *desc, int r, int *reader_fd_1) reader_fd[0]=reader_fd[1]=-1; ret=-1; - if (!is_main){ - LM_CRIT("called from a non \"main\" process\n"); + if (!_ksr_is_main){ + LM_CRIT("called from a non \"main\" process (%d)\n", _ksr_is_main); goto error; } if (tcp_main_pid){ @@ -441,7 +441,7 @@ int fork_tcp_process(int child_id, char *desc, int r, int *reader_fd_1) goto end; } if (pid==0){ - is_main=0; /* a forked process cannot be the "main" one */ + _ksr_is_main=0; /* a forked process cannot be the "main" one */ process_no=child_process_no; /* close unneeded unix sockets */ close_extra_socks(child_id, process_no); diff --git a/src/main.c b/src/main.c index 60435e865e..016a90cabe 100644 --- a/src/main.c +++ b/src/main.c @@ -508,7 +508,7 @@ extern FILE* yyin; extern int yyparse(void); -int is_main=1; /* flag = is this the "main" process? */ +int _ksr_is_main=1; /* flag = is this the "main" process? */ int fixup_complete=0; /* flag = is the fixup complete ? */ char* pid_file = 0; /* filename as asked by use */ @@ -649,7 +649,7 @@ static void kill_all_children(int signum) * (only main can add processes, so from main is safe not to lock * and moreover it avoids the lock-holding suicidal children problem) */ - if (!is_main) lock_get(process_lock); + if (!_ksr_is_main) lock_get(process_lock); for (r=1; r<*process_count; r++){ if (r==process_no) continue; /* try not to be suicidal */ if (pt[r].pid) { @@ -658,7 +658,7 @@ static void kill_all_children(int signum) else LM_CRIT("killing: %s > %d no pid!!!\n", pt[r].desc, pt[r].pid); } - if (!is_main) lock_release(process_lock); + if (!_ksr_is_main) lock_release(process_lock); } } @@ -832,7 +832,7 @@ void sig_usr(int signo) #endif #endif - if (is_main){ + if (_ksr_is_main){ if (sig_flag==0) sig_flag=signo; else /* previous sig. not processed yet, ignoring? */ return; ; @@ -3070,7 +3070,7 @@ int main(int argc, char** argv) if (ret < 0) goto error; /*kill everything*/ - if (is_main) shutdown_children(SIGTERM, 0); + if (_ksr_is_main) shutdown_children(SIGTERM, 0); if (!dont_daemonize) { if (daemon_status_send(0) < 0) fprintf(stderr, "error sending exit status: %s [%d]\n", @@ -3081,7 +3081,7 @@ int main(int argc, char** argv) error: /*kill everything*/ - if (is_main) shutdown_children(SIGTERM, 0); + if (_ksr_is_main) shutdown_children(SIGTERM, 0); if (!dont_daemonize) { if (daemon_status_send((char)-1) < 0) fprintf(stderr, "error sending exit status: %s [%d]\n",

2 years, 3 months

git:master:e7c14adc: ctl: rename is_main to _ksr_is_main

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e7c14adc0b171fae9ad7c0fed4fb3c785dd282ca URL: https://github.com/kamailio/kamailio/commit/e7c14adc0b171fae9ad7c0fed4fb3c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-10T18:38:00+01:00 ctl: rename is_main to _ksr_is_main --- Modified: src/modules/ctl/ctl.c --- Diff: https://github.com/kamailio/kamailio/commit/e7c14adc0b171fae9ad7c0fed4fb3c7… Patch: https://github.com/kamailio/kamailio/commit/e7c14adc0b171fae9ad7c0fed4fb3c7… --- diff --git a/src/modules/ctl/ctl.c b/src/modules/ctl/ctl.c index a51a7b41ff..65cb10589e 100644 --- a/src/modules/ctl/ctl.c +++ b/src/modules/ctl/ctl.c @@ -332,7 +332,7 @@ static int mod_child(int rank) goto error; } if (pid == 0){ /* child */ - is_main=0; + _ksr_is_main=0; DBG("ctl: %d io_listen_loop(%d, %p)\n", rank, fd_no, ctrl_sock_lst); io_listen_loop(fd_no, ctrl_sock_lst);

2 years, 3 months

git:master:c73a8deb: modules: readme files regenerated - siputils ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: c73a8deb2f3ff18bdcb98c7ed4cf9f562058265e URL: https://github.com/kamailio/kamailio/commit/c73a8deb2f3ff18bdcb98c7ed4cf9f5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-01-10T15:01:23+01:00 modules: readme files regenerated - siputils ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/c73a8deb2f3ff18bdcb98c7ed4cf9f5… Patch: https://github.com/kamailio/kamailio/commit/c73a8deb2f3ff18bdcb98c7ed4cf9f5…

2 years, 3 months

git:master:195f7ea8: siputils: remove ring 180/183 conversion functions (GH #2989)

by Henning Westerholt

Module: kamailio Branch: master Commit: 195f7ea8a16aa4df36c722267b6456a4b82fb2bd URL: https://github.com/kamailio/kamailio/commit/195f7ea8a16aa4df36c722267b6456a… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2022-01-10T13:44:51Z siputils: remove ring 180/183 conversion functions (GH #2989) - remove ring 180/183 conversion functions (GH #2989) - they are not working correctly anymore, and can easily be replaced by textops/htable or reply routes --- Modified: src/modules/siputils/doc/siputils_admin.xml Modified: src/modules/siputils/siputils.c Removed: src/modules/siputils/ring.c Removed: src/modules/siputils/ring.h --- Diff: https://github.com/kamailio/kamailio/commit/195f7ea8a16aa4df36c722267b6456a… Patch: https://github.com/kamailio/kamailio/commit/195f7ea8a16aa4df36c722267b6456a…

2 years, 3 months

git:master:cd3942b1: modules: readme files regenerated - nats ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: cd3942b13cd09e0a1a27264a714424db3ad05895 URL: https://github.com/kamailio/kamailio/commit/cd3942b13cd09e0a1a27264a714424d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-01-07T14:31:10+01:00 modules: readme files regenerated - nats ... [skip ci] --- Modified: src/modules/nats/README --- Diff: https://github.com/kamailio/kamailio/commit/cd3942b13cd09e0a1a27264a714424d… Patch: https://github.com/kamailio/kamailio/commit/cd3942b13cd09e0a1a27264a714424d…

2 years, 3 months

[kamailio/kamailio] NATS: add new function `nats_publish()` (PR #2978)

by Emmanuel Schmidbauer

#### 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 Adds Publish function to NATS module. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2978 -- Commit Summary -- * NATS: add new function `nats_publish()` -- File Changes -- M src/modules/nats/Makefile (2) A src/modules/nats/defs.h (40) M src/modules/nats/doc/nats_admin.xml (23) M src/modules/nats/nats_mod.c (44) M src/modules/nats/nats_mod.h (17) A src/modules/nats/nats_pub.c (157) A src/modules/nats/nats_pub.h (46) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2978.patch https://github.com/kamailio/kamailio/pull/2978.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2978 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/2978(a)github.com>

2 years, 3 months

git:master:fbdb57aa: Merge pull request #2978 from kamailio/NATS-add-nats_publish

by GitHub

Module: kamailio Branch: master Commit: fbdb57aab18b570880bf63590b41e8f32f13fca1 URL: https://github.com/kamailio/kamailio/commit/fbdb57aab18b570880bf63590b41e8f… Author: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2022-01-07T08:16:17-05:00 Merge pull request #2978 from kamailio/NATS-add-nats_publish NATS: add new function `nats_publish()` --- Added: src/modules/nats/defs.h Added: src/modules/nats/nats_pub.c Added: src/modules/nats/nats_pub.h Modified: src/modules/nats/doc/nats_admin.xml Modified: src/modules/nats/nats_mod.c Modified: src/modules/nats/nats_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/fbdb57aab18b570880bf63590b41e8f… Patch: https://github.com/kamailio/kamailio/commit/fbdb57aab18b570880bf63590b41e8f…

2 years, 3 months

git:master:ce21bd8a: NATS: add new function `nats_publish()`

by Emmanuel Schmidbauer

Module: kamailio Branch: master Commit: ce21bd8a0cd4c74227bc43bef2bdd8f4a8006171 URL: https://github.com/kamailio/kamailio/commit/ce21bd8a0cd4c74227bc43bef2bdd8f… Author: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Committer: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Date: 2021-12-30T10:37:27-05:00 NATS: add new function `nats_publish()` --- Added: src/modules/nats/defs.h Added: src/modules/nats/nats_pub.c Added: src/modules/nats/nats_pub.h Modified: src/modules/nats/doc/nats_admin.xml Modified: src/modules/nats/nats_mod.c Modified: src/modules/nats/nats_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/ce21bd8a0cd4c74227bc43bef2bdd8f… Patch: https://github.com/kamailio/kamailio/commit/ce21bd8a0cd4c74227bc43bef2bdd8f…

2 years, 3 months

← Newer
1
...
19
20
21
22
23
24
25
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2022