- sr-dev - kamailio.org

git:master:84591b66: modules: readme files regenerated - mohqueue ... [skip ci]
by The Root 14 Jul '23

14 Jul '23

Module: kamailio Branch: master Commit: 84591b667e06ac8794d9f1050796a6273ce4532c URL: https://github.com/kamailio/kamailio/commit/84591b667e06ac8794d9f1050796a62… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: The Root <root(a)kamailio.org> Date: 2023-07-14T15:01:17+02:00 modules: readme files regenerated - mohqueue ... [skip ci] --- Modified: src/modules/mohqueue/README Modified: src/modules/osp/README Modified: src/modules/pike/README Modified: src/modules/qos/README Modified: src/modules/ratelimit/README Modified: src/modules/registrar/README Modified: src/modules/rr/README Modified: src/modules/rtimer/README Modified: src/modules/rtp_media_server/README Modified: src/modules/ruxc/README Modified: src/modules/statsd/README Modified: src/modules/tcpops/README Modified: src/modules/textops/README Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/84591b667e06ac8794d9f1050796a62… Patch: https://github.com/kamailio/kamailio/commit/84591b667e06ac8794d9f1050796a62…

1 0

git:master:60abf767: geoip2: added distance function
by Daniel-Constantin Mierla 14 Jul '23

14 Jul '23

Module: kamailio Branch: master Commit: 60abf767988dba052d7e08c386a589c1aeb711ef URL: https://github.com/kamailio/kamailio/commit/60abf767988dba052d7e08c386a589c… Author: Nikolay Ivanuschak <ivanuschak.nikolay(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-14T14:47:12+02:00 geoip2: added distance function Added distance function which allows to calculate the distance between the geocoordinates of the the IP-address passed as incoming parameter (coordinates for the IP are determined inside the function) and the geocoordinates passed as parameters for the function. --- Modified: src/modules/geoip2/doc/geoip2_admin.xml Modified: src/modules/geoip2/geoip2_mod.c Modified: src/modules/geoip2/geoip2_pv.c Modified: src/modules/geoip2/geoip2_pv.h --- Diff: https://github.com/kamailio/kamailio/commit/60abf767988dba052d7e08c386a589c… Patch: https://github.com/kamailio/kamailio/commit/60abf767988dba052d7e08c386a589c…

1 0

[kamailio/kamailio] Typos (PR #3491)
by Дилян Палаузов 14 Jul '23

14 Jul '23

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>

2 1

git: new commits in branch master
by Daniel-Constantin Mierla 14 Jul '23

14 Jul '23

- 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

1 0

git:master:1335e93a: modules: readme files regenerated - imc ... [skip ci]
by Kamailio Dev 13 Jul '23

13 Jul '23

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

1 0

git:master:27a4fc54: imc: docs for imc_room_member()
by Daniel-Constantin Mierla 13 Jul '23

13 Jul '23

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>

1 0

git:master:04bb88f9: imc: added function to check if a user is member of a chat room
by Daniel-Constantin Mierla 13 Jul '23

13 Jul '23

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 */

1 0

git:master:daa88d8b: imc: exported imc_room_member() to kemi
by Daniel-Constantin Mierla 13 Jul '23

13 Jul '23

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 } } };

1 0

[kamailio/kamailio] siptrace: fix pseudo var direction attribute length (PR #3489)
by Mvondo Eric 13 Jul '23

13 Jul '23

#### 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>

2 3

git:master:508886c3: siptrace: fix pseudo var direction attribute length
by Daniel-Constantin Mierla 13 Jul '23

13 Jul '23

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:

1 0

git:master:7e8a70e9: jsonrcps: use strncpy() for setting boundaries
by Victor Seva 12 Jul '23

12 Jul '23

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); }

1 0

git:master:675f6c02: core: modparam use strncpy() for setting boundaries
by Victor Seva 12 Jul '23

12 Jul '23

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);

1 0

git:master:dd04bceb: path: use snprintf() instead of sprintf()
by Victor Seva 12 Jul '23

12 Jul '23

