sr-dev July 2023

sr-dev@lists.kamailio.org

15 participants
237 discussions

by Дилян Палаузов

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3491 -- Commit Summary -- * mohqueue: typo * osp: typos * p_usrloc: typo * permissions: typos * pike: typo * presence: typo * qos: typos * ratelimit: typo * regex: typos * registrar: typos and formatting * rls: typos * rr: typo * rtimer: typo * rtp_media_server: typos * ruxc: typos * sca: typos * seas: typo * snmpstats: typos * statsd: typo * tcpops: typos * textops: typos -- File Changes -- M src/modules/mohqueue/doc/mohqueue_admin.xml (2) M src/modules/osp/destination.c (2) M src/modules/osp/doc/osp_admin.xml (4) M src/modules/osp/orig_transaction.c (2) M src/modules/osp/osp_mod.c (2) M src/modules/osp/osptoolkit.h (2) M src/modules/p_usrloc/udomain.c (2) M src/modules/permissions/trusted.c (4) M src/modules/permissions/trusted.h (2) M src/modules/pike/doc/pike_devel.xml (2) M src/modules/presence/doc/presence_admin.xml (2) M src/modules/qos/doc/qos_devel.xml (6) M src/modules/qos/qos.c (2) M src/modules/qos/qos_cb.c (4) M src/modules/qos/qos_handlers.c (2) M src/modules/ratelimit/doc/ratelimit_admin.xml (2) M src/modules/regex/regex_mod.c (6) M src/modules/registrar/doc/registrar_admin.xml (21) M src/modules/registrar/lookup.c (4) M src/modules/registrar/save.c (2) M src/modules/registrar/save.h (2) M src/modules/rls/notify.c (2) M src/modules/rls/resource_notify.c (6) M src/modules/rls/rls.c (4) M src/modules/rls/subscribe.c (2) M src/modules/rr/doc/rr_devel.xml (2) M src/modules/rtimer/doc/rtimer_admin.xml (2) M src/modules/rtp_media_server/doc/rtp_media_server_admin.xml (4) M src/modules/rtp_media_server/rms_sdp.c (2) M src/modules/rtp_media_server/rtp_media_server.c (6) M src/modules/ruxc/doc/ruxc_admin.xml (8) M src/modules/sca/sca_call_info.c (2) M src/modules/sca/sca_subscribe.c (4) M src/modules/sca/sca_util.c (2) M src/modules/seas/event_dispatcher.c (2) M src/modules/snmpstats/snmpObjects.c (2) M src/modules/snmpstats/snmpstats.c (2) M src/modules/statsd/doc/statsd_admin.xml (2) M src/modules/tcpops/doc/params.xml (2) M src/modules/tcpops/doc/tcpops.xml (2) M src/modules/textops/api.h (2) M src/modules/textops/doc/textops_admin.xml (2) M src/modules/textopsx/api.h (2) M src/modules/textopsx/doc/functions.xml (12) M src/modules/textopsx/textopsx.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3491.patch https://github.com/kamailio/kamailio/pull/3491.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3491 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3491(a)github.com>

10 months, 3 weeks

git: new commits in branch master

by Daniel-Constantin Mierla

