sr-dev

sr-dev@lists.kamailio.org

16 participants
45365 discussions

git:master:c828cf87: app_java: global variables declared in c files
by Daniel-Constantin Mierla 19 Dec '17

19 Dec '17

Module: kamailio Branch: master Commit: c828cf872fe629381a8c9be24058d63add881071 URL: https://github.com/kamailio/kamailio/commit/c828cf872fe629381a8c9be24058d63… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-19T10:07:26+01:00 app_java: global variables declared in c files - some renamed to avoid global reference conflicts due to common naming --- Modified: src/modules/app_java/app_java_mod.c Modified: src/modules/app_java/global.h Modified: src/modules/app_java/java_iface.c Modified: src/modules/app_java/java_native_methods.c Modified: src/modules/app_java/java_sig_parser.c Modified: src/modules/app_java/java_support.c --- Diff: https://github.com/kamailio/kamailio/commit/c828cf872fe629381a8c9be24058d63… Patch: https://github.com/kamailio/kamailio/commit/c828cf872fe629381a8c9be24058d63…

1 0

git:master:93606c35: app_java: declare global variable in c file instead of header file
by Daniel-Constantin Mierla 19 Dec '17

19 Dec '17

Module: kamailio Branch: master Commit: 93606c35ffdcd55ab98c5704880a6d5375aae299 URL: https://github.com/kamailio/kamailio/commit/93606c35ffdcd55ab98c5704880a6d5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-19T10:07:26+01:00 app_java: declare global variable in c file instead of header file --- Modified: src/modules/app_java/app_java_mod.c Modified: src/modules/app_java/app_java_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/93606c35ffdcd55ab98c5704880a6d5… Patch: https://github.com/kamailio/kamailio/commit/93606c35ffdcd55ab98c5704880a6d5… --- diff --git a/src/modules/app_java/app_java_mod.c b/src/modules/app_java/app_java_mod.c index 24797a747d..935320cf86 100644 --- a/src/modules/app_java/app_java_mod.c +++ b/src/modules/app_java/app_java_mod.c @@ -46,6 +46,8 @@ static int child_init(int rank); static void mod_destroy(void); +int force_cmd_exec = 0; + /** module parameters */ static param_export_t params[] = { {"class_name", PARAM_STRING, &class_name }, diff --git a/src/modules/app_java/app_java_mod.h b/src/modules/app_java/app_java_mod.h index 65227e620d..9f40e7d0f3 100644 --- a/src/modules/app_java/app_java_mod.h +++ b/src/modules/app_java/app_java_mod.h @@ -22,6 +22,6 @@ #ifndef __JAVA_MOD_H__ #define __JAVA_MOD_H__ -int force_cmd_exec; +extern int force_cmd_exec; #endif

1 0

git:5.0:0b935ae4: pkg/rpm: version set to v5.0.5 in specs
by Daniel-Constantin Mierla 19 Dec '17

19 Dec '17

