sr-dev August 2024

sr-dev@lists.kamailio.org

10 participants
157 discussions

[kamailio/kamailio] main: Add support for naming socket in cli (PR #3954)

by Xenofon Karamanos

#### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR introduces the socket name support to kamailio cli just like [listen directive](https://www.kamailio.org/wikidocs/cookbooks/devel/core/#listen) does in the config file. You can start kamailio using the `-l` argument to define listening sockets. This PR adds the `name=` part support to match the config file. `kamailio -l test=udp:10.0.0.55:5061/1.1.1.1:5060` Discussion about whether `-l **test=**udp:10.0.0.55:5061/1.1.1.1:5060` or `-l udp:10.0.0.55:5061/1.1.1.1:5060**=test**` can be found in You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3954 -- Commit Summary -- * main: Add support for naming socket in cli -- File Changes -- M src/main.c (41) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3954.patch https://github.com/kamailio/kamailio/pull/3954.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3954 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3954(a)github.com>

3 weeks, 6 days

git:master:d44b13cd: core: main - add support for socket names as command line parameters

by Henning Westerholt

Module: kamailio Branch: master Commit: d44b13cd91183e12aed1a3c5ee41f9d22ddac074 URL: https://github.com/kamailio/kamailio/commit/d44b13cd91183e12aed1a3c5ee41f9d… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-08-23T09:28:24Z core: main - add support for socket names as command line parameters - format: [proto:]addr_lst[:port][/advaddr][/socket_name] - example: -l udp:127.0.0.1:5060/1.1.1.1:5060/local - Listening on: udp: 127.0.0.1:5060 name local advertise udp:1.1.1.1:5060 - based on a pull-request from Xenofon Karamanos (GH #3954) --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/d44b13cd91183e12aed1a3c5ee41f9d… Patch: https://github.com/kamailio/kamailio/commit/d44b13cd91183e12aed1a3c5ee41f9d…

3 weeks, 6 days

git:master:57144a26: core: add new function pkg_char_dup, similar as shm_char_dup but for PKG memory

by Henning Westerholt

Module: kamailio Branch: master Commit: 57144a263680e86616dea49e9f2ca9f84a48d777 URL: https://github.com/kamailio/kamailio/commit/57144a263680e86616dea49e9f2ca9f… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-08-23T09:26:06Z core: add new function pkg_char_dup, similar as shm_char_dup but for PKG memory --- Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/57144a263680e86616dea49e9f2ca9f… Patch: https://github.com/kamailio/kamailio/commit/57144a263680e86616dea49e9f2ca9f… --- diff --git a/src/core/ut.h b/src/core/ut.h index aa51108229b..31b45fe5b4d 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -1017,6 +1017,34 @@ static inline int pkg_str_dup(str *dst, const str *src) return 0; } +/** + * \brief Make a copy of a char pointer to a char pointer using pkg_malloc + * \param src source + * \return a pointer to the new allocated char on success, 0 on failure + */ +static inline char *pkg_char_dup(const char *src) +{ + char *rval; + int len; + + if(!src) { + LM_ERR("NULL src or dst\n"); + return NULL; + } + + len = strlen(src) + 1; + rval = (char *)pkg_malloc(len); + if(!rval) { + PKG_MEM_ERROR; + return NULL; + } + + memcpy(rval, src, len); + + return rval; +} + + /** * \brief Compare two str's case sensitive * \param str1 first str

3 weeks, 6 days

git:master:e839563d: modules: readme files regenerated - tm ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: e839563d3bd572dd60c6045cc71461ec39cdf290 URL: https://github.com/kamailio/kamailio/commit/e839563d3bd572dd60c6045cc71461e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-08-22T13:31:10+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/e839563d3bd572dd60c6045cc71461e… Patch: https://github.com/kamailio/kamailio/commit/e839563d3bd572dd60c6045cc71461e…

4 weeks

git:master:c622429b: tm: align comments

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c622429b1514f49d36519248f90b647f7b7b3144 URL: https://github.com/kamailio/kamailio/commit/c622429b1514f49d36519248f90b647… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-22T13:22:56+02:00 tm: align comments --- Modified: src/modules/tm/t_fwd.c --- Diff: https://github.com/kamailio/kamailio/commit/c622429b1514f49d36519248f90b647… Patch: https://github.com/kamailio/kamailio/commit/c622429b1514f49d36519248f90b647… --- diff --git a/src/modules/tm/t_fwd.c b/src/modules/tm/t_fwd.c index b669f1d7762..c9f0bc2cab4 100644 --- a/src/modules/tm/t_fwd.c +++ b/src/modules/tm/t_fwd.c @@ -1348,9 +1348,9 @@ void e2e_cancel(struct sip_msg *cancel_msg, struct cell *t_cancel, for(i = 0; i < t_invite->nr_of_outgoings; i++) { if(cancel_bm & (1 << i)) { /* it's safe to get the reply lock since e2e_cancel is - * called with the cancel as the "current" transaction so - * at most t_cancel REPLY_LOCK is held in this process => - * no deadlock possibility */ + * called with the cancel as the "current" transaction so + * at most t_cancel REPLY_LOCK is held in this process => + * no deadlock possibility */ ret = cancel_branch(t_invite, i, reason, cfg_get(tm, tm_cfg, cancel_b_flags) | ((t_invite->uac[i].request.buffer == NULL) @@ -1391,8 +1391,8 @@ void e2e_cancel(struct sip_msg *cancel_msg, struct cell *t_cancel, if(t_invite->uac[i].last_received >= 100) { /* Provisional reply received on this branch, send CANCEL */ /* we do need to stop the retr. timers if the request is not - * an invite and since the stop_rb_retr() cost is lower than - * the invite check we do it always --andrei */ + * an invite and since the stop_rb_retr() cost is lower than + * the invite check we do it always --andrei */ stop_rb_retr(&t_invite->uac[i].request); if(SEND_BUFFER(&t_cancel->uac[i].request) == -1) { LM_ERR("e2e cancel - send failed\n"); @@ -1409,12 +1409,12 @@ void e2e_cancel(struct sip_msg *cancel_msg, struct cell *t_cancel, &t_cancel->uac[i].request); } else { /* No provisional response received, stop - * retransmission timers */ + * retransmission timers */ if(!(cfg_get(tm, tm_cfg, cancel_b_flags) & F_CANCEL_B_FORCE_RETR)) stop_rb_retr(&t_invite->uac[i].request); /* no need to stop fr, it will be stopped by relay_reply - * put_on_wait -- andrei */ + * put_on_wait -- andrei */ /* Generate faked reply */ if(cfg_get(tm, tm_cfg, cancel_b_flags) & F_CANCEL_B_FAKE_REPLY) {

4 weeks

git:master:2d2daa0e: tm: docs for e2e_cancel_hop_by_hop parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2d2daa0e69e57787d974dfae6826f03397109be2 URL: https://github.com/kamailio/kamailio/commit/2d2daa0e69e57787d974dfae6826f03… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-22T13:22:56+02:00 tm: docs for e2e_cancel_hop_by_hop parameter --- Modified: src/modules/tm/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/2d2daa0e69e57787d974dfae6826f03… Patch: https://github.com/kamailio/kamailio/commit/2d2daa0e69e57787d974dfae6826f03… --- diff --git a/src/modules/tm/doc/params.xml b/src/modules/tm/doc/params.xml index b8d7a8a3db4..2c42e2cea5e 100644 --- a/src/modules/tm/doc/params.xml +++ b/src/modules/tm/doc/params.xml @@ -1351,6 +1351,23 @@ modparam("tm", "local_cancel_reason", 0) <programlisting> ... modparam("tm", "e2e_cancel_reason", 0) +... + </programlisting> + </example> + </section> + <section id="e2e_cancel_hop_by_hop"> + <title><varname>e2e_cancel_hop_by_hop</varname> (int)</title> + <para> + Enable/disable sending CANCEL in hop-by-hop mode. + </para> + <para> + Default value: 1 ( hop-by-hop mode). + </para> + <example> + <title>Set <varname>e2e_cancel_hop_by_hop</varname> parameter</title> + <programlisting> +... +modparam("tm", "e2e_cancel_hop_by_hop", 0) ... </programlisting> </example>

4 weeks

git:master:13895810: tm: compile define E2E_CANCEL_HOP_BY_HOP turned into modparam

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 138958103c4083c5273a6019169514a54623fb45 URL: https://github.com/kamailio/kamailio/commit/138958103c4083c5273a6019169514a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-22T13:22:56+02:00 tm: compile define E2E_CANCEL_HOP_BY_HOP turned into modparam - easier to control without recompilation with modparam e2e_cancel_hop_by_hop - default 1, same as so far, with E2E_CANCEL_HOP_BY_HOP defined --- Modified: src/modules/tm/t_fwd.c Modified: src/modules/tm/t_fwd.h Modified: src/modules/tm/t_lookup.c Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/138958103c4083c5273a6019169514a… Patch: https://github.com/kamailio/kamailio/commit/138958103c4083c5273a6019169514a…

4 weeks

git:master:82abbf4c: modules: readme files regenerated - presence_conference ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 82abbf4cce93845352e158db03516236e99ebd87 URL: https://github.com/kamailio/kamailio/commit/82abbf4cce93845352e158db0351623… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-08-22T12:01:10+02:00 modules: readme files regenerated - presence_conference ... [skip ci] --- Modified: src/modules/presence_conference/README --- Diff: https://github.com/kamailio/kamailio/commit/82abbf4cce93845352e158db0351623… Patch: https://github.com/kamailio/kamailio/commit/82abbf4cce93845352e158db0351623… --- diff --git a/src/modules/presence_conference/README b/src/modules/presence_conference/README index 83ee87aca4d..34c6e6302d1 100644 --- a/src/modules/presence_conference/README +++ b/src/modules/presence_conference/README @@ -108,6 +108,9 @@ modparam("presence_conference", "default_expires", 3600) 4.1. conference_reset + The following MI commands are currently disabled, they need to migrated + to the RPC infrastructure. + 4.1. conference_reset Reset internal data.

4 weeks

git:master:20f7aa0d: presence_conference: add a note about deactivated MI cmds to docs [skip ci]

by Victor Seva

Module: kamailio Branch: master Commit: 20f7aa0d0fe2f152e47321657983e7fdbaa4727d URL: https://github.com/kamailio/kamailio/commit/20f7aa0d0fe2f152e47321657983e7f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-22T11:46:55+02:00 presence_conference: add a note about deactivated MI cmds to docs [skip ci] --- Modified: src/modules/presence_conference/doc/presence_conference_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/20f7aa0d0fe2f152e47321657983e7f… Patch: https://github.com/kamailio/kamailio/commit/20f7aa0d0fe2f152e47321657983e7f… --- diff --git a/src/modules/presence_conference/doc/presence_conference_admin.xml b/src/modules/presence_conference/doc/presence_conference_admin.xml index ae6d3f5eed2..d8e9ac79b47 100644 --- a/src/modules/presence_conference/doc/presence_conference_admin.xml +++ b/src/modules/presence_conference/doc/presence_conference_admin.xml @@ -100,7 +100,7 @@ modparam("presence_conference", "default_expires", 3600) <section> <title>MI Commands</title> - + The following MI commands are currently disabled, they need to migrated to the RPC infrastructure. <section> <title> <function moreinfo="none">conference_reset</function>

4 weeks

git:master:59862ba2: presence_conference: add section ID's to documentation [skip ci]

by Victor Seva

Module: kamailio Branch: master Commit: 59862ba222127b89e5d547dfb86e206ea8d0588d URL: https://github.com/kamailio/kamailio/commit/59862ba222127b89e5d547dfb86e206… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-22T11:46:09+02:00 presence_conference: add section ID's to documentation [skip ci] --- Modified: src/modules/presence_conference/doc/presence_conference_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/59862ba222127b89e5d547dfb86e206… Patch: https://github.com/kamailio/kamailio/commit/59862ba222127b89e5d547dfb86e206… --- diff --git a/src/modules/presence_conference/doc/presence_conference_admin.xml b/src/modules/presence_conference/doc/presence_conference_admin.xml index 83816723dbe..ae6d3f5eed2 100644 --- a/src/modules/presence_conference/doc/presence_conference_admin.xml +++ b/src/modules/presence_conference/doc/presence_conference_admin.xml @@ -56,7 +56,7 @@ </section> <section> <title>Parameters</title> - <section> + <section id="presence_conference.p.use_partial_states"> <title><varname>use_partial_states</varname> (int)</title> <para> Control usage of partial state notifications. @@ -76,19 +76,19 @@ modparam("presence_conference", "use_partial_states", 0) </example> </section> -<section id="presence_conference.p.default_expires"> - <title><varname>default_expires</varname> (int)</title> - <para> - The default expires value used when missing from SUBSCRIBE - message (in seconds). - </para> - <para> - <emphasis>Default value is <quote>3600</quote>. - </emphasis> - </para> - <example> - <title>Set <varname>default_expires</varname> parameter</title> - <programlisting format="linespecific"> + <section id="presence_conference.p.default_expires"> + <title><varname>default_expires</varname> (int)</title> + <para> + The default expires value used when missing from SUBSCRIBE + message (in seconds). + </para> + <para> + <emphasis>Default value is <quote>3600</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>default_expires</varname> parameter</title> + <programlisting format="linespecific"> ... modparam("presence_conference", "default_expires", 3600) ... @@ -127,4 +127,3 @@ modparam("presence_conference", "default_expires", 3600) </section> </chapter> -

4 weeks

← Newer
1
...
6
7
8
9
10
11
12
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2024