- URL: https://github.com/kamailio/kamailio/commit/0dcaaed5148cba775cebfd88d8e4a59… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 mohqueue: typo - URL: https://github.com/kamailio/kamailio/commit/c663fac898f6976ed96480bc924cc7e… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 osp: typos - URL: https://github.com/kamailio/kamailio/commit/dfbc9aba5bf9a11545cbaee74393225… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 p_usrloc: typo - URL: https://github.com/kamailio/kamailio/commit/26caea49d9d1834a3bf9ebe208a5b3e… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 permissions: typos - URL: https://github.com/kamailio/kamailio/commit/194cc306c445c8050da5dcd5ecc64b5… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 pike: typo - URL: https://github.com/kamailio/kamailio/commit/2d26aa4193f2bf8c6598ca00fb8b03b… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 presence: typo - URL: https://github.com/kamailio/kamailio/commit/73a766a99a859f41ad796cb4282ac3f… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 qos: typos - URL: https://github.com/kamailio/kamailio/commit/fcbde898093f3316e238baa19af5099… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 ratelimit: typo - URL: https://github.com/kamailio/kamailio/commit/650b109dbcfe2c3083e09c987bae7ca… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 regex: typos - URL: https://github.com/kamailio/kamailio/commit/44bbc54018375c6717adb78f8bffdd1… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 registrar: typos and formatting - URL: https://github.com/kamailio/kamailio/commit/373fb98ef5e4f9a403d0e93080906ce… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 rls: typos - URL: https://github.com/kamailio/kamailio/commit/86f0fd45e420874cef4f23f0a1c350e… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 rr: typo - URL: https://github.com/kamailio/kamailio/commit/c741e8c7a04d77dec08d0b4953de812… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 rtimer: typo - URL: https://github.com/kamailio/kamailio/commit/f6c5638e3ef5c5ff195fdf179e2cdae… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 rtp_media_server: typos - URL: https://github.com/kamailio/kamailio/commit/286f0c764bcc4856ee3195119f929cb… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 ruxc: typos - URL: https://github.com/kamailio/kamailio/commit/ad81a4a258c0e70ce04bfef36dfbd52… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 sca: typos - URL: https://github.com/kamailio/kamailio/commit/b6f84b7e5985bdd12122cc51f5a07cc… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 seas: typo - URL: https://github.com/kamailio/kamailio/commit/2ac0cf8c3e73af59480e54aaa483d19… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 snmpstats: typos - URL: https://github.com/kamailio/kamailio/commit/b582e77086f9b8a93223979fa5bdcb4… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 statsd: typo - URL: https://github.com/kamailio/kamailio/commit/267a7ac1056979af800bb0818b87390… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 tcpops: typos - URL: https://github.com/kamailio/kamailio/commit/1f1926f1e2feb4cd2eccc2ec5e21606… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 textops: typos

10 months, 3 weeks

git:master:1335e93a: modules: readme files regenerated - imc ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 1335e93a76d051cb724bc696ac857aa7c3a3f43e URL: https://github.com/kamailio/kamailio/commit/1335e93a76d051cb724bc696ac857aa… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-07-13T17:46:27+02:00 modules: readme files regenerated - imc ... [skip ci] --- Modified: src/modules/imc/README --- Diff: https://github.com/kamailio/kamailio/commit/1335e93a76d051cb724bc696ac857aa… Patch: https://github.com/kamailio/kamailio/commit/1335e93a76d051cb724bc696ac857aa… --- diff --git a/src/modules/imc/README b/src/modules/imc/README index 6fa83d72aa6..a62f56d429f 100644 --- a/src/modules/imc/README +++ b/src/modules/imc/README @@ -46,6 +46,7 @@ Joey Golan 4.1. imc_manager() 4.2. imc_room_active(room) + 4.3. imc_room_member(room, user) 5. RPC Commands @@ -73,7 +74,8 @@ Joey Golan 1.10. Set check_on_create parameter 1.11. Usage of imc_manager() function 1.12. Usage of imc_room_active() function - 1.13. List of commands + 1.13. Usage of imc_room_member() function + 1.14. List of commands Chapter 1. Admin Guide @@ -102,6 +104,7 @@ Chapter 1. Admin Guide 4.1. imc_manager() 4.2. imc_room_active(room) + 4.3. imc_room_member(room, user) 5. RPC Commands @@ -289,6 +292,7 @@ modparam("imc", "check_on_create", 1) 4.1. imc_manager() 4.2. imc_room_active(room) + 4.3. imc_room_member(room, user) 4.1. imc_manager() @@ -329,6 +333,21 @@ if(is_method("MESSAGE) } ... +4.3. imc_room_member(room, user) + + Return 1 (true) if the user is member of the room, -1 (false) if the + user is not member of the room. The parameters are the SIP URIs to + identify the room and the user, they can contain variables. + + This function can be used from ANY_ROUTE. + + Example 1.13. Usage of imc_room_member() function +... + if(imc_room_member("sip:chat-sip@$fd", "sip:$rU@$rd")) { + ... + } +... + 5. RPC Commands 5.1. imc.list_rooms @@ -377,7 +396,7 @@ kamcmd imc_list_members _room_ Next picture presents the list of commands and their parameters. - Example 1.13. List of commands + Example 1.14. List of commands ... 1.create

10 months, 3 weeks

git:master:27a4fc54: imc: docs for imc_room_member()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 27a4fc543cb60636308e587523236b1ac4d56754 URL: https://github.com/kamailio/kamailio/commit/27a4fc543cb60636308e587523236b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-13T17:41:16+02:00 imc: docs for imc_room_member() --- Modified: src/modules/imc/doc/imc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/27a4fc543cb60636308e587523236b1… Patch: https://github.com/kamailio/kamailio/commit/27a4fc543cb60636308e587523236b1… --- diff --git a/src/modules/imc/doc/imc_admin.xml b/src/modules/imc/doc/imc_admin.xml index 1b485ac77ca..d77c3028b9b 100644 --- a/src/modules/imc/doc/imc_admin.xml +++ b/src/modules/imc/doc/imc_admin.xml @@ -332,6 +332,29 @@ if(is_method("MESSAGE) ... } ... +</programlisting> + </example> + </section> + <section> + <title id="imc.p.imc_room_member"> + <function moreinfo="none">imc_room_member(room, user)</function> + </title> + <para> + Return 1 (true) if the user is member of the room, -1 (false) if the + user is not member of the room. The parameters are the SIP URIs to + identify the room and the user, they can contain variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title>Usage of <varname>imc_room_member()</varname> function</title> + <programlisting format="linespecific"> +... + if(imc_room_member("sip:chat-sip@$fd", "sip:$rU@$rd")) { + ... + } +... </programlisting> </example> </section>

10 months, 3 weeks

git:master:daa88d8b: imc: exported imc_room_member() to kemi

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: daa88d8b287de5b40a478fd8291a45311fe738b2 URL: https://github.com/kamailio/kamailio/commit/daa88d8b287de5b40a478fd8291a453… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-13T17:41:16+02:00 imc: exported imc_room_member() to kemi --- Modified: src/modules/imc/imc.c --- Diff: https://github.com/kamailio/kamailio/commit/daa88d8b287de5b40a478fd8291a453… Patch: https://github.com/kamailio/kamailio/commit/daa88d8b287de5b40a478fd8291a453… --- diff --git a/src/modules/imc/imc.c b/src/modules/imc/imc.c index 14b36c62300..1251b993b63 100644 --- a/src/modules/imc/imc.c +++ b/src/modules/imc/imc.c @@ -739,6 +739,11 @@ static sr_kemi_t sr_kemi_imc_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("imc"), str_init("imc_room_member"), + SR_KEMIP_INT, ki_imc_room_member, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

10 months, 3 weeks

git:master:04bb88f9: imc: added function to check if a user is member of a chat room

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 04bb88f988d4e99625efef3f3b575b5a2dc652c1 URL: https://github.com/kamailio/kamailio/commit/04bb88f988d4e99625efef3f3b575b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-13T17:41:16+02:00 imc: added function to check if a user is member of a chat room --- Modified: src/modules/imc/imc.c --- Diff: https://github.com/kamailio/kamailio/commit/04bb88f988d4e99625efef3f3b575b5… Patch: https://github.com/kamailio/kamailio/commit/04bb88f988d4e99625efef3f3b575b5… --- diff --git a/src/modules/imc/imc.c b/src/modules/imc/imc.c index c5b65cb95d7..14b36c62300 100644 --- a/src/modules/imc/imc.c +++ b/src/modules/imc/imc.c @@ -91,6 +91,7 @@ static int child_init(int); static int w_imc_manager(struct sip_msg *, char *, char *); static int w_imc_room_active(sip_msg_t *, char *, char *); +static int w_imc_room_member(sip_msg_t *, char *, char *); static int imc_rpc_init(void); @@ -107,6 +108,8 @@ static cmd_export_t cmds[] = { {"imc_manager", (cmd_function)w_imc_manager, 0, 0, 0, REQUEST_ROUTE}, {"imc_room_active", (cmd_function)w_imc_room_active, 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, + {"imc_room_member", (cmd_function)w_imc_room_member, 2, + fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -471,7 +474,7 @@ static int w_imc_room_active(sip_msg_t *msg, char *proom, char *str2) { str room = STR_NULL; - if(fixup_get_svalue(msg, (gparam_t*)proom, &room) != 0) { + if(fixup_get_svalue(msg, (gparam_t *)proom, &room) != 0) { LM_ERR("invalid room parameter"); return -1; } @@ -479,6 +482,57 @@ static int w_imc_room_active(sip_msg_t *msg, char *proom, char *str2) return ki_imc_room_active(msg, &room); } +/** + * + */ +static int ki_imc_room_member(sip_msg_t *msg, str *room, str *member) +{ + sip_uri_t puri; + imc_room_t *rm; + imc_member_t *mb; + + if(parse_uri(room->s, room->len, &puri) != 0) { + LM_ERR("failed to parse room uri [%.*s]\n", room->len, room->s); + return -1; + } + + rm = imc_get_room(&puri.user, &puri.host); + + if(rm == NULL) { + return -1; + } + + if(parse_uri(member->s, member->len, &puri) != 0) { + imc_release_room(rm); + LM_ERR("failed to parse member uri [%.*s]\n", member->len, member->s); + return -1; + } + mb = imc_get_member(rm, &puri.user, &puri.host); + imc_release_room(rm); + + return (mb != NULL) ? 1 : -1; +} + +/** + * + */ +static int w_imc_room_member(sip_msg_t *msg, char *proom, char *pmember) +{ + str room = STR_NULL; + str member = STR_NULL; + + if(fixup_get_svalue(msg, (gparam_t *)proom, &room) != 0) { + LM_ERR("invalid room parameter"); + return -1; + } + if(fixup_get_svalue(msg, (gparam_t *)pmember, &member) != 0) { + LM_ERR("invalid member parameter"); + return -1; + } + + return ki_imc_room_member(msg, &room, &member); +} + /** * destroy module */

10 months, 3 weeks

[kamailio/kamailio] siptrace: fix pseudo var direction attribute length (PR #3489)

by Mvondo Eric

#### 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 - [ ] 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/3489 -- Commit Summary -- * siptrace: fix pseudo var direction attribute length -- File Changes -- M src/modules/siptrace/siptrace.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3489.patch https://github.com/kamailio/kamailio/pull/3489.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3489 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3489(a)github.com>

10 months, 3 weeks

git:master:508886c3: siptrace: fix pseudo var direction attribute length

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 508886c3054a8470fe4469e78e63aa37ae93922d URL: https://github.com/kamailio/kamailio/commit/508886c3054a8470fe4469e78e63aa3… Author: MVONDO Eric OBS/OINIS <bycl2332(a)orange.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-13T08:47:33+02:00 siptrace: fix pseudo var direction attribute length --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/508886c3054a8470fe4469e78e63aa3… Patch: https://github.com/kamailio/kamailio/commit/508886c3054a8470fe4469e78e63aa3… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 1c129762314..b37d860ca3f 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -2795,6 +2795,8 @@ int pv_parse_siptrace_name(pv_spec_t *sp, str *in) sp->pvp.pvn.u.isname.name.n = 6; else if(strncmp(in->s, "dst_proto", 9)==0) sp->pvp.pvn.u.isname.name.n = 7; + else if(strncmp(in->s, "direction", 9)==0) + sp->pvp.pvn.u.isname.name.n = 10; else goto error; break; case 10: @@ -2802,8 +2804,6 @@ int pv_parse_siptrace_name(pv_spec_t *sp, str *in) sp->pvp.pvn.u.isname.name.n = 8; else if(strncmp(in->s, "dst_hostip", 10)==0) sp->pvp.pvn.u.isname.name.n = 9; - else if(strncmp(in->s, "direction", 10)==0) - sp->pvp.pvn.u.isname.name.n = 10; else goto error; break; default:

10 months, 3 weeks

git:master:675f6c02: core: modparam use strncpy() for setting boundaries

by Victor Seva

Module: kamailio Branch: master Commit: 675f6c0224897544d30f5f863c503499b2e5f2fe URL: https://github.com/kamailio/kamailio/commit/675f6c0224897544d30f5f863c50349… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-13T00:12:59+02:00 core: modparam use strncpy() for setting boundaries * use strncat() > https://github.com/kamailio/kamailio/security/code-scanning/1836 > https://github.com/kamailio/kamailio/security/code-scanning/1834 --- Modified: src/core/modparam.c Modified: src/core/sr_module.c --- Diff: https://github.com/kamailio/kamailio/commit/675f6c0224897544d30f5f863c50349… Patch: https://github.com/kamailio/kamailio/commit/675f6c0224897544d30f5f863c50349… --- diff --git a/src/core/modparam.c b/src/core/modparam.c index cf7957a16a9..46ea0169e53 100644 --- a/src/core/modparam.c +++ b/src/core/modparam.c @@ -72,7 +72,7 @@ int set_mod_param_regex(char *regex, char *name, modparam_t type, void *val) { struct sr_module *t; regex_t preg; - int mod_found, len; + int mod_found, len, len_param; char *reg; void *ptr, *val2; modparam_t param_type; @@ -143,15 +143,15 @@ int set_mod_param_regex(char *regex, char *name, modparam_t type, void *val) } else { switch(PARAM_TYPE_MASK(param_type)) { case PARAM_STRING: - *((char **)ptr) = - pkg_malloc(strlen((char *)val2) + 1); + len_param = strlen((char *)val2); + *((char **)ptr) = pkg_malloc(len_param + 1); if(!*((char **)ptr)) { PKG_MEM_ERROR; regfree(&preg); pkg_free(reg); return -1; } - strcpy(*((char **)ptr), (char *)val2); + strncpy(*((char **)ptr), (char *)val2, len_param); break; case PARAM_STR: diff --git a/src/core/sr_module.c b/src/core/sr_module.c index 2c5b4f1852f..1b7ea7332d2 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -503,7 +503,7 @@ int ksr_locate_module(char *mod_path, char **new_path) len++; } path[len] = 0; - strcat(path, mod_path); + strncat(path, mod_path, strlen(mod_path)); if(stat(path, &stat_buf) == -1) { LM_DBG("module file not found <%s>\n", path);

10 months, 3 weeks

git:master:7e8a70e9: jsonrcps: use strncpy() for setting boundaries

by Victor Seva

Module: kamailio Branch: master Commit: 7e8a70e9bf3d0b52eae1b7933633095686f234b2 URL: https://github.com/kamailio/kamailio/commit/7e8a70e9bf3d0b52eae1b7933633095… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-13T00:12:59+02:00 jsonrcps: use strncpy() for setting boundaries * use strncat() > https://github.com/kamailio/kamailio/security/code-scanning/2381 > https://github.com/kamailio/kamailio/security/code-scanning/2380 > https://github.com/kamailio/kamailio/security/code-scanning/1843 > https://github.com/kamailio/kamailio/security/code-scanning/1841 --- Modified: src/modules/jsonrpcs/jsonrpcs_fifo.c Modified: src/modules/jsonrpcs/jsonrpcs_sock.c --- Diff: https://github.com/kamailio/kamailio/commit/7e8a70e9bf3d0b52eae1b7933633095… Patch: https://github.com/kamailio/kamailio/commit/7e8a70e9bf3d0b52eae1b7933633095… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_fifo.c b/src/modules/jsonrpcs/jsonrpcs_fifo.c index f6ff7049890..906deb03334 100644 --- a/src/modules/jsonrpcs/jsonrpcs_fifo.c +++ b/src/modules/jsonrpcs/jsonrpcs_fifo.c @@ -560,10 +560,10 @@ int jsonrpc_fifo_mod_init(void) LM_ERR("no more pkg\n"); return -1; } - strcpy(p, runtime_dir); + strncpy(p, runtime_dir, len); if(sep) strcat(p, "/"); - strcat(p, jsonrpc_fifo); + strncat(p, jsonrpc_fifo, len - strlen(runtime_dir) - sep); jsonrpc_fifo = p; LM_DBG("fifo path is [%s]\n", jsonrpc_fifo); } diff --git a/src/modules/jsonrpcs/jsonrpcs_sock.c b/src/modules/jsonrpcs/jsonrpcs_sock.c index 4c6eb028a69..c73687a8239 100644 --- a/src/modules/jsonrpcs/jsonrpcs_sock.c +++ b/src/modules/jsonrpcs/jsonrpcs_sock.c @@ -205,10 +205,10 @@ int jsonrpc_dgram_mod_init(void) LM_ERR("no more pkg\n"); return -1; } - strcpy(p, runtime_dir); + strncpy(p, runtime_dir, len); if(sep) strcat(p, "/"); - strcat(p, jsonrpc_dgram_socket); + strncat(p, jsonrpc_dgram_socket, len - strlen(runtime_dir) - sep); jsonrpc_dgram_socket = p; LM_DBG("unix socket path is [%s]\n", jsonrpc_dgram_socket); }

10 months, 3 weeks

← Newer
1
...
16
17
18
19
20
21
22
23
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 2023