Module: kamailio Branch: 5.0 Commit: 0b935ae4d18c992a1220d275cb418d9072334352 URL: https://github.com/kamailio/kamailio/commit/0b935ae4d18c992a1220d275cb418d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-19T10:45:43+01:00 pkg/rpm: version set to v5.0.5 in specs --- Modified: pkg/kamailio/centos/6/kamailio.spec Modified: pkg/kamailio/centos/7/kamailio.spec Modified: pkg/kamailio/fedora/17/kamailio.spec Modified: pkg/kamailio/obs/kamailio.spec Modified: pkg/kamailio/oracle/el6/kamailio.spec Modified: pkg/kamailio/oracle/el7/kamailio.spec Modified: pkg/kamailio/rpm/kamailio.spec-4.1 Modified: pkg/kamailio/rpm/kamailio.spec.CenOS Modified: pkg/kamailio/rpm/kamailio.spec.SuSE --- Diff: https://github.com/kamailio/kamailio/commit/0b935ae4d18c992a1220d275cb418d9… Patch: https://github.com/kamailio/kamailio/commit/0b935ae4d18c992a1220d275cb418d9… --- diff --git a/pkg/kamailio/centos/6/kamailio.spec b/pkg/kamailio/centos/6/kamailio.spec index b345e4c789..41f57f1c5a 100644 --- a/pkg/kamailio/centos/6/kamailio.spec +++ b/pkg/kamailio/centos/6/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.4 +%define ver 5.0.5 %define rel dev0.0%{dist} diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index a34446f73b..443f6db4e8 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.4 +%define ver 5.0.5 %define rel dev0.0%{dist} %bcond_with dnssec %bcond_with kazoo diff --git a/pkg/kamailio/fedora/17/kamailio.spec b/pkg/kamailio/fedora/17/kamailio.spec index b8bcf62099..d2eb0a2fc1 100644 --- a/pkg/kamailio/fedora/17/kamailio.spec +++ b/pkg/kamailio/fedora/17/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.4 +%define ver 5.0.5 %define rel dev7.2%{dist} diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 1d0a01af83..8c3a11b2b0 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.4 +%define ver 5.0.5 %define rel dev0.0%{dist} %if 0%{?fedora} == 24 diff --git a/pkg/kamailio/oracle/el6/kamailio.spec b/pkg/kamailio/oracle/el6/kamailio.spec index 342be9fcd3..4b29b904dc 100644 --- a/pkg/kamailio/oracle/el6/kamailio.spec +++ b/pkg/kamailio/oracle/el6/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.4 +%define ver 5.0.5 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/oracle/el7/kamailio.spec b/pkg/kamailio/oracle/el7/kamailio.spec index 08a5de31a7..e6d4228fb4 100644 --- a/pkg/kamailio/oracle/el7/kamailio.spec +++ b/pkg/kamailio/oracle/el7/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.4 +%define ver 5.0.5 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec-4.1 b/pkg/kamailio/rpm/kamailio.spec-4.1 index bcd08a2a28..fe91d349e2 100644 --- a/pkg/kamailio/rpm/kamailio.spec-4.1 +++ b/pkg/kamailio/rpm/kamailio.spec-4.1 @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.4 +%define ver 5.0.5 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c avp_radius auth_radius group_radius uri_radius pa postgres osp tlsops unixodbc diff --git a/pkg/kamailio/rpm/kamailio.spec.CenOS b/pkg/kamailio/rpm/kamailio.spec.CenOS index 7910759012..18d5261970 100644 --- a/pkg/kamailio/rpm/kamailio.spec.CenOS +++ b/pkg/kamailio/rpm/kamailio.spec.CenOS @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.4 +%define ver 5.0.5 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec.SuSE b/pkg/kamailio/rpm/kamailio.spec.SuSE index 5a504eeb56..748b6ff36c 100644 --- a/pkg/kamailio/rpm/kamailio.spec.SuSE +++ b/pkg/kamailio/rpm/kamailio.spec.SuSE @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.4 +%define ver 5.0.5 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c auth_radius misc_radius peering postgress pa unixodbc osp tlsops

1 0

git:5.0:18128800: pkg/kamailio/deb: version set to 5.0.5
by Victor Seva 19 Dec '17

19 Dec '17

Module: kamailio Branch: 5.0 Commit: 1812880027d6a1df12bf904a843795d58f68f119 URL: https://github.com/kamailio/kamailio/commit/1812880027d6a1df12bf904a843795d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-12-19T10:43:15+01:00 pkg/kamailio/deb: version set to 5.0.5 --- Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog Modified: pkg/kamailio/deb/xenial/control --- Diff: https://github.com/kamailio/kamailio/commit/1812880027d6a1df12bf904a843795d… Patch: https://github.com/kamailio/kamailio/commit/1812880027d6a1df12bf904a843795d…

1 0

Planning Kamailio v5.0.5
by Daniel-Constantin Mierla 19 Dec '17

19 Dec '17

Hello, I am considering to release in the near future a new version from branch 5.0, respectively v5.0.5, a candidate day being next week, on Tuesday, December 19, 2017. If you are aware of any issue in branch 5.0 which is not yet reported on github.com/kamailio/kamailio issues tracker, then do it as soon as possible to have a chance to look at it. Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - www.asipto.com Kamailio World Conference - May 14-16, 2018 - www.kamailioworld.com

1 1

git:5.0:609186f5: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 18 Dec '17

18 Dec '17

