sr-dev July 2023

sr-dev@lists.kamailio.org

15 participants
239 discussions

[kamailio/kamailio] nats: nats_publish set reply parameter to be optional (PR #3507)

by Emmanuel Schmidbauer

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

1 year, 2 months

git:master:9fd006e4: modules: readme files regenerated - imc ... [skip ci]

by Kamailio Dev

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 year, 2 months

git:master:4d045954: imc: docs for imc_room_active() function

by Daniel-Constantin Mierla

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 year, 2 months

git:master:ce3b1656: imc: added function to check if a room is active

by Daniel-Constantin Mierla

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 year, 2 months

git:master:874351c0: imc: reformat initialized structures

by Daniel-Constantin Mierla

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 year, 2 months

git:master:5da9ba4c: modules: readme files regenerated - msilo ... [skip ci]

by Kamailio Dev

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 year, 2 months

git:master:917b608f: msilo: docs for use_mode parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 917b608f958e9a7a68388d8b53630cdf9cb2f3b1 URL: https://github.com/kamailio/kamailio/commit/917b608f958e9a7a68388d8b53630cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-11T18:22:06+02:00 msilo: docs for use_mode parameter --- Modified: src/modules/msilo/doc/msilo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/917b608f958e9a7a68388d8b53630cd… Patch: https://github.com/kamailio/kamailio/commit/917b608f958e9a7a68388d8b53630cd… --- diff --git a/src/modules/msilo/doc/msilo_admin.xml b/src/modules/msilo/doc/msilo_admin.xml index 1c4a0d0e06d..f9623891411 100644 --- a/src/modules/msilo/doc/msilo_admin.xml +++ b/src/modules/msilo/doc/msilo_admin.xml @@ -726,6 +726,27 @@ m_store(...); </example> </section> + <section id="msilo.p.use_mode"> + <title><varname>use_mode</varname> (int)</title> + <para> + If set to 1, the call-id header of incoming MESSAGE is stored and reused + later for delivery MESSAGE. + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set the <quote>use_mode</quote> parameter</title> + <programlisting format="linespecific"> +... +modparam("msilo", "use_mode", 1) +... +</programlisting> + </example> + </section> + </section> <section>

1 year, 2 months

git:master:8ada99e8: msilo: option to store call-id and reuse it on delivery

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8ada99e8c686db639ee73a6584816c3fe0096b6d URL: https://github.com/kamailio/kamailio/commit/8ada99e8c686db639ee73a6584816c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-11T18:22:06+02:00 msilo: option to store call-id and reuse it on delivery --- Modified: src/modules/msilo/msilo.c --- Diff: https://github.com/kamailio/kamailio/commit/8ada99e8c686db639ee73a6584816c3… Patch: https://github.com/kamailio/kamailio/commit/8ada99e8c686db639ee73a6584816c3…

1 year, 2 months

git:master:38514a77: msilo: docs for parms to set column names for callid and status

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 38514a77aea446e36ba5ce2db32d0c4ae57571ed URL: https://github.com/kamailio/kamailio/commit/38514a77aea446e36ba5ce2db32d0c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-11T18:22:06+02:00 msilo: docs for parms to set column names for callid and status --- Modified: src/modules/msilo/doc/msilo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/38514a77aea446e36ba5ce2db32d0c4… Patch: https://github.com/kamailio/kamailio/commit/38514a77aea446e36ba5ce2db32d0c4… --- diff --git a/src/modules/msilo/doc/msilo_admin.xml b/src/modules/msilo/doc/msilo_admin.xml index 189ee5ee9e6..1c4a0d0e06d 100644 --- a/src/modules/msilo/doc/msilo_admin.xml +++ b/src/modules/msilo/doc/msilo_admin.xml @@ -297,6 +297,36 @@ modparam("msilo", "sc_snd_time", "send_reminder_time") ... modparam("msilo", "sc_stored_hdrs", "extra_headers") ... +</programlisting> + </example> + </section> + <section id="msilo.p.sc_callid"> + <title><varname>sc_callid</varname> (string)</title> + <para> + The name of the column in silo table, storing callid. + </para> + <para>Default value is <quote>callid</quote>.</para> + <example> + <title>Set the <quote>sc_callid</quote> parameter</title> + <programlisting format="linespecific"> +... +modparam("msilo", "sc_callid", "call_id") +... +</programlisting> + </example> + </section> + <section id="msilo.p.sc_status"> + <title><varname>sc_callid</varname> (string)</title> + <para> + The name of the column in silo table, storing status. + </para> + <para>Default value is <quote>status</quote>.</para> + <example> + <title>Set the <quote>sc_status</quote> parameter</title> + <programlisting format="linespecific"> +... +modparam("msilo", "sc_status", "st") +... </programlisting> </example> </section>

1 year, 2 months

git:master:cdd6b960: msilo: exppose callid and status columns as params to match db schema

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cdd6b960f4cfea2fa8a2f5f79750568d8c49d89f URL: https://github.com/kamailio/kamailio/commit/cdd6b960f4cfea2fa8a2f5f79750568… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-11T18:22:06+02:00 msilo: exppose callid and status columns as params to match db schema --- Modified: src/modules/msilo/msilo.c --- Diff: https://github.com/kamailio/kamailio/commit/cdd6b960f4cfea2fa8a2f5f79750568… Patch: https://github.com/kamailio/kamailio/commit/cdd6b960f4cfea2fa8a2f5f79750568… --- diff --git a/src/modules/msilo/msilo.c b/src/modules/msilo/msilo.c index e086148907a..b231fe2c13c 100644 --- a/src/modules/msilo/msilo.c +++ b/src/modules/msilo/msilo.c @@ -53,7 +53,7 @@ #include "api.h" #define MAX_DEL_KEYS 1 -#define NR_KEYS 11 +#define NR_KEYS 13 static str sc_mid = str_init("id"); /* 0 */ static str sc_from = str_init("src_addr"); /* 1 */ @@ -66,6 +66,8 @@ static str sc_exp_time = str_init("exp_time"); /* 7 */ static str sc_inc_time = str_init("inc_time"); /* 8 */ static str sc_snd_time = str_init("snd_time"); /* 9 */ static str sc_stored_hdrs = str_init("extra_hdrs"); /* 10 */ +static str sc_callid = str_init("callid"); /* 11 */ +static str sc_status = str_init("status"); /* 12 */ #define SET_STR_VAL(_str, _res, _r, _c) \ if(RES_ROWS(_res)[_r].values[_c].nul == 0) { \ @@ -213,6 +215,8 @@ static param_export_t params[] = { {"sc_inc_time", PARAM_STR, &sc_inc_time}, {"sc_snd_time", PARAM_STR, &sc_snd_time}, {"sc_stored_hdrs", PARAM_STR, &sc_stored_hdrs}, + {"sc_callid", PARAM_STR, &sc_callid}, + {"sc_status", PARAM_STR, &sc_status}, {"snd_time_avp", PARAM_STR, &ms_snd_time_avp_param}, {"extra_hdrs_avp", PARAM_STR, &ms_extra_hdrs_avp_param}, {"add_date", INT_PARAM, &ms_add_date},

1 year, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2023