sr-dev September 2019

sr-dev@lists.kamailio.org

24 participants
368 discussions

git:5.2:79dd00cd: nathelper: Fixed memory leak in nathelper fetch contact timer (GH #2062)

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: 79dd00cdb3f02868e847c6c20932360c403a73d0 URL: https://github.com/kamailio/kamailio/commit/79dd00cdb3f02868e847c6c20932360… Author: Pintu Lohar <plohar(a)sk.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-10T09:17:42+02:00 nathelper: Fixed memory leak in nathelper fetch contact timer (GH #2062) - Allocated buffer is not freed when contact fetch is failed - Leak frequently occur when database disconnect and reconnect (cherry picked from commit 79fecc643d0a17b4de25f54ae269d1bee1f0cb00) --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/79dd00cdb3f02868e847c6c20932360… Patch: https://github.com/kamailio/kamailio/commit/79dd00cdb3f02868e847c6c20932360… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c old mode 100644 new mode 100755 index 27015b7bd8..f78878a0b0 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1951,6 +1951,8 @@ static void nh_timer(unsigned int ticks, void *timer_idx) + iteration, natping_processes * natping_interval, options); if(rval < 0) { + if(buf != NULL) + pkg_free(buf); LM_ERR("failed to fetch contacts\n"); goto done; }

4 years, 8 months

git:master:79fecc64: nathelper: Fixed memory leak in nathelper fetch contact timer (GH #2062)

by Henning Westerholt

Module: kamailio Branch: master Commit: 79fecc643d0a17b4de25f54ae269d1bee1f0cb00 URL: https://github.com/kamailio/kamailio/commit/79fecc643d0a17b4de25f54ae269d1b… Author: Pintu Lohar <plohar(a)sk.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-10T09:15:26+02:00 nathelper: Fixed memory leak in nathelper fetch contact timer (GH #2062) - Allocated buffer is not freed when contact fetch is failed - Leak frequently occur when database disconnect and reconnect --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/79fecc643d0a17b4de25f54ae269d1b… Patch: https://github.com/kamailio/kamailio/commit/79fecc643d0a17b4de25f54ae269d1b… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c old mode 100644 new mode 100755 index 4426b93478..e77c9470a8 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -2003,6 +2003,8 @@ static void nh_timer(unsigned int ticks, void *timer_idx) + iteration, natping_processes * natping_interval, options); if(rval < 0) { + if(buf != NULL) + pkg_free(buf); LM_ERR("failed to fetch contacts\n"); goto done; }

4 years, 8 months

[kamailio/kamailio] nathelper: Fixed memory leak (#2062)

by pintulohargcetts

- Allocated buffer is not freed when contact fetch is failed - Leak frequently occurs when database disconnects and reconnects   #### Pre-Submission Checklist    - [ ] 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) - [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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Found the leak during stress test and intentionally disconnecting database access You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2062 -- Commit Summary -- * nathelper: Fixed memory leak -- File Changes -- M src/modules/nathelper/nathelper.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2062.patch https://github.com/kamailio/kamailio/pull/2062.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/2062

4 years, 8 months

git:5.2:d6bc471a: db_postgres: database URL supports IPv6 address as hostname

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: d6bc471aa41447d605eab42ee0596a2e47e3be29 URL: https://github.com/kamailio/kamailio/commit/d6bc471aa41447d605eab42ee0596a2… Author: Alexey Vasilyev <alexei.vasilyev(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-09T21:54:00+02:00 db_postgres: database URL supports IPv6 address as hostname - changed parsing of db_url to accept IPv6 address for hostname (cherry picked from commit f99b4926c817e181f83f92ffa15510ff133d0a15) --- Modified: src/modules/db_postgres/pg_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/d6bc471aa41447d605eab42ee0596a2… Patch: https://github.com/kamailio/kamailio/commit/d6bc471aa41447d605eab42ee0596a2… --- diff --git a/src/modules/db_postgres/pg_uri.c b/src/modules/db_postgres/pg_uri.c index 3e4f9a32bc..ce7ac1d989 100644 --- a/src/modules/db_postgres/pg_uri.c +++ b/src/modules/db_postgres/pg_uri.c @@ -109,12 +109,13 @@ static int parse_postgres_uri(struct pg_uri *res, str *uri) ST_USER_HOST, /* Username or hostname */ ST_PASS_PORT, /* Password or port part */ ST_HOST, /* Hostname part */ + ST_HOST6, /* Hostname part IPv6 */ ST_PORT, /* Port part */ ST_DB /* Database part */ }; enum state st; - int i; + int i, ipv6_flag=0; const char *begin; char *prev_token; @@ -172,6 +173,11 @@ static int parse_postgres_uri(struct pg_uri *res, str *uri) begin = uri->s + i + 1; break; + case '[': + st = ST_HOST6; + begin = uri->s + i + 1; + break; + case '/': if(memchr(uri->s + i + 1, '/', uri->len - i - 1) != NULL) @@ -212,9 +218,14 @@ static int parse_postgres_uri(struct pg_uri *res, str *uri) case ST_HOST: switch(uri->s[i]) { + case '[': + st = ST_HOST6; + begin = uri->s + i + 1; + break; + case ':': st = ST_PORT; - if(dupl_string(&res->host, begin, uri->s + i) < 0) + if(dupl_string(&res->host, begin, uri->s + i - ipv6_flag) < 0) goto err; begin = uri->s + i + 1; break; @@ -223,7 +234,7 @@ static int parse_postgres_uri(struct pg_uri *res, str *uri) if(memchr(uri->s + i + 1, '/', uri->len - i - 1) != NULL) break; - if(dupl_string(&res->host, begin, uri->s + i) < 0) + if(dupl_string(&res->host, begin, uri->s + i - ipv6_flag) < 0) goto err; if(dupl_string(&res->database, uri->s + i + 1, uri->s + uri->len) @@ -233,6 +244,15 @@ static int parse_postgres_uri(struct pg_uri *res, str *uri) } break; + case ST_HOST6: + switch(uri->s[i]) { + case ']': + ipv6_flag = 1; + st = ST_HOST; + break; + } + break; + case ST_PORT: switch(uri->s[i]) { case '/':

4 years, 8 months

git:5.2:d128b317: db_mysql: database URL supports IPv6 address as hostname

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: d128b3170c6e82ecd5751351885f9098490068f5 URL: https://github.com/kamailio/kamailio/commit/d128b3170c6e82ecd5751351885f909… Author: Alexey Vasilyev <alexei.vasilyev(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-09T21:53:50+02:00 db_mysql: database URL supports IPv6 address as hostname - changed parsing of db_url to accept IPv6 address for hostname (cherry picked from commit a7588f382605991bef4499de8c89b10a9468c8cf) --- Modified: src/modules/db_mysql/my_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/d128b3170c6e82ecd5751351885f909… Patch: https://github.com/kamailio/kamailio/commit/d128b3170c6e82ecd5751351885f909… --- diff --git a/src/modules/db_mysql/my_uri.c b/src/modules/db_mysql/my_uri.c index 8ad5b60b61..1da887080a 100644 --- a/src/modules/db_mysql/my_uri.c +++ b/src/modules/db_mysql/my_uri.c @@ -95,12 +95,13 @@ static int parse_mysql_uri(struct my_uri* res, str* uri) ST_USER_HOST, /* Username or hostname */ ST_PASS_PORT, /* Password or port part */ ST_HOST, /* Hostname part */ + ST_HOST6, /* Hostname part IPv6 */ ST_PORT, /* Port part */ ST_DB /* Database part */ }; enum state st; - int i; + int i, ipv6_flag=0; const char* begin; char* prev_token; @@ -156,6 +157,11 @@ static int parse_mysql_uri(struct my_uri* res, str* uri) begin = uri->s + i + 1; break; + case '[': + st = ST_HOST6; + begin = uri->s + i + 1; + break; + case '/': if (dupl_string(&res->host, begin, uri->s + i) < 0) goto err; if (dupl_string(&res->database, uri->s + i + 1, uri->s + uri->len) < 0) goto err; @@ -184,19 +190,33 @@ static int parse_mysql_uri(struct my_uri* res, str* uri) case ST_HOST: switch(uri->s[i]) { + case '[': + st = ST_HOST6; + begin = uri->s + i + 1; + break; + case ':': st = ST_PORT; - if (dupl_string(&res->host, begin, uri->s + i) < 0) goto err; + if (dupl_string(&res->host, begin, uri->s + i - ipv6_flag) < 0) goto err; begin = uri->s + i + 1; break; case '/': - if (dupl_string(&res->host, begin, uri->s + i) < 0) goto err; + if (dupl_string(&res->host, begin, uri->s + i - ipv6_flag) < 0) goto err; if (dupl_string(&res->database, uri->s + i + 1, uri->s + uri->len) < 0) goto err; return 0; } break; + case ST_HOST6: + switch(uri->s[i]) { + case ']': + ipv6_flag = 1; + st = ST_HOST; + break; + } + break; + case ST_PORT: switch(uri->s[i]) { case '/':

4 years, 8 months

git:5.2:5a4debab: lib: database URL supports IPv6 address as hostname

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: 5a4debabd3c6e997200947453503a972b9dcab0f URL: https://github.com/kamailio/kamailio/commit/5a4debabd3c6e997200947453503a97… Author: Alexey Vasilyev <alexei.vasilyev(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-09T21:53:21+02:00 lib: database URL supports IPv6 address as hostname - changed parsing of db_url to accept IPv6 address for hostname (cherry picked from commit 9e29e262f0107cedbf2e2d61d045b05c5a5fc410) --- Modified: src/lib/srdb1/db_id.c --- Diff: https://github.com/kamailio/kamailio/commit/5a4debabd3c6e997200947453503a97… Patch: https://github.com/kamailio/kamailio/commit/5a4debabd3c6e997200947453503a97… --- diff --git a/src/lib/srdb1/db_id.c b/src/lib/srdb1/db_id.c index ef985e52ad..8a43def2d9 100644 --- a/src/lib/srdb1/db_id.c +++ b/src/lib/srdb1/db_id.c @@ -100,12 +100,13 @@ static int parse_db_url(struct db_id* id, const str* url) ST_USER_HOST, /* Username or hostname */ ST_PASS_PORT, /* Password or port part */ ST_HOST, /* Hostname part */ + ST_HOST6, /* Hostname part IPv6 */ ST_PORT, /* Port part */ ST_DB /* Database part */ }; enum state st; - unsigned int len, i, j, a, foundanother; + unsigned int len, i, j, a, foundanother, ipv6_flag=0; const char* begin; char* prev_token; @@ -188,6 +189,11 @@ static int parse_db_url(struct db_id* id, const str* url) begin = url->s + i + 1; break; + case '[': + st = ST_HOST6; + begin = url->s + i + 1; + break; + case '/': if (dupl_string(&id->host, begin, url->s + i) < 0) goto err; if (dupl_string_name(&id->database, url->s + i + 1, url->s + len) < 0) goto err; @@ -224,19 +230,33 @@ static int parse_db_url(struct db_id* id, const str* url) case ST_HOST: switch(url->s[i]) { + case '[': + st = ST_HOST6; + begin = url->s + i + 1; + break; + case ':': st = ST_PORT; - if (dupl_string(&id->host, begin, url->s + i) < 0) goto err; + if (dupl_string(&id->host, begin, url->s + i - ipv6_flag) < 0) goto err; begin = url->s + i + 1; break; case '/': - if (dupl_string(&id->host, begin, url->s + i) < 0) goto err; + if (dupl_string(&id->host, begin, url->s + i - ipv6_flag) < 0) goto err; if (dupl_string_name(&id->database, url->s + i + 1, url->s + len) < 0) goto err; return 0; } break; + case ST_HOST6: + switch(url->s[i]) { + case ']': + ipv6_flag = 1; + st = ST_HOST; + break; + } + break; + case ST_PORT: switch(url->s[i]) { case '/':

4 years, 8 months

[kamailio/kamailio] db can't parse ipv6 address from config (#2060)

by Alexey Vasilyev

### Description If in kamailio.cfg I write IPv6 address for Database URL like this: ``` #!ifndef DBURL #!define DBURL "mysql://kamailio:kamailiorw@[2001:5c8:4e00:11:a213:ba2d:579a:3e3d]/kamailio" #!endif ``` Then kamailio can't connect to database. #### Reproduction Just try to use database server with IPv6-address in kamailio.cfg #### Log Messages ``` Sep 8 14:35:40 c7-01 /sbin/kamailio[10680]: ERROR: db_mysql [km_my_con.c:139]: db_mysql_new_connection(): driver error: Unknown MySQL server host '[2001' (2) Sep 8 14:35:40 c7-01 /sbin/kamailio[10680]: ERROR: <core> [db.c:319]: db_do_init2(): could not add connection to the pool Sep 8 14:35:40 c7-01 /sbin/kamailio[10680]: ERROR: usrloc [dlist.c:646]: register_udomain(): failed to open database connection ``` ### Possible Solutions Correct parsing of config file. ### Additional Information ``` version: kamailio 5.3.0-dev7 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. ``` * **Operating System**: CentOS 7 ``` Linux sip.aaa.de 3.10.0-957.27.2.el7.x86_64 #1 SMP Mon Jul 29 17:46:05 UTC 2019 x86_64 x86_64 x86_64 GNU/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/2060

4 years, 8 months

[kamailio/kamailio] Db ipv6-address parsing in config file (#2061)

by Alexey Vasilyev

#### 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: - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #2060 #### Description Added parsing of IPv6 address in config file for DB URL. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2061 -- Commit Summary -- * lib: database URL supports IPv6 address as hostname * db_mysql: database URL supports IPv6 address as hostname * db_postgres: database URL supports IPv6 address as hostname -- File Changes -- M src/lib/srdb1/db_id.c (26) M src/modules/db_mysql/my_uri.c (26) M src/modules/db_postgres/pg_uri.c (26) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2061.patch https://github.com/kamailio/kamailio/pull/2061.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/2061

4 years, 8 months

git:master:f99b4926: db_postgres: database URL supports IPv6 address as hostname

by Henning Westerholt

Module: kamailio Branch: master Commit: f99b4926c817e181f83f92ffa15510ff133d0a15 URL: https://github.com/kamailio/kamailio/commit/f99b4926c817e181f83f92ffa15510f… Author: Alexey Vasilyev <alexei.vasilyev(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-09T21:51:59+02:00 db_postgres: database URL supports IPv6 address as hostname - changed parsing of db_url to accept IPv6 address for hostname --- Modified: src/modules/db_postgres/pg_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/f99b4926c817e181f83f92ffa15510f… Patch: https://github.com/kamailio/kamailio/commit/f99b4926c817e181f83f92ffa15510f… --- diff --git a/src/modules/db_postgres/pg_uri.c b/src/modules/db_postgres/pg_uri.c index 89c12dc069..50132c16f9 100644 --- a/src/modules/db_postgres/pg_uri.c +++ b/src/modules/db_postgres/pg_uri.c @@ -110,12 +110,13 @@ static int parse_postgres_uri(struct pg_uri *res, str *uri) ST_USER_HOST, /* Username or hostname */ ST_PASS_PORT, /* Password or port part */ ST_HOST, /* Hostname part */ + ST_HOST6, /* Hostname part IPv6 */ ST_PORT, /* Port part */ ST_DB /* Database part */ }; enum state st; - int i; + int i, ipv6_flag=0; const char *begin; char *prev_token; @@ -173,6 +174,11 @@ static int parse_postgres_uri(struct pg_uri *res, str *uri) begin = uri->s + i + 1; break; + case '[': + st = ST_HOST6; + begin = uri->s + i + 1; + break; + case '/': if(memchr(uri->s + i + 1, '/', uri->len - i - 1) != NULL) @@ -213,9 +219,14 @@ static int parse_postgres_uri(struct pg_uri *res, str *uri) case ST_HOST: switch(uri->s[i]) { + case '[': + st = ST_HOST6; + begin = uri->s + i + 1; + break; + case ':': st = ST_PORT; - if(dupl_string(&res->host, begin, uri->s + i) < 0) + if(dupl_string(&res->host, begin, uri->s + i - ipv6_flag) < 0) goto err; begin = uri->s + i + 1; break; @@ -224,7 +235,7 @@ static int parse_postgres_uri(struct pg_uri *res, str *uri) if(memchr(uri->s + i + 1, '/', uri->len - i - 1) != NULL) break; - if(dupl_string(&res->host, begin, uri->s + i) < 0) + if(dupl_string(&res->host, begin, uri->s + i - ipv6_flag) < 0) goto err; if(dupl_string(&res->database, uri->s + i + 1, uri->s + uri->len) @@ -234,6 +245,15 @@ static int parse_postgres_uri(struct pg_uri *res, str *uri) } break; + case ST_HOST6: + switch(uri->s[i]) { + case ']': + ipv6_flag = 1; + st = ST_HOST; + break; + } + break; + case ST_PORT: switch(uri->s[i]) { case '/':

4 years, 8 months

git:master:a7588f38: db_mysql: database URL supports IPv6 address as hostname

by Henning Westerholt

Module: kamailio Branch: master Commit: a7588f382605991bef4499de8c89b10a9468c8cf URL: https://github.com/kamailio/kamailio/commit/a7588f382605991bef4499de8c89b10… Author: Alexey Vasilyev <alexei.vasilyev(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-09T21:51:59+02:00 db_mysql: database URL supports IPv6 address as hostname - changed parsing of db_url to accept IPv6 address for hostname --- Modified: src/modules/db_mysql/my_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/a7588f382605991bef4499de8c89b10… Patch: https://github.com/kamailio/kamailio/commit/a7588f382605991bef4499de8c89b10… --- diff --git a/src/modules/db_mysql/my_uri.c b/src/modules/db_mysql/my_uri.c index 48267ba95c..8ab819e3ed 100644 --- a/src/modules/db_mysql/my_uri.c +++ b/src/modules/db_mysql/my_uri.c @@ -96,12 +96,13 @@ static int parse_mysql_uri(struct my_uri* res, str* uri) ST_USER_HOST, /* Username or hostname */ ST_PASS_PORT, /* Password or port part */ ST_HOST, /* Hostname part */ + ST_HOST6, /* Hostname part IPv6 */ ST_PORT, /* Port part */ ST_DB /* Database part */ }; enum state st; - int i; + int i, ipv6_flag=0; const char* begin; char* prev_token; @@ -157,6 +158,11 @@ static int parse_mysql_uri(struct my_uri* res, str* uri) begin = uri->s + i + 1; break; + case '[': + st = ST_HOST6; + begin = uri->s + i + 1; + break; + case '/': if (dupl_string(&res->host, begin, uri->s + i) < 0) goto err; if (dupl_string(&res->database, uri->s + i + 1, uri->s + uri->len) < 0) goto err; @@ -185,19 +191,33 @@ static int parse_mysql_uri(struct my_uri* res, str* uri) case ST_HOST: switch(uri->s[i]) { + case '[': + st = ST_HOST6; + begin = uri->s + i + 1; + break; + case ':': st = ST_PORT; - if (dupl_string(&res->host, begin, uri->s + i) < 0) goto err; + if (dupl_string(&res->host, begin, uri->s + i - ipv6_flag) < 0) goto err; begin = uri->s + i + 1; break; case '/': - if (dupl_string(&res->host, begin, uri->s + i) < 0) goto err; + if (dupl_string(&res->host, begin, uri->s + i - ipv6_flag) < 0) goto err; if (dupl_string(&res->database, uri->s + i + 1, uri->s + uri->len) < 0) goto err; return 0; } break; + case ST_HOST6: + switch(uri->s[i]) { + case ']': + ipv6_flag = 1; + st = ST_HOST; + break; + } + break; + case ST_PORT: switch(uri->s[i]) { case '/':

4 years, 8 months

← Newer
1
...
26
27
28
29
30
31
32
...
37
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2019