Module: kamailio Branch: master Commit: dd04bceb99ba69bd59c67ba103f3c55d47a31dd6 URL: https://github.com/kamailio/kamailio/commit/dd04bceb99ba69bd59c67ba103f3c55… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-13T00:12:58+02:00 path: use snprintf() instead of sprintf() > https://github.com/kamailio/kamailio/security/code-scanning/2612 > https://github.com/kamailio/kamailio/security/code-scanning/2613 > https://github.com/kamailio/kamailio/security/code-scanning/2614 > https://github.com/kamailio/kamailio/security/code-scanning/2615 --- Modified: src/modules/path/path.c --- Diff: https://github.com/kamailio/kamailio/commit/dd04bceb99ba69bd59c67ba103f3c55… Patch: https://github.com/kamailio/kamailio/commit/dd04bceb99ba69bd59c67ba103f3c55… --- diff --git a/src/modules/path/path.c b/src/modules/path/path.c index 23309c33fe9..2431a985553 100644 --- a/src/modules/path/path.c +++ b/src/modules/path/path.c @@ -105,7 +105,8 @@ static int prepend_path( sip_msg_t *_m, str *user, path_param_t param, str *add_params) { struct lump *l; - char *prefix, *suffix, *cp, *dp; + char *prefix, *suffix, *dp; + str cp = STR_NULL; const char *proto_str; int prefix_len, suffix_len; struct hdr_field *hf; @@ -115,13 +116,13 @@ static int prepend_path( + IP_ADDR_MAX_STR_SIZE + 2 + (add_params ? add_params->len : 0) + path_received_name.len + 1; - cp = suffix = pkg_malloc(suffix_len); + cp.s = suffix = pkg_malloc(suffix_len); if(!suffix) { PKG_MEM_ERROR_FMT("for suffix\n"); goto out1; } - cp += sprintf(cp, ";lr"); + cp.len = sprintf(cp.s, ";lr"); if(param & PATH_PARAM_RECEIVED) { if(path_received_format == 0) { @@ -132,21 +133,25 @@ static int prepend_path( proto_str = NULL; } if(_m->rcv.src_ip.af == AF_INET6) { - cp += sprintf(cp, ";%s=sip:[%s]:%hu%s", path_received_name.s, + cp.len += snprintf(cp.s + cp.len, suffix_len - cp.len, + ";%s=sip:[%s]:%hu%s", path_received_name.s, ip_addr2a(&_m->rcv.src_ip), _m->rcv.src_port, proto_str ?: ""); } else { - cp += sprintf(cp, ";%s=sip:%s:%hu%s", path_received_name.s, + cp.len += snprintf(cp.s + cp.len, suffix_len - cp.len, + ";%s=sip:%s:%hu%s", path_received_name.s, ip_addr2a(&_m->rcv.src_ip), _m->rcv.src_port, proto_str ?: ""); } } else { if(_m->rcv.src_ip.af == AF_INET6) { - cp += sprintf(cp, ";%s=[%s]~%hu~%d", path_received_name.s, + cp.len += snprintf(cp.s + cp.len, suffix_len - cp.len, + ";%s=[%s]~%hu~%d", path_received_name.s, ip_addr2a(&_m->rcv.src_ip), _m->rcv.src_port, (int)_m->rcv.proto); } else { - cp += sprintf(cp, ";%s=%s~%hu~%d", path_received_name.s, + cp.len += snprintf(cp.s + cp.len, suffix_len - cp.len, + ";%s=%s~%hu~%d", path_received_name.s, ip_addr2a(&_m->rcv.src_ip), _m->rcv.src_port, (int)_m->rcv.proto); } @@ -154,17 +159,18 @@ static int prepend_path( } if(param & PATH_PARAM_OB) { - cp += sprintf(cp, ";ob"); + cp.len += sprintf(cp.s + cp.len, ";ob"); } if(add_params && add_params->len) { - cp += sprintf(cp, ";%.*s", add_params->len, add_params->s); + cp.len += snprintf(cp.s + cp.len, suffix_len - cp.len, ";%.*s", + add_params->len, add_params->s); } if(path_enable_r2 == 0) { - cp += sprintf(cp, ">\r\n"); + cp.len += sprintf(cp.s + cp.len, ">\r\n"); } else { - cp += sprintf(cp, ";r2=on>\r\n"); + cp.len += sprintf(cp.s + cp.len, ";r2=on>\r\n"); } prefix_len = PATH_PREFIX_LEN + (user ? user->len : 0) + 2; @@ -174,7 +180,8 @@ static int prepend_path( goto out2; } if(user && user->len) - prefix_len = sprintf(prefix, PATH_PREFIX "%.*s@", user->len, user->s); + prefix_len = snprintf( + prefix, prefix_len, PATH_PREFIX "%.*s@", user->len, user->s); else prefix_len = sprintf(prefix, PATH_PREFIX); @@ -201,7 +208,7 @@ static int prepend_path( l, (path_sockname_mode) ? SUBST_SND_ALL_EX : SUBST_SND_ALL, 0); if(!l) goto out2; - l = insert_new_lump_before(l, suffix, cp - suffix, 0); + l = insert_new_lump_before(l, suffix, cp.s - suffix, 0); if(!l) goto out2; @@ -216,10 +223,10 @@ static int prepend_path( l, (path_sockname_mode) ? SUBST_RCV_ALL_EX : SUBST_RCV_ALL, 0); if(!l) goto out1; - dp = path_strzdup(suffix, cp - suffix); + dp = path_strzdup(suffix, cp.s - suffix); if(dp == NULL) goto out1; - l = insert_new_lump_before(l, dp, cp - suffix, 0); + l = insert_new_lump_before(l, dp, cp.s - suffix, 0); if(!l) goto out1; }

