- sr-dev - kamailio.org

git:master:5443db4d: dispatcher: safety checks for str fields
by Daniel-Constantin Mierla 11 Jan '22

11 Jan '22

Module: kamailio Branch: master Commit: 5443db4d632c8502dc622cc28fe2847fb0c147c1 URL: https://github.com/kamailio/kamailio/commit/5443db4d632c8502dc622cc28fe2847… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-11T08:20:30+01:00 dispatcher: safety checks for str fields --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/5443db4d632c8502dc622cc28fe2847… Patch: https://github.com/kamailio/kamailio/commit/5443db4d632c8502dc622cc28fe2847… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 661b4a9533..26836433f1 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -1192,7 +1192,7 @@ unsigned int ds_get_hash(str *x, str *y) if(!x && !y) return 0; h = 0; - if(x) { + if(x && x->s) { p = x->s; if(x->len >= 4) { for(; p <= (x->s + x->len - 4); p += 4) { @@ -1207,7 +1207,7 @@ unsigned int ds_get_hash(str *x, str *y) } h += v ^ (v >> 3); } - if(y) { + if(y && y->s) { p = y->s; if(y->len >= 4) { for(; p <= (y->s + y->len - 4); p += 4) {

1 0

git:master:55f23d09: rls: free xml doc in case of error
by Daniel-Constantin Mierla 11 Jan '22

11 Jan '22

Module: kamailio Branch: master Commit: 55f23d09faee06a892dde13e371d144b98bae68f URL: https://github.com/kamailio/kamailio/commit/55f23d09faee06a892dde13e371d144… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-11T08:30:46+01:00 rls: free xml doc in case of error --- Modified: src/modules/rls/resource_notify.c --- Diff: https://github.com/kamailio/kamailio/commit/55f23d09faee06a892dde13e371d144… Patch: https://github.com/kamailio/kamailio/commit/55f23d09faee06a892dde13e371d144… --- diff --git a/src/modules/rls/resource_notify.c b/src/modules/rls/resource_notify.c index d42c29666b..0f31e7c877 100644 --- a/src/modules/rls/resource_notify.c +++ b/src/modules/rls/resource_notify.c @@ -183,6 +183,7 @@ static void send_notifies(db1_res_t *result, int did_col, int resource_uri_col, subs_t* dialog= NULL; int len_est = 0; int resource_added = 0; /* Flag to indicate that we have added at least one resource */ + int ok = 0; /* generate the boundary string */ boundary_string= generate_string(BOUNDARY_STRING_LEN); @@ -430,6 +431,7 @@ static void send_notifies(db1_res_t *result, int did_col, int resource_uri_col, } done: + ok = 1; if (dbmode == RLS_DB_ONLY && rls_dbf.end_transaction) { if (rls_dbf.end_transaction(rls_db) < 0) @@ -454,6 +456,11 @@ static void send_notifies(db1_res_t *result, int did_col, int resource_uri_col, LM_ERR("in abort_transaction\n"); } + if(ok==0) { + if(rlmi_doc!=NULL) { + xmlFreeDoc(rlmi_doc); + } + } return; }

1 0

git:master:33c40170: presence: utils - use memcpy instead of strncpy for coherence
by Daniel-Constantin Mierla 11 Jan '22

11 Jan '22

Module: kamailio Branch: master Commit: 33c40170e73adc71e2ad66d8dbb6c776b771ce5d URL: https://github.com/kamailio/kamailio/commit/33c40170e73adc71e2ad66d8dbb6c77… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-11T08:19:06+01:00 presence: utils - use memcpy instead of strncpy for coherence --- Modified: src/modules/presence/utils_func.h --- Diff: https://github.com/kamailio/kamailio/commit/33c40170e73adc71e2ad66d8dbb6c77… Patch: https://github.com/kamailio/kamailio/commit/33c40170e73adc71e2ad66d8dbb6c77… --- diff --git a/src/modules/presence/utils_func.h b/src/modules/presence/utils_func.h index 27fcc07d0a..5c5d58b22a 100644 --- a/src/modules/presence/utils_func.h +++ b/src/modules/presence/utils_func.h @@ -137,7 +137,7 @@ static inline int ps_fill_local_contact(struct sip_msg *msg, str *contact) contact->len += 1; p += 1; } - strncpy(p, ip.s, ip.len); + memcpy(p, ip.s, ip.len); contact->len += ip.len; p += ip.len; if(msg->rcv.bind_address->address.af == AF_INET6) { @@ -145,7 +145,7 @@ static inline int ps_fill_local_contact(struct sip_msg *msg, str *contact) contact->len += 1; p += 1; } - if(contact->len > LCONTACT_BUF_SIZE - 21) { + if(contact->len > LCONTACT_BUF_SIZE - 22) { LM_ERR("buffer overflow\n"); goto error; } @@ -156,8 +156,9 @@ static inline int ps_fill_local_contact(struct sip_msg *msg, str *contact) } contact->len += len; p += len; - strncpy(p, proto, plen); + memcpy(p, proto, plen); contact->len += plen; + contact->s[contact->len] = '\0'; return 0; error:

1 0

git:master:0247c336: lcr: init buffers to try to get rid of new warnings
by Daniel-Constantin Mierla 11 Jan '22

11 Jan '22

Module: kamailio Branch: master Commit: 0247c336e208912324c71aea9843e688d7c5a463 URL: https://github.com/kamailio/kamailio/commit/0247c336e208912324c71aea9843e68… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-11T08:19:42+01:00 lcr: init buffers to try to get rid of new warnings --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0247c336e208912324c71aea9843e68… Patch: https://github.com/kamailio/kamailio/commit/0247c336e208912324c71aea9843e68… --- diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c index 630593bd36..9647dde044 100644 --- a/src/modules/lcr/lcr_mod.c +++ b/src/modules/lcr/lcr_mod.c @@ -2900,6 +2900,8 @@ static int ki_next_gw(sip_msg_t *_m) struct ip_addr addr; tag_str.s = &(tag[0]); + r_uri[0] = '\0'; + dst_uri[0] = '\0'; ru_avp = search_first_avp( ruri_user_avp_type, ruri_user_avp, &ruri_user_val, 0);

1 0

git:master:819ca1d7: ims_usrloc_scscf: removed unrelated comment with is_main
by Daniel-Constantin Mierla 10 Jan '22

10 Jan '22

Module: kamailio Branch: master Commit: 819ca1d7afe558d944fa88b2d453bf7ae7fcc819 URL: https://github.com/kamailio/kamailio/commit/819ca1d7afe558d944fa88b2d453bf7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-10T18:38:00+01:00 ims_usrloc_scscf: removed unrelated comment with is_main - was not even used --- Modified: src/modules/ims_usrloc_scscf/ims_usrloc_scscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/819ca1d7afe558d944fa88b2d453bf7… Patch: https://github.com/kamailio/kamailio/commit/819ca1d7afe558d944fa88b2d453bf7… --- diff --git a/src/modules/ims_usrloc_scscf/ims_usrloc_scscf_mod.c b/src/modules/ims_usrloc_scscf/ims_usrloc_scscf_mod.c index 0b01fdc437..bb5c394704 100644 --- a/src/modules/ims_usrloc_scscf/ims_usrloc_scscf_mod.c +++ b/src/modules/ims_usrloc_scscf/ims_usrloc_scscf_mod.c @@ -47,7 +47,7 @@ #include "../../core/dprint.h" #include "../../core/rpc_lookup.h" #include "../../core/timer.h" /* register_timer */ -#include "../../core/globals.h" /* is_main */ +#include "../../core/globals.h" #include "../../core/ut.h" /* str_init */ #include "dlist.h" /* register_udomain */ #include "udomain.h" /* {insert,delete,get,release}_urecord */

1 0

git:master:5978ec11: ims_usrloc_pcscf: removed unrelated comment with is_main
by Daniel-Constantin Mierla 10 Jan '22

10 Jan '22

