sr-dev November 2021

sr-dev@lists.kamailio.org

20 participants
310 discussions

git:5.5:e87193a2: rtpengine: update dependencies

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: e87193a20ed4c0419aa13762257b1d8ff355e0dc URL: https://github.com/kamailio/kamailio/commit/e87193a20ed4c0419aa13762257b1d8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T08:45:16+01:00 rtpengine: update dependencies lwsc module is needed if wsapi parameter is set https://lists.kamailio.org/pipermail/sr-users/2021-October/113494.html (cherry picked from commit a602c26fe3c83a0f1b825927be145459a08730e2) --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e87193a20ed4c0419aa13762257b1d8… Patch: https://github.com/kamailio/kamailio/commit/e87193a20ed4c0419aa13762257b1d8… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index 9e8dee5d80..11431f57fc 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -120,6 +120,10 @@ <emphasis>tm module</emphasis> - (optional) if you want to have rtpengine_manage() fully functional </para> + <para> + <emphasis>lwsc module</emphasis> - (optional) if you plan to use + <quote>wsapi</quote> parameter + </para> </listitem> </itemizedlist> </para>

3 years

git:5.5:3e82cdbf: core: hashes - cast to unsigned int for left shifting

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 3e82cdbf2311deedb0a3cb528047b54e11d54808 URL: https://github.com/kamailio/kamailio/commit/3e82cdbf2311deedb0a3cb528047b54… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T08:44:26+01:00 core: hashes - cast to unsigned int for left shifting (cherry picked from commit f7f9ea0f3cfb8e61a4f2f47a214cb4e89d713da4) --- Modified: src/core/hashes.h --- Diff: https://github.com/kamailio/kamailio/commit/3e82cdbf2311deedb0a3cb528047b54… Patch: https://github.com/kamailio/kamailio/commit/3e82cdbf2311deedb0a3cb528047b54… --- diff --git a/src/core/hashes.h b/src/core/hashes.h index 2afb8361c8..62708bdb35 100644 --- a/src/core/hashes.h +++ b/src/core/hashes.h @@ -273,7 +273,7 @@ static inline unsigned int core_hash(const str *s1, const str *s2, end=s1->s+s1->len; for ( p=s1->s ; p<=(end-4) ; p+=4 ){ - v=(*p<<24)+(p[1]<<16)+(p[2]<<8)+p[3]; + v=((unsigned int)p[0]<<24)+(p[1]<<16)+(p[2]<<8)+p[3]; ch_h_inc; } v=0; @@ -283,11 +283,11 @@ static inline unsigned int core_hash(const str *s1, const str *s2, if (s2) { end=s2->s+s2->len; for (p=s2->s; p<=(end-4); p+=4){ - v=(*p<<24)+(p[1]<<16)+(p[2]<<8)+p[3]; + v=((unsigned int)p[0]<<24)+(p[1]<<16)+(p[2]<<8)+p[3]; ch_h_inc; } v=0; - for (; p<end ; p++){ v<<=8; v+=*p;} + for (; p<end ; p++){ v<<=8; v+=p[0];} ch_h_inc; } h=((h)+(h>>11))+((h>>13)+(h>>23));

3 years

git:5.5:f4ebe527: msrp: fix some tcpconn where memory was never cleaned up

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: f4ebe527c25ecedb3caffa8a361b5c42a2dd6b88 URL: https://github.com/kamailio/kamailio/commit/f4ebe527c25ecedb3caffa8a361b5c4… Author: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T08:43:59+01:00 msrp: fix some tcpconn where memory was never cleaned up Thanks to Jason Shugart at INdigital. Fix consist of caring of removing references to previously retrieved tcp connections. GH #2880 (cherry picked from commit bf371ccbfa1c89fefcd9d9322ae75189d97fc862) --- Modified: src/modules/msrp/msrp_netio.c --- Diff: https://github.com/kamailio/kamailio/commit/f4ebe527c25ecedb3caffa8a361b5c4… Patch: https://github.com/kamailio/kamailio/commit/f4ebe527c25ecedb3caffa8a361b5c4… --- diff --git a/src/modules/msrp/msrp_netio.c b/src/modules/msrp/msrp_netio.c index 92f7cf525b..859432aa6d 100644 --- a/src/modules/msrp/msrp_netio.c +++ b/src/modules/msrp/msrp_netio.c @@ -74,6 +74,7 @@ int msrp_relay(msrp_frame_t *mf) char *l; int port; sr_event_param_t evp = {0}; + int ret; if(mf->buf.len>=MSRP_MAX_FRAME_SIZE-1) return -1; @@ -169,12 +170,17 @@ int msrp_relay(msrp_frame_t *mf) wsev.len = p - reqbuf; wsev.id = con->id; evp.data = (void *)&wsev; - return sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + ret = sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + tcpconn_put(con); + return ret; } else if (tcp_send(dst, 0, reqbuf, p - reqbuf) < 0) { LM_ERR("forwarding frame failed\n"); + tcpconn_put(con); return -1; } + + tcpconn_put(con); } else if (tcp_send(dst, 0, reqbuf, p - reqbuf) < 0) { LM_ERR("forwarding frame failed\n"); @@ -195,6 +201,7 @@ int msrp_reply(msrp_frame_t *mf, str *code, str *text, str *xhdrs) char *p; char *l; sr_event_param_t evp = {0}; + int ret; /* no reply for a reply */ if(mf->fline.msgtypeid==MSRP_REPLY) @@ -301,7 +308,9 @@ int msrp_reply(msrp_frame_t *mf, str *code, str *text, str *xhdrs) wsev.len = p - rplbuf; wsev.id = con->id; evp.data = (void *)&wsev; - return sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + ret = sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + tcpconn_put(con); + return ret; } else if (tcp_send(&env->srcinfo, 0, rplbuf, p - rplbuf) < 0) {

3 years

git:5.5:c4821bda: core: unsigned literal for 1 used in left shifting for script callbacks

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: c4821bdaa44198dce153c1764b298c8c00652463 URL: https://github.com/kamailio/kamailio/commit/c4821bdaa44198dce153c1764b298c8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T08:43:09+01:00 core: unsigned literal for 1 used in left shifting for script callbacks - GH #2897 (cherry picked from commit 6348de19626f691036fd94134be6f64fff4418ed) --- Modified: src/core/script_cb.c Modified: src/core/script_cb.h --- Diff: https://github.com/kamailio/kamailio/commit/c4821bdaa44198dce153c1764b298c8… Patch: https://github.com/kamailio/kamailio/commit/c4821bdaa44198dce153c1764b298c8… --- 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

3 years

git:5.5:a2043123: ctl: removed unused function safe_write()

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: a204312372bd09dcfb276e960892e14fbe2eceeb URL: https://github.com/kamailio/kamailio/commit/a204312372bd09dcfb276e960892e14… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T08:42:26+01:00 ctl: removed unused function safe_write() (cherry picked from commit cc0cbad3660423f679fed62c42fcffb4a402081f) --- Modified: src/modules/ctl/fifo_server.c --- Diff: https://github.com/kamailio/kamailio/commit/a204312372bd09dcfb276e960892e14… Patch: https://github.com/kamailio/kamailio/commit/a204312372bd09dcfb276e960892e14… --- 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;

3 years

git:5.5:04591e08: avpops: removed unused function get_source_uri()

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 04591e08a4d74a9f57972b1552f941b86cbb6e55 URL: https://github.com/kamailio/kamailio/commit/04591e08a4d74a9f57972b1552f941b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T08:41:53+01:00 avpops: removed unused function get_source_uri() (cherry picked from commit c9b885ff791bd71fcbf40824369fc9369dcc6e48) --- Modified: src/modules/avpops/avpops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/04591e08a4d74a9f57972b1552f941b… Patch: https://github.com/kamailio/kamailio/commit/04591e08a4d74a9f57972b1552f941b… --- 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)

3 years

git:5.5:058ed2e1: tls: print src/dst port in error message

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 058ed2e1e4fdaf4ff99cd6db5a96793d6b420483 URL: https://github.com/kamailio/kamailio/commit/058ed2e1e4fdaf4ff99cd6db5a96793… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T08:40:47+01:00 tls: print src/dst port in error message - related to GH #2872 (cherry picked from commit daedf1201c2776ccc1040e03f8f63d256e75a43a) --- Modified: src/modules/tls/tls_server.c --- Diff: https://github.com/kamailio/kamailio/commit/058ed2e1e4fdaf4ff99cd6db5a96793… Patch: https://github.com/kamailio/kamailio/commit/058ed2e1e4fdaf4ff99cd6db5a96793… --- diff --git a/src/modules/tls/tls_server.c b/src/modules/tls/tls_server.c index 2af43b9eb9..f75b111168 100644 --- a/src/modules/tls/tls_server.c +++ b/src/modules/tls/tls_server.c @@ -1330,10 +1330,10 @@ int tls_h_read_f(struct tcp_connection* c, rd_conn_flags_t* flags) TLS_ERR(err_src); memset(ip_buf, 0, sizeof(ip_buf)); ip_addr2sbuf(&(c->rcv.src_ip), ip_buf, sizeof(ip_buf)); - ERR("source IP: %s\n", ip_buf); + ERR("src addr: %s:%d\n", ip_buf, c->rcv.src_port); memset(ip_buf, 0, sizeof(ip_buf)); ip_addr2sbuf(&(c->rcv.dst_ip), ip_buf, sizeof(ip_buf)); - ERR("destination IP: %s\n", ip_buf); + ERR("dst addr: %s:%d\n", ip_buf, c->rcv.dst_port); goto error; #if OPENSSL_VERSION_NUMBER >= 0x00907000L /*0.9.7*/

3 years

git:5.5:8df8974b: sipdump: docs - fix example config snippet

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 8df8974bb0f9754b126cac75eed76360e12d8a22 URL: https://github.com/kamailio/kamailio/commit/8df8974bb0f9754b126cac75eed7636… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T08:40:09+01:00 sipdump: docs - fix example config snippet (cherry picked from commit f202cfe647c6a1ac92a3c2b8e2ee056d678fb802) --- Modified: src/modules/sipdump/doc/sipdump_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8df8974bb0f9754b126cac75eed7636… Patch: https://github.com/kamailio/kamailio/commit/8df8974bb0f9754b126cac75eed7636… --- diff --git a/src/modules/sipdump/doc/sipdump_admin.xml b/src/modules/sipdump/doc/sipdump_admin.xml index 7e642f6010..e728ebf3b0 100644 --- a/src/modules/sipdump/doc/sipdump_admin.xml +++ b/src/modules/sipdump/doc/sipdump_admin.xml @@ -318,8 +318,8 @@ event_route[sipdump:msg] { </para> <programlisting format="linespecific"> ... -loadmodule "rtimer.so -loadmodule "exec.so +loadmodule "rtimer.so" +loadmodule "exec.so" ... modparam("rtimer", "timer", "name=tjobs;interval=300;mode=1;") modparam("rtimer", "exec", "timer=tjobs;route=TCLEAN")

3 years

git:5.5:992c5a34: core: parse main headers after updating msg buffer

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 992c5a349454e40c87c8918283ffde7302da9d8e URL: https://github.com/kamailio/kamailio/commit/992c5a349454e40c87c8918283ffde7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T08:39:39+01:00 core: parse main headers after updating msg buffer - same group of headers as for the case of receiving the message - applies for msg_apply_changes() as well - related to GH #2877 (cherry picked from commit d5c1b4693b6e47b4123b5f9417b5fd88d4dafd1f) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/992c5a349454e40c87c8918283ffde7… Patch: https://github.com/kamailio/kamailio/commit/992c5a349454e40c87c8918283ffde7… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 9fd5635655..bc1b9736df 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -3328,7 +3328,13 @@ int sip_msg_update_buffer(sip_msg_t *msg, str *obuf) * valid/safe for config */ return 0; } - + if(parse_headers(msg, HDR_FROM_F|HDR_TO_F|HDR_CALLID_F|HDR_CSEQ_F, 0) < 0) { + LM_ERR("parsing main headers of new sip message failed [[%.*s]]\n", + msg->len, msg->buf); + /* exit config execution - sip_msg_t structure is no longer + * valid/safe for config */ + return 0; + } return 1; }

3 years

[kamailio/kamailio] ims_usrloc_pcscf: new callbacks and some fixes (#2882)

by Erhan Onur Sendag

### Description  Other modules use ims_usrloc_pcscf's callback calls for following operations: #define PCSCF_CONTACT_INSERT (1<<0) #define PCSCF_CONTACT_UPDATE (1<<1) #define PCSCF_CONTACT_DELETE (1<<2) #define PCSCF_CONTACT_EXPIRE (1<<3) ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- 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/2882

3 years

← Newer
1
...
24
25
26
27
28
29
30
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2021