Module: kamailio Branch: 5.0 Commit: 609186f5c71dd4813f7c83ea9b101e8cb859cd3a URL: https://github.com/kamailio/kamailio/commit/609186f5c71dd4813f7c83ea9b101e8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-12-18T20:46:22+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/609186f5c71dd4813f7c83ea9b101e8… Patch: https://github.com/kamailio/kamailio/commit/609186f5c71dd4813f7c83ea9b101e8… --- diff --git a/src/modules/dialog/README b/src/modules/dialog/README index 79fc06074d..35f2f7c396 100644 --- a/src/modules/dialog/README +++ b/src/modules/dialog/README @@ -1321,16 +1321,16 @@ unset_dlg_profile("caller","$fu"); 7.3. is_in_profile(profile,[value]) - Checks if the current dialog belongs to a profile. If the profile - supports values, the check can be reinforced to take into account a - specific value, if the dialog was inserted into the profile for a - specific value. If no value is passed, only the membership of the - dialog in the profile per se is checked. Note that if the profile does - not support values, the value parameter will be silently discarded. + Checks if the current dialog belongs to a profile. If the profile is + defined with values, then the check is also matching with the specific + value provided as parameter. + + Note that if the profile is not defined with support for values, the + value parameter will be silently discarded. Meaning of the parameters is as follows: * profile - name of the profile to be checked against; - * value (optional) - string value to further restrict the check. + * value (optional) - string value to be matched during the check. Pseudo-variables are supported. This function can be used from REQUEST_ROUTE, BRANCH_ROUTE, REPLY_ROUTE

1 0

git: new commits in branch 5.0
by Daniel-Constantin Mierla 18 Dec '17

18 Dec '17

- URL: https://github.com/kamailio/kamailio/commit/3155ab5c297e553d48a5dac2c4ab5bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-18T19:53:32+01:00 dialog: proper description of is_in_profile() to match the code - reported by GH #1320 (cherry picked from commit d319c449c8c15334ed913633cfece869a7d955aa) (cherry picked from commit 89bdf5edb485e636f3592c37ac9ce5e1458b868b) - URL: https://github.com/kamailio/kamailio/commit/5736d90efaad9827997be304920e190… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-18T19:54:26+01:00 tm: default port checking in via_matching() (cherry picked from commit 5fabdea4d86c527a2e38caaae7a54884367d6a7c) (cherry picked from commit be53e5d24707d8248a904124a6c88913b6eb0174) - URL: https://github.com/kamailio/kamailio/commit/adec5e4a039884af28ddd52579c47c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-18T19:54:35+01:00 tm: fixed condition in via_matching() - introduced in previous commit (cherry picked from commit 4bd1d70c2804ee2a1d29bd911275aa241577cfc1) (cherry picked from commit 41bfcaab0d403d2290d353e9fa522af22b72e8f6) - URL: https://github.com/kamailio/kamailio/commit/04a858667c4bdb83583e84951e8a1d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-18T19:55:27+01:00 app_lua: detect if a kemi function was already added in the exports list (cherry picked from commit d98a005ac57b957231f8bda26c711bf7c7260049) (cherry picked from commit 7093572c5ca65f805e4421d6d821eb06dd1a6dcd) - URL: https://github.com/kamailio/kamailio/commit/539d14e35734a1b2bdc8c72f2c9efa5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-18T19:55:37+01:00 app_lua: updated the utils/app_lua_ctl (cherry picked from commit ac8cc0a3735325ec79a4a634eea6bcdcea4affe7) (cherry picked from commit d56ec1c20796e9a32790d880c0ab9a4ee579216e) - URL: https://github.com/kamailio/kamailio/commit/885c632267fc3138caf5e3ad8e700ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-18T19:55:49+01:00 app_python: updated the ctl tool to generate the exports (cherry picked from commit f4c6365f2678e5c30d4a1fc287206b82a7eee459) (cherry picked from commit ba8bc6a23aed88625512b963862fe719650ea3f6) - URL: https://github.com/kamailio/kamailio/commit/6451c270b7384a9488d293092719b1b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-18T19:56:04+01:00 app_lua: updated paths to included files from core in the ctl tool (cherry picked from commit 50a9e2ec1cb86590a067dc23b2298b96a12bc232) (cherry picked from commit a56d3f8552d3926e8b69bd5cd0bdcd8d83a1f97f) - URL: https://github.com/kamailio/kamailio/commit/e9cef32174c69ed25b649d5d9a2aba3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-18T19:56:21+01:00 app_jsdt: detect if a kemi function is already in exported list (cherry picked from commit 48d55652fa36cb2b20540d1ebc7665476dfb1b1e) (cherry picked from commit 1dbc2f40554a72ce4757ccbb0501b2568c602c3c) - URL: https://github.com/kamailio/kamailio/commit/f4672cefef8df7db17daa1aeec7b27d… Author: Vasiliy Ganchev <vance(a)ukr.net> Date: 2017-12-18T19:57:16+01:00 http_client: add missed useragent parameter While preparing query_params, "useragent" was missed - add it. (cherry picked from commit 65a777f3316fb3a3adfa61739a091bb9d61582a8) (cherry picked from commit 5c44038e0c4dfae0ad0042222f2138161e3c1b11) - URL: https://github.com/kamailio/kamailio/commit/eecad6db51953955f088eb06a2e451b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-18T19:57:42+01:00 rtpengine: proper check for empty string inside add_rtpengine_socks() - reported by GH #1325 (cherry picked from commit 991fe9b28e0e201309048f3b38a135037e40357a) (cherry picked from commit 49ab70feb630634977a11809d40b60a1344df352) - URL: https://github.com/kamailio/kamailio/commit/79622dce62567045c7f82f440fc6f02… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-18T19:59:03+01:00 core: timer - use uint type instead of short for flags and slow index - get rid of unused padding field (cherry picked from commit 3d22063ebd4cfa8b54ec3e83a04e92770c6d7319) (cherry picked from commit 1de066ee6e6360056dad4c6d19b3413f26e4759c) - URL: https://github.com/kamailio/kamailio/commit/f5e9778f8558a3813943bb3a1ab50ca… Author: Timo Teras <timo.teras(a)iki.fi> Date: 2017-12-18T20:00:01+01:00 mtree: use cast to unsigned char for accessing _mt_char_table array - switched the index from unsigned int to unsigned char - simplifies the code by avoiding the tests for exceeding the size of the array - error message extended to print the full string - slightly modified version of PR #1343 (cherry picked from commit ae18e409d71d2d4eccb4604bb6f29a121309b54e) (cherry picked from commit 26bd009c4963e4acb1e0eb52d0f5c9f17096d412) - URL: https://github.com/kamailio/kamailio/commit/a12254ddeead5c966d5d3a1f9c620d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-18T20:00:32+01:00 kamctl: expose db root password variable used by kamdbctl.mysql in kamctlrc - DBROOTPW can be now set in kamctlrc - targeting use for automatic testing (cherry picked from commit 313805136d22ed79d1c4900753247032240d5a5b) (cherry picked from commit ec7d89da1cce4060969b4a7bd7db64ffa23c1b3d) - URL: https://github.com/kamailio/kamailio/commit/db7794cc6577798261cc6950cde98a0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-18T20:03:31+01:00 app_mono: safety check beforing accessing field inside pointer - zero terminated allocated strings (cherry picked from commit 53c27ac3eb3e762110bd5cf54e55ddd85a7973a1) (cherry picked from commit 7fef1fe169c587f3d6af3916cbcfde11570c920e) - URL: https://github.com/kamailio/kamailio/commit/361cd5623cd1b510aaeaa10bbeb4d25… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-18T20:05:09+01:00 cplc: null terminate log string - reset field to avoid double free (cherry picked from commit 66051f400c0a1dcd472f0c9a7957b24e9cb54a07) (cherry picked from commit c31f33de17067cbe29042b4558f28aad59ec25f0) - URL: https://github.com/kamailio/kamailio/commit/4066b1d1acf05df768116500ce2830d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-18T20:05:41+01:00 tls: safety checks for select values (cherry picked from commit 084364becd2f6f5d6e620721cb0837466c3a2f31) (cherry picked from commit d86963283cd7a58d94929959ca09ed31ae9bd116) - URL: https://github.com/kamailio/kamailio/commit/728848f6fe4a19b2a9eb69c37b49a51… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-18T20:06:21+01:00 pua: safety check for params values (cherry picked from commit a009a5bf4f145b4e877e5ba41d218607c30849ec) (cherry picked from commit 7b4a653abef51afe6a6289048ed989ba969c1310) - URL: https://github.com/kamailio/kamailio/commit/4f653e95fceb81d36f267af6e331708… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-18T20:06:36+01:00 rls: avoid walking a null string (cherry picked from commit 5f62d05180c7148f3899732dfc0da44034a314f8) (cherry picked from commit b8698724134095814339701c19f0d02bb37caa89) - URL: https://github.com/kamailio/kamailio/commit/4e74fd4337d9cafc76fa56d2fc34611… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-18T20:07:34+01:00 cdp: remove inline to functions that break the symbol linking (cherry picked from commit 76a262f4c39ecb48410f0cb531cf144baf8105e6) (cherry picked from commit 17ad3546e38dde4c893fd6e3394615e34c88466e) - URL: https://github.com/kamailio/kamailio/commit/f387a6af44b9eb00d13583e425da669… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-18T20:08:14+01:00 db_perlvdb: remove inline to functions that break the symbol linking (cherry picked from commit 8dc82f3ac87502dcf149f7b46367bfc3c45f2621) (cherry picked from commit 5bde5d47e944cd55e1d1476c46b5f24d20ef0838) - URL: https://github.com/kamailio/kamailio/commit/4edb45496e73e029d6482da41f66006… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-18T20:08:42+01:00 db_berkeley: removed inline declaration that break the linking (cherry picked from commit 373e99fd593814b55b307d0dc4a29e0c53f34850) (cherry picked from commit bf023ac2e04010f647147e9c68324d2337554464)