1 0

git:master:77ca2e93: permissions: use strncpy() for setting boundaries
by Victor Seva 12 Jul '23

12 Jul '23

Module: kamailio Branch: master Commit: 77ca2e93e945fe46783e953d58bc546d9d6d1b81 URL: https://github.com/kamailio/kamailio/commit/77ca2e93e945fe46783e953d58bc546… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-13T00:12:59+02:00 permissions: use strncpy() for setting boundaries > https://github.com/kamailio/kamailio/security/code-scanning/2616 > https://github.com/kamailio/kamailio/security/code-scanning/1845 --- Modified: src/modules/permissions/parse_config.c Modified: src/modules/permissions/rule.c --- Diff: https://github.com/kamailio/kamailio/commit/77ca2e93e945fe46783e953d58bc546… Patch: https://github.com/kamailio/kamailio/commit/77ca2e93e945fe46783e953d58bc546… --- diff --git a/src/modules/permissions/parse_config.c b/src/modules/permissions/parse_config.c index 20fdf8b6c47..7bf0c95a4fc 100644 --- a/src/modules/permissions/parse_config.c +++ b/src/modules/permissions/parse_config.c @@ -1,7 +1,7 @@ /* * PERMISSIONS module * - * Copyright (C) 2003 Mikl�s Tirp�k (mtirpak(a)sztaki.hu) + * Copyright (C) 2003 Mikl��s Tirp��k (mtirpak(a)sztaki.hu) * * This file is part of Kamailio, a free SIP server. * @@ -137,7 +137,7 @@ static int parse_expression(char *sv, expression **e, expression **e_exceptions) } } else { /* no exception */ - strcpy(str2, sv); + strncpy(str2, sv, LINE_LENGTH); *e_exceptions = NULL; } diff --git a/src/modules/permissions/rule.c b/src/modules/permissions/rule.c index 3140acfe01f..f315d10d749 100644 --- a/src/modules/permissions/rule.c +++ b/src/modules/permissions/rule.c @@ -1,7 +1,7 @@ /* * PERMISSIONS module * - * Copyright (C) 2003 Mikl�s Tirp�k (mtirpak(a)sztaki.hu) + * Copyright (C) 2003 Mikl��s Tirp��k (mtirpak(a)sztaki.hu) * * This file is part of Kamailio, a free SIP server. * @@ -148,7 +148,7 @@ expression *new_expression(char *sv) return 0; } - strcpy(e->value, sv); + strncpy(e->value, sv, EXPRESSION_LENGTH); e->reg_value = (regex_t *)pkg_malloc(sizeof(regex_t)); if(!e->reg_value) {

1 0

git:master:e347d89d: core: socket_info use strncpy() for setting boundaries
by Victor Seva 12 Jul '23

12 Jul '23

Module: kamailio Branch: master Commit: e347d89dba284f2d9635828b10b7ed49ad2244ad URL: https://github.com/kamailio/kamailio/commit/e347d89dba284f2d9635828b10b7ed4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-13T00:12:59+02:00 core: socket_info use strncpy() for setting boundaries > https://github.com/kamailio/kamailio/security/code-scanning/2586 --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/e347d89dba284f2d9635828b10b7ed4… Patch: https://github.com/kamailio/kamailio/commit/e347d89dba284f2d9635828b10b7ed4… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 56a4ba261eb..04a2e609323 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -329,10 +329,10 @@ static inline struct socket_info *new_sock_info(char *name, } if(usename != NULL) { si->useinfo.name.len = strlen(usename); - si->useinfo.name.s = (char *)pkg_malloc(si->useinfo.name.len + 1); + si->useinfo.name.s = (char *)pkg_malloc(si->useinfo.name.len); if(si->useinfo.name.s == 0) goto error; - strcpy(si->useinfo.name.s, usename); + strncpy(si->useinfo.name.s, usename, si->useinfo.name.len + 1); if(usename[0] == '[' && usename[si->useinfo.name.len - 1] == ']') { si->useinfo.address_str.len = si->useinfo.name.len - 2; p = si->useinfo.name.s + 1; @@ -354,7 +354,7 @@ static inline struct socket_info *new_sock_info(char *name, (char *)pkg_malloc(si->useinfo.port_no_str.len + 1); if(si->useinfo.port_no_str.s == NULL) goto error; - strcpy(si->useinfo.port_no_str.s, p); + strncpy(si->useinfo.port_no_str.s, p, si->useinfo.port_no_str.len); si->useinfo.port_no = useport; he = resolvehost(si->useinfo.name.s);

