sr-dev July 2019

sr-dev@lists.kamailio.org

20 participants
232 discussions

[kamailio/kamailio] kamctl: enable kamctl test from shell variable. (#1977)

by Ali Shirvani

- we can enable kamctl test by setting `KAMCTL_TEST=true kamctl` instead of setting TEST variable in kamctl script.   #### 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:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1977 -- Commit Summary -- * kamctl: enable kamctl test from shell variable. -- File Changes -- M utils/kamctl/kamctl (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1977.patch https://github.com/kamailio/kamailio/pull/1977.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/1977

5 years, 4 months

git:master:4968e899: kamctl: option to enable kamctl test from shell variable

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4968e8994157f1152bf7461b16049d67e5c9cc59 URL: https://github.com/kamailio/kamailio/commit/4968e8994157f1152bf7461b16049d6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-07-29T12:25:17+02:00 kamctl: option to enable kamctl test from shell variable - set KAMCTL_TEST variable in shell --- Modified: utils/kamctl/kamctl --- Diff: https://github.com/kamailio/kamailio/commit/4968e8994157f1152bf7461b16049d6… Patch: https://github.com/kamailio/kamailio/commit/4968e8994157f1152bf7461b16049d6… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index aab756a191..c97ad491a2 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -11,7 +11,11 @@ PATH=$PATH:/usr/local/sbin/ # for testing only, please don't enable this in production environments # as this introduce security risks -TEST="false" +if [ -z "$KAMCTL_TEST" ]; then + TEST="false" +else + TEST="true" +fi ### include config files

5 years, 4 months

git:master:b642263a: usrloc: delete contact attributes in db-only mode

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b642263a08313e86cc4936a9c489e8afb4a2cb5f URL: https://github.com/kamailio/kamailio/commit/b642263a08313e86cc4936a9c489e8a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-07-29T10:54:41+02:00 usrloc: delete contact attributes in db-only mode --- Modified: src/modules/usrloc/ucontact.h Modified: src/modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/b642263a08313e86cc4936a9c489e8a… Patch: https://github.com/kamailio/kamailio/commit/b642263a08313e86cc4936a9c489e8a… --- diff --git a/src/modules/usrloc/ucontact.h b/src/modules/usrloc/ucontact.h index abe7353ce7..321bd95f7b 100644 --- a/src/modules/usrloc/ucontact.h +++ b/src/modules/usrloc/ucontact.h @@ -176,4 +176,6 @@ int uldb_insert_attrs(str *_dname, str *_user, str *_domain, */ void ul_set_xavp_contact_clone(int v); +int uldb_delete_attrs_ruid(str* _dname, str *_ruid); + #endif diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c index c29e6fcfc0..6160cd94b2 100644 --- a/src/modules/usrloc/udomain.c +++ b/src/modules/usrloc/udomain.c @@ -909,6 +909,9 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) int n; urecord_t* r; ucontact_t* c; +#define RUIDBUF_SIZE 128 + char ruidbuf[RUIDBUF_SIZE]; + str ruid; if (db_mode!=DB_ONLY) { return 0; @@ -1028,8 +1031,24 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) run_ul_callbacks( UL_CONTACT_EXPIRE, c); } c->state = CS_SYNC; + ruid.len = 0; + if(c->ruid.len > 0 && ul_xavp_contact_name.s != NULL) { + /* clone ruid to delete attributes out of lock */ + if(c->ruid.len < RUIDBUF_SIZE - 2) { + memcpy(ruidbuf, c->ruid.s, c->ruid.len); + ruidbuf[c->ruid.len] = '\0'; + ruid.s = ruidbuf; + ruid.len = c->ruid.len; + } else { + LM_ERR("ruid is too long: %d\n", c->ruid.len); + } + } release_urecord(r); unlock_udomain(_d, &user); + if(ruid.len > 0 && ul_xavp_contact_name.s != NULL) { + /* delete attributes by ruid */ + uldb_delete_attrs_ruid(_d->name, &ruid); + } } if (DB_CAPABILITY(ul_dbf, DB_CAP_FETCH)) {

5 years, 4 months

git:master:12bf3cb5: usrloc: coherent indentation and whitespacing

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 12bf3cb574e2ead2da46e7e237a33415ae12df61 URL: https://github.com/kamailio/kamailio/commit/12bf3cb574e2ead2da46e7e237a3341… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-07-29T10:40:56+02:00 usrloc: coherent indentation and whitespacing --- Modified: src/modules/usrloc/udomain.c Modified: src/modules/usrloc/urecord.c --- Diff: https://github.com/kamailio/kamailio/commit/12bf3cb574e2ead2da46e7e237a3341… Patch: https://github.com/kamailio/kamailio/commit/12bf3cb574e2ead2da46e7e237a3341…

5 years, 4 months

git:master:5d303af2: Makefile.defs: version set to 5.3.0-dev7

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5d303af2da471be82c6868d791c0fd6497af8f1d URL: https://github.com/kamailio/kamailio/commit/5d303af2da471be82c6868d791c0fd6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-07-29T10:02:31+02:00 Makefile.defs: version set to 5.3.0-dev7 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/5d303af2da471be82c6868d791c0fd6… Patch: https://github.com/kamailio/kamailio/commit/5d303af2da471be82c6868d791c0fd6… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 3d66d830dc..eb1ab2d798 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 3 SUBLEVEL = 0 -EXTRAVERSION = -dev6 +EXTRAVERSION = -dev7 # memory manager switcher # 0 - f_malloc (fast malloc)

5 years, 4 months

git:master:13545fb1: app_sqlang: disabled unused static function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 13545fb140b633b14f7a3f0a0fb5c1c55449dbd7 URL: https://github.com/kamailio/kamailio/commit/13545fb140b633b14f7a3f0a0fb5c1c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-07-29T09:47:22+02:00 app_sqlang: disabled unused static function --- Modified: src/modules/app_sqlang/app_sqlang_api.c --- Diff: https://github.com/kamailio/kamailio/commit/13545fb140b633b14f7a3f0a0fb5c1c… Patch: https://github.com/kamailio/kamailio/commit/13545fb140b633b14f7a3f0a0fb5c1c… --- diff --git a/src/modules/app_sqlang/app_sqlang_api.c b/src/modules/app_sqlang/app_sqlang_api.c index c27693997c..22d2ce6ff3 100644 --- a/src/modules/app_sqlang/app_sqlang_api.c +++ b/src/modules/app_sqlang/app_sqlang_api.c @@ -211,6 +211,7 @@ static void sqlang_pushlstring(HSQUIRRELVM J, char *s, int l) sq_pushstring(J, (const SQChar*)s, (SQInteger)l); } +#if 0 static int sqlang_isnumber(HSQUIRRELVM J, int idx) { if(idx>=0) { @@ -221,6 +222,7 @@ static int sqlang_isnumber(HSQUIRRELVM J, int idx) return 1; return 0; } +#endif static int sqlang_isstring(HSQUIRRELVM J, int idx) {

5 years, 4 months

git:master:0bb113db: kemix: fix export of gete_fhost()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0bb113dbccb8bfcc5503cc0ceecffb9319496505 URL: https://github.com/kamailio/kamailio/commit/0bb113dbccb8bfcc5503cc0ceecffb9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-07-29T09:47:22+02:00 kemix: fix export of gete_fhost() --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0bb113dbccb8bfcc5503cc0ceecffb9… Patch: https://github.com/kamailio/kamailio/commit/0bb113dbccb8bfcc5503cc0ceecffb9… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index 81a4f2bc1c..608d2fd502 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -631,7 +631,7 @@ static sr_kemi_t sr_kemi_kx_exports[] = { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("kx"), str_init("gete_fhost"), - SR_KEMIP_XVAL, ki_kx_gete_rhost, + SR_KEMIP_XVAL, ki_kx_gete_fhost, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } },

5 years, 4 months

git:5.2:dd21d3ea: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.2 Commit: dd21d3eab5024e351c06ea3ae7b0e427dbd38701 URL: https://github.com/kamailio/kamailio/commit/dd21d3eab5024e351c06ea3ae7b0e42… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-07-28T22:01:44+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/db_text/README --- Diff: https://github.com/kamailio/kamailio/commit/dd21d3eab5024e351c06ea3ae7b0e42… Patch: https://github.com/kamailio/kamailio/commit/dd21d3eab5024e351c06ea3ae7b0e42… --- diff --git a/src/modules/db_text/README b/src/modules/db_text/README index eb4cfe1304..a43bf8087c 100644 --- a/src/modules/db_text/README +++ b/src/modules/db_text/README @@ -10,14 +10,10 @@ Ovidiu Sas <osas(a)voipembedded.com> -Edited by - Daniel-Constantin Mierla <miconda(a)gmail.com> -Edited by - Olle E. Johansson <oej(a)edvina.net> @@ -355,7 +351,7 @@ modparam("module_name", "db_url", "text:///path/to/dbtext/database") Here are definitions for the most important tables as well as a basic configuration file to use db_text with Kamailio. The table structures may change in time and you will have to adjust these examples. Check - the source code directory “utils/kamctl/dbtxt/kamailio” for current + the source code directory “utils/kamctl/dbtext/kamailio” for current definitions. You have to populate the table 'subscriber' by hand with user profiles

5 years, 4 months

git:5.1:9961bd66: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.1 Commit: 9961bd66f277e721d6a080d45bb254096537e017 URL: https://github.com/kamailio/kamailio/commit/9961bd66f277e721d6a080d45bb2540… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-07-28T22:01:30+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/db_text/README --- Diff: https://github.com/kamailio/kamailio/commit/9961bd66f277e721d6a080d45bb2540… Patch: https://github.com/kamailio/kamailio/commit/9961bd66f277e721d6a080d45bb2540… --- diff --git a/src/modules/db_text/README b/src/modules/db_text/README index eb4cfe1304..a43bf8087c 100644 --- a/src/modules/db_text/README +++ b/src/modules/db_text/README @@ -10,14 +10,10 @@ Ovidiu Sas <osas(a)voipembedded.com> -Edited by - Daniel-Constantin Mierla <miconda(a)gmail.com> -Edited by - Olle E. Johansson <oej(a)edvina.net> @@ -355,7 +351,7 @@ modparam("module_name", "db_url", "text:///path/to/dbtext/database") Here are definitions for the most important tables as well as a basic configuration file to use db_text with Kamailio. The table structures may change in time and you will have to adjust these examples. Check - the source code directory “utils/kamctl/dbtxt/kamailio” for current + the source code directory “utils/kamctl/dbtext/kamailio” for current definitions. You have to populate the table 'subscriber' by hand with user profiles

5 years, 4 months

git:master:d6249edf: modules: readme files regenerated - db_text ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: d6249edf97a30863a656f3d8c6ea62b55d30e0d9 URL: https://github.com/kamailio/kamailio/commit/d6249edf97a30863a656f3d8c6ea62b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-07-28T21:46:42+02:00 modules: readme files regenerated - db_text ... [skip ci] --- Modified: src/modules/db_text/README --- Diff: https://github.com/kamailio/kamailio/commit/d6249edf97a30863a656f3d8c6ea62b… Patch: https://github.com/kamailio/kamailio/commit/d6249edf97a30863a656f3d8c6ea62b… --- diff --git a/src/modules/db_text/README b/src/modules/db_text/README index eb4cfe1304..a43bf8087c 100644 --- a/src/modules/db_text/README +++ b/src/modules/db_text/README @@ -10,14 +10,10 @@ Ovidiu Sas <osas(a)voipembedded.com> -Edited by - Daniel-Constantin Mierla <miconda(a)gmail.com> -Edited by - Olle E. Johansson <oej(a)edvina.net> @@ -355,7 +351,7 @@ modparam("module_name", "db_url", "text:///path/to/dbtext/database") Here are definitions for the most important tables as well as a basic configuration file to use db_text with Kamailio. The table structures may change in time and you will have to adjust these examples. Check - the source code directory “utils/kamctl/dbtxt/kamailio” for current + the source code directory “utils/kamctl/dbtext/kamailio” for current definitions. You have to populate the table 'subscriber' by hand with user profiles

5 years, 4 months

← Newer
1
...
9
10
11
12
13
14
15
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2019