sr-dev November 2020

sr-dev@lists.kamailio.org

22 participants
313 discussions

git:5.4:f61d7a1b: tm: use q field comparison in while for standard t contacts load
by Daniel-Constantin Mierla 19 Nov '20

19 Nov '20

Module: kamailio Branch: 5.4 Commit: f61d7a1b6b45bbed29bf4bc6c8a69fd52700ca41 URL: https://github.com/kamailio/kamailio/commit/f61d7a1b6b45bbed29bf4bc6c8a69fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-19T13:28:53+01:00 tm: use q field comparison in while for standard t contacts load - fix ordering change to standar mode introduced with proportional mode - GH #2449 (cherry picked from commit 59f6ddbe902d61bc682dd12fc6330df656468b1b) --- Modified: src/modules/tm/t_serial.c --- Diff: https://github.com/kamailio/kamailio/commit/f61d7a1b6b45bbed29bf4bc6c8a69fd… Patch: https://github.com/kamailio/kamailio/commit/f61d7a1b6b45bbed29bf4bc6c8a69fd… --- diff --git a/src/modules/tm/t_serial.c b/src/modules/tm/t_serial.c index d27a648243..13611cdb54 100644 --- a/src/modules/tm/t_serial.c +++ b/src/modules/tm/t_serial.c @@ -459,11 +459,20 @@ int ki_t_load_contacts_mode(struct sip_msg* msg, int mode) prev = (struct contact *)0; curr = contacts; - while (curr && - ((curr->q_index < next->q_index) || - ((curr->q_index == next->q_index) && (next->path.len == 0)))) { - prev = curr; - curr = curr->next; + if (mode == T_LOAD_PROPORTIONAL) { + while (curr && + ((curr->q_index < next->q_index) || + ((curr->q_index == next->q_index) && (next->path.len == 0)))) { + prev = curr; + curr = curr->next; + } + } else { + while (curr && + ((curr->q < next->q) || + ((curr->q == next->q) && (next->path.len == 0)))) { + prev = curr; + curr = curr->next; + } } if (!curr) { next->next = (struct contact *)0;

1 0

git:5.4:d9a1a5cf: drouting: give portparameter set to 0 to sip_resolvehost()
by Daniel-Constantin Mierla 19 Nov '20

19 Nov '20

Module: kamailio Branch: 5.4 Commit: d9a1a5cf667e7d093cc077fc51297825565c79d1 URL: https://github.com/kamailio/kamailio/commit/d9a1a5cf667e7d093cc077fc5129782… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-19T13:28:35+01:00 drouting: give portparameter set to 0 to sip_resolvehost() - enable doing SRV query, GH #2553 (cherry picked from commit 18f59c10582845da5eea280990daf19c804978fb) --- Modified: src/modules/drouting/routing.c --- Diff: https://github.com/kamailio/kamailio/commit/d9a1a5cf667e7d093cc077fc5129782… Patch: https://github.com/kamailio/kamailio/commit/d9a1a5cf667e7d093cc077fc5129782… --- diff --git a/src/modules/drouting/routing.c b/src/modules/drouting/routing.c index a1d32fa0ba..da4385911f 100644 --- a/src/modules/drouting/routing.c +++ b/src/modules/drouting/routing.c @@ -268,6 +268,7 @@ int add_dst(rt_data_t *r, #define GWABUF_MAX_SIZE 512 char gwabuf[GWABUF_MAX_SIZE]; str gwas; + unsigned short port; if(NULL == r || NULL == ip) { LM_ERR("invalid parametres\n"); @@ -331,7 +332,8 @@ int add_dst(rt_data_t *r, } /* note we discard the port discovered by the resolve function - we are interested only in the port that was actually configured. */ - if((he = sip_resolvehost(&uri.host, NULL, (char *)(void *)&uri.proto)) + port = 0; + if((he = sip_resolvehost(&uri.host, &port, (char *)(void *)&uri.proto)) == 0) { if(dr_force_dns) { LM_ERR("cannot resolve <%.*s>\n", uri.host.len, uri.host.s);

1 0

git:5.4:c9ab7671: jsonrpcs: exported dispatch() function to kemi
by Daniel-Constantin Mierla 19 Nov '20

19 Nov '20

Module: kamailio Branch: 5.4 Commit: c9ab7671bffdee3c775f6eb13cbd2363b6f5ecf3 URL: https://github.com/kamailio/kamailio/commit/c9ab7671bffdee3c775f6eb13cbd236… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-19T13:28:08+01:00 jsonrpcs: exported dispatch() function to kemi (cherry picked from commit 08a9ed3d136c861f990e4f63c2c0544e08d9078d) --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c9ab7671bffdee3c775f6eb13cbd236… Patch: https://github.com/kamailio/kamailio/commit/c9ab7671bffdee3c775f6eb13cbd236… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index 6f3491b038..c3b8003046 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -1227,7 +1227,7 @@ static void mod_destroy(void) /** * */ -static int jsonrpc_dispatch(sip_msg_t* msg, char* s1, char* s2) +static int ki_jsonrpcs_dispatch(sip_msg_t* msg) { rpc_export_t* rpce; jsonrpc_ctx_t* ctx; @@ -1315,6 +1315,14 @@ static int jsonrpc_dispatch(sip_msg_t* msg, char* s1, char* s2) } +/** + * + */ +static int jsonrpc_dispatch(sip_msg_t* msg, char* s1, char* s2) +{ + return ki_jsonrpcs_dispatch(msg); +} + int jsonrpc_exec_ex(str *cmd, str *rpath) { rpc_export_t* rpce; @@ -1551,6 +1559,11 @@ static sr_kemi_xval_t* ki_jsonrpcs_response(sip_msg_t *msg) */ /* clang-format off */ static sr_kemi_t sr_kemi_jsonrpcs_exports[] = { + { str_init("jsonrpcs"), str_init("dispatch"), + SR_KEMIP_INT, ki_jsonrpcs_dispatch, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("jsonrpcs"), str_init("exec"), SR_KEMIP_INT, ki_jsonrpcs_exec, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:5.4:bec6cdf1: core: added missing field in sip_msg_update_buffer
by Daniel-Constantin Mierla 19 Nov '20

19 Nov '20

Module: kamailio Branch: 5.4 Commit: bec6cdf10dfbf9f32fce041987a3468b8a675a22 URL: https://github.com/kamailio/kamailio/commit/bec6cdf10dfbf9f32fce041987a3468… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-19T13:27:38+01:00 core: added missing field in sip_msg_update_buffer - added a missing field in sip_msg_update_buffer() when restoring message fiedls: msg->pid. (cherry picked from commit 57be5c1f33344275c15777a7927d9c48df4a69ba) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/bec6cdf10dfbf9f32fce041987a3468… Patch: https://github.com/kamailio/kamailio/commit/bec6cdf10dfbf9f32fce041987a3468… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index fd183d4f80..77b90a92c6 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -3276,6 +3276,7 @@ int sip_msg_update_buffer(sip_msg_t *msg, str *obuf) /* restore msg fields */ msg->buf = tmp.buf; msg->id = tmp.id; + msg->pid = tmp.pid; msg->rcv = tmp.rcv; msg->set_global_address = tmp.set_global_address; msg->set_global_port = tmp.set_global_port;

1 0

git:5.4:f6747a1f: sctp: memcpy field data to avoid unaligned access warning
by Daniel-Constantin Mierla 19 Nov '20

19 Nov '20

Module: kamailio Branch: 5.4 Commit: f6747a1fe4af59062733090ee0081d1bf15669c3 URL: https://github.com/kamailio/kamailio/commit/f6747a1fe4af59062733090ee0081d1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-19T13:27:02+01:00 sctp: memcpy field data to avoid unaligned access warning - GH #2543 (cherry picked from commit 4bb099b046939b85e1827b804167a51ef4bc00c4) --- Modified: src/modules/sctp/sctp_server.c --- Diff: https://github.com/kamailio/kamailio/commit/f6747a1fe4af59062733090ee0081d1… Patch: https://github.com/kamailio/kamailio/commit/f6747a1fe4af59062733090ee0081d1… --- diff --git a/src/modules/sctp/sctp_server.c b/src/modules/sctp/sctp_server.c index 6690503973..fff7a0b6b3 100644 --- a/src/modules/sctp/sctp_server.c +++ b/src/modules/sctp/sctp_server.c @@ -2258,6 +2258,7 @@ static int sctp_handle_notification(struct socket_info *si, { union sctp_notification *snp; char su_buf[SU2A_MAX_STR_SIZE]; + struct sockaddr_storage sa_storage; #define SNOT DBG #define ERR_LEN_TOO_SMALL(length, val, bind_addr, from_su, text) \ @@ -2311,8 +2312,9 @@ static int sctp_handle_notification(struct socket_info *si, sctp_paddr_change_state2s(snp->sn_paddr_change.spc_state), snp->sn_paddr_change.spc_state, &snp->sn_paddr_change.spc_aaddr); - strcpy(su_buf, su2a((union sockaddr_union *)&snp->sn_paddr_change - .spc_aaddr, + memcpy(&sa_storage, &snp->sn_paddr_change.spc_aaddr, + sizeof(snp->sn_paddr_change.spc_aaddr)); + strcpy(su_buf, su2a((union sockaddr_union *)&sa_storage, sizeof(snp->sn_paddr_change.spc_aaddr))); SNOT("sctp notification from %s on %.*s:%d: SCTP_PEER_ADDR_CHANGE" ": %s: %s: assoc_id %d \n",

1 0

git:5.4:f3a872e9: http_async_client: include poll.h instead sys/poll.h
by Daniel-Constantin Mierla 19 Nov '20

19 Nov '20

Module: kamailio Branch: 5.4 Commit: f3a872e9e8f780a23f7e3426ce4152a3a26cc448 URL: https://github.com/kamailio/kamailio/commit/f3a872e9e8f780a23f7e3426ce4152a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-19T13:26:53+01:00 http_async_client: include poll.h instead sys/poll.h - according to POSIX specs - GH #2543 (cherry picked from commit 8f30c75cff7787a39f7c934e00e933b1beb43c20) --- Modified: src/modules/http_async_client/http_multi.h --- Diff: https://github.com/kamailio/kamailio/commit/f3a872e9e8f780a23f7e3426ce4152a… Patch: https://github.com/kamailio/kamailio/commit/f3a872e9e8f780a23f7e3426ce4152a… --- diff --git a/src/modules/http_async_client/http_multi.h b/src/modules/http_async_client/http_multi.h index c830daa9b1..10070eb6bd 100644 --- a/src/modules/http_async_client/http_multi.h +++ b/src/modules/http_async_client/http_multi.h @@ -37,7 +37,7 @@ #include <sys/time.h> #include <time.h> #include <unistd.h> -#include <sys/poll.h> +#include <poll.h> #include <curl/curl.h> #include <event2/event.h> #include <fcntl.h>

1 0

git:5.4:b72ab5e5: core: init origproto to fix compiler warning
by Daniel-Constantin Mierla 19 Nov '20

19 Nov '20

Module: kamailio Branch: 5.4 Commit: b72ab5e554d230b36a7c6dbc79b8e86b5d0c70e2 URL: https://github.com/kamailio/kamailio/commit/b72ab5e554d230b36a7c6dbc79b8e86… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-19T13:26:19+01:00 core: init origproto to fix compiler warning - GH #2543 (cherry picked from commit ef3233d14080936486d09edbe9598d7d92bd2f33) --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/b72ab5e554d230b36a7c6dbc79b8e86… Patch: https://github.com/kamailio/kamailio/commit/b72ab5e554d230b36a7c6dbc79b8e86… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index e383786de2..05dc3f98ba 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -3261,6 +3261,7 @@ inline static int dns_naptr_sip_resolve(struct dns_srv_handle* h, str* name, ret=-E_DNS_NO_NAPTR; if(proto) origproto=*proto; + else origproto = PROTO_NONE; if (dns_hash==0){ /* not init => use normal, non-cached version */ LM_WARN("called before dns cache initialization\n"); h->srv=h->a=0;

1 0

git:5.4:88f43b97: dialog: skip doing cseq update processing for non-sip requests
by Daniel-Constantin Mierla 19 Nov '20

19 Nov '20

Module: kamailio Branch: 5.4 Commit: 88f43b97768676fd2b84c3e855ec5ae441b826cd URL: https://github.com/kamailio/kamailio/commit/88f43b97768676fd2b84c3e855ec5ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-19T13:23:45+01:00 dialog: skip doing cseq update processing for non-sip requests (cherry picked from commit 960b60ede8543f38b61ad2769e81e11d5a777df8) --- Modified: src/modules/dialog/dlg_cseq.c --- Diff: https://github.com/kamailio/kamailio/commit/88f43b97768676fd2b84c3e855ec5ae… Patch: https://github.com/kamailio/kamailio/commit/88f43b97768676fd2b84c3e855ec5ae… --- diff --git a/src/modules/dialog/dlg_cseq.c b/src/modules/dialog/dlg_cseq.c index a85b726514..17c63bbb1c 100644 --- a/src/modules/dialog/dlg_cseq.c +++ b/src/modules/dialog/dlg_cseq.c @@ -381,7 +381,12 @@ int dlg_cseq_msg_sent(sr_event_param_t *evp) goto done; } - if((get_to(&msg)->tag_value.len<=0)) { + if(!IS_SIP(&msg)) { + /* nothing to do for non-sip requests */ + goto done; + } + + if(get_to(&msg)->tag_value.len<=0) { /* intial request - handle only INVITEs */ if(msg.first_line.u.request.method_value!=METHOD_INVITE) { goto done;

1 0

git:5.4:82e00ce3: exec: debug message when command returns non-zero
by Daniel-Constantin Mierla 19 Nov '20

19 Nov '20

Module: kamailio Branch: 5.4 Commit: 82e00ce32c9a232be1dbd2e0a0e6e6c349e054b0 URL: https://github.com/kamailio/kamailio/commit/82e00ce32c9a232be1dbd2e0a0e6e6c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-19T13:23:06+01:00 exec: debug message when command returns non-zero (cherry picked from commit e9eee1ead964992a2d81014709755bbfd1e995c9) --- Modified: src/modules/exec/exec.c --- Diff: https://github.com/kamailio/kamailio/commit/82e00ce32c9a232be1dbd2e0a0e6e6c… Patch: https://github.com/kamailio/kamailio/commit/82e00ce32c9a232be1dbd2e0a0e6e6c… --- diff --git a/src/modules/exec/exec.c b/src/modules/exec/exec.c index 0e809ed8af..763e30816e 100644 --- a/src/modules/exec/exec.c +++ b/src/modules/exec/exec.c @@ -326,11 +326,17 @@ int exec_cmd(sip_msg_t *msg, char *cmd) exit_status = pclose(pipe); if(WIFEXITED(exit_status)) { /* exited properly .... */ /* return false if script exited with non-zero status */ - if(WEXITSTATUS(exit_status) != 0) + if(WEXITSTATUS(exit_status) != 0) { + LM_DBG("cmd %s with non-zero status - exit_status=%d," + " wexitstatus: %d, errno=%d: %s\n", + cmd, exit_status, WEXITSTATUS(exit_status), + errno, strerror(errno)); ret = -1; + } } else { /* exited erroneously */ - LM_ERR("cmd %s failed. exit_status=%d, errno=%d: %s\n", cmd, - exit_status, errno, strerror(errno)); + LM_ERR("cmd %s failed. exit_status=%d, wexitstatus: %d, errno=%d: %s\n", + cmd, exit_status, WEXITSTATUS(exit_status), + errno, strerror(errno)); ret = -1; }

1 0

git:5.4:17cb589c: dialog: small formatting changes
by Daniel-Constantin Mierla 19 Nov '20

19 Nov '20

Module: kamailio Branch: 5.4 Commit: 17cb589ce5ac07dbb12f1b99f17258f313adf783 URL: https://github.com/kamailio/kamailio/commit/17cb589ce5ac07dbb12f1b99f17258f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-19T13:22:55+01:00 dialog: small formatting changes (cherry picked from commit a3443211515068bb12ecbd53541785a5ebf1cb6c) --- Modified: src/modules/dialog/dlg_dmq.c Modified: src/modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/17cb589ce5ac07dbb12f1b99f17258f… Patch: https://github.com/kamailio/kamailio/commit/17cb589ce5ac07dbb12f1b99f17258f… --- diff --git a/src/modules/dialog/dlg_dmq.c b/src/modules/dialog/dlg_dmq.c index a5628f485b..9f70354d50 100644 --- a/src/modules/dialog/dlg_dmq.c +++ b/src/modules/dialog/dlg_dmq.c @@ -534,11 +534,11 @@ int dlg_dmq_replicate_action(dlg_dmq_action_t action, dlg_cell_t* dlg, if (dlg->vars != NULL) { srjson_t *pj = NULL; pj = srjson_CreateObject(&jdoc); - for(var=dlg->vars ; var ; var=var->next) { + for(var=dlg->vars ; var ; var=var->next) { srjson_AddStrToObject(&jdoc, pj, var->key.s, var->value.s, var->value.len); - } - srjson_AddItemToObject(&jdoc, jdoc.root, "vars", pj); + } + srjson_AddItemToObject(&jdoc, jdoc.root, "vars", pj); } if (dlg->profile_links) { @@ -657,8 +657,8 @@ int dmq_send_all_dlgs(dmq_node_t* dmq_node) { dlg_lock( d_table, &entry); for(dlg = entry.first; dlg != NULL; dlg = dlg->next){ - dlg->dflags |= DLG_FLAG_CHANGED_PROF; - dlg_dmq_replicate_action(DLG_DMQ_UPDATE, dlg, 0, dmq_node); + dlg->dflags |= DLG_FLAG_CHANGED_PROF; + dlg_dmq_replicate_action(DLG_DMQ_UPDATE, dlg, 0, dmq_node); } dlg_unlock( d_table, &entry); @@ -672,7 +672,7 @@ int dmq_send_all_dlgs(dmq_node_t* dmq_node) { * @brief dmq response callback */ int dlg_dmq_resp_callback_f(struct sip_msg* msg, int code, - dmq_node_t* node, void* param) + dmq_node_t* node, void* param) { LM_DBG("dmq response callback triggered [%p %d %p]\n", msg, code, param); return 0; diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index 7cf6b7ba7a..3f8adefb79 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -749,15 +749,15 @@ static void dlg_on_send(struct cell* t, int type, struct tmcb_params *param) LM_DBG("dialog_on_send CB\n"); iuid = (dlg_iuid_t*)(*param->param); if (iuid==NULL) - return; + return; dlg = dlg_get_by_iuid(iuid); if(dlg==NULL) - return; + return; /* sync over dmq */ if (dlg_enable_dmq) { - dlg_dmq_replicate_action(DLG_DMQ_UPDATE, dlg, 1, 0); + dlg_dmq_replicate_action(DLG_DMQ_UPDATE, dlg, 1, 0); } /* unref by 2: 1 set when adding in tm cb, 1 set by dlg_get_by_iuid() */

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2020