1 0

git:master:cbd7810f: sipcapture: use memcpy instead of strncpy for coherence
by Victor Seva 12 Jul '23

12 Jul '23

Module: kamailio Branch: master Commit: cbd7810fff3d5145c1ce34c0e362b5590bb92a12 URL: https://github.com/kamailio/kamailio/commit/cbd7810fff3d5145c1ce34c0e362b55… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-13T00:12:46+02:00 sipcapture: use memcpy instead of strncpy for coherence > https://github.com/kamailio/kamailio/security/code-scanning/2620 > https://github.com/kamailio/kamailio/security/code-scanning/2621 --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/cbd7810fff3d5145c1ce34c0e362b55… Patch: https://github.com/kamailio/kamailio/commit/cbd7810fff3d5145c1ce34c0e362b55… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 46f9059d489..de0a15174cc 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -1849,6 +1849,7 @@ static int sip_capture( struct timeval tvb; struct timezone tz; char tmp_node[100]; + str ip; LM_DBG("CAPTURE DEBUG...\n"); @@ -2249,9 +2250,11 @@ static int sip_capture( /* IP source and destination */ - strcpy(buf_ip, ip_addr2a(&msg->rcv.src_ip)); + ip.s = ip_addr2a(&msg->rcv.src_ip); + ip.len = strlen(ip.s); + memcpy(buf_ip, ip.s, ip.len); sco.source_ip.s = buf_ip; - sco.source_ip.len = strlen(buf_ip); + sco.source_ip.len = ip.len; sco.source_port = msg->rcv.src_port; /*source ip*/ @@ -2794,7 +2797,7 @@ static int report_capture(sip_msg_t *msg, str *_table, str *_corr, str *_data) struct timezone tz; char tmp_node[100]; time_t epoch_time_as_time_t; - str corrtmp = STR_NULL, tmp; + str corrtmp = STR_NULL, tmp, ip; _capture_mode_data_t *c = NULL; @@ -2834,10 +2837,11 @@ static int report_capture(sip_msg_t *msg, str *_table, str *_corr, str *_data) //EMPTY_STR(sco.msg); /* IP source and destination */ - - strcpy(buf_ip, ip_addr2a(&msg->rcv.src_ip)); + ip.s = ip_addr2a(&msg->rcv.src_ip); + ip.len = strlen(ip.s); + memcpy(buf_ip, ip.s, ip.len); sco.source_ip.s = buf_ip; - sco.source_ip.len = strlen(buf_ip); + sco.source_ip.len = ip.len; sco.source_port = msg->rcv.src_port; /*source ip*/

1 0

git:master:d00ceda2: rtpproxy: use memcpy instead of strcpy for coherence
by Victor Seva 12 Jul '23

12 Jul '23

Module: kamailio Branch: master Commit: d00ceda2c0428c6c02f3ed6d4c8c067e3f6ae94b URL: https://github.com/kamailio/kamailio/commit/d00ceda2c0428c6c02f3ed6d4c8c067… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-13T00:12:58+02:00 rtpproxy: use memcpy instead of strcpy for coherence > https://github.com/kamailio/kamailio/security/code-scanning/2617 > https://github.com/kamailio/kamailio/security/code-scanning/2618 > https://github.com/kamailio/kamailio/security/code-scanning/2620 --- Modified: src/modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/d00ceda2c0428c6c02f3ed6d4c8c067… Patch: https://github.com/kamailio/kamailio/commit/d00ceda2c0428c6c02f3ed6d4c8c067… --- diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c index 493d8ffdf88..8103fef4edd 100644 --- a/src/modules/rtpproxy/rtpproxy.c +++ b/src/modules/rtpproxy/rtpproxy.c @@ -1667,7 +1667,7 @@ static int set_rtp_proxy_set_f(struct sip_msg *msg, char *str1, char *str2) static int rtpproxy_manage(struct sip_msg *msg, char *flags, char *ip) { - char *cp = NULL; + str cp = STR_NULL; char newip[IP_ADDR_MAX_STR_SIZE]; int method; int nosdp; @@ -1696,8 +1696,9 @@ static int rtpproxy_manage(struct sip_msg *msg, char *flags, char *ip) return unforce_rtp_proxy(msg, flags); if(ip == NULL) { - cp = ip_addr2a(&msg->rcv.dst_ip); - strcpy(newip, cp); + cp.s = ip_addr2a(&msg->rcv.dst_ip); + cp.len = strlen(cp.s); + memcpy(newip, cp.s, cp.len); } if(msg->msg_flags & FL_SDP_BODY) @@ -1707,13 +1708,13 @@ static int rtpproxy_manage(struct sip_msg *msg, char *flags, char *ip) if(msg->first_line.type == SIP_REQUEST) { if(method == METHOD_ACK && nosdp == 0) - return force_rtp_proxy(msg, flags, (cp != NULL) ? newip : ip, 0, + return force_rtp_proxy(msg, flags, (cp.s != NULL) ? newip : ip, 0, (ip != NULL) ? 1 : 0); if(method == METHOD_PRACK && nosdp == 0) - return force_rtp_proxy(msg, flags, (cp != NULL) ? newip : ip, 1, + return force_rtp_proxy(msg, flags, (cp.s != NULL) ? newip : ip, 1, (ip != NULL) ? 1 : 0); if(method == METHOD_UPDATE && nosdp == 0) - return force_rtp_proxy(msg, flags, (cp != NULL) ? newip : ip, 1, + return force_rtp_proxy(msg, flags, (cp.s != NULL) ? newip : ip, 1, (ip != NULL) ? 1 : 0); if(method == METHOD_INVITE && nosdp == 0) { msg->msg_flags |= FL_SDP_BODY; @@ -1722,7 +1723,7 @@ static int rtpproxy_manage(struct sip_msg *msg, char *flags, char *ip) tmb.t_gett()->uas.request->msg_flags |= FL_SDP_BODY; if(route_type == FAILURE_ROUTE) return unforce_rtp_proxy(msg, flags); - return force_rtp_proxy(msg, flags, (cp != NULL) ? newip : ip, 1, + return force_rtp_proxy(msg, flags, (cp.s != NULL) ? newip : ip, 1, (ip != NULL) ? 1 : 0); } } else if(msg->first_line.type == SIP_REPLY) { @@ -1730,19 +1731,19 @@ static int rtpproxy_manage(struct sip_msg *msg, char *flags, char *ip) return unforce_rtp_proxy(msg, flags); if(nosdp == 0) { if(method == METHOD_PRACK) - return force_rtp_proxy(msg, flags, (cp != NULL) ? newip : ip, 0, - (ip != NULL) ? 1 : 0); + return force_rtp_proxy(msg, flags, (cp.s != NULL) ? newip : ip, + 0, (ip != NULL) ? 1 : 0); if(method == METHOD_UPDATE) - return force_rtp_proxy(msg, flags, (cp != NULL) ? newip : ip, 0, - (ip != NULL) ? 1 : 0); + return force_rtp_proxy(msg, flags, (cp.s != NULL) ? newip : ip, + 0, (ip != NULL) ? 1 : 0); if(tmb.t_gett == NULL || tmb.t_gett() == NULL || tmb.t_gett() == T_UNDEFINED) - return force_rtp_proxy(msg, flags, (cp != NULL) ? newip : ip, 0, - (ip != NULL) ? 1 : 0); + return force_rtp_proxy(msg, flags, (cp.s != NULL) ? newip : ip, + 0, (ip != NULL) ? 1 : 0); if(tmb.t_gett()->uas.request->msg_flags & FL_SDP_BODY) - return force_rtp_proxy(msg, flags, (cp != NULL) ? newip : ip, 0, - (ip != NULL) ? 1 : 0); - return force_rtp_proxy(msg, flags, (cp != NULL) ? newip : ip, 1, + return force_rtp_proxy(msg, flags, (cp.s != NULL) ? newip : ip, + 0, (ip != NULL) ? 1 : 0); + return force_rtp_proxy(msg, flags, (cp.s != NULL) ? newip : ip, 1, (ip != NULL) ? 1 : 0); } } @@ -1823,15 +1824,16 @@ static int rtpproxy_offer2_f(struct sip_msg *msg, char *param1, char *param2) static int rtpproxy_answer1_helper_f(struct sip_msg *msg, char *flags) { - char *cp; + str cp = STR_NULL; char newip[IP_ADDR_MAX_STR_SIZE]; if(msg->first_line.type == SIP_REQUEST) if(msg->first_line.u.request.method_value != METHOD_ACK) return -1; - cp = ip_addr2a(&msg->rcv.dst_ip); - strcpy(newip, cp); + cp.s = ip_addr2a(&msg->rcv.dst_ip); + cp.len = strlen(cp.s); + memcpy(newip, cp.s, cp.len); return force_rtp_proxy(msg, flags, newip, 0, 0); }

1 0

