sr-dev February 2021

sr-dev@lists.kamailio.org

20 participants
250 discussions

git:master:c88e65ed: rtpengine: rebuild sockets if any skipped nodes
by Henning Westerholt 17 Feb '21

17 Feb '21

Module: kamailio Branch: master Commit: c88e65edf05f7e61826831a2f7528edbc184f68b URL: https://github.com/kamailio/kamailio/commit/c88e65edf05f7e61826831a2f7528ed… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-02-17T17:21:22+01:00 rtpengine: rebuild sockets if any skipped nodes Retry build_rtpp_socks() if any DNS or create, bind, connect issues happened when kamailio started, and at least one node from list was skipped. This retry will happen automatically, when select_rtpp_node() is called and will avoid a need for a "kamcmd rtpengine.reload" --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/c88e65edf05f7e61826831a2f7528ed… Patch: https://github.com/kamailio/kamailio/commit/c88e65edf05f7e61826831a2f7528ed… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 00b27be148..8b751eb48a 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -1794,6 +1794,9 @@ static int build_rtpp_socks(int lmode, int rtest) { if(_rtpe_list_vernum_local == _rtpe_list_version->vernum) { /* same version for the list of rtpengines */ + LM_DBG("same rtpengines list version: %d (%u)\n", + _rtpe_list_version->vernum, + (unsigned int)_rtpe_list_version->vertime); return 0; } @@ -1840,6 +1843,11 @@ static int build_rtpp_socks(int lmode, int rtest) { if (hostname==NULL) { LM_ERR("no more pkg memory\n"); rtpp_socks[pnode->idx] = -1; + + /* retry later */ + _rtpe_list_version->vernum += 1; + _rtpe_list_version->vertime = time(NULL); + continue; } strcpy(hostname, pnode->rn_address); @@ -1860,6 +1868,11 @@ static int build_rtpp_socks(int lmode, int rtest) { LM_ERR("%s\n", gai_strerror(n)); pkg_free(hostname); rtpp_socks[pnode->idx] = -1; + + /* retry later */ + _rtpe_list_version->vernum += 1; + _rtpe_list_version->vertime = time(NULL); + continue; } pkg_free(hostname); @@ -1869,6 +1882,11 @@ static int build_rtpp_socks(int lmode, int rtest) { if (rtpp_socks[pnode->idx] == -1) { LM_ERR("can't create socket\n"); freeaddrinfo(res); + + /* retry later */ + _rtpe_list_version->vernum += 1; + _rtpe_list_version->vertime = time(NULL); + continue; } @@ -1899,6 +1917,11 @@ static int build_rtpp_socks(int lmode, int rtest) { close(rtpp_socks[pnode->idx]); rtpp_socks[pnode->idx] = -1; freeaddrinfo(res); + + /* retry later */ + _rtpe_list_version->vernum += 1; + _rtpe_list_version->vertime = time(NULL); + continue; } @@ -1907,6 +1930,11 @@ static int build_rtpp_socks(int lmode, int rtest) { close(rtpp_socks[pnode->idx]); rtpp_socks[pnode->idx] = -1; freeaddrinfo(res); + + /* retry later */ + _rtpe_list_version->vernum += 1; + _rtpe_list_version->vertime = time(NULL); + continue; }

1 0

git:master:6863cb8b: core: early detect of empty host for check_self()
by Daniel-Constantin Mierla 17 Feb '21

17 Feb '21

Module: kamailio Branch: master Commit: 6863cb8b0253c641146633bd063575a53bc6a466 URL: https://github.com/kamailio/kamailio/commit/6863cb8b0253c641146633bd063575a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-17T14:07:43+01:00 core: early detect of empty host for check_self() --- Modified: src/core/forward.c --- Diff: https://github.com/kamailio/kamailio/commit/6863cb8b0253c641146633bd063575a… Patch: https://github.com/kamailio/kamailio/commit/6863cb8b0253c641146633bd063575a… --- diff --git a/src/core/forward.c b/src/core/forward.c index 0ffa627233..57661c211f 100644 --- a/src/core/forward.c +++ b/src/core/forward.c @@ -408,6 +408,13 @@ int run_check_self_func(str* host, unsigned short port, unsigned short proto) int check_self(str* host, unsigned short port, unsigned short proto) { int ret = 1; + + if(host==NULL || host->s==NULL || host->len<=0) { + /* no host (e.g., tel uri) - not matching myself */ + LM_DBG("no host value - not matching myself addresses\n"); + return 0; + } + if (grep_sock_info(host, port, proto)) { goto done; }

1 0

git:master:bfbf41d8: tm: consider local_rport parameter when building local via
by Daniel-Constantin Mierla 17 Feb '21

17 Feb '21

Module: kamailio Branch: master Commit: bfbf41d8ba2ba2b6eed8eb8fff2e554476c0a5b8 URL: https://github.com/kamailio/kamailio/commit/bfbf41d8ba2ba2b6eed8eb8fff2e554… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-17T13:31:34+01:00 tm: consider local_rport parameter when building local via --- Modified: src/modules/tm/t_msgbuilder.c --- Diff: https://github.com/kamailio/kamailio/commit/bfbf41d8ba2ba2b6eed8eb8fff2e554… Patch: https://github.com/kamailio/kamailio/commit/bfbf41d8ba2ba2b6eed8eb8fff2e554… --- diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index 47f94c1697..ef9b45e246 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -1358,6 +1358,7 @@ static inline int assemble_via(str* dest, struct cell* t, unsigned int via_len; str branch_str; struct hostport hp; + str rport = str_init(";rport"); if (!t_calc_branch(t, branch, branch_buf, &len)) { LM_ERR("branch calculation failed\n"); @@ -1372,7 +1373,11 @@ static inline int assemble_via(str* dest, struct cell* t, #endif set_hostport(&hp, 0); - via = via_builder(&via_len, NULL, dst, &branch_str, 0, &hp); + if(ksr_local_rport) { + via = via_builder(&via_len, NULL, dst, &branch_str, &rport, &hp); + } else { + via = via_builder(&via_len, NULL, dst, &branch_str, 0, &hp); + } if (!via) { LM_ERR("via building failed\n"); return -2;

1 0

git:master:81cd9c5d: rr: catch uri without host part when matching local addresses
by Daniel-Constantin Mierla 17 Feb '21

17 Feb '21

Module: kamailio Branch: master Commit: 81cd9c5d6934392cafd4b73541a19dbfa4b553f9 URL: https://github.com/kamailio/kamailio/commit/81cd9c5d6934392cafd4b73541a19db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-17T12:15:55+01:00 rr: catch uri without host part when matching local addresses - can happen for tel or urn uri --- Modified: src/modules/rr/loose.c --- Diff: https://github.com/kamailio/kamailio/commit/81cd9c5d6934392cafd4b73541a19db… Patch: https://github.com/kamailio/kamailio/commit/81cd9c5d6934392cafd4b73541a19db… --- diff --git a/src/modules/rr/loose.c b/src/modules/rr/loose.c index cfccfffa50..f1cbe1b629 100644 --- a/src/modules/rr/loose.c +++ b/src/modules/rr/loose.c @@ -122,6 +122,11 @@ static inline int is_myself(sip_uri_t *_puri) { int ret; + if(_puri->host.len==0) { + /* catch uri without host (e.g., tel uri) */ + return 0; + } + ret = check_self(&_puri->host, _puri->port_no?_puri->port_no:SIP_PORT, 0);/* match all protos*/ if (ret < 0) return 0;

1 0

Errored: kamailio/kamailio#9889 (master - cffd96c)
by Travis CI 17 Feb '21

17 Feb '21

Build Update for kamailio/kamailio ------------------------------------- Build: #9889 Status: Errored Duration: 5 mins and 31 secs Commit: cffd96c (master) Author: Daniel-Constantin Mierla Message: tm: use BUILD_NEW_LOCAL_VIA after local request event route execution View the changeset: https://github.com/kamailio/kamailio/compare/cc4644ea306f...cffd96cc3944 View the full build log and details: https://travis-ci.org/github/kamailio/kamailio/builds/759303331?utm_medium=… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:master:cffd96cc: tm: use BUILD_NEW_LOCAL_VIA after local request event route execution
by Daniel-Constantin Mierla 17 Feb '21

17 Feb '21

Module: kamailio Branch: master Commit: cffd96cc3944fb15aacee97291e4b2c1bb769fbb URL: https://github.com/kamailio/kamailio/commit/cffd96cc3944fb15aacee97291e4b2c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-17T08:23:34+01:00 tm: use BUILD_NEW_LOCAL_VIA after local request event route execution --- Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/cffd96cc3944fb15aacee97291e4b2c… Patch: https://github.com/kamailio/kamailio/commit/cffd96cc3944fb15aacee97291e4b2c… --- diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index 40d333b7db..ad6a74c8cb 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -343,7 +343,8 @@ static inline int t_run_local_req( LM_DBG("apply new updates with Via to sip msg\n"); buf1 = build_req_buf_from_sip_req(&lreq, - (unsigned int*)&buf_len1, &request->dst, BUILD_IN_SHM); + (unsigned int*)&buf_len1, &request->dst, + BUILD_NEW_LOCAL_VIA|BUILD_IN_SHM); if (likely(buf1)){ shm_free(*buf); *buf = buf1;

1 0

git:master:da0a6d48: core: new option BUILD_NEW_LOCAL_VIA to recreate the local via
by Daniel-Constantin Mierla 17 Feb '21

17 Feb '21

Module: kamailio Branch: master Commit: da0a6d48debb9c69c5a06a9e702a4378c61eaac7 URL: https://github.com/kamailio/kamailio/commit/da0a6d48debb9c69c5a06a9e702a437… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-17T08:21:36+01:00 core: new option BUILD_NEW_LOCAL_VIA to recreate the local via - to be used from tm uac when a local-generated request has to update the via header following the event route execution --- Modified: src/core/msg_translator.c Modified: src/core/msg_translator.h --- Diff: https://github.com/kamailio/kamailio/commit/da0a6d48debb9c69c5a06a9e702a437… Patch: https://github.com/kamailio/kamailio/commit/da0a6d48debb9c69c5a06a9e702a437… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index f895df9683..c3587d2e88 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -1971,7 +1971,7 @@ int check_boundaries(struct sip_msg *msg, struct dest_info *send_info) * depending on the presence of the BUILD_IN_SHM flag, needs freeing when * done) and sets returned_len or 0 on error. */ -char * build_req_buf_from_sip_req( struct sip_msg* msg, +char * build_req_buf_from_sip_req(struct sip_msg* msg, unsigned int *returned_len, struct dest_info* send_info, unsigned int mode) @@ -1987,6 +1987,7 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, unsigned int offset, s_offset, size; struct lump* via_anchor; struct lump* via_lump; + struct lump* via_rm; struct lump* via_insert_param; struct lump* path_anchor; struct lump* path_lump; @@ -2032,11 +2033,22 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, via_anchor=anchor_lump(msg, msg->via1->hdr.s-buf, 0, HDR_VIA_T); if (unlikely(via_anchor==0)) goto error00; - line_buf = create_via_hf( &via_len, msg, send_info, &branch); + line_buf = create_via_hf(&via_len, msg, send_info, &branch); if (unlikely(!line_buf)){ LM_ERR("could not create Via header\n"); goto error00; } + if(unlikely(mode&BUILD_NEW_LOCAL_VIA)) { + /* delete exiting top Via header */ + via_rm = del_lump(msg, msg->h_via1->name.s - msg->buf, + msg->h_via1->len, 0); + if (via_rm==0) { + LM_ERR("failed to remove exiting Via header\n"); + goto error00; + } + /* do not update old Via header anymore */ + mode |= BUILD_NO_VIA1_UPDATE; + } after_local_via: if(unlikely(mode&BUILD_NO_VIA1_UPDATE)) goto after_update_via1; diff --git a/src/core/msg_translator.h b/src/core/msg_translator.h index 4d14ce0fb2..9b9802ad1e 100644 --- a/src/core/msg_translator.h +++ b/src/core/msg_translator.h @@ -49,6 +49,7 @@ #define BUILD_NO_LOCAL_VIA (1<<0) #define BUILD_NO_VIA1_UPDATE (1<<1) #define BUILD_NO_PATH (1<<2) +#define BUILD_NEW_LOCAL_VIA (1<<3) #define BUILD_IN_SHM (1<<7) #include "parser/msg_parser.h"

1 0

git:master:cc4644ea: tm: uac - use new send socket only if set in event route local request
by Daniel-Constantin Mierla 16 Feb '21

16 Feb '21

Module: kamailio Branch: master Commit: cc4644ea306f1f8abf9d0f69eb452ae8cabeb4b9 URL: https://github.com/kamailio/kamailio/commit/cc4644ea306f1f8abf9d0f69eb452ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-16T16:36:10+01:00 tm: uac - use new send socket only if set in event route local request - GH #2639 --- Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/cc4644ea306f1f8abf9d0f69eb452ae… Patch: https://github.com/kamailio/kamailio/commit/cc4644ea306f1f8abf9d0f69eb452ae… --- diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index d01c722844..40d333b7db 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -315,10 +315,10 @@ static inline int t_run_local_req( if((lreq.force_send_socket != uac_r->dialog->send_sock) || (lreq.msg_flags&(FL_ADD_LOCAL_RPORT|FL_ADD_SRVID |FL_ADD_XAVP_VIA_PARAMS|FL_USE_XAVP_VIA_FIELDS))) { - LM_DBG("local Via update - socket: [%.*s] - msg-flags: %u", - lreq.force_send_socket->address_str.len, - lreq.force_send_socket->address_str.s, - lreq.msg_flags); + LM_DBG("local Via update - new socket: [%.*s] - msg-flags: %u", + (lreq.force_send_socket)?lreq.force_send_socket->address_str.len:4, + (lreq.force_send_socket)?lreq.force_send_socket->address_str.s:"none", + lreq.msg_flags); /* rebuild local Via - remove previous value * and add the one for the new send socket */ @@ -335,9 +335,11 @@ static inline int t_run_local_req( lreq.add_to_branch_len = lreq.via1->branch->value.len; /* update also info about new destination and send sock */ - uac_r->dialog->send_sock=lreq.force_send_socket; - request->dst.send_sock = lreq.force_send_socket; - request->dst.proto = lreq.force_send_socket->proto; + if(lreq.force_send_socket) { + uac_r->dialog->send_sock=lreq.force_send_socket; + request->dst.send_sock = lreq.force_send_socket; + request->dst.proto = lreq.force_send_socket->proto; + } LM_DBG("apply new updates with Via to sip msg\n"); buf1 = build_req_buf_from_sip_req(&lreq,

1 0

git:master:7de21e14: secsipid: check version of loaded module in child init callback
by Daniel-Constantin Mierla 16 Feb '21

16 Feb '21

Module: kamailio Branch: master Commit: 7de21e14662e560cda0a9426f2d3bb6cd1412686 URL: https://github.com/kamailio/kamailio/commit/7de21e14662e560cda0a9426f2d3bb6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-16T16:28:31+01:00 secsipid: check version of loaded module in child init callback --- Modified: src/modules/secsipid/secsipid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7de21e14662e560cda0a9426f2d3bb6… Patch: https://github.com/kamailio/kamailio/commit/7de21e14662e560cda0a9426f2d3bb6… --- diff --git a/src/modules/secsipid/secsipid_mod.c b/src/modules/secsipid/secsipid_mod.c index d5968fde30..c8b19ca6d3 100644 --- a/src/modules/secsipid/secsipid_mod.c +++ b/src/modules/secsipid/secsipid_mod.c @@ -134,6 +134,10 @@ static int child_init(int rank) /* launch register */ bind_f = (secsipid_proc_bind_f)dlsym(handle, "secsipid_proc_bind"); if (((errstr=(char*)dlerror())==NULL) && bind_f!=NULL) { + /* version control */ + if (!ksr_version_control(handle, modpath)) { + goto error; + } /* no error - call it */ if(bind_f(&_secsipid_papi)<0) { LM_ERR("filed to bind the api of proc module: %s\n", modpath);

1 0

git:master:92e72ab4: core: exposed module version control function
by Daniel-Constantin Mierla 16 Feb '21

16 Feb '21

Module: kamailio Branch: master Commit: 92e72ab4de7e7a9d1dee57e9bac61cf513367a42 URL: https://github.com/kamailio/kamailio/commit/92e72ab4de7e7a9d1dee57e9bac61cf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-02-16T16:22:45+01:00 core: exposed module version control function --- Modified: src/core/sr_module.c Modified: src/core/sr_module.h --- Diff: https://github.com/kamailio/kamailio/commit/92e72ab4de7e7a9d1dee57e9bac61cf… Patch: https://github.com/kamailio/kamailio/commit/92e72ab4de7e7a9d1dee57e9bac61cf… --- diff --git a/src/core/sr_module.c b/src/core/sr_module.c index c37e1ab680..03f8feef81 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -335,7 +335,10 @@ static int register_module(module_exports_t* e, char* path, void* handle) return ret; } -static inline int version_control(void *handle, char *path) +/** + * check the version of loaded module + */ +int ksr_version_control(void *handle, char *path) { char **m_ver; char **m_flags; @@ -572,7 +575,7 @@ int load_module(char* mod_path) } } /* version control */ - if (!version_control(handle, path)) { + if (!ksr_version_control(handle, path)) { ksr_exit(-1); } /* launch register */ diff --git a/src/core/sr_module.h b/src/core/sr_module.h index 8de9026c2a..99c1dc1de1 100644 --- a/src/core/sr_module.h +++ b/src/core/sr_module.h @@ -551,4 +551,6 @@ int ksr_shutdown_phase(void); int ksr_locate_module(char *mod_path, char **new_path); +int ksr_version_control(void *handle, char *path); + #endif /* sr_module_h */

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
25
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2021