sr-dev August 2019

sr-dev@lists.kamailio.org

17 participants
339 discussions

git:5.2:000e778c: topos_redis: fix regression in PRACK routing (commit cfc89db53c087, GH #1784)

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: 000e778cf8838989e316aa71f35f2e0e252c511d URL: https://github.com/kamailio/kamailio/commit/000e778cf8838989e316aa71f35f2e0… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-20T21:12:57+02:00 topos_redis: fix regression in PRACK routing (commit cfc89db53c087, GH #1784) - fix regression in PRACK routing (introduced in cfc89db53c, GH #1784) - result set were set to 0 before usage by a memset (cherry picked from commit a263f5b62c03851a5d8a61f09e69745f90370703) --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/000e778cf8838989e316aa71f35f2e0… Patch: https://github.com/kamailio/kamailio/commit/000e778cf8838989e316aa71f35f2e0… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index 47ddad0c1a..dd454935e1 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -727,6 +727,7 @@ int tps_redis_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, memset(argv, 0, TPS_REDIS_NR_KEYS * sizeof(char*)); memset(argvlen, 0, TPS_REDIS_NR_KEYS * sizeof(size_t)); argc = 0; + memset(&id, 0, sizeof(tps_data_t)); if(mode==0) { /* load same transaction using Via branch */ @@ -737,7 +738,6 @@ int tps_redis_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, LM_ERR("failed to load the INVITE branch value\n"); return -1; } - memset(&id, 0, sizeof(tps_data_t)); xvbranch1 = &id.x_vbranch1; } if(xvbranch1->len<=0 || xvbranch1->s==NULL) {

5 years, 3 months

git:5.1:9ebd82b6: topos_redis: fix regression in PRACK routing (commit cfc89db53c087, GH #1784)

by Henning Westerholt

Module: kamailio Branch: 5.1 Commit: 9ebd82b66c2967f38e94c58c4fd22d8c2be61479 URL: https://github.com/kamailio/kamailio/commit/9ebd82b66c2967f38e94c58c4fd22d8… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-20T21:13:02+02:00 topos_redis: fix regression in PRACK routing (commit cfc89db53c087, GH #1784) - fix regression in PRACK routing (introduced in cfc89db53c, GH #1784) - result set were set to 0 before usage by a memset (cherry picked from commit a263f5b62c03851a5d8a61f09e69745f90370703) --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/9ebd82b66c2967f38e94c58c4fd22d8… Patch: https://github.com/kamailio/kamailio/commit/9ebd82b66c2967f38e94c58c4fd22d8… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index 6d09029b48..377ef3db9d 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -727,6 +727,7 @@ int tps_redis_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, memset(argv, 0, TPS_REDIS_NR_KEYS * sizeof(char*)); memset(argvlen, 0, TPS_REDIS_NR_KEYS * sizeof(size_t)); argc = 0; + memset(&id, 0, sizeof(tps_data_t)); if(mode==0) { /* load same transaction using Via branch */ @@ -737,7 +738,6 @@ int tps_redis_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, LM_ERR("failed to load the INVITE branch value\n"); return -1; } - memset(&id, 0, sizeof(tps_data_t)); xvbranch1 = &id.x_vbranch1; } if(xvbranch1->len<=0 || xvbranch1->s==NULL) {

5 years, 3 months

git:master:dc437506: core: tcp - new global parameter tcp_connection_match

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: dc43750644f723494c6821e3298b3580cf49797a URL: https://github.com/kamailio/kamailio/commit/dc43750644f723494c6821e3298b358… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-20T13:48:48+02:00 core: tcp - new global parameter tcp_connection_match - control how the connection is matched - set it to 1 to force a more strict matching trying to lookup using local port as well, not only remote ip/port and local address - default 0 - exiting behaviour --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/forward.h Modified: src/core/globals.h Modified: src/core/tcp_conn.h Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/dc43750644f723494c6821e3298b358… Patch: https://github.com/kamailio/kamailio/commit/dc43750644f723494c6821e3298b358…

5 years, 3 months

[kamailio/kamailio] topoh: PKG memory leak (#2027)

by Whitey

### Description I've noticed PKG memory increasing since enabling the topoh module last week in a significant manner (~7MB per worker over 3000 calls split between 4 workers). Removing the topoh module removed the memory usage. Here is a pkg dump of one of the process post 3000 calls: https://paste.ubuntu.com/p/85KYg7gD2z/ ### Additional Information ```kamailio 5.3.0-dev4 (x86_64/linux) 6d43ea-dirty. ``` I'm unsure why it's tagged dirty, as I simply cloned master and reset to 6d43eacd6d5b78fe857267e70b7fa85519a7d5b6. I do plan to test this on dev7, however an unrelated issue is preventing me from testing this with my app_ruby based code. -- 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/2027

5 years, 3 months

git:master:8d608d1c: tm: set send socket flag when computing the destination and local socket is found

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8d608d1c3ed0fe4c69cb02868b746cd0497dd1f5 URL: https://github.com/kamailio/kamailio/commit/8d608d1c3ed0fe4c69cb02868b746cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-20T12:07:30+02:00 tm: set send socket flag when computing the destination and local socket is found --- Modified: src/modules/tm/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/8d608d1c3ed0fe4c69cb02868b746cd… Patch: https://github.com/kamailio/kamailio/commit/8d608d1c3ed0fe4c69cb02868b746cd… --- diff --git a/src/modules/tm/ut.h b/src/modules/tm/ut.h index 41e69c407f..98aaffa549 100644 --- a/src/modules/tm/ut.h +++ b/src/modules/tm/ut.h @@ -296,6 +296,7 @@ inline static struct dest_info *uri2dst2(struct dest_info* dst, dst->proto, 0); if (dst->send_sock){ dst->to=to; + dst->send_flags.f |= SND_F_FORCE_SOCKET; return dst; /* found a good one */ } }while(dns_srv_handle_next(dns_h, err)); @@ -317,6 +318,8 @@ inline static struct dest_info *uri2dst2(struct dest_info* dst, proto2a(dst->proto), su2a(&dst->to, sizeof(dst->to))); /* ser_error = E_NO_SOCKET;*/ /* try to continue */ + } else { + dst->send_flags.f |= SND_F_FORCE_SOCKET; } return dst; }

5 years, 3 months

git:5.2:0ded702c: evapi: use a completely new fake message structure for dispatcher handling

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: 0ded702ccbb746a26c7172bcbf80dd971ec8b530 URL: https://github.com/kamailio/kamailio/commit/0ded702ccbb746a26c7172bcbf80dd9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-20T10:23:39+02:00 evapi: use a completely new fake message structure for dispatcher handling (cherry picked from commit 769dce2fad66efdbc6cce6951bc60b60bf453a19) --- Modified: src/modules/evapi/evapi_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/0ded702ccbb746a26c7172bcbf80dd9… Patch: https://github.com/kamailio/kamailio/commit/0ded702ccbb746a26c7172bcbf80dd9… --- diff --git a/src/modules/evapi/evapi_dispatch.c b/src/modules/evapi/evapi_dispatch.c index e603753cec..b0e1e8386b 100644 --- a/src/modules/evapi/evapi_dispatch.c +++ b/src/modules/evapi/evapi_dispatch.c @@ -151,8 +151,10 @@ int evapi_run_cfg_route(evapi_env_t *evenv, int rt, str *rtname) if((rt<0) && (_evapi_event_callback.s==NULL || _evapi_event_callback.len<=0)) return 0; - fmsg = faked_msg_next(); - memcpy(&tmsg, fmsg, sizeof(sip_msg_t)); + if(faked_msg_get_new(&tmsg)<0) { + LM_ERR("failed to get a new faked message\n"); + return -1; + } fmsg = &tmsg; evapi_set_msg_env(fmsg, evenv); backup_rt = get_route_type();

5 years, 3 months

git:5.2:67f889bc: core: clear branches and expose the function for a new faked msg

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: 67f889bcda49ad8f99f619b495e3fa201968ad64 URL: https://github.com/kamailio/kamailio/commit/67f889bcda49ad8f99f619b495e3fa2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-20T10:23:29+02:00 core: clear branches and expose the function for a new faked msg (cherry picked from commit d7bd8a187546f132547788c47ff9a3947be49957) --- Modified: src/core/fmsg.c Modified: src/core/fmsg.h --- Diff: https://github.com/kamailio/kamailio/commit/67f889bcda49ad8f99f619b495e3fa2… Patch: https://github.com/kamailio/kamailio/commit/67f889bcda49ad8f99f619b495e3fa2… --- diff --git a/src/core/fmsg.c b/src/core/fmsg.c index 1450509f8c..71ea74a5e2 100644 --- a/src/core/fmsg.c +++ b/src/core/fmsg.c @@ -127,6 +127,7 @@ sip_msg_t* faked_msg_get_next_clear(void) int faked_msg_get_new(sip_msg_t *fmsg) { + clear_branches(); if(faked_msg_init_new(fmsg)<0) { return -1; } diff --git a/src/core/fmsg.h b/src/core/fmsg.h index 99eb9f61b3..734b4c0090 100644 --- a/src/core/fmsg.h +++ b/src/core/fmsg.h @@ -29,6 +29,7 @@ sip_msg_t* faked_msg_next(void); sip_msg_t* faked_msg_get_next(void); sip_msg_t* faked_msg_next_clear(void); sip_msg_t* faked_msg_get_next_clear(void); +int faked_msg_get_new(sip_msg_t *fmsg); int faked_msg_match(sip_msg_t *tmsg); #endif

5 years, 3 months

git:5.2:4db7db84: core: function to get a new faked message in a specific structure

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: 4db7db8486ecab55e649a4037a1d86cda7633faf URL: https://github.com/kamailio/kamailio/commit/4db7db8486ecab55e649a4037a1d86c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-20T10:23:19+02:00 core: function to get a new faked message in a specific structure - refactored the code to be able to fill a sip msg structure with content from the faked request (cherry picked from commit 4a904b5fe90253d0d5517cf1a5cdca3695e59ec3) --- Modified: src/core/fmsg.c --- Diff: https://github.com/kamailio/kamailio/commit/4db7db8486ecab55e649a4037a1d86c… Patch: https://github.com/kamailio/kamailio/commit/4db7db8486ecab55e649a4037a1d86c… --- diff --git a/src/core/fmsg.c b/src/core/fmsg.c index 28d24cd116..1450509f8c 100644 --- a/src/core/fmsg.c +++ b/src/core/fmsg.c @@ -30,48 +30,69 @@ #define FAKED_SIP_MSG "OPTIONS sip:you@kamailio.org SIP/2.0\r\nVia: SIP/2.0/UDP 127.0.0.1\r\nFrom: <sip:you@kamailio.org>;tag=123\r\nTo: <sip:you@kamailio.org>\r\nCall-ID: 123\r\nCSeq: 1 OPTIONS\r\nContent-Length: 0\r\n\r\n" #define FAKED_SIP_MSG_LEN (sizeof(FAKED_SIP_MSG)-1) -static char _faked_sip_buf[FAKED_SIP_MSG_LEN+1]; -static struct sip_msg _faked_msg; +static char _faked_sip_buf[BUF_SIZE]; +static int _faked_sip_buf_init = 0; +static sip_msg_t _faked_msg; static unsigned int _faked_msg_no = 0; -int faked_msg_init(void) +static unsigned int faked_msg_get_next_id(void) { - if(_faked_msg_no>0) - return 0; - /* init faked sip msg */ + _faked_msg_no += ((_faked_msg_no+1)==0)?2:1; + return _faked_msg_no; +} + +static void faked_msg_buf_init(void) +{ + if(_faked_sip_buf_init!=0) { + return; + } memcpy(_faked_sip_buf, FAKED_SIP_MSG, FAKED_SIP_MSG_LEN); _faked_sip_buf[FAKED_SIP_MSG_LEN] = '\0'; + _faked_sip_buf_init = 1; +} + +static int faked_msg_init_new(sip_msg_t *fmsg) +{ + faked_msg_buf_init(); - memset(&_faked_msg, 0, sizeof(struct sip_msg)); + /* init faked sip msg */ + memset(fmsg, 0, sizeof(sip_msg_t)); - _faked_msg.buf=_faked_sip_buf; - _faked_msg.len=FAKED_SIP_MSG_LEN; + fmsg->buf=_faked_sip_buf; + fmsg->len=FAKED_SIP_MSG_LEN; - _faked_msg.set_global_address=default_global_address; - _faked_msg.set_global_port=default_global_port; + fmsg->set_global_address=default_global_address; + fmsg->set_global_port=default_global_port; - if (parse_msg(_faked_msg.buf, _faked_msg.len, &_faked_msg)!=0) - { - LM_ERR("parse_msg failed\n"); + if (parse_msg(fmsg->buf, fmsg->len, fmsg)!=0) { + LM_ERR("parse faked msg failed\n"); return -1; } - _faked_msg.rcv.proto = PROTO_UDP; - _faked_msg.rcv.src_port = 5060; - _faked_msg.rcv.src_ip.u.addr32[0] = 0x7f000001; - _faked_msg.rcv.src_ip.af = AF_INET; - _faked_msg.rcv.src_ip.len = 4; - _faked_msg.rcv.dst_port = 5060; - _faked_msg.rcv.dst_ip.u.addr32[0] = 0x7f000001; - _faked_msg.rcv.dst_ip.af = AF_INET; - _faked_msg.rcv.dst_ip.len = 4; + fmsg->rcv.proto = PROTO_UDP; + fmsg->rcv.src_port = 5060; + fmsg->rcv.src_ip.u.addr32[0] = 0x7f000001; + fmsg->rcv.src_ip.af = AF_INET; + fmsg->rcv.src_ip.len = 4; + fmsg->rcv.dst_port = 5060; + fmsg->rcv.dst_ip.u.addr32[0] = 0x7f000001; + fmsg->rcv.dst_ip.af = AF_INET; + fmsg->rcv.dst_ip.len = 4; return 0; } -static inline sip_msg_t* faked_msg_next_id(int mode) +int faked_msg_init(void) +{ + if(_faked_msg_no>0) { + return 0; + } + return faked_msg_init_new(&_faked_msg); +} + +static inline sip_msg_t* faked_msg_build_next(int mode) { - _faked_msg.id = 1 + _faked_msg_no++; + _faked_msg.id = faked_msg_get_next_id(); _faked_msg.pid = my_pid(); memset(&_faked_msg.tval, 0, sizeof(struct timeval)); if(mode) clear_branches(); @@ -80,12 +101,12 @@ static inline sip_msg_t* faked_msg_next_id(int mode) sip_msg_t* faked_msg_next(void) { - return faked_msg_next_id(0); + return faked_msg_build_next(0); } sip_msg_t* faked_msg_next_clear(void) { - return faked_msg_next_id(1); + return faked_msg_build_next(1); } sip_msg_t* faked_msg_get_next(void) @@ -104,6 +125,18 @@ sip_msg_t* faked_msg_get_next_clear(void) return faked_msg_next_clear(); } +int faked_msg_get_new(sip_msg_t *fmsg) +{ + if(faked_msg_init_new(fmsg)<0) { + return -1; + } + fmsg->id = faked_msg_get_next_id(); + fmsg->pid = my_pid(); + memset(&fmsg->tval, 0, sizeof(struct timeval)); + + return 0; +} + int faked_msg_match(sip_msg_t *tmsg) { return ( tmsg == &_faked_msg ) ? 1 : 0;

5 years, 3 months

git:5.2:9f4c8c37: evapi: free the faked msg clone used for dispatcher event route

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: 9f4c8c37f50ce15e52ea64388d7aab46167e78cd URL: https://github.com/kamailio/kamailio/commit/9f4c8c37f50ce15e52ea64388d7aab4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-20T10:22:59+02:00 evapi: free the faked msg clone used for dispatcher event route (cherry picked from commit d36a4b00c6becd42cfcec4fc7eb398371e1cc812) --- Modified: src/modules/evapi/evapi_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/9f4c8c37f50ce15e52ea64388d7aab4… Patch: https://github.com/kamailio/kamailio/commit/9f4c8c37f50ce15e52ea64388d7aab4… --- diff --git a/src/modules/evapi/evapi_dispatch.c b/src/modules/evapi/evapi_dispatch.c index ec56945b5e..e603753cec 100644 --- a/src/modules/evapi/evapi_dispatch.c +++ b/src/modules/evapi/evapi_dispatch.c @@ -37,6 +37,7 @@ #include "../../core/dprint.h" #include "../../core/ut.h" #include "../../core/cfg/cfg_struct.h" +#include "../../core/receive.h" #include "../../core/kemi.h" #include "../../core/fmsg.h" @@ -170,6 +171,9 @@ int evapi_run_cfg_route(evapi_env_t *evenv, int rt, str *rtname) } set_route_type(backup_rt); evapi_set_msg_env(fmsg, NULL); + /* free the structure -- it is a clone of faked msg */ + free_sip_msg(fmsg); + ksr_msg_env_reset(); return 0; }

5 years, 3 months

git:5.2:9b6d1e9e: corex: free old outbound buffer inside SREV_NET_DATA_OUT callback

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: 9b6d1e9ee767e2bf2a31dcf817558566d99f81b2 URL: https://github.com/kamailio/kamailio/commit/9b6d1e9ee767e2bf2a31dcf81755856… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-15T12:44:54+02:00 corex: free old outbound buffer inside SREV_NET_DATA_OUT callback (cherry picked from commit c79dfbeab0bfefaa4dd5cefc41cba3ba157da0ce) --- Modified: src/modules/corex/corex_nio.c --- Diff: https://github.com/kamailio/kamailio/commit/9b6d1e9ee767e2bf2a31dcf81755856… Patch: https://github.com/kamailio/kamailio/commit/9b6d1e9ee767e2bf2a31dcf81755856… --- diff --git a/src/modules/corex/corex_nio.c b/src/modules/corex/corex_nio.c index 96837e8a0c..6b79fcc648 100644 --- a/src/modules/corex/corex_nio.c +++ b/src/modules/corex/corex_nio.c @@ -141,6 +141,7 @@ int nio_msg_sent(sr_event_param_t *evp) int_str avp_value; struct usr_avp *avp; struct run_act_ctx ra_ctx; + str nbuf = STR_NULL; obuf = (str*)evp->data; @@ -163,7 +164,15 @@ int nio_msg_sent(sr_event_param_t *evp) if(avp!=NULL && is_avp_str_val(avp)) { msg.buf = avp_value.s.s; msg.len = avp_value.s.len; - obuf->s = nio_msg_update(&msg, (unsigned int*)&obuf->len); + nbuf.s = nio_msg_update(&msg, (unsigned int*)&nbuf.len); + if(nbuf.s!=NULL) { + LM_DBG("new outbound buffer generated\n"); + pkg_free(obuf->s); + obuf->s = nbuf.s; + obuf->len = nbuf.len; + } else { + LM_ERR("failed to generate new outbound buffer\n"); + } } else { LM_WARN("no value set for AVP %.*s, using unmodified message\n", nio_msg_avp_param.len, nio_msg_avp_param.s);

5 years, 3 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2019