[kamailio/kamailio] Rabbitmq amqps (PR #3510)
by joelbax 12 Jul '23

12 Jul '23

#### Pre-Submission Checklist    - [x] 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) - [ ] 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 - [ ] 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/3510 -- Commit Summary -- * db_redis: Adding TLS support * ndb_redis: Adding TLS support * db_redis: Fixing format * db_redis: Missing format fixes * ndb_redis: Format fixes * db_redis: Fixing build * db_redis: Fixing Makefile * db_redis: Fixing global variables * ndb_redis: Fixing global variables names * ndb_redis: Missing uprotected redisSSLContext * db_redis: Searching SSL support in gcc search library path * ndb_redis: Searching SSL support in gcc search library path * db_redis: Format fixes * ndb_redis: Fixing format * Merge remote-tracking branch 'upstream/master' * rabbitmq: Adding ampqs support -- File Changes -- M src/modules/rabbitmq/doc/rabbitmq_admin.xml (3) M src/modules/rabbitmq/rabbitmq.c (33) M src/modules/rabbitmq/rabbitmq.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3510.patch https://github.com/kamailio/kamailio/pull/3510.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3510 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3510(a)github.com>

2 2

git:master:e17a3de2: nats: nats_publish set reply parameter to be optional
by Victor Seva 12 Jul '23

12 Jul '23

Module: kamailio Branch: master Commit: e17a3de2994e3237ea4a0916f60635f9f038d266 URL: https://github.com/kamailio/kamailio/commit/e17a3de2994e3237ea4a0916f60635f… Author: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-12T09:55:10+02:00 nats: nats_publish set reply parameter to be optional --- Modified: src/modules/nats/nats_mod.c Modified: src/modules/nats/nats_mod.h Modified: src/modules/nats/nats_pub.c Modified: src/modules/nats/nats_pub.h --- Diff: https://github.com/kamailio/kamailio/commit/e17a3de2994e3237ea4a0916f60635f… Patch: https://github.com/kamailio/kamailio/commit/e17a3de2994e3237ea4a0916f60635f…

1 0

[kamailio/kamailio] nats: nats_publish set reply parameter to be optional (PR #3507)
by Emmanuel Schmidbauer 12 Jul '23

12 Jul '23

#### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description commit a725b4fd224c27d84a9f5623faa5af3c3873a2e5 seems to make the `nats_publish` function require the `reply.topic` parameter required. The change from that commit breaks backward compatibility and forces the configuration to pass a reply.topic. This PR makes the `reply.topic` optional. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3507 -- Commit Summary -- * nats: nats_publish set reply parameter to be optional -- File Changes -- M src/modules/nats/nats_mod.c (4) M src/modules/nats/nats_mod.h (6) M src/modules/nats/nats_pub.c (39) M src/modules/nats/nats_pub.h (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3507.patch https://github.com/kamailio/kamailio/pull/3507.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3507 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3507(a)github.com>

2 2

git:master:9fd006e4: modules: readme files regenerated - imc ... [skip ci]
by Kamailio Dev 12 Jul '23

12 Jul '23

Module: kamailio Branch: master Commit: 9fd006e48469d86f68926418fc749cb798fdc9b7 URL: https://github.com/kamailio/kamailio/commit/9fd006e48469d86f68926418fc749cb… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-07-12T09:16:27+02:00 modules: readme files regenerated - imc ... [skip ci] --- Modified: src/modules/imc/README --- Diff: https://github.com/kamailio/kamailio/commit/9fd006e48469d86f68926418fc749cb… Patch: https://github.com/kamailio/kamailio/commit/9fd006e48469d86f68926418fc749cb… --- diff --git a/src/modules/imc/README b/src/modules/imc/README index fa467ab6148..6fa83d72aa6 100644 --- a/src/modules/imc/README +++ b/src/modules/imc/README @@ -45,6 +45,7 @@ Joey Golan 4. Functions 4.1. imc_manager() + 4.2. imc_room_active(room) 5. RPC Commands @@ -71,7 +72,8 @@ Joey Golan 1.9. Set create_on_join parameter 1.10. Set check_on_create parameter 1.11. Usage of imc_manager() function - 1.12. List of commands + 1.12. Usage of imc_room_active() function + 1.13. List of commands Chapter 1. Admin Guide @@ -99,6 +101,7 @@ Chapter 1. Admin Guide 4. Functions 4.1. imc_manager() + 4.2. imc_room_active(room) 5. RPC Commands @@ -285,6 +288,7 @@ modparam("imc", "check_on_create", 1) 4. Functions 4.1. imc_manager() + 4.2. imc_room_active(room) 4.1. imc_manager() @@ -310,6 +314,21 @@ if(is_method("MESSAGE) } ... +4.2. imc_room_active(room) + + Return 1 (true) if the room is active, -1 (false) if the room is not + found. The parameter is the SIP URI to identify the room, it can + contain variables. + + This function can be used from ANY_ROUTE. + + Example 1.12. Usage of imc_room_active() function +... + if(imc_room_active("sip:chat-sip@$fd")) { + ... + } +... + 5. RPC Commands 5.1. imc.list_rooms @@ -358,7 +377,7 @@ kamcmd imc_list_members _room_ Next picture presents the list of commands and their parameters. - Example 1.12. List of commands + Example 1.13. List of commands ... 1.create

1 0

git:master:4d045954: imc: docs for imc_room_active() function
by Daniel-Constantin Mierla 12 Jul '23

12 Jul '23

Module: kamailio Branch: master Commit: 4d0459545ada92786d3d7ee1f9aeefd82c8527e7 URL: https://github.com/kamailio/kamailio/commit/4d0459545ada92786d3d7ee1f9aeefd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-12T09:06:49+02:00 imc: docs for imc_room_active() function --- Modified: src/modules/imc/doc/imc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4d0459545ada92786d3d7ee1f9aeefd… Patch: https://github.com/kamailio/kamailio/commit/4d0459545ada92786d3d7ee1f9aeefd… --- diff --git a/src/modules/imc/doc/imc_admin.xml b/src/modules/imc/doc/imc_admin.xml index 853176eaa6d..1b485ac77ca 100644 --- a/src/modules/imc/doc/imc_admin.xml +++ b/src/modules/imc/doc/imc_admin.xml @@ -309,6 +309,29 @@ if(is_method("MESSAGE) exit; } ... +</programlisting> + </example> + </section> + <section> + <title id="imc.p.imc_room_active"> + <function moreinfo="none">imc_room_active(room)</function> + </title> + <para> + Return 1 (true) if the room is active, -1 (false) if the room is not + found. The parameter is the SIP URI to identify the room, it can contain + variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title>Usage of <varname>imc_room_active()</varname> function</title> + <programlisting format="linespecific"> +... + if(imc_room_active("sip:chat-sip@$fd")) { + ... + } +... </programlisting> </example> </section>

1 0

git:master:874351c0: imc: reformat initialized structures
by Daniel-Constantin Mierla 12 Jul '23

12 Jul '23

Module: kamailio Branch: master Commit: 874351c0d4bc4e8fce5dd9f3ca617e8c3b61ef89 URL: https://github.com/kamailio/kamailio/commit/874351c0d4bc4e8fce5dd9f3ca617e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-12T08:28:41+02:00 imc: reformat initialized structures --- Modified: src/modules/imc/imc.c --- Diff: https://github.com/kamailio/kamailio/commit/874351c0d4bc4e8fce5dd9f3ca617e8… Patch: https://github.com/kamailio/kamailio/commit/874351c0d4bc4e8fce5dd9f3ca617e8… --- diff --git a/src/modules/imc/imc.c b/src/modules/imc/imc.c index b15e42aba2f..4364609a10b 100644 --- a/src/modules/imc/imc.c +++ b/src/modules/imc/imc.c @@ -100,45 +100,53 @@ struct tm_binds tmb; /** TM callback function */ void inv_callback(struct cell *t, int type, struct tmcb_params *ps); +/* clang-format off */ static cmd_export_t cmds[] = { - {"imc_manager", (cmd_function)w_imc_manager, 0, 0, 0, REQUEST_ROUTE}, - {0, 0, 0, 0, 0, 0}}; - + {"imc_manager", (cmd_function)w_imc_manager, 0, 0, 0, REQUEST_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; -static param_export_t params[] = {{"db_url", PARAM_STR, &db_url}, - {"db_mode", INT_PARAM, &db_mode}, - {"hash_size", INT_PARAM, &imc_hash_size}, - {"imc_cmd_start_char", PARAM_STR, &imc_cmd_start_str}, - {"rooms_table", PARAM_STR, &rooms_table}, - {"members_table", PARAM_STR, &members_table}, - {"outbound_proxy", PARAM_STR, &outbound_proxy}, - {"extra_hdrs", PARAM_STR, &extra_hdrs}, - {"create_on_join", INT_PARAM, &imc_create_on_join}, - {"check_on_create", INT_PARAM, &imc_check_on_create}, {0, 0, 0}}; +static param_export_t params[] = { + {"db_url", PARAM_STR, &db_url}, + {"db_mode", INT_PARAM, &db_mode}, + {"hash_size", INT_PARAM, &imc_hash_size}, + {"imc_cmd_start_char", PARAM_STR, &imc_cmd_start_str}, + {"rooms_table", PARAM_STR, &rooms_table}, + {"members_table", PARAM_STR, &members_table}, + {"outbound_proxy", PARAM_STR, &outbound_proxy}, + {"extra_hdrs", PARAM_STR, &extra_hdrs}, + {"create_on_join", INT_PARAM, &imc_create_on_join}, + {"check_on_create", INT_PARAM, &imc_check_on_create}, + {0, 0, 0} +}; #ifdef STATISTICS #include "../../core/counters.h" stat_var *imc_active_rooms; -stat_export_t imc_stats[] = {{"active_rooms", 0, &imc_active_rooms}, {0, 0, 0}}; +stat_export_t imc_stats[] = { + {"active_rooms", 0, &imc_active_rooms}, + {0, 0, 0} +}; #endif /** module exports */ struct module_exports exports = { - "imc", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported commands */ - params, /* exported parameters */ - 0, /* exported rpc functions */ - 0, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module init function */ - child_init, /* child init function */ - destroy /* module destroy function */ + "imc", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported commands */ + params, /* exported parameters */ + 0, /* exported rpc functions */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module init function */ + child_init, /* child init function */ + destroy /* module destroy function */ }; +/* clang-format on */ static int mod_init(void) { @@ -601,10 +609,13 @@ static const char *imc_rpc_list_rooms_doc[2] = {"List imc rooms.", 0}; static const char *imc_rpc_list_members_doc[2] = { "List members in an imc room.", 0}; -rpc_export_t imc_rpc[] = {{"imc.list_rooms", imc_rpc_list_rooms, - imc_rpc_list_rooms_doc, RET_ARRAY}, - {"imc.list_members", imc_rpc_list_members, imc_rpc_list_members_doc, 0}, - {0, 0, 0, 0}}; +/* clang-format off */ +rpc_export_t imc_rpc[] = { + {"imc.list_rooms", imc_rpc_list_rooms, imc_rpc_list_rooms_doc, RET_ARRAY}, + {"imc.list_members", imc_rpc_list_members, imc_rpc_list_members_doc, 0}, + {0, 0, 0, 0} +}; +/* clang-format on */ static int imc_rpc_init(void) {

1 0

git:master:ce3b1656: imc: added function to check if a room is active
by Daniel-Constantin Mierla 12 Jul '23

12 Jul '23

Module: kamailio Branch: master Commit: ce3b16565a3375c4fcdabb39bfbd0c814f402da9 URL: https://github.com/kamailio/kamailio/commit/ce3b16565a3375c4fcdabb39bfbd0c8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-12T09:00:56+02:00 imc: added function to check if a room is active --- Modified: src/modules/imc/imc.c --- Diff: https://github.com/kamailio/kamailio/commit/ce3b16565a3375c4fcdabb39bfbd0c8… Patch: https://github.com/kamailio/kamailio/commit/ce3b16565a3375c4fcdabb39bfbd0c8… --- diff --git a/src/modules/imc/imc.c b/src/modules/imc/imc.c index 4364609a10b..c5b65cb95d7 100644 --- a/src/modules/imc/imc.c +++ b/src/modules/imc/imc.c @@ -43,6 +43,7 @@ #include "../../core/hashes.h" #include "../../core/rpc.h" #include "../../core/rpc_lookup.h" +#include "../../core/mod_fix.h" #include "../../core/kemi.h" #include "../../modules/tm/tm_load.h" @@ -89,6 +90,7 @@ static int mod_init(void); 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 imc_rpc_init(void); @@ -103,6 +105,8 @@ void inv_callback(struct cell *t, int type, struct tmcb_params *ps); /* clang-format off */ 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}, {0, 0, 0, 0, 0, 0} }; @@ -430,11 +434,51 @@ static int ki_imc_manager(struct sip_msg *msg) return ret; } +/** + * + */ static int w_imc_manager(struct sip_msg *msg, char *str1, char *str2) { return ki_imc_manager(msg); } +/** + * + */ +static int ki_imc_room_active(sip_msg_t *msg, str *room) +{ + sip_uri_t puri; + imc_room_t *rm; + + 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) { + imc_release_room(rm); + return 1; + } + return -1; +} + +/** + * + */ +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) { + LM_ERR("invalid room parameter"); + return -1; + } + + return ki_imc_room_active(msg, &room); +} + /** * destroy module */ @@ -636,6 +680,11 @@ static sr_kemi_t sr_kemi_imc_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("imc"), str_init("imc_room_active"), + SR_KEMIP_INT, ki_imc_room_active, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:5da9ba4c: modules: readme files regenerated - msilo ... [skip ci]
by Kamailio Dev 11 Jul '23

11 Jul '23

Module: kamailio Branch: master Commit: 5da9ba4c12161ac864022b1624faef6c16777b4f URL: https://github.com/kamailio/kamailio/commit/5da9ba4c12161ac864022b1624faef6… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-07-11T18:32:06+02:00 modules: readme files regenerated - msilo ... [skip ci] --- Modified: src/modules/msilo/README --- Diff: https://github.com/kamailio/kamailio/commit/5da9ba4c12161ac864022b1624faef6… Patch: https://github.com/kamailio/kamailio/commit/5da9ba4c12161ac864022b1624faef6…

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev