sr-dev July 2020

sr-dev@lists.kamailio.org

26 participants
389 discussions

git:master:67f9de8a: core: tcp - safety checks on emptly local tcp connection list

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 67f9de8a946335e2bf16fe0e6063877cd4d51fb7 URL: https://github.com/kamailio/kamailio/commit/67f9de8a946335e2bf16fe0e6063877… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-03T14:02:20+02:00 core: tcp - safety checks on emptly local tcp connection list --- Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/67f9de8a946335e2bf16fe0e6063877… Patch: https://github.com/kamailio/kamailio/commit/67f9de8a946335e2bf16fe0e6063877… --- diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index 304fefb56d..ed0a5753cb 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -1689,10 +1689,10 @@ void release_tcpconn(struct tcp_connection* c, long state, int unix_sock) static ticks_t tcpconn_read_timeout(ticks_t t, struct timer_ln* tl, void* data) { struct tcp_connection *c; - - c=(struct tcp_connection*)data; + + c=(struct tcp_connection*)data; /* or (struct tcp...*)(tl-offset(c->timer)) */ - + if (likely(!(c->state<0) && TICKS_LT(t, c->timeout))){ /* timeout extended, exit */ return (ticks_t)(c->timeout - t); @@ -1706,9 +1706,10 @@ static ticks_t tcpconn_read_timeout(ticks_t t, struct timer_ln* tl, void* data) ip_addr2a(&c->rcv.src_ip), c->rcv.src_port, ip_addr2a(&c->rcv.dst_ip), c->rcv.dst_port); } - tcpconn_listrm(tcp_conn_lst, c, c_next, c_prev); - release_tcpconn(c, (c->state<0)?CONN_ERROR:CONN_RELEASE, tcpmain_sock); - + if(tcp_conn_lst!=NULL) { + tcpconn_listrm(tcp_conn_lst, c, c_next, c_prev); + release_tcpconn(c, (c->state<0)?CONN_ERROR:CONN_RELEASE, tcpmain_sock); + } return 0; } @@ -1836,8 +1837,10 @@ inline static int handle_io(struct fd_map* fm, short events, int idx) ip_addr2a(&ec->rcv.dst_ip), ec->rcv.dst_port); } - tcpconn_listrm(tcp_conn_lst, con, c_next, c_prev); - local_timer_del(&tcp_reader_ltimer, &con->timer); + if(tcp_conn_lst!=NULL) { + tcpconn_listrm(tcp_conn_lst, con, c_next, c_prev); + local_timer_del(&tcp_reader_ltimer, &con->timer); + } goto con_error; } break; @@ -1877,11 +1880,13 @@ inline static int handle_io(struct fd_map* fm, short events, int idx) ip_addr2a(&con->rcv.src_ip), con->rcv.src_port, ip_addr2a(&con->rcv.dst_ip), con->rcv.dst_port); } - tcpconn_listrm(tcp_conn_lst, con, c_next, c_prev); - local_timer_del(&tcp_reader_ltimer, &con->timer); - if (unlikely(resp!=CONN_EOF)) - con->state=S_CONN_BAD; - release_tcpconn(con, resp, tcpmain_sock); + if(tcp_conn_lst!=NULL) { + tcpconn_listrm(tcp_conn_lst, con, c_next, c_prev); + local_timer_del(&tcp_reader_ltimer, &con->timer); + if (unlikely(resp!=CONN_EOF)) + con->state=S_CONN_BAD; + release_tcpconn(con, resp, tcpmain_sock); + } }else{ #ifdef USE_TLS if (unlikely(read_flags & RD_CONN_REPEAT_READ)) @@ -1889,8 +1894,8 @@ inline static int handle_io(struct fd_map* fm, short events, int idx) #endif /* USE_TLS */ /* update timeout */ con->timeout=get_ticks_raw()+S_TO_TICKS(TCP_CHILD_TIMEOUT); - /* ret= 0 (read the whole socket buffer) if short read & - * !POLLPRI, bytes read otherwise */ + /* ret= 0 (read the whole socket buffer) if short read + * & !POLLPRI, bytes read otherwise */ ret&=(((read_flags & RD_CONN_SHORT_READ) && !(events & POLLPRI)) - 1); } @@ -1904,7 +1909,7 @@ inline static int handle_io(struct fd_map* fm, short events, int idx) LM_CRIT("unknown fd type %d\n", fm->type); goto error; } - + return ret; con_error: con->state=S_CONN_BAD;

3 years, 9 months

git:master:fefb3f1b: core: tcp - more details on error log messages

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: fefb3f1b2dbae8d9df24fecee763c5a1cd588107 URL: https://github.com/kamailio/kamailio/commit/fefb3f1b2dbae8d9df24fecee763c5a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-03T10:50:06+02:00 core: tcp - more details on error log messages --- Modified: src/core/io_wait.h Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/fefb3f1b2dbae8d9df24fecee763c5a… Patch: https://github.com/kamailio/kamailio/commit/fefb3f1b2dbae8d9df24fecee763c5a…

3 years, 9 months

[kamailio/kamailio] Function "tcp_get_conid" from tcpops module does not write the conid into given target variable (#2382)

by kvrban

Function "tcp_get_conid" from tcpops module does not write the conid into target variable I followed the documentation on https://www.kamailio.org/docs/modules/devel/modules/tcpops.html#tcpops.f.tc… And with debug enabled, you see the connection is found: `Jun 30 14:13:47 kamailio-dev-2 /usr/sbin/kamailio[121285]: DEBUG: <core> [core/tcp_main.c:1670]: _tcpconn_find(): found connection by peer address (id: 14)` But the given variable $var(conid) is always empty. After a lookup("location") the code is like: ``` if(tcp_get_conid("$dd:$dp", "$var(conid)")) { xlog("connection id is: $var(conid)\n"); } ``` But the given variable $var(conid) is always empty. Version used: kamailio 5.3.5 (x86_64/linux) -- 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/2382

3 years, 9 months

[kamailio/kamailio] tcpops: target variable passed on tcp_get_conid function was empty (#2386)

by kvrban

Adding the additional flag PV_TYPE_INT fixed the issue i reported on https://github.com/kamailio/kamailio/issues/2382 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2386 -- Commit Summary -- * tcpops: target variable passed on tcp_get_conid function was empty -- File Changes -- M src/modules/tcpops/tcpops_mod.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2386.patch https://github.com/kamailio/kamailio/pull/2386.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/2386

3 years, 9 months

git:master:fbb4312f: Merge pull request #2386 from kvrban/master

by GitHub

Module: kamailio Branch: master Commit: fbb4312f1b2ebf6793408241d56bfc2dca6543ec URL: https://github.com/kamailio/kamailio/commit/fbb4312f1b2ebf6793408241d56bfc2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-07-03T09:40:12+02:00 Merge pull request #2386 from kvrban/master tcpops: target variable passed on tcp_get_conid function was empty --- Modified: src/modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fbb4312f1b2ebf6793408241d56bfc2… Patch: https://github.com/kamailio/kamailio/commit/fbb4312f1b2ebf6793408241d56bfc2… --- diff --git a/src/modules/tcpops/tcpops_mod.c b/src/modules/tcpops/tcpops_mod.c index ee2404a9ac..82d9889355 100644 --- a/src/modules/tcpops/tcpops_mod.c +++ b/src/modules/tcpops/tcpops_mod.c @@ -592,7 +592,7 @@ static int ki_tcp_get_conid_helper(sip_msg_t* msg, str *saddr, pv_spec_t *pvs) setvalue: memset(&val, 0, sizeof(pv_value_t)); val.ri = conid; - val.flags = PV_VAL_INT; + val.flags = PV_VAL_INT|PV_TYPE_INT; if(pvs->setf(msg, &pvs->pvp, (int)EQ_T, &val)<0) { LM_ERR("failed to set the output var\n"); return -1;

3 years, 9 months

git:master:a2932492: tcpops: target variable passed on tcp_get_conid function was empty

by kvrban

Module: kamailio Branch: master Commit: a2932492e24ac3c3afe4d33f025c7501c93fda49 URL: https://github.com/kamailio/kamailio/commit/a2932492e24ac3c3afe4d33f025c750… Author: kvrban <k.vrban(a)googlemail.com> Committer: kvrban <k.vrban(a)googlemail.com> Date: 2020-07-02T10:09:09+02:00 tcpops: target variable passed on tcp_get_conid function was empty --- Modified: src/modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a2932492e24ac3c3afe4d33f025c750… Patch: https://github.com/kamailio/kamailio/commit/a2932492e24ac3c3afe4d33f025c750… --- diff --git a/src/modules/tcpops/tcpops_mod.c b/src/modules/tcpops/tcpops_mod.c index ee2404a9ac..82d9889355 100644 --- a/src/modules/tcpops/tcpops_mod.c +++ b/src/modules/tcpops/tcpops_mod.c @@ -592,7 +592,7 @@ static int ki_tcp_get_conid_helper(sip_msg_t* msg, str *saddr, pv_spec_t *pvs) setvalue: memset(&val, 0, sizeof(pv_value_t)); val.ri = conid; - val.flags = PV_VAL_INT; + val.flags = PV_VAL_INT|PV_TYPE_INT; if(pvs->setf(msg, &pvs->pvp, (int)EQ_T, &val)<0) { LM_ERR("failed to set the output var\n"); return -1;

3 years, 9 months

git:master:0780e781: lib/srdb1: init timeval structs to silent analyzer

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0780e781c319254307c85bd873c58c6478a28da8 URL: https://github.com/kamailio/kamailio/commit/0780e781c319254307c85bd873c58c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-03T08:33:13+02:00 lib/srdb1: init timeval structs to silent analyzer --- Modified: src/lib/srdb1/db_query.c --- Diff: https://github.com/kamailio/kamailio/commit/0780e781c319254307c85bd873c58c6… Patch: https://github.com/kamailio/kamailio/commit/0780e781c319254307c85bd873c58c6… --- diff --git a/src/lib/srdb1/db_query.c b/src/lib/srdb1/db_query.c index d2319446a6..4a5cd63e22 100644 --- a/src/lib/srdb1/db_query.c +++ b/src/lib/srdb1/db_query.c @@ -13,8 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ @@ -46,7 +46,7 @@ static inline int db_do_submit_query(const db1_con_t* _h, const str *_query, int (*submit_query)(const db1_con_t*, const str*)) { int ret; - struct timeval tvb, tve; + struct timeval tvb = {0}, tve = {0}; struct timezone tz; unsigned int tdiff;

3 years, 9 months

git:master:d0d2c8fd: core: init timeval structs to silent analyzer

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d0d2c8fd6a57affac7bffab441b2126b9df0dfb1 URL: https://github.com/kamailio/kamailio/commit/d0d2c8fd6a57affac7bffab441b2126… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-03T08:30:46+02:00 core: init timeval structs to silent analyzer --- Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/d0d2c8fd6a57affac7bffab441b2126… Patch: https://github.com/kamailio/kamailio/commit/d0d2c8fd6a57affac7bffab441b2126… --- diff --git a/src/core/receive.c b/src/core/receive.c index 38bc1e4ab1..a76fd14519 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -227,7 +227,7 @@ int receive_msg(char *buf, unsigned int len, receive_info_t *rcv_info) struct run_act_ctx ctx; struct run_act_ctx *bctx = NULL; int ret = -1; - struct timeval tvb, tve; + struct timeval tvb = {0}, tve = {0}; unsigned int diff = 0; str inb = STR_NULL; sr_net_info_t netinfo = {0};

3 years, 9 months

Looking for a VoIP & Kamailio Dev-Ops

by Henning Westerholt

Dev-Ops VoIP & Kamailio GILAWA is looking for a new colleague to join our team! Tasks: Deploying, developing, and integrating our software based on Kamailio Testing and validation of our customer solutions Solve complex customer problems in the VoIP field Fix Bugs and create extensions in the Kamailio project Requirements: Good background in VoIP telephony and Kamailio Stack Experience with signalling standards (SIP, RTP etc..) and troubleshooting Knowledge and experience in one of the following languages: C/C++, Bash, PHP Experience with Debian or RedHat/CentOS Linux, knowledge of Ansible would be a plus Fluent in English Based in European or neighbouring time zone (e.g. EMEA area) Self-organized and strong communication skills Given the current situation this is a remote position. If you are interested, please send me a (direct) e-mail with an CV or Linkedin link, please include your availability and salary expectations as well. Best regards, Henning Westerholt -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://gilawa.com<https://gilawa.com/>

3 years, 9 months

[kamailio/kamailio] set_contact_alias() issue with clients adding it to their Contact (#2308)

by mtryfoss

I'm using set_contact_alias() to fix nat registrations, in this case with a Bria client. Somehow Bria learns that I'm using this - probably through the Contact in the 200 OK reply of save(). Bria then adds this to the Contact when replying to incoming INVITE. After some time, something happens in the network at client side and the connection gets a new port through the router. Bria does not notice and still sends the old alias-parameter with the port not used anymore. When I'm calling handle_ruri_alias(), Kamailio reads this instead of the actual port and the ACK to 200 OK is sent to a port not used anymore. This can probably be solved by either, in preferred order: - rewrite set_contact_alias() and add_contact_alias() to replace existing alias parameters - regexp remove of alias parameter from Contact of all messages coming from clients - regexp remove of alias parameter from Contact returned by save() Br, Morten -- 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/2308

3 years, 9 months

← Newer
1
...
31
32
33
34
35
36
37
38
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2020