Module: kamailio Branch: master Commit: 5978ec116c3efacacf260e9f579d93c9e9bfb780 URL: https://github.com/kamailio/kamailio/commit/5978ec116c3efacacf260e9f579d93c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-10T18:38:00+01:00 ims_usrloc_pcscf: removed unrelated comment with is_main - was not even used --- Modified: src/modules/ims_usrloc_pcscf/ims_usrloc_pcscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5978ec116c3efacacf260e9f579d93c… Patch: https://github.com/kamailio/kamailio/commit/5978ec116c3efacacf260e9f579d93c… --- diff --git a/src/modules/ims_usrloc_pcscf/ims_usrloc_pcscf_mod.c b/src/modules/ims_usrloc_pcscf/ims_usrloc_pcscf_mod.c index 9765526015..fe9a1f5f02 100644 --- a/src/modules/ims_usrloc_pcscf/ims_usrloc_pcscf_mod.c +++ b/src/modules/ims_usrloc_pcscf/ims_usrloc_pcscf_mod.c @@ -47,7 +47,7 @@ #include "../../core/dprint.h" #include "../../core/rpc_lookup.h" #include "../../core/timer.h" /* register_timer */ -#include "../../core/globals.h" /* is_main */ +#include "../../core/globals.h" #include "../../core/ut.h" /* str_init */ #include "dlist.h" /* register_udomain */ #include "udomain.h" /* {insert,delete,get,release}_urecord */

1 0

git:master:9d280b58: p_usrloc: removed unrelated comment with is_main
by Daniel-Constantin Mierla 10 Jan '22

10 Jan '22

Module: kamailio Branch: master Commit: 9d280b589a035fa04cd4c7235671d1fdb6ae44e9 URL: https://github.com/kamailio/kamailio/commit/9d280b589a035fa04cd4c7235671d1f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-10T18:38:00+01:00 p_usrloc: removed unrelated comment with is_main - was not even used --- Modified: src/modules/p_usrloc/p_usrloc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9d280b589a035fa04cd4c7235671d1f… Patch: https://github.com/kamailio/kamailio/commit/9d280b589a035fa04cd4c7235671d1f… --- diff --git a/src/modules/p_usrloc/p_usrloc_mod.c b/src/modules/p_usrloc/p_usrloc_mod.c index 8804e5cd86..e6fd33d9b9 100644 --- a/src/modules/p_usrloc/p_usrloc_mod.c +++ b/src/modules/p_usrloc/p_usrloc_mod.c @@ -45,7 +45,7 @@ #include "../../core/dprint.h" #include "../../core/rpc_lookup.h" #include "../../core/timer_proc.h" -#include "../../core/globals.h" /* is_main */ +#include "../../core/globals.h" #include "../../core/ut.h" /* str_init */ #include "udomain.h" /* {insert,delete,get,release}_urecord */ #include "urecord.h" /* {insert,delete,get}_ucontact */

1 0

git:master:3a00526b: usrloc: removed unrelated comment with is_main
by Daniel-Constantin Mierla 10 Jan '22

10 Jan '22

Module: kamailio Branch: master Commit: 3a00526bbe535d46d234108cb71fd80376f0718d URL: https://github.com/kamailio/kamailio/commit/3a00526bbe535d46d234108cb71fd80… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-10T18:38:00+01:00 usrloc: removed unrelated comment with is_main - was not even used --- Modified: src/modules/usrloc/usrloc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3a00526bbe535d46d234108cb71fd80… Patch: https://github.com/kamailio/kamailio/commit/3a00526bbe535d46d234108cb71fd80… --- diff --git a/src/modules/usrloc/usrloc_mod.c b/src/modules/usrloc/usrloc_mod.c index 5668586733..d60162ed3e 100644 --- a/src/modules/usrloc/usrloc_mod.c +++ b/src/modules/usrloc/usrloc_mod.c @@ -46,7 +46,7 @@ #include "../../core/rpc_lookup.h" #include "../../core/timer.h" /* register_timer */ #include "../../core/timer_proc.h" /* register_sync_timer */ -#include "../../core/globals.h" /* is_main */ +#include "../../core/globals.h" #include "../../core/ut.h" /* str_init */ #include "../../core/utils/sruid.h" #include "dlist.h" /* register_udomain */

1 0

git:master:52cad0a3: db_text: rename is_main to _ksr_is_main
by Daniel-Constantin Mierla 10 Jan '22

10 Jan '22

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) {

1 0

git:master:461ec0a7: http_async_module: check return for event_base_dispatch()
by Daniel-Constantin Mierla 10 Jan '22

10 Jan '22

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;

1 0

git:master:e7c14adc: ctl: rename is_main to _ksr_is_main
by Daniel-Constantin Mierla 10 Jan '22

10 Jan '22

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);

1 0

git:master:f3454dd9: core: renamed global is_main to _ksr_is_main
by Daniel-Constantin Mierla 10 Jan '22

10 Jan '22

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",

1 0

git:master:c73a8deb: modules: readme files regenerated - siputils ... [skip ci]
by Kamailio Dev 10 Jan '22

10 Jan '22

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…

1 0

git:master:195f7ea8: siputils: remove ring 180/183 conversion functions (GH #2989)
by Henning Westerholt 10 Jan '22

10 Jan '22

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…

1 0

git:master:cd3942b1: modules: readme files regenerated - nats ... [skip ci]
by Kamailio Dev 07 Jan '22

07 Jan '22

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…

1 0

[kamailio/kamailio] NATS: add new function `nats_publish()` (PR #2978)
by Emmanuel Schmidbauer 07 Jan '22

07 Jan '22

#### 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>

3 9

git:master:ce21bd8a: NATS: add new function `nats_publish()`
by Emmanuel Schmidbauer 07 Jan '22

07 Jan '22

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…

1 0

git:master:fbdb57aa: Merge pull request #2978 from kamailio/NATS-add-nats_publish
by GitHub 07 Jan '22

07 Jan '22

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…

1 0

[kamailio/kamailio] core: Add virtual flag to listen config to ignore inactive ip addresses (PR #2985)
by rhys-hanrahan 07 Jan '22

07 Jan '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 - [X] Related to issue #2984 #### Description A new option to "listen" has been added called "virtual". This sets a flag on the listening socket to modify the behaviour of grep_sock_info. When this flag is set, grep_sock_info will only consider the listening IP a match if the IP is found in the system's current list of local IP addresses. If the IP is not currently local, then the matching IP is ignored. If the virtual flag is not set on the socket then existing behaviour used instead. This feature is intended for scenarios where you have two Kamailio nodes in active/active setup, with virtual IPs, where you need to be able to listen on a virtual IP but it may not always be active locally. With this flag applied to a `listen=` socket, Kamailio will only consider traffic destined to this IP local, when the IP is actually active on the system, and other times the match is ignored. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2985 -- Commit Summary -- * core: listen can now have a "virtual" flag to check for nonlocal floating IPs. * etc: kamailio.cfg - added example use of listen's new virtual flag. * core: Added virtual flag to output of core.sockets_list * corex: Added virtual flag to output of "corex.list_sockets" * ims_ipsec_pcscf: Added virtual flag to output of sockets list. -- File Changes -- M etc/kamailio.cfg (2) M src/core/cfg.lex (2) M src/core/cfg.y (83) M src/core/core_cmd.c (10) M src/core/ip_addr.h (1) M src/core/socket_info.c (85) M src/modules/corex/corex_rpc.c (5) M src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2985.patch https://github.com/kamailio/kamailio/pull/2985.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2985 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/2985(a)github.com>

3 17

git:master:3e7d5ed3: core: Updated check_local_addresses to use getifaddrs
by Daniel-Constantin Mierla 07 Jan '22

07 Jan '22

Module: kamailio Branch: master Commit: 3e7d5ed34033067377ed9034e4ec49be444ca6fe URL: https://github.com/kamailio/kamailio/commit/3e7d5ed34033067377ed9034e4ec49b… Author: Rhys Hanrahan <rhys(a)nexusone.com.au> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-07T12:27:25+01:00 core: Updated check_local_addresses to use getifaddrs Changed virtual socket code to use getifaddrs instead of gethostbyname as this avoids lookups against the hosts file, which causes incorrect results. --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/3e7d5ed34033067377ed9034e4ec49b… Patch: https://github.com/kamailio/kamailio/commit/3e7d5ed34033067377ed9034e4ec49b… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 8ee6cd0b32..afb1dd5603 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -575,8 +575,8 @@ struct socket_info** get_sock_info_list(unsigned short proto) */ static int check_local_addresses(struct socket_info* si) { - struct hostent* he; - struct utsname myname; + int match = 0; + struct ifaddrs *ifap, *ifa; if (si == NULL) { LM_ERR("Socket info is NULL. Returning no match.\n"); @@ -589,40 +589,41 @@ static int check_local_addresses(struct socket_info* si) return 1; } - if (uname(&myname) <0){ - LM_ERR("Cannot determine hostname. Guessing a not local virtual IP.\n"); + if (getifaddrs(&ifap) != 0) { + LM_ERR("getifaddrs failed. Assuming no match.\n"); return 0; } - - //Should return a list of local IPs - he = _resolvehost(myname.nodename); - if (he == NULL) { - LM_ERR("Cannot get list of local IPs. Guessing not a local virtual IP.\n"); - return 0; - } - char** paddrlist = he->h_addr_list; - int i = 0; - while (*paddrlist != NULL) + + for (ifa = ifap; ifa; ifa = ifa->ifa_next) { + /* skip if no IP addr associated with the interface */ + if (ifa->ifa_addr==0) + continue; +#ifdef AF_PACKET + /* skip AF_PACKET addr family since it is of no use later on */ + if (ifa->ifa_addr->sa_family == AF_PACKET) + continue; +#endif struct ip_addr local_addr; - hostent2ip_addr(&local_addr, he, i); + sockaddr2ip_addr(&local_addr, (struct sockaddr*)ifa->ifa_addr); LM_DBG("Checking local address: %s\n", ip_addr2a(&local_addr)); if (ip_addr_cmp(&si->address, &local_addr)) { - LM_DBG("Found matching local IP for virtual socket: %s\n", ip_addr2a(&local_addr)); - return 1; + match = 1; + LM_DBG("Found matching local IP %s for virtual socket %s\n", ip_addr2a(&local_addr), si->name.s); + break; } - - i++; - paddrlist++; } - + freeifaddrs(ifap); //Default to not local if no match is found - LM_DBG("No matching local IP found.\n"); - return 0; + if (!match) { + LM_DBG("No matching local IP found for socket %s.\n", si->name.s); + return 0; + } else { + return 1; + } } - /* helper function for grep_sock_info * params: * host - hostname to compare with

1 0

git:master:04aa88c5: corex: Added virtual flag to output of "corex.list_sockets"
by Daniel-Constantin Mierla 07 Jan '22

07 Jan '22

Module: kamailio Branch: master Commit: 04aa88c524ba6a61e59d9be6a344dce79c3aa178 URL: https://github.com/kamailio/kamailio/commit/04aa88c524ba6a61e59d9be6a344dce… Author: Rhys Hanrahan <rhys(a)nexusone.com.au> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-07T12:27:25+01:00 corex: Added virtual flag to output of "corex.list_sockets" --- Modified: src/modules/corex/corex_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/04aa88c524ba6a61e59d9be6a344dce… Patch: https://github.com/kamailio/kamailio/commit/04aa88c524ba6a61e59d9be6a344dce… --- diff --git a/src/modules/corex/corex_rpc.c b/src/modules/corex/corex_rpc.c index 8677c35d22..12fd8044af 100644 --- a/src/modules/corex/corex_rpc.c +++ b/src/modules/corex/corex_rpc.c @@ -95,10 +95,11 @@ static void corex_rpc_list_sockets(rpc_t* rpc, void* ctx) } } - if(rpc->struct_add(th, "sssss", + if(rpc->struct_add(th, "ssssss", "PORT", si->port_no_str.s, "MCAST", si->flags & SI_IS_MCAST ? "yes" : "no", - "MHOMED", si->flags & SI_IS_MHOMED? "yes" : "no", + "MHOMED", si->flags & SI_IS_MHOMED ? "yes" : "no", + "VIRTUAL", si->flags & SI_IS_VIRTUAL ? "yes" : "no", "SOCKNAME", si->sockname.s? si->sockname.s : "-", "ADVERTISE", si->useinfo.name.s?si->useinfo.name.s:"-")<0) {

1 0

git:master:3cf03329: ims_ipsec_pcscf: Added virtual flag to output of sockets list.
by Daniel-Constantin Mierla 07 Jan '22

07 Jan '22

Module: kamailio Branch: master Commit: 3cf033295f2ec78aeddf53b130ae9eab8f6d60f8 URL: https://github.com/kamailio/kamailio/commit/3cf033295f2ec78aeddf53b130ae9ea… Author: Rhys Hanrahan <rhys(a)nexusone.com.au> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-07T12:27:25+01:00 ims_ipsec_pcscf: Added virtual flag to output of sockets list. --- Modified: src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3cf033295f2ec78aeddf53b130ae9ea… Patch: https://github.com/kamailio/kamailio/commit/3cf033295f2ec78aeddf53b130ae9ea… --- diff --git a/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c b/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c index dbcf64b924..b2a19f332e 100644 --- a/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c +++ b/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c @@ -140,9 +140,9 @@ static void ipsec_print_all_socket_lists() } if(si->port_no_str.s){ - sprintf(buf + cnt, "):%s%s%s", si->port_no_str.s, si->flags & SI_IS_MCAST ? " mcast" : "", si->flags & SI_IS_MHOMED? " mhomed" : ""); + sprintf(buf + cnt, "):%s%s%s%s", si->port_no_str.s, si->flags & SI_IS_MCAST ? " mcast" : "", si->flags & SI_IS_MHOMED ? " mhomed" : "", si->flags & SI_IS_VIRTUAL ? " virtual" : ""); }else{ - sprintf(buf + cnt, "):%u%s%s", si->port_no, si->flags & SI_IS_MCAST ? " mcast" : "", si->flags & SI_IS_MHOMED? " mhomed" : ""); + sprintf(buf + cnt, "):%u%s%s%s", si->port_no, si->flags & SI_IS_MCAST ? " mcast" : "", si->flags & SI_IS_MHOMED ? " mhomed" : "", si->flags & SI_IS_VIRTUAL ? " virtual" : ""); } cnt = strlen(buf); }else{ @@ -157,9 +157,9 @@ static void ipsec_print_all_socket_lists() } if(si->port_no_str.s){ - sprintf(buf + cnt, ":%s%s%s", si->port_no_str.s, si->flags & SI_IS_MCAST ? " mcast" : "", si->flags & SI_IS_MHOMED? " mhomed" : ""); + sprintf(buf + cnt, ":%s%s%s%s", si->port_no_str.s, si->flags & SI_IS_MCAST ? " mcast" : "", si->flags & SI_IS_MHOMED ? " mhomed" : "", si->flags & SI_IS_VIRTUAL ? " virtual" : ""); }else{ - sprintf(buf + cnt, ":%u%s%s", si->port_no, si->flags & SI_IS_MCAST ? " mcast" : "", si->flags & SI_IS_MHOMED? " mhomed" : ""); + sprintf(buf + cnt, ":%u%s%s%s", si->port_no, si->flags & SI_IS_MCAST ? " mcast" : "", si->flags & SI_IS_MHOMED ? " mhomed" : "", si->flags & SI_IS_VIRTUAL ? " virtual" : ""); } cnt = strlen(buf);

1 0

git:master:e93640e6: core: listen can now have a "virtual" flag to check for nonlocal floating IPs.
by Daniel-Constantin Mierla 07 Jan '22

07 Jan '22

Module: kamailio Branch: master Commit: e93640e6119e61a24d8c1f6d36b60c83b3573f90 URL: https://github.com/kamailio/kamailio/commit/e93640e6119e61a24d8c1f6d36b60c8… Author: Rhys Hanrahan <rhys(a)nexusone.com.au> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-07T12:27:25+01:00 core: listen can now have a "virtual" flag to check for nonlocal floating IPs. A new option to "listen" has been added called "virtual". This sets a flag on the listening socket to modify the behaviour of grep_sock_info. When this flag is set, grep_sock_info will only consider the listening IP a match if the IP is found in the system's current list of local IP addresses. If the IP is not currently local, then the matching IP is ignored. If the virtual flag is not set on the socket then existing behaviour used instead. This is useful in scenarios with an active/active cluster where Kamailio must know if a floating IP is currently local or not. --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/ip_addr.h Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/e93640e6119e61a24d8c1f6d36b60c8… Patch: https://github.com/kamailio/kamailio/commit/e93640e6119e61a24d8c1f6d36b60c8…

1 0

git:master:92c44f1b: core: Added virtual flag to output of core.sockets_list
by Daniel-Constantin Mierla 07 Jan '22

07 Jan '22

Module: kamailio Branch: master Commit: 92c44f1b3196f125b3e298499ed65df12cdd1a5a URL: https://github.com/kamailio/kamailio/commit/92c44f1b3196f125b3e298499ed65df… Author: Rhys Hanrahan <rhys(a)nexusone.com.au> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-07T12:27:25+01:00 core: Added virtual flag to output of core.sockets_list --- Modified: src/core/core_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/92c44f1b3196f125b3e298499ed65df… Patch: https://github.com/kamailio/kamailio/commit/92c44f1b3196f125b3e298499ed65df… --- diff --git a/src/core/core_cmd.c b/src/core/core_cmd.c index ba17c06e47..8231e3b1b9 100644 --- a/src/core/core_cmd.c +++ b/src/core/core_cmd.c @@ -955,10 +955,11 @@ static void core_sockets_list(rpc_t* rpc, void* c) for (ai=si->addr_info_lst; ai; ai=ai->next) rpc->struct_add(ha, "ss", "address", ai->address_str.s); - rpc->struct_add(ha, "sss", + rpc->struct_add(ha, "ssss", "port", si->port_no_str.s, "mcast", si->flags & SI_IS_MCAST ? "yes" : "no", - "mhomed", si->flags & SI_IS_MHOMED ? "yes" : "no"); + "mhomed", si->flags & SI_IS_MHOMED ? "yes" : "no", + "virtual", si->flags & SI_IS_VIRTUAL ? "yes" : "no"); } else { printf(" %s: %s", get_proto_name(proto), @@ -969,10 +970,11 @@ static void core_sockets_list(rpc_t* rpc, void* c) if (!(si->flags & SI_IS_IP)) rpc->struct_add(ha, "s", "ipaddress", si->address_str.s); - rpc->struct_add(ha, "sss", + rpc->struct_add(ha, "ssss", "port", si->port_no_str.s, "mcast", si->flags & SI_IS_MCAST ? "yes" : "no", - "mhomed", si->flags & SI_IS_MHOMED ? "yes" : "no"); + "mhomed", si->flags & SI_IS_MHOMED ? "yes" : "no", + "virtual", si->flags & SI_IS_VIRTUAL ? "yes" : "no"); } } } while((proto=next_proto(proto)));

1 0

[kamailio/kamailio] tcpclose event_routes issue (PR #2980)
by vlitvinov 07 Jan '22

07 Jan '22

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] 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) - [ ] New feature (non-breaking change which adds new functionality) - [x] 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  We faced an issue that tcp:close (timeout and reset) event routes don't execute in rare cases. Debugging and testing show that in the case when a connection is marked as BAD or write timeout etc our event routes don't execute. I found that executing event routes is in the read function only. So in case when a connection is destroyed triggered by other reasons we don't have a notification about this. I propose to do this in main file every time when we destroy connections. But in this case, we don't have I reason to destroy (timeout reset or EOF). In our lab with these changes issue is gone. But sure this is just a concept. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2980 -- Commit Summary -- * tcpclose event_routes issue -- File Changes -- M src/core/tcp_main.c (26) M src/core/tcp_read.c (26) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2980.patch https://github.com/kamailio/kamailio/pull/2980.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2980 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/2980(a)github.com>

2 6

git:master:60c5a873: tcpclose event_routes issue
by Daniel-Constantin Mierla 07 Jan '22

07 Jan '22

Module: kamailio Branch: master Commit: 60c5a87379b30aa3f0eef569166abac703fab50a URL: https://github.com/kamailio/kamailio/commit/60c5a87379b30aa3f0eef569166abac… Author: Viktor <victor.litvinov(a)wildix.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-07T12:23:41+01:00 tcpclose event_routes issue --- Modified: src/core/tcp_conn.h Modified: src/core/tcp_main.c Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/60c5a87379b30aa3f0eef569166abac… Patch: https://github.com/kamailio/kamailio/commit/60c5a87379b30aa3f0eef569166abac…

1 0

git:master:635f3fb5: tcpclose event_routes issue
by Daniel-Constantin Mierla 07 Jan '22

07 Jan '22

Module: kamailio Branch: master Commit: 635f3fb5387713181a3492278bcf72d34738afd2 URL: https://github.com/kamailio/kamailio/commit/635f3fb5387713181a3492278bcf72d… Author: Viktor <victor.litvinov(a)wildix.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-07T12:23:41+01:00 tcpclose event_routes issue --- Modified: src/core/tcp_main.c Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/635f3fb5387713181a3492278bcf72d… Patch: https://github.com/kamailio/kamailio/commit/635f3fb5387713181a3492278bcf72d…

1 0

git:master:da0d4658: tcpclose event_routes issue
by Daniel-Constantin Mierla 07 Jan '22

07 Jan '22

Module: kamailio Branch: master Commit: da0d4658985fe4b98a8247dc7a89dd48a6635e94 URL: https://github.com/kamailio/kamailio/commit/da0d4658985fe4b98a8247dc7a89dd4… Author: Viktor <victor.litvinov(a)wildix.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-07T12:23:41+01:00 tcpclose event_routes issue --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/da0d4658985fe4b98a8247dc7a89dd4… Patch: https://github.com/kamailio/kamailio/commit/da0d4658985fe4b98a8247dc7a89dd4… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 458093b22d..f738325285 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -3649,7 +3649,7 @@ inline static int handle_tcp_child(struct tcp_child* tcp_c, int fd_i) /* if refcnt was 1 => it was used only in the tcp reader => it's not hashed or watched for IO anymore => no need to io_watch_del() */ - tcp_emit_closed_event(c, TCP_CLOSED_EOF); + tcp_emit_closed_event(tcpconn, TCP_CLOSED_EOF); tcpconn_destroy(tcpconn); break; } @@ -3661,7 +3661,7 @@ inline static int handle_tcp_child(struct tcp_child* tcp_c, int fd_i) tcpconn->flags &= ~F_CONN_WRITE_W; } #endif /* TCP_ASYNC */ - tcp_emit_closed_event(c, TCP_CLOSED_EOF); + tcp_emit_closed_event(tcpconn, TCP_CLOSED_EOF); tcpconn_put_destroy(tcpconn); } #ifdef TCP_ASYNC @@ -3713,7 +3713,7 @@ inline static int handle_tcp_child(struct tcp_child* tcp_c, int fd_i) io_watch_del(&io_h, tcpconn->s, -1, IO_FD_CLOSING); tcpconn->flags&=~F_CONN_WRITE_W; } - tcp_emit_closed_event(c, TCP_CLOSED_EOF); + tcp_emit_closed_event(tcpconn, TCP_CLOSED_EOF); tcpconn_put_destroy(tcpconn); } else if (unlikely(tcpconn->flags & F_CONN_WRITE_W)){ BUG("unhashed connection watched for write\n"); @@ -3750,7 +3750,7 @@ inline static int handle_tcp_child(struct tcp_child* tcp_c, int fd_i) tcpconn->flags&=~F_CONN_WRITE_W; } #endif /* TCP_ASYNC */ - tcp_emit_closed_event(c, TCP_CLOSED_EOF); + tcp_emit_closed_event(tcpconn, TCP_CLOSED_EOF); tcpconn_put_destroy(tcpconn); } #ifdef TCP_ASYNC @@ -3782,7 +3782,7 @@ inline static int handle_tcp_child(struct tcp_child* tcp_c, int fd_i) #endif /* TCP_ASYNC */ if (tcpconn_try_unhash(tcpconn)) tcpconn_put(tcpconn); - tcp_emit_closed_event(c, TCP_CLOSED_EOF); + tcp_emit_closed_event(tcpconn, TCP_CLOSED_EOF); tcpconn_put_destroy(tcpconn); /* deref & delete if refcnt==0 */ break; default:

1 0

git:master:7583b930: Makefile.defs: version set to 5.6.0-dev3
by Daniel-Constantin Mierla 06 Jan '22

06 Jan '22

Module: kamailio Branch: master Commit: 7583b9300864caeb6538a3bfbaf30aa7b0a22ba3 URL: https://github.com/kamailio/kamailio/commit/7583b9300864caeb6538a3bfbaf30aa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-06T11:10:12+01:00 Makefile.defs: version set to 5.6.0-dev3 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/7583b9300864caeb6538a3bfbaf30aa… Patch: https://github.com/kamailio/kamailio/commit/7583b9300864caeb6538a3bfbaf30aa… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 57bccfe725..84f9438bc4 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 6 SUBLEVEL = 0 -EXTRAVERSION = -dev2 +EXTRAVERSION = -dev3 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:f7358b01: db_cluster: enclose block in curly braces
by Daniel-Constantin Mierla 06 Jan '22

06 Jan '22

Module: kamailio Branch: master Commit: f7358b01efd0d8d71edf730d1a8cf4c9555d1dd8 URL: https://github.com/kamailio/kamailio/commit/f7358b01efd0d8d71edf730d1a8cf4c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-06T11:08:09+01:00 db_cluster: enclose block in curly braces - fix returning always introduced in previous commit --- Modified: src/modules/db_cluster/db_cluster_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f7358b01efd0d8d71edf730d1a8cf4c… Patch: https://github.com/kamailio/kamailio/commit/f7358b01efd0d8d71edf730d1a8cf4c… --- diff --git a/src/modules/db_cluster/db_cluster_mod.c b/src/modules/db_cluster/db_cluster_mod.c index c42d5b2aa9..07192d6362 100644 --- a/src/modules/db_cluster/db_cluster_mod.c +++ b/src/modules/db_cluster/db_cluster_mod.c @@ -263,9 +263,10 @@ static void dbcl_rpc_disable_connection(rpc_t *rpc, void *c) return; } - if(con->sinfo==NULL) + if(con->sinfo==NULL) { rpc->fault(c, 500, "Cluster state info missing."); return; + } /* Overwrite the number of seconds if the connection is already disabled. */ if (con->sinfo->state & DBCL_CON_INACTIVE)

1 0

[kamailio/kamailio] pua : default_expires parameter is not used in code (Issue #2994)
by adita76 05 Jan '22

05 Jan '22

### Description pua : default_expires parameter is not functionally used in code It is not used neither in pua module, nor in others pua_* modules. ### Troubleshooting Its presence is confusing if it does nothing, but it is described in documentation. ### Possible Solutions Can it be used as default expires for subscriptions related to pua events ? Otherwise it should be removed. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2994 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/2994(a)github.com>

2 2

git:master:50a976f0: pua: use parameter default_expires instead of 3600 constant
by Daniel-Constantin Mierla 05 Jan '22

05 Jan '22

Module: kamailio Branch: master Commit: 50a976f00e4ee19c24260a10f0a70349fe2d9d6d URL: https://github.com/kamailio/kamailio/commit/50a976f00e4ee19c24260a10f0a7034… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-05T18:44:41+01:00 pua: use parameter default_expires instead of 3600 constant - GH #2994 --- Modified: src/modules/pua/pua.c Modified: src/modules/pua/pua.h Modified: src/modules/pua/send_publish.c Modified: src/modules/pua/send_subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/50a976f00e4ee19c24260a10f0a7034… Patch: https://github.com/kamailio/kamailio/commit/50a976f00e4ee19c24260a10f0a7034… --- diff --git a/src/modules/pua/pua.c b/src/modules/pua/pua.c index d0c89ba10d..be68e29549 100644 --- a/src/modules/pua/pua.c +++ b/src/modules/pua/pua.c @@ -58,7 +58,7 @@ htable_t* HashT= NULL; int HASH_SIZE= -1; extern int bind_pua(pua_api_t* api); int min_expires= 0; -int default_expires=3600; +int pua_default_expires=3600; static str db_url = str_init(DEFAULT_DB_URL); str db_table= str_init("pua"); int update_period= 100; @@ -126,7 +126,7 @@ static param_export_t params[]={ {"db_url", PARAM_STR, &db_url}, {"db_table", PARAM_STR, &db_table}, {"min_expires", INT_PARAM, &min_expires}, - {"default_expires", INT_PARAM, &default_expires}, + {"default_expires", INT_PARAM, &pua_default_expires}, {"update_period", INT_PARAM, &update_period}, {"outbound_proxy", PARAM_STR, &outbound_proxy}, {"dlginfo_increase_version", INT_PARAM, &dlginfo_increase_version}, @@ -162,8 +162,8 @@ static int mod_init(void) if(min_expires< 0) min_expires= 0; - if(default_expires< 600) - default_expires= 3600; + if(pua_default_expires< 600) + pua_default_expires= 3600; if(pua_rpc_init()<0) { LM_ERR("failed to register RPC commands\n"); @@ -702,7 +702,7 @@ int update_pua(ua_pres_t* p) dlg_t* td = NULL; if(p->desired_expires== 0) - expires= 3600; + expires= pua_default_expires; else expires= p->desired_expires- (int)time(NULL); @@ -1255,4 +1255,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_pua_exports); return 0; -} \ No newline at end of file +} diff --git a/src/modules/pua/pua.h b/src/modules/pua/pua.h index 908f5b0cb3..7d99c0f796 100644 --- a/src/modules/pua/pua.h +++ b/src/modules/pua/pua.h @@ -43,7 +43,7 @@ extern htable_t* HashT; extern int HASH_SIZE; extern int min_expires; extern int pua_ul_publish; -extern int default_expires; +extern int pua_default_expires; extern str outbound_proxy; extern int check_remote_contact; extern int dbmode; diff --git a/src/modules/pua/send_publish.c b/src/modules/pua/send_publish.c index 338ee892b4..e2e4c0ca7f 100644 --- a/src/modules/pua/send_publish.c +++ b/src/modules/pua/send_publish.c @@ -668,7 +668,7 @@ int send_publish( publ_info_t* publ ) if(publ->flag & UPDATE_TYPE) LM_DBG("etag:%.*s\n", etag.len, etag.s); - str_hdr = publ_build_hdr((publ->expires< 0)?3600:publ->expires, ev, &publ->content_type, + str_hdr = publ_build_hdr((publ->expires< 0)?pua_default_expires:publ->expires, ev, &publ->content_type, (publ->flag & UPDATE_TYPE)?&etag:NULL, publ->extra_headers, (body)?1:0); if(str_hdr == NULL) diff --git a/src/modules/pua/send_subscribe.c b/src/modules/pua/send_subscribe.c index fefc4ef283..723507bb86 100644 --- a/src/modules/pua/send_subscribe.c +++ b/src/modules/pua/send_subscribe.c @@ -971,7 +971,7 @@ int send_subscribe(subs_info_t* subs) subs->source_flag= XMPP_SUBSCRIBE; if(subs->expires< 0) - expires= 3600; + expires= pua_default_expires; else expires= subs->expires;

1 0

Re: [sr-dev] [kamailio/kamailio] mtree: Add RPC response on successful reload, re-organise function rpc_mtree_reload (559b52b)
by Olle E. Johansson 04 Jan '22

04 Jan '22

Fixed in cf1907cac4c21fe12a27057cc3eeb2dd98e65635 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/559b52b194f813c0c8584b3becbac9b… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/559b52b194f813c0c8584b3becbac9b2ab8e0343/62881526(a)github.com>

1 0

git:master:6ce9c3c8: Secfilter: Modify error messages to RPC error messages instead of printf
by Olle E. Johansson 04 Jan '22

04 Jan '22

Module: kamailio Branch: master Commit: 6ce9c3c897055ff9942634c493caf79780ccf71b URL: https://github.com/kamailio/kamailio/commit/6ce9c3c897055ff9942634c493caf79… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-04T10:49:10+01:00 Secfilter: Modify error messages to RPC error messages instead of printf --- Modified: src/modules/secfilter/secfilter_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/6ce9c3c897055ff9942634c493caf79… Patch: https://github.com/kamailio/kamailio/commit/6ce9c3c897055ff9942634c493caf79… --- diff --git a/src/modules/secfilter/secfilter_rpc.c b/src/modules/secfilter/secfilter_rpc.c index 2f763e4732..72db9a599d 100644 --- a/src/modules/secfilter/secfilter_rpc.c +++ b/src/modules/secfilter/secfilter_rpc.c @@ -112,7 +112,7 @@ void secf_rpc_add_bl(rpc_t *rpc, void *ctx) rpc->rpl_printf(ctx, "Values (%.*s, %.*s) inserted into blacklist", ctype.len, ctype.s, data.len, data.s); } else { - rpc->rpl_printf(ctx, "Error insert values in the blacklist"); + rpc->fault(ctx, 500, "Error inserting values in the blacklist"); } lock_release(&secf_data->lock); } @@ -141,7 +141,7 @@ void secf_rpc_add_wl(rpc_t *rpc, void *ctx) rpc->rpl_printf(ctx, "Values (%.*s, %.*s) inserted into whitelist", ctype.len, ctype.s, data.len, data.s); } else { - rpc->rpl_printf(ctx, "Error insert values in the whitelist"); + rpc->fault(ctx, 500, "Error insert values in the whitelist"); } lock_release(&secf_data->lock); } @@ -154,7 +154,7 @@ void secf_rpc_reload(rpc_t *rpc, void *ctx) if(secf_load_db() == -1) { LM_ERR("Error loading data from database\n"); - rpc->rpl_printf(ctx, "Error loading data from database"); + rpc->fault(ctx, 500, "Error loading data from database"); } else { rpc->rpl_printf(ctx, "Data reloaded"); }

1 0

git:master:89958e93: TLS: Add RPC success confirmation message
by Olle E. Johansson 04 Jan '22

04 Jan '22

Module: kamailio Branch: master Commit: 89958e9350597100d09689357b631ad30928ed99 URL: https://github.com/kamailio/kamailio/commit/89958e9350597100d09689357b631ad… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T17:00:28+01:00 TLS: Add RPC success confirmation message --- Modified: src/modules/tls/tls_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/89958e9350597100d09689357b631ad… Patch: https://github.com/kamailio/kamailio/commit/89958e9350597100d09689357b631ad… --- diff --git a/src/modules/tls/tls_rpc.c b/src/modules/tls/tls_rpc.c index 9927710647..9c7f980e71 100644 --- a/src/modules/tls/tls_rpc.c +++ b/src/modules/tls/tls_rpc.c @@ -87,7 +87,7 @@ static void tls_reload(rpc_t* rpc, void* ctx) *tls_domains_cfg = cfg; lock_release(tls_domains_cfg_lock); - + rpc->rpl_printf(ctx, "Ok. TLS configuration reloaded."); return; error:

1 0

git:master:cf1907ca: mtree: Re-instate error log messages in RPC reload removed in an earlier commit
by Olle E. Johansson 04 Jan '22

04 Jan '22

Module: kamailio Branch: master Commit: cf1907cac4c21fe12a27057cc3eeb2dd98e65635 URL: https://github.com/kamailio/kamailio/commit/cf1907cac4c21fe12a27057cc3eeb2d… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-04T10:47:28+01:00 mtree: Re-instate error log messages in RPC reload removed in an earlier commit --- Modified: src/modules/mtree/mtree_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/cf1907cac4c21fe12a27057cc3eeb2d… Patch: https://github.com/kamailio/kamailio/commit/cf1907cac4c21fe12a27057cc3eeb2d… --- diff --git a/src/modules/mtree/mtree_mod.c b/src/modules/mtree/mtree_mod.c index 1a2cd9f737..8c703f3531 100644 --- a/src/modules/mtree/mtree_mod.c +++ b/src/modules/mtree/mtree_mod.c @@ -937,6 +937,7 @@ void rpc_mtree_reload(rpc_t* rpc, void* c) if(mt_load_db_trees()!=0) { rpc->fault(c, 500, "Can not reload Mtrees from database."); + LM_ERR("RPC failed: cannot reload mtrees from database\n"); return; } rpc->rpl_printf(c, "Ok. Mtrees reloaded."); @@ -945,6 +946,7 @@ void rpc_mtree_reload(rpc_t* rpc, void* c) if(!mt_defined_trees()) { rpc->fault(c, 500, "No Mtrees defined."); + LM_ERR("RPC failed: No Mtrees defined\n"); return; } @@ -971,6 +973,7 @@ void rpc_mtree_reload(rpc_t* rpc, void* c) if(mt_load_db(pt)!=0) { rpc->fault(c, 500, "Mtree Reload Failed"); + LM_ERR("RPC failed: cannot reload mtrees from database\n"); return; } treeloaded = 1; @@ -978,7 +981,7 @@ void rpc_mtree_reload(rpc_t* rpc, void* c) pt = pt->next; } if(treeloaded == 0) { - rpc->fault(c, 500, "Can not find specified Mtree"); + rpc->fault(c, 500, "Can not find specified Mtree"); } rpc->rpl_printf(c, "Ok. Mtree reloaded."); return;

1 0

Re: [sr-dev] [kamailio/kamailio] mtree: Add RPC response on successful reload, re-organise function rpc_mtree_reload (559b52b)
by Olle E. Johansson 03 Jan '22

03 Jan '22

OK, I did not see the point of them, but you made it understandable :-) Thanks. Will fix. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/559b52b194f813c0c8584b3becbac9b… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/559b52b194f813c0c8584b3becbac9b2ab8e0343/62841767(a)github.com>

1 0

Re: [sr-dev] [kamailio/kamailio] mtree: Add RPC response on successful reload, re-organise function rpc_mtree_reload (559b52b)
by Daniel-Constantin Mierla 03 Jan '22

03 Jan '22

The commit seems to remove the existing error log messages and they are useful with the systems that monitor syslog and trigger alerts. While the commit adds text to rpc response, that is visible on client app and it might not be easily caught by server devops team. The error logs should be reintroduced. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/559b52b194f813c0c8584b3becbac9b… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/559b52b194f813c0c8584b3becbac9b2ab8e0343/62841330(a)github.com>

1 0

git:master:7feb3865: secfilter: Convert error messages to error responses in secf_rpc_add_dst()
by Olle E. Johansson 03 Jan '22

03 Jan '22

Module: kamailio Branch: master Commit: 7feb38651970fc1f3cfd90769685c46804ab25ae URL: https://github.com/kamailio/kamailio/commit/7feb38651970fc1f3cfd90769685c46… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T16:36:46+01:00 secfilter: Convert error messages to error responses in secf_rpc_add_dst() --- Modified: src/modules/secfilter/secfilter_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/7feb38651970fc1f3cfd90769685c46… Patch: https://github.com/kamailio/kamailio/commit/7feb38651970fc1f3cfd90769685c46… --- diff --git a/src/modules/secfilter/secfilter_rpc.c b/src/modules/secfilter/secfilter_rpc.c index cea9d400e8..2f763e4732 100644 --- a/src/modules/secfilter/secfilter_rpc.c +++ b/src/modules/secfilter/secfilter_rpc.c @@ -63,7 +63,7 @@ void secf_rpc_add_dst(rpc_t *rpc, void *ctx) char *text = NULL; if(rpc->scan(ctx, "d", &number) < 1) { - rpc->fault(ctx, 0, + rpc->fault(ctx, 500, "Invalid Parameters. Usage: secfilter.add_dst " "number\n Example: secfilter.add_dst " "555123123"); @@ -73,7 +73,7 @@ void secf_rpc_add_dst(rpc_t *rpc, void *ctx) data.s = pkg_malloc(data.len * sizeof(char)); if(!data.s) { PKG_MEM_ERROR; - rpc->rpl_printf(ctx, "Error insert values in the blacklist"); + rpc->fault(ctx, 500, "Error insert values in the blacklist"); return; } memcpy(data.s, text, data.len); @@ -82,7 +82,7 @@ void secf_rpc_add_dst(rpc_t *rpc, void *ctx) rpc->rpl_printf(ctx, "Values (%s) inserted into blacklist destinations", data); } else { - rpc->rpl_printf(ctx, "Error insert values in the blacklist"); + rpc->fault(ctx, 500, "Error insert values in the blacklist"); } lock_release(&secf_data->lock); if(data.s)

1 0

git:master:9ebf483a: rtpengine: Fix typo in RPC response handling
by Olle E. Johansson 03 Jan '22

03 Jan '22

Module: kamailio Branch: master Commit: 9ebf483a51b8584c05a2bcd3d4b26ac22a878ce8 URL: https://github.com/kamailio/kamailio/commit/9ebf483a51b8584c05a2bcd3d4b26ac… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T16:36:46+01:00 rtpengine: Fix typo in RPC response handling --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/9ebf483a51b8584c05a2bcd3d4b26ac… Patch: https://github.com/kamailio/kamailio/commit/9ebf483a51b8584c05a2bcd3d4b26ac… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 3440daec93..ab6920c01d 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -1341,7 +1341,7 @@ static void rtpengine_rpc_reload(rpc_t* rpc, void* ctx) LM_DBG("current rtpengines list version: %d (%u)\n", _rtpe_list_version->vernum, (unsigned int)_rtpe_list_version->vertime); - rpc->rpl_printf(c, "Ok. Reload successful."); + rpc->rpl_printf(ctx, "Ok. Reload successful."); } static int rtpengine_rpc_iterate(rpc_t* rpc, void* ctx, const str *rtpp_url,

1 0

git:master:b108bd6a: modules: readme files regenerated - rtp_media_server ... [skip ci]
by Kamailio Dev 03 Jan '22

03 Jan '22

Module: kamailio Branch: master Commit: b108bd6aaa7f25f91bd058c92103e9f0910bba0e URL: https://github.com/kamailio/kamailio/commit/b108bd6aaa7f25f91bd058c92103e9f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-01-03T16:31:27+01:00 modules: readme files regenerated - rtp_media_server ... [skip ci] --- Modified: src/modules/rtp_media_server/README --- Diff: https://github.com/kamailio/kamailio/commit/b108bd6aaa7f25f91bd058c92103e9f… Patch: https://github.com/kamailio/kamailio/commit/b108bd6aaa7f25f91bd058c92103e9f… --- diff --git a/src/modules/rtp_media_server/README b/src/modules/rtp_media_server/README index 511263f880..769af84350 100644 --- a/src/modules/rtp_media_server/README +++ b/src/modules/rtp_media_server/README @@ -85,11 +85,9 @@ Chapter 1. Admin Guide 1. Overview - rtp_media_server module is adding RTP and media processing - functionalities to Kamailio - - Kamailio is providing SIP signaling including and enpoint with Dialog - state, SDP parsing and scripting language + rtp_media_server module adds RTP and media processing functionalities + to Kamailio. Kamailio is providing SIP signaling including an endpoint + with Dialog state, SDP parsing and scripting language. oRTP: is providing Real-time Transport Protocol (RFC 3550) @@ -106,10 +104,11 @@ Chapter 1. Admin Guide 2.1. Building on Debian, Dockerfile and docker image - The module includes Dockerfile that can also be use as a reference on - how to build everything from source on Debian, the of libmediastreamer - on Linux is usually outdated. A docker image is also available from - dockerhub https://hub.docker.com/r/jchavanton/rtp_media_server + The module includes Dockerfile that can also be used as a reference on + how to build everything from source on Debian, the package of + libmediastreamer on Linux is usually outdated. A Docker image is also + available from dockerhub + https://hub.docker.com/r/jchavanton/rtp_media_server 3. Dependencies @@ -118,9 +117,9 @@ Chapter 1. Admin Guide 3.1. Kamailio Modules - The module depends on the following modules (in the other words the - listed modules must be loaded before this module): - * tm - accounting module + The module depends on the following modules (in other words the listed + modules must be loaded before this module): + * tm - transaction module 3.2. External Libraries or Applications @@ -129,7 +128,7 @@ Chapter 1. Admin Guide If you want to build oRTP and mediastreamer from source, you can use the provided script for Debian "install_bc.sh". - * oRTP git://git.linphone.org/ortp.git + * oRTP git clone git://git.linphone.org/ortp.git oRTP is a library implemeting Real-time Transport Protocol (RFC 3550), distributed under GNU GPLv2 or proprietary license. * mediastreamer2 git clone git://git.linphone.org/mediastreamer2.git @@ -167,7 +166,7 @@ modparam("rtp_media_server", "log_file_name", "/var/log/rms/rms_ortp.log") 5.1. rms_answer (event_route) - Create a call leg : with a SIP dialog and an RTP session call the + Create a call leg with a SIP dialog and an RTP session call the event_route This function can be used from REQUEST_ROUTE, REPLY_ROUTE and @@ -201,7 +200,7 @@ route { 5.2. rms_hangup () - Send a BYE, delete the RTP session and the media ressources. + Send a BYE, delete the RTP session and the media resources. This function can be used from EVENT_ROUTE. @@ -245,7 +244,7 @@ e in-dialog request needs to be handled by it. 5.4. rms_dialog_check () Returns true if the current SIP message it handled/known by the RMS - module, else it may be handle in any other way by Kamailio. + module, else it may be handled in any other way by Kamailio. This function can be used from REQUEST_ROUTE, REPLY_ROUTE and FAILURE_ROUTE.

1 0

git:master:261b7e13: matrix: Add RPC response on matrix reload success
by Olle E. Johansson 03 Jan '22

03 Jan '22

Module: kamailio Branch: master Commit: 261b7e13d711e5361ed491a8fd04efee2d73709e URL: https://github.com/kamailio/kamailio/commit/261b7e13d711e5361ed491a8fd04efe… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T16:00:05+01:00 matrix: Add RPC response on matrix reload success --- Modified: src/modules/matrix/matrix.c --- Diff: https://github.com/kamailio/kamailio/commit/261b7e13d711e5361ed491a8fd04efe… Patch: https://github.com/kamailio/kamailio/commit/261b7e13d711e5361ed491a8fd04efe… --- diff --git a/src/modules/matrix/matrix.c b/src/modules/matrix/matrix.c index d2177ccb24..54f26aa0f7 100644 --- a/src/modules/matrix/matrix.c +++ b/src/modules/matrix/matrix.c @@ -526,11 +526,12 @@ static void matrix_rpc_reload(rpc_t* rpc, void* c) if(db_reload_matrix() < 0) { rpc->fault(c, 500, "Reload failed"); } + rpc->rpl_printf(c, "Ok. Reload successful."); matrix_db_close(); } static const char *matrix_rpc_reload_doc[2] = { - "reload matrix records from database", + "Reload matrix records from database", 0 };

1 0

git:master:2468473c: rtpengine: Add RPC success message on reload
by Olle E. Johansson 03 Jan '22

03 Jan '22

Module: kamailio Branch: master Commit: 2468473c18200161bba42e01468d3007541329ef URL: https://github.com/kamailio/kamailio/commit/2468473c18200161bba42e01468d300… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T16:14:19+01:00 rtpengine: Add RPC success message on reload --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/2468473c18200161bba42e01468d300… Patch: https://github.com/kamailio/kamailio/commit/2468473c18200161bba42e01468d300… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 738e55d312..3440daec93 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -283,7 +283,7 @@ static str body_intermediate; static str rtp_inst_pv_param = {NULL, 0}; static pv_spec_t *rtp_inst_pvar = NULL; -/* array with the sockets used by rtpporxy (per process)*/ +/* array with the sockets used by rtpproxy (per process)*/ static unsigned int *rtpp_no = 0; static gen_lock_t *rtpp_no_lock = 0; static int *rtpp_socks = 0; @@ -1341,6 +1341,7 @@ static void rtpengine_rpc_reload(rpc_t* rpc, void* ctx) LM_DBG("current rtpengines list version: %d (%u)\n", _rtpe_list_version->vernum, (unsigned int)_rtpe_list_version->vertime); + rpc->rpl_printf(c, "Ok. Reload successful."); } static int rtpengine_rpc_iterate(rpc_t* rpc, void* ctx, const str *rtpp_url,

1 0

git:master:82721b91: rtp_media_server: Documentation update, typo fixing
by Olle E. Johansson 03 Jan '22

03 Jan '22

Module: kamailio Branch: master Commit: 82721b916d9743cca58b69a5772b3e5a7ce8461e URL: https://github.com/kamailio/kamailio/commit/82721b916d9743cca58b69a5772b3e5… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T16:28:27+01:00 rtp_media_server: Documentation update, typo fixing --- Modified: src/modules/rtp_media_server/doc/rtp_media_server_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/82721b916d9743cca58b69a5772b3e5… Patch: https://github.com/kamailio/kamailio/commit/82721b916d9743cca58b69a5772b3e5…

1 0

git:master:41e20d7f: keepalive: Add RPC success responses
by Olle E. Johansson 03 Jan '22

03 Jan '22

Module: kamailio Branch: master Commit: 41e20d7f5106748a415951f6766cf64b9d14180d URL: https://github.com/kamailio/kamailio/commit/41e20d7f5106748a415951f6766cf64… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T15:58:41+01:00 keepalive: Add RPC success responses --- Modified: src/modules/keepalive/keepalive_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/41e20d7f5106748a415951f6766cf64… Patch: https://github.com/kamailio/kamailio/commit/41e20d7f5106748a415951f6766cf64… --- diff --git a/src/modules/keepalive/keepalive_rpc.c b/src/modules/keepalive/keepalive_rpc.c index e6a64dbcd1..ef9fe24a56 100644 --- a/src/modules/keepalive/keepalive_rpc.c +++ b/src/modules/keepalive/keepalive_rpc.c @@ -123,7 +123,7 @@ static void keepalive_rpc_add(rpc_t *rpc, void *ctx) rpc->fault(ctx, 500, "couldn't add data to list"); return; } - + rpc->rpl_printf(ctx, "Ok. Destination added."); return; } static const char *keepalive_rpc_add_doc[2] = { @@ -156,7 +156,7 @@ static void keepalive_rpc_del(rpc_t *rpc, void *ctx) rpc->fault(ctx, 500, "couldn't delete data from list"); return; } - + rpc->rpl_printf(ctx, "Ok. Destination removed."); return; } static const char *keepalive_rpc_del_doc[2] = { @@ -217,7 +217,7 @@ static const char *keepalive_rpc_get_doc[2] = { static void keepalive_rpc_flush(rpc_t *rpc, void *ctx) { ka_dest_t *dest; - LM_DBG("keepalive flushe\n"); + LM_DBG("keepalive flush\n"); ka_lock_destination_list(); for(dest = ka_destinations_list->first; dest != NULL; dest = dest->next) { @@ -225,7 +225,7 @@ static void keepalive_rpc_flush(rpc_t *rpc, void *ctx) } ka_destinations_list->first = 0; ka_unlock_destination_list(); - + rpc->rpl_printf(ctx, "Ok. Destination list flushed."); return; } static const char *keepalive_rpc_flush_doc[2] = {

1 0

git:master:e5dac2fb: dmq: Add RPC success response on removing a node
by Olle E. Johansson 03 Jan '22

03 Jan '22

Module: kamailio Branch: master Commit: e5dac2fb61f375ccd131d4ad0c85ddabda32754c URL: https://github.com/kamailio/kamailio/commit/e5dac2fb61f375ccd131d4ad0c85dda… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T15:41:10+01:00 dmq: Add RPC success response on removing a node --- Modified: src/modules/dmq/dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/e5dac2fb61f375ccd131d4ad0c85dda… Patch: https://github.com/kamailio/kamailio/commit/e5dac2fb61f375ccd131d4ad0c85dda… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index 817fc3f3bb..843b7e3e4d 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -442,6 +442,7 @@ void rpc_dmq_remove(rpc_t* rpc, void* ctx) rpc->fault(ctx, 500, "Failure"); return; } + rpc->rpl_printf(ctx, "Ok. DMQ node removed."); } static const char* rpc_dmq_remove_doc[3] = {

1 0

git:master:af8b605b: disaptcher: Add RPC success message on set_state
by Olle E. Johansson 03 Jan '22

03 Jan '22

Module: kamailio Branch: master Commit: af8b605b71a4b15f8c2f69878e589c8554bebfec URL: https://github.com/kamailio/kamailio/commit/af8b605b71a4b15f8c2f69878e589c8… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T15:41:10+01:00 disaptcher: Add RPC success message on set_state --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/af8b605b71a4b15f8c2f69878e589c8… Patch: https://github.com/kamailio/kamailio/commit/af8b605b71a4b15f8c2f69878e589c8… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 4493fed425..655c0ace83 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1775,7 +1775,7 @@ static void dispatcher_rpc_set_state_helper(rpc_t *rpc, void *ctx, int mattr) } } } - + rpc->rpl_printf(ctx, "Ok. Dispatcher state updated."); return; }

1 0

git:master:70a7f92b: dispatcher: Add RPC success message on adding destination to set
by Olle E. Johansson 03 Jan '22

03 Jan '22

Module: kamailio Branch: master Commit: 70a7f92b6df5fa154709ccb711a81641ea84ab51 URL: https://github.com/kamailio/kamailio/commit/70a7f92b6df5fa154709ccb711a8164… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T15:41:10+01:00 dispatcher: Add RPC success message on adding destination to set --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/70a7f92b6df5fa154709ccb711a8164… Patch: https://github.com/kamailio/kamailio/commit/70a7f92b6df5fa154709ccb711a8164… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 655c0ace83..551e1e0ffd 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1872,7 +1872,7 @@ static void dispatcher_rpc_add(rpc_t *rpc, void *ctx) rpc->fault(ctx, 500, "Adding dispatcher dst failed"); return; } - + rpc->rpl_printf(ctx, "Ok. Dispatcher destination added."); return; }

1 0

git:master:101ddb5e: dispatcher: Add RPC success message when removing destination from set
by Olle E. Johansson 03 Jan '22

03 Jan '22

Module: kamailio Branch: master Commit: 101ddb5efe16fd415410be1ac86ff759e83bdc54 URL: https://github.com/kamailio/kamailio/commit/101ddb5efe16fd415410be1ac86ff75… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T15:41:10+01:00 dispatcher: Add RPC success message when removing destination from set --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/101ddb5efe16fd415410be1ac86ff75… Patch: https://github.com/kamailio/kamailio/commit/101ddb5efe16fd415410be1ac86ff75… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 551e1e0ffd..fbf65d33fe 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1897,7 +1897,7 @@ static void dispatcher_rpc_remove(rpc_t *rpc, void *ctx) rpc->fault(ctx, 500, "Removing dispatcher dst failed"); return; } - + rpc->rpl_printf(ctx, "Ok. Dispatcher destination removed."); return; }

1 0

git:master:82845eac: db_cluster: Add RPC success and error messages to dbcl_rpc_enable_connection
by Olle E. Johansson 03 Jan '22

03 Jan '22

Module: kamailio Branch: master Commit: 82845eac8a8bae73d1033736ff9cf15337661981 URL: https://github.com/kamailio/kamailio/commit/82845eac8a8bae73d1033736ff9cf15… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2022-01-03T15:41:10+01:00 db_cluster: Add RPC success and error messages to dbcl_rpc_enable_connection --- Modified: src/modules/db_cluster/db_cluster_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/82845eac8a8bae73d1033736ff9cf15… Patch: https://github.com/kamailio/kamailio/commit/82845eac8a8bae73d1033736ff9cf15… --- diff --git a/src/modules/db_cluster/db_cluster_mod.c b/src/modules/db_cluster/db_cluster_mod.c index d4aae0e123..2ddbffc2ad 100644 --- a/src/modules/db_cluster/db_cluster_mod.c +++ b/src/modules/db_cluster/db_cluster_mod.c @@ -309,6 +309,7 @@ static void dbcl_rpc_enable_connection(rpc_t *rpc, void *c) if(cls==NULL) { LM_INFO("cluster not found [%.*s]\n", cluster.len, cluster.s); + rpc->fault(c, 500, "Cluster not found"); return; } @@ -317,11 +318,14 @@ static void dbcl_rpc_enable_connection(rpc_t *rpc, void *c) if(con==NULL) { LM_INFO("connection not found [%.*s]\n", connection.len, connection.s); + rpc->fault(c, 500, "Cluster connection not found"); return; } - - dbcl_enable_con(con); - + if(dbcl_enable_con(con) < 0) { + rpc->fault(c, 500, "Failed to enable cluster connection."); + return; + } + rpc->rpl_printf(c, "Ok. Cluster connection enabled."); return; }

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev