sr-dev October 2021

sr-dev@lists.kamailio.org

19 participants
243 discussions

git:master:6348de19: core: unsigned literal for 1 used in left shifting for script callbacks

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6348de19626f691036fd94134be6f64fff4418ed URL: https://github.com/kamailio/kamailio/commit/6348de19626f691036fd94134be6f64… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-25T15:11:29+02:00 core: unsigned literal for 1 used in left shifting for script callbacks - GH #2897 --- Modified: src/core/script_cb.c Modified: src/core/script_cb.h --- Diff: https://github.com/kamailio/kamailio/commit/6348de19626f691036fd94134be6f64… Patch: https://github.com/kamailio/kamailio/commit/6348de19626f691036fd94134be6f64… --- diff --git a/src/core/script_cb.c b/src/core/script_cb.c index 2f83608e66..266037674a 100644 --- a/src/core/script_cb.c +++ b/src/core/script_cb.c @@ -78,11 +78,11 @@ int register_script_cb( cb_function f, unsigned int flags, void *param ) int i; /* type checkings */ - if ( (flags&((1<<SCRIPT_CB_NUM)-1))==0 ) { + if ( (flags&((1u<<SCRIPT_CB_NUM)-1))==0 ) { LM_BUG("callback flag not specified\n"); return -1; } - if ( (flags&(~(PRE_SCRIPT_CB|POST_SCRIPT_CB))) >= 1<<SCRIPT_CB_NUM ) { + if ( (flags&(~(PRE_SCRIPT_CB|POST_SCRIPT_CB))) >= 1u<<SCRIPT_CB_NUM ) { LM_BUG("unsupported callback flags: %u\n", flags); return -1; @@ -102,7 +102,7 @@ int register_script_cb( cb_function f, unsigned int flags, void *param ) * (as many times as many flags are set) */ for (i=0; i<SCRIPT_CB_NUM; i++) { - if ((flags&(1<<i)) == 0) + if ((flags&(1u<<i)) == 0) continue; if (add_callback(&cb_array[i], f, param) < 0) goto add_error; @@ -155,7 +155,7 @@ int exec_pre_script_cb( struct sip_msg *msg, enum script_cb_type type) return 0; } - flags = PRE_SCRIPT_CB | (1<<(type-1)); + flags = PRE_SCRIPT_CB | (1u<<(type-1)); for (cb=pre_script_cb[type-1]; cb ; cb=cb->next ) { /* stop on error */ if (cb->cbf(msg, flags, cb->param)==0) @@ -177,7 +177,7 @@ int exec_post_script_cb( struct sip_msg *msg, enum script_cb_type type) return 1; } - flags = POST_SCRIPT_CB | (1<<(type-1)); + flags = POST_SCRIPT_CB | (1u<<(type-1)); for (cb=post_script_cb[type-1]; cb ; cb=cb->next){ cb->cbf(msg, flags, cb->param); } diff --git a/src/core/script_cb.h b/src/core/script_cb.h index ece69b8e41..650bf053fa 100644 --- a/src/core/script_cb.h +++ b/src/core/script_cb.h @@ -33,8 +33,8 @@ typedef int (cb_function)(struct sip_msg *msg, unsigned int flags, void *param); -#define PRE_SCRIPT_CB (1<<30) -#define POST_SCRIPT_CB (1<<31) +#define PRE_SCRIPT_CB (1u<<30) +#define POST_SCRIPT_CB (1u<<31) /* Pre- and post-script callback flags. Use these flags to register * for the callbacks, and to check the type of the callback from the

2 years, 6 months

git:5.5:158f794d: uac: fixing REGISTER to use custom socket after 401/407

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 158f794d07890f0f237683ece880dd123be7dbbf URL: https://github.com/kamailio/kamailio/commit/158f794d07890f0f237683ece880dd1… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-25T14:49:36+02:00 uac: fixing REGISTER to use custom socket after 401/407 - After receiving 401/407 uac does not use configured custom socket, second register send from first available address. (cherry picked from commit ea4d7fee43269ed50a55c444a0efdcc0dd64a95c) --- Modified: src/modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/158f794d07890f0f237683ece880dd1… Patch: https://github.com/kamailio/kamailio/commit/158f794d07890f0f237683ece880dd1… --- diff --git a/src/modules/uac/uac_reg.c b/src/modules/uac/uac_reg.c index c36ee8ac822..f96f1ca0614 100644 --- a/src/modules/uac/uac_reg.c +++ b/src/modules/uac/uac_reg.c @@ -1011,6 +1011,20 @@ void uac_reg_tm_callback( struct cell *t, int type, struct tmcb_params *ps) uac_r.cb = uac_reg_tm_callback; /* Callback parameter */ uac_r.cbp = (void*)uuid; + + if(ri->socket.s != NULL && ri->socket.len > 0) { + /* custom socket */ + LM_DBG("using custom socket %.*s to send request\n", + ri->socket.len, ri->socket.s); + uac_r.ssock = &ri->socket; + } else { + /* default socket */ + if(uac_default_socket.s != NULL && uac_default_socket.len > 0) { + LM_DBG("using configured default_socket to send request\n"); + uac_r.ssock = &uac_default_socket; + } + } + ret = uac_tmb.t_request_within(&uac_r); if(ret<0) {

2 years, 6 months

git:master:cc0cbad3: ctl: removed unused function safe_write()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cc0cbad3660423f679fed62c42fcffb4a402081f URL: https://github.com/kamailio/kamailio/commit/cc0cbad3660423f679fed62c42fcffb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-25T14:45:28+02:00 ctl: removed unused function safe_write() --- Modified: src/modules/ctl/fifo_server.c --- Diff: https://github.com/kamailio/kamailio/commit/cc0cbad3660423f679fed62c42fcffb… Patch: https://github.com/kamailio/kamailio/commit/cc0cbad3660423f679fed62c42fcffb… --- diff --git a/src/modules/ctl/fifo_server.c b/src/modules/ctl/fifo_server.c index b40b079a1d..50507dd03b 100644 --- a/src/modules/ctl/fifo_server.c +++ b/src/modules/ctl/fifo_server.c @@ -947,29 +947,6 @@ static void rpc_fault(rpc_ctx_t* ctx, int code, char* fmt, ...) } -static inline int safe_write(FILE* f, char* fmt, ...) -{ - va_list ap; - - if (!*fmt) return 0; - va_start(ap, fmt); - - retry: - /* First line containing code and reason phrase */ - if (vfprintf(f, fmt, ap) <= 0) { - ERR("fifo write error: %s\n", strerror(errno)); - if ((errno == EINTR) || (errno == EAGAIN) || (errno == EWOULDBLOCK)) { - goto retry; - } - va_end(ap); - return -1; - } - va_end(ap); - return 0; -} - - - inline static int build_iovec(rpc_ctx_t* ctx, struct iovec* v, int v_size) { struct text_chunk* p;

2 years, 6 months

git:master:c9b885ff: avpops: removed unused function get_source_uri()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c9b885ff791bd71fcbf40824369fc9369dcc6e48 URL: https://github.com/kamailio/kamailio/commit/c9b885ff791bd71fcbf40824369fc93… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-25T14:43:17+02:00 avpops: removed unused function get_source_uri() --- Modified: src/modules/avpops/avpops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/c9b885ff791bd71fcbf40824369fc93… Patch: https://github.com/kamailio/kamailio/commit/c9b885ff791bd71fcbf40824369fc93… --- diff --git a/src/modules/avpops/avpops_impl.c b/src/modules/avpops/avpops_impl.c index c760becb43..8a6e4c2b2d 100644 --- a/src/modules/avpops/avpops_impl.c +++ b/src/modules/avpops/avpops_impl.c @@ -214,38 +214,6 @@ static int dbrow2avp(struct db_row *row, struct db_param *dbp, int_str attr, return add_avp( (unsigned short)db_flags, avp_attr, avp_val); } - -inline static str* get_source_uri(struct sip_msg* msg,int source) -{ - /* which uri will be used? */ - if (source&AVPOPS_USE_FROM) - { /* from */ - if (parse_from_header( msg )<0 ) - { - LM_ERR("failed to parse from\n"); - goto error; - } - return &(get_from(msg)->uri); - } else if (source&AVPOPS_USE_TO) - { /* to */ - if (parse_headers( msg, HDR_TO_F, 0)<0) - { - LM_ERR("failed to parse to\n"); - goto error; - } - return &(get_to(msg)->uri); - } else if (source&AVPOPS_USE_RURI) { /* RURI */ - if(msg->new_uri.s!=NULL && msg->new_uri.len>0) - return &(msg->new_uri); - return &(msg->first_line.u.request.uri); - } else { - LM_ERR("unknown source <%d>\n", source); - goto error; - } -error: - return 0; -} - static inline void int_str2db_val( int_str is_val, str *val, int is_s) { if (is_s)

2 years, 6 months

[kamailio/kamailio] i want write smpp server module (Issue #2899)

by tarikogut

hello i want write smpp module do you have any documentation ?* -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2899

2 years, 6 months

[kamailio/kamailio] uac: fixing REGISTER to use custom socket after 401/407 (PR #2902)

by Dennis

- After receiving 401/407 uac does not use configured custom socket, second register send from first available address.   #### Pre-Submission Checklist    - [x] 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) - [ ] 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) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description uac module does not use configured custom socket when send second REGISTER after receiving 401/407, so packet send via first suitable socket in config with wrong source address, some carriers drops this packets because they have configured ACLs. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2902 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2902/commits/ea4d7fee43269ed50a55…">uac: fixing REGISTER to use custom socket after 401/407</a> -- File Changes -- M src/modules/uac/uac_reg.c (14) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2902.patch https://github.com/kamailio/kamailio/pull/2902.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2902

2 years, 6 months

git:master:306489e8: Merge pull request #2902 from Den4t/master

by GitHub

Module: kamailio Branch: master Commit: 306489e82ae37ab3788808745a465ef438fb929f URL: https://github.com/kamailio/kamailio/commit/306489e82ae37ab3788808745a465ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-10-25T14:31:24+02:00 Merge pull request #2902 from Den4t/master uac: fixing REGISTER to use custom socket after 401/407 --- Modified: src/modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/306489e82ae37ab3788808745a465ef… Patch: https://github.com/kamailio/kamailio/commit/306489e82ae37ab3788808745a465ef… --- diff --git a/src/modules/uac/uac_reg.c b/src/modules/uac/uac_reg.c index 1ea1b62135..85fe266c92 100644 --- a/src/modules/uac/uac_reg.c +++ b/src/modules/uac/uac_reg.c @@ -1011,6 +1011,20 @@ void uac_reg_tm_callback( struct cell *t, int type, struct tmcb_params *ps) uac_r.cb = uac_reg_tm_callback; /* Callback parameter */ uac_r.cbp = (void*)uuid; + + if(ri->socket.s != NULL && ri->socket.len > 0) { + /* custom socket */ + LM_DBG("using custom socket %.*s to send request\n", + ri->socket.len, ri->socket.s); + uac_r.ssock = &ri->socket; + } else { + /* default socket */ + if(uac_default_socket.s != NULL && uac_default_socket.len > 0) { + LM_DBG("using configured default_socket to send request\n"); + uac_r.ssock = &uac_default_socket; + } + } + ret = uac_tmb.t_request_within(&uac_r); if(ret<0) {

2 years, 6 months

git:master:ea4d7fee: uac: fixing REGISTER to use custom socket after 401/407

by Dennis Yurasov

Module: kamailio Branch: master Commit: ea4d7fee43269ed50a55c444a0efdcc0dd64a95c URL: https://github.com/kamailio/kamailio/commit/ea4d7fee43269ed50a55c444a0efdcc… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Committer: Dennis Yurasov <dennis-y(a)yandex-team.ru> Date: 2021-10-25T13:34:14+03:00 uac: fixing REGISTER to use custom socket after 401/407 - After receiving 401/407 uac does not use configured custom socket, second register send from first available address. --- Modified: src/modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/ea4d7fee43269ed50a55c444a0efdcc… Patch: https://github.com/kamailio/kamailio/commit/ea4d7fee43269ed50a55c444a0efdcc… --- diff --git a/src/modules/uac/uac_reg.c b/src/modules/uac/uac_reg.c index 1ea1b62135..85fe266c92 100644 --- a/src/modules/uac/uac_reg.c +++ b/src/modules/uac/uac_reg.c @@ -1011,6 +1011,20 @@ void uac_reg_tm_callback( struct cell *t, int type, struct tmcb_params *ps) uac_r.cb = uac_reg_tm_callback; /* Callback parameter */ uac_r.cbp = (void*)uuid; + + if(ri->socket.s != NULL && ri->socket.len > 0) { + /* custom socket */ + LM_DBG("using custom socket %.*s to send request\n", + ri->socket.len, ri->socket.s); + uac_r.ssock = &ri->socket; + } else { + /* default socket */ + if(uac_default_socket.s != NULL && uac_default_socket.len > 0) { + LM_DBG("using configured default_socket to send request\n"); + uac_r.ssock = &uac_default_socket; + } + } + ret = uac_tmb.t_request_within(&uac_r); if(ret<0) {

2 years, 6 months

[kamailio/kamailio] presence: fix build (PR #2901)

by Stefan Mititelu

#### 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 - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Fix build for 5.3 branch, presence module. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2901 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2901/commits/420173265bbcd484deeb…">presence: fix build</a> -- File Changes -- M src/modules/presence/presence_dmq.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2901.patch https://github.com/kamailio/kamailio/pull/2901.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2901

2 years, 6 months

git:5.3:eee27448: Merge pull request #2901 from smititelu/5.3

by GitHub

Module: kamailio Branch: 5.3 Commit: eee27448e603d554b1486376909947995c94d207 URL: https://github.com/kamailio/kamailio/commit/eee27448e603d554b14863769099479… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-10-25T09:11:46+02:00 Merge pull request #2901 from smititelu/5.3 presence: fix build --- Modified: src/modules/presence/presence_dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/eee27448e603d554b14863769099479… Patch: https://github.com/kamailio/kamailio/commit/eee27448e603d554b14863769099479… --- diff --git a/src/modules/presence/presence_dmq.c b/src/modules/presence/presence_dmq.c index 8dd7c99fe8..a9ed2f2f4e 100644 --- a/src/modules/presence/presence_dmq.c +++ b/src/modules/presence/presence_dmq.c @@ -102,7 +102,7 @@ static int pres_dmq_init_proc() } } - if(publ_cache_mode==PS_PCACHE_RECORD && pres_subs_dbmode==NO_DB) { + if(publ_cache_enabled && subs_dbmode==NO_DB) { goto finish; }

2 years, 6 months

← Newer
1
...
13
14
15
16
17
18
19
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2021