1 0

travis-ci error messages to the list related to coverity_scan
by Victor Seva 18 Dec '17

18 Dec '17

Hi, I must apologize about the amount of mails sent to the list during my work on coverity scan being integrated into our travis-ci build flow. I'll try not to spam the list any longer during my build tests. Sorry for the noise, Victor Seva

2 4

Please grant commit rights to Paul Claudiu Boriga
by Lucian Balaceanu 18 Dec '17

18 Dec '17

Hello Daniel, I would like to ask you to grant commit rights to my 1&1 colleague, Claudiu Boriga. As you know he has already been a contributor to Kamailio via multiple pull requests. His github account is https://github.com/claudiupb . Thank you, Lucian

2 1

git:master:2c5c25b7: cfgt: use snprintf to simplify _cfgt_get_filename()
by Victor Seva 18 Dec '17

18 Dec '17

Module: kamailio Branch: master Commit: 2c5c25b77c086ffe925820ed281f91d0549aee9e URL: https://github.com/kamailio/kamailio/commit/2c5c25b77c086ffe925820ed281f91d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-12-18T16:55:22+01:00 cfgt: use snprintf to simplify _cfgt_get_filename() > CID 153754 (#1 of 1): Buffer not null terminated (BUFFER_SIZE) > 6. buffer_size: Calling strncpy with a source string whose length (1 chars) is > greater than or equal to the size argument (1) will fail to null-terminate > dest->s + i. --- Modified: src/modules/cfgt/cfgt_int.c --- Diff: https://github.com/kamailio/kamailio/commit/2c5c25b77c086ffe925820ed281f91d… Patch: https://github.com/kamailio/kamailio/commit/2c5c25b77c086ffe925820ed281f91d… --- diff --git a/src/modules/cfgt/cfgt_int.c b/src/modules/cfgt/cfgt_int.c index 2a0777ebcb..1c5b938e9c 100644 --- a/src/modules/cfgt/cfgt_int.c +++ b/src/modules/cfgt/cfgt_int.c @@ -270,15 +270,19 @@ void _cfgt_remove_node(cfgt_node_p node) int _cfgt_get_filename(int msgid, str uuid, str *dest, int *dir) { - int i, lid; + int lid; char buff_id[INT2STR_MAX_LEN]; char *sid; + char *format = "%.*s%.*s/%.*s.json"; if(dest == NULL || uuid.len == 0) return -1; dest->len = cfgt_basedir.len + uuid.len; - if(cfgt_basedir.s[cfgt_basedir.len - 1] != '/') + if(cfgt_basedir.s[cfgt_basedir.len - 1] != '/') { dest->len = dest->len + 1; + format = "%.*s/%.*s/%.*s.json"; + } + (*dir) = dest->len; sid = sint2strbuf(msgid, buff_id, INT2STR_MAX_LEN, &lid); dest->len += lid + 6; dest->s = (char *)pkg_malloc((dest->len * sizeof(char) + 1)); @@ -286,20 +290,8 @@ int _cfgt_get_filename(int msgid, str uuid, str *dest, int *dir) LM_ERR("no more memory.\n"); return -1; } - strncpy(dest->s, cfgt_basedir.s, cfgt_basedir.len); - i = cfgt_basedir.len; - if(cfgt_basedir.s[cfgt_basedir.len - 1] != '/') { - strncpy(dest->s + i, "/", 1); - i = i + 1; - } - strncpy(dest->s + i, uuid.s, uuid.len); - i = i + uuid.len; - (*dir) = i; - strncpy(dest->s + i, "\0", 1); - i = i + 1; - strncpy(dest->s + i, sid, lid); - i = i + lid; - strncpy(dest->s + i, ".json\0", 6); + snprintf(dest->s, dest->len + 1, format, cfgt_basedir.len, cfgt_basedir.s, + uuid.len, uuid.s, lid, sid); return 0; } @@ -334,6 +326,7 @@ void cfgt_save_node(cfgt_node_p node) LM_ERR("can't build filename\n"); return; } + dest.s[dir] = '\0'; LM_DBG("dir [%s]\n", dest.s); if(mkdir(dest.s, S_IRWXO | S_IXGRP | S_IRWXU) < 0) { LM_ERR("failed to make directory: %s\n", strerror(errno));

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev