sr-dev April 2021

sr-dev@lists.kamailio.org

14 participants
302 discussions

git:master:563c6f69: core: cfg.lex - free after log message

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 563c6f69aef22a90fc7870398fcfbd4242e33779 URL: https://github.com/kamailio/kamailio/commit/563c6f69aef22a90fc7870398fcfbd4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-08T09:36:02+02:00 core: cfg.lex - free after log message --- Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/563c6f69aef22a90fc7870398fcfbd4… Patch: https://github.com/kamailio/kamailio/commit/563c6f69aef22a90fc7870398fcfbd4… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index d36fc72b54..2b90fbb66a 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -1802,13 +1802,14 @@ static int sr_push_yy_state(char *fin, int mode) fp = fopen(newf, "r" ); if ( fp==NULL ) { - pkg_free(newf); if(mode==0) { LM_CRIT("cannot open included file: %s (%s)\n", fbuf, newf); + pkg_free(newf); return -1; } else { LM_DBG("importing file ignored: %s (%s)\n", fbuf, newf); + pkg_free(newf); return 0; } }

3 years

git:master:7ef0a272: core: check for non empty receive address and port in msg translator

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7ef0a272dc9c81afa05ef8b1591e9f05c2810e9a URL: https://github.com/kamailio/kamailio/commit/7ef0a272dc9c81afa05ef8b1591e9f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-07T11:33:24+02:00 core: check for non empty receive address and port in msg translator --- Modified: src/core/msg_translator.c Modified: src/core/str.h --- Diff: https://github.com/kamailio/kamailio/commit/7ef0a272dc9c81afa05ef8b1591e9f0… Patch: https://github.com/kamailio/kamailio/commit/7ef0a272dc9c81afa05ef8b1591e9f0… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 4622b264d5..a2f6505e83 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -597,7 +597,7 @@ static inline int lumps_len(struct sip_msg* msg, struct lump* lumps, #define SUBST_LUMP_LEN(subst_l) \ switch((subst_l)->u.subst){ \ case SUBST_RCV_IP: \ - if (msg->rcv.bind_address){ \ + if (msg->rcv.bind_address && STR_WITHVAL(recv_address_str)){ \ new_len+=recv_address_str->len; \ if (msg->rcv.bind_address->address.af!=AF_INET) \ new_len+=2; \ @@ -607,7 +607,7 @@ static inline int lumps_len(struct sip_msg* msg, struct lump* lumps, }; \ break; \ case SUBST_RCV_PORT: \ - if (msg->rcv.bind_address){ \ + if (msg->rcv.bind_address && STR_WITHVAL(recv_port_str)){ \ new_len+=recv_port_str->len; \ }else{ \ /* FIXME */ \ @@ -646,14 +646,14 @@ static inline int lumps_len(struct sip_msg* msg, struct lump* lumps, break; \ case SUBST_RCV_ALL: \ case SUBST_RCV_ALL_EX: \ - if (msg->rcv.bind_address){ \ + if (msg->rcv.bind_address && STR_WITHVAL(recv_address_str)){ \ new_len+=recv_address_str->len; \ if ((msg->rcv.bind_address->address.af==AF_INET6)\ && (recv_address_str->s[0]!='[')\ && (memchr(recv_address_str->s, ':',\ recv_address_str->len)!=NULL))\ new_len+=2; \ - if (recv_port_no!=SIP_PORT){ \ + if (recv_port_no!=SIP_PORT && STR_WITHVAL(recv_port_str)){ \ /* add :port_no */ \ new_len+=1+recv_port_str->len; \ }\ @@ -990,7 +990,7 @@ void process_lumps( struct sip_msg* msg, #define SUBST_LUMP(subst_l) \ switch((subst_l)->u.subst){ \ case SUBST_RCV_IP: \ - if (msg->rcv.bind_address){ \ + if (msg->rcv.bind_address && STR_WITHVAL(recv_address_str)){ \ if (msg->rcv.bind_address->address.af!=AF_INET){\ new_buf[offset]='['; offset++; \ }\ @@ -1006,7 +1006,7 @@ void process_lumps( struct sip_msg* msg, }; \ break; \ case SUBST_RCV_PORT: \ - if (msg->rcv.bind_address){ \ + if (msg->rcv.bind_address && STR_WITHVAL(recv_port_str)){ \ memcpy(new_buf+offset, recv_port_str->s, \ recv_port_str->len); \ offset+=recv_port_str->len; \ @@ -1017,7 +1017,7 @@ void process_lumps( struct sip_msg* msg, break; \ case SUBST_RCV_ALL: \ case SUBST_RCV_ALL_EX: \ - if (msg->rcv.bind_address){ \ + if (msg->rcv.bind_address && STR_WITHVAL(recv_address_str)){ \ /* address */ \ if ((msg->rcv.bind_address->address.af==AF_INET6)\ && (recv_address_str->s[0]!='[')\ @@ -1035,7 +1035,7 @@ void process_lumps( struct sip_msg* msg, new_buf[offset]=']'; offset++; \ }\ /* :port */ \ - if (recv_port_no!=SIP_PORT){ \ + if (recv_port_no!=SIP_PORT && STR_WITHVAL(recv_port_str)){ \ new_buf[offset]=':'; offset++; \ memcpy(new_buf+offset, \ recv_port_str->s, \ diff --git a/src/core/str.h b/src/core/str.h index 58d7d627f6..d7977652d9 100644 --- a/src/core/str.h +++ b/src/core/str.h @@ -142,6 +142,11 @@ typedef struct _str str; } \ } while(0) +/** + * str with value: not null and not emptu + */ +#define STR_WITHVAL(_sp) ((_sp) && ((_sp)->s) && ((_sp)->len)) + /** @} */ /** Appends a sufffix

3 years

[kamailio/kamailio] volte：401 Unauthorized (#2703)

by King-Osmond

Hello! I have a problem about volte. > 4(4467) INFO: rr [rr_mod.c:515]: pv_get_route_uri_f(): No route header present. > 4(4467) NOTICE: <script>: PCSCF REGISTER: > Destination URI: <null> > Request URI: sip:ims.mnc007.mcc460.3gppnetwork.org > 4(4467) INFO: rr [rr_mod.c:515]: pv_get_route_uri_f(): No route header present. > 4(4467) NOTICE: <script>: Source IP and Port: (10.45.0.6:5060) > Route-URI: > 4(4467) NOTICE: <script>: Received IP and Port: (192.168.107.6:5060) > 4(4467) NOTICE: <script>: Contact header: <sip:460070000000001@10.45.0.6:5060>;+sip.instance="<urn:gsma:imei:86772304-493882-0>";+g.3gpp.accesstype="cellular2";audio;video;+g.3gpp.smsip;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-service.ims.icsi.mmtel" > 4(4467) INFO: ims_registrar_pcscf [sec_agree.c:296]: cscf_get_security_verify(): No sec ![1617780139(1)](https://user-images.githubusercontent.com/65008453/113834050-f41b2e80-97bc-11eb-8ebb-c669f2fee210.png) ![1617780742(1)](https://user-images.githubusercontent.com/65008453/113834075-fa110f80-97bc-11eb-951c-9a75283ff69a.png) urity-verify parameters found ![1617781355(1)](https://user-images.githubusercontent.com/65008453/113834098-04330e00-97bd-11eb-8dd3-3ff310df2e7c.png) [open5gs.tar.gz](https://github.com/kamailio/kamailio/files/6270079/open5gs.… Can you help me see where the problem is？ Thanks! Tips：About SQN, the SQN is the same at the beginning of the test (Open5GS, FOHSS), but when it is found that the sip registration fails, the SQN is inconsistent. If this situation is normal? If it is not normal, how to solve it? open5gs：v2.2.3 kamailio：5.3 -- 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/2703

3 years

git:master:e8583372: app_sqlang: init timeval structures

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e8583372cb1078a29bb6526c11f838e30811b94a URL: https://github.com/kamailio/kamailio/commit/e8583372cb1078a29bb6526c11f838e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-07T10:29:25+02:00 app_sqlang: init timeval structures --- Modified: src/modules/app_sqlang/app_sqlang_api.c --- Diff: https://github.com/kamailio/kamailio/commit/e8583372cb1078a29bb6526c11f838e… Patch: https://github.com/kamailio/kamailio/commit/e8583372cb1078a29bb6526c11f838e… --- diff --git a/src/modules/app_sqlang/app_sqlang_api.c b/src/modules/app_sqlang/app_sqlang_api.c index 192e059e2e..7bff2a87d3 100644 --- a/src/modules/app_sqlang/app_sqlang_api.c +++ b/src/modules/app_sqlang/app_sqlang_api.c @@ -1548,7 +1548,7 @@ int sr_kemi_sqlang_exec_func(HSQUIRRELVM J, int eidx) { sr_kemi_t *ket; int ret; - struct timeval tvb, tve; + struct timeval tvb = {0}, tve = {0}; struct timezone tz; unsigned int tdiff;

3 years

git:master:50f92131: app_ruby: init timeval structures

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 50f92131ac0a9f5dd1e19fb6e3636657ad996e37 URL: https://github.com/kamailio/kamailio/commit/50f92131ac0a9f5dd1e19fb6e363665… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-07T10:29:24+02:00 app_ruby: init timeval structures --- Modified: src/modules/app_ruby/app_ruby_api.c --- Diff: https://github.com/kamailio/kamailio/commit/50f92131ac0a9f5dd1e19fb6e363665… Patch: https://github.com/kamailio/kamailio/commit/50f92131ac0a9f5dd1e19fb6e363665… --- diff --git a/src/modules/app_ruby/app_ruby_api.c b/src/modules/app_ruby/app_ruby_api.c index 41e6a3ec9e..116c4358ea 100644 --- a/src/modules/app_ruby/app_ruby_api.c +++ b/src/modules/app_ruby/app_ruby_api.c @@ -1421,7 +1421,7 @@ VALUE sr_kemi_ruby_exec_func(ksr_ruby_context_t *R, int eidx, int argc, { sr_kemi_t *ket; int ret; - struct timeval tvb, tve; + struct timeval tvb = {0}, tve = {0}; struct timezone tz; unsigned int tdiff;

3 years

git:master:7457b3ce: app_python3: init timeval structures

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7457b3cefd08595c054291398de0f9a4e62691b7 URL: https://github.com/kamailio/kamailio/commit/7457b3cefd08595c054291398de0f9a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-07T10:29:24+02:00 app_python3: init timeval structures --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/7457b3cefd08595c054291398de0f9a… Patch: https://github.com/kamailio/kamailio/commit/7457b3cefd08595c054291398de0f9a… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index 7af949de6e..f3463a781f 100644 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -1791,7 +1791,7 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) PyObject *ret = NULL; PyThreadState *pstate = NULL; PyFrameObject *pframe = NULL; - struct timeval tvb, tve; + struct timeval tvb = {0}, tve = {0}; struct timezone tz; unsigned int tdiff;

3 years

git:master:97991c9c: app_python: init timeval structures

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 97991c9cf56ca034df914ae499053e597582ef80 URL: https://github.com/kamailio/kamailio/commit/97991c9cf56ca034df914ae499053e5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-07T10:29:24+02:00 app_python: init timeval structures --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/97991c9cf56ca034df914ae499053e5… Patch: https://github.com/kamailio/kamailio/commit/97991c9cf56ca034df914ae499053e5… --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index 43a47d28ad..586926428a 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -1783,7 +1783,7 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) PyObject *ret = NULL; PyThreadState *pstate = NULL; PyFrameObject *pframe = NULL; - struct timeval tvb, tve; + struct timeval tvb = {0}, tve = {0}; struct timezone tz; unsigned int tdiff;

3 years

git:master:e1369a4c: app_lua: init timeval structures

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e1369a4cf0c668a0ee40d3b84b9c6382c2168e49 URL: https://github.com/kamailio/kamailio/commit/e1369a4cf0c668a0ee40d3b84b9c638… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-07T10:29:24+02:00 app_lua: init timeval structures --- Modified: src/modules/app_lua/app_lua_api.c --- Diff: https://github.com/kamailio/kamailio/commit/e1369a4cf0c668a0ee40d3b84b9c638… Patch: https://github.com/kamailio/kamailio/commit/e1369a4cf0c668a0ee40d3b84b9c638… --- diff --git a/src/modules/app_lua/app_lua_api.c b/src/modules/app_lua/app_lua_api.c index 3fa131ca3a..f736bea98b 100644 --- a/src/modules/app_lua/app_lua_api.c +++ b/src/modules/app_lua/app_lua_api.c @@ -1605,7 +1605,7 @@ int sr_kemi_lua_exec_func(lua_State* L, int eidx) { sr_kemi_t *ket; int ret; - struct timeval tvb, tve; + struct timeval tvb = {0}, tve = {0}; struct timezone tz; unsigned int tdiff; lua_Debug dinfo;

3 years

git:master:cad5cc37: app_jsdt: init timeval structures

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cad5cc37c63477fbcf429af34e516b523c74132e URL: https://github.com/kamailio/kamailio/commit/cad5cc37c63477fbcf429af34e516b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-07T10:29:24+02:00 app_jsdt: init timeval structures --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/cad5cc37c63477fbcf429af34e516b5… Patch: https://github.com/kamailio/kamailio/commit/cad5cc37c63477fbcf429af34e516b5… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index ff4e629075..c41d1d2217 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -1339,7 +1339,7 @@ int sr_kemi_jsdt_exec_func(duk_context *J, int eidx) { sr_kemi_t *ket; int ret; - struct timeval tvb, tve; + struct timeval tvb ={0}, tve = {0}; struct timezone tz; unsigned int tdiff; int sline = 0;

3 years

git:master:3bb1a30d: ctl: free send_buf in case of error

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3bb1a30dda3b40ba2f188a4baab94ebda41f4a74 URL: https://github.com/kamailio/kamailio/commit/3bb1a30dda3b40ba2f188a4baab94eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-07T10:08:56+02:00 ctl: free send_buf in case of error - disabled unused function --- Modified: src/modules/ctl/binrpc_run.c --- Diff: https://github.com/kamailio/kamailio/commit/3bb1a30dda3b40ba2f188a4baab94eb… Patch: https://github.com/kamailio/kamailio/commit/3bb1a30dda3b40ba2f188a4baab94eb… --- diff --git a/src/modules/ctl/binrpc_run.c b/src/modules/ctl/binrpc_run.c index 8c786a680a..5aed95c40f 100644 --- a/src/modules/ctl/binrpc_run.c +++ b/src/modules/ctl/binrpc_run.c @@ -223,7 +223,7 @@ static struct rpc_struct_l* grow_rpc_struct(struct rpc_struct_l *rs) #endif - +#if 0 /* appends buf to an already init. binrpc_pkt */ inline static int append_pkt_body(struct binrpc_pkt* p, unsigned char* buf, int len) @@ -247,7 +247,7 @@ inline static int append_pkt_body(struct binrpc_pkt* p, unsigned char* buf, error: return -1; /* buff. overflow */ } - +#endif inline static int append_iovec(struct iovec_array* a, unsigned char* buf, @@ -379,6 +379,9 @@ inline static int init_binrpc_ctx( struct binrpc_ctx* ctx, } /* we'll keep only the body */ err=binrpc_init_pkt(&ctx->out.pkt, send_buf, send_buf_len); + if(err!=0) { + ctl_free(send_buf); + } end: return err; }

3 years

← Newer
1
...
23
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 April 2021