- sr-dev - kamailio.org

git:master:c1f814b2: fipatcher: more fields to $dsg(...) related to overload control
by Daniel-Constantin Mierla 26 Nov '24

26 Nov '24

Module: kamailio Branch: master Commit: c1f814b2c01d2589e41eac06d3e63571933105eb URL: https://github.com/kamailio/kamailio/commit/c1f814b2c01d2589e41eac06d3e6357… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-26T10:11:24+01:00 fipatcher: more fields to $dsg(...) related to overload control --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/c1f814b2c01d2589e41eac06d3e6357… Patch: https://github.com/kamailio/kamailio/commit/c1f814b2c01d2589e41eac06d3e6357… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 852296bbad1..d5abb6a62ac 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1528,6 +1528,14 @@ static int pv_get_dsg(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) case 4: /* pinactive */ return pv_get_sintval( msg, param, res, (int)((inactive * 100) / count)); + case 5: /* octime_sec */ + return pv_get_sintval(msg, param, res, (long)ocdata.octime.tv_sec); + case 6: /* octime_usec */ + return pv_get_sintval(msg, param, res, (long)ocdata.octime.tv_usec); + case 7: /* ocseq */ + return pv_get_sintval(msg, param, res, ocdata.ocseq); + case 8: /* ocrate */ + return pv_get_sintval(msg, param, res, ocdata.ocrate); default: return pv_get_null(msg, param, res); } @@ -1545,12 +1553,16 @@ static int pv_parse_dsg(pv_spec_p sp, str *in) case 5: if(strncmp(in->s, "count", 5) == 0) sp->pvp.pvn.u.isname.name.n = 0; + else if(strncmp(in->s, "ocseq", 5) == 0) + sp->pvp.pvn.u.isname.name.n = 7; else goto error; break; case 6: if(strncmp(in->s, "active", 6) == 0) sp->pvp.pvn.u.isname.name.n = 1; + else if(strncmp(in->s, "ocrate", 6) == 0) + sp->pvp.pvn.u.isname.name.n = 8; else goto error; break; @@ -1572,6 +1584,18 @@ static int pv_parse_dsg(pv_spec_p sp, str *in) else goto error; break; + case 10: + if(strncmp(in->s, "octime_sec", 10) == 0) + sp->pvp.pvn.u.isname.name.n = 5; + else + goto error; + break; + case 11: + if(strncmp(in->s, "octime_usec", 11) == 0) + sp->pvp.pvn.u.isname.name.n = 6; + else + goto error; + break; default: goto error; }

1 0

git:master:c9ec6cad: dispatcher: function to fetch by group id and uri
by Daniel-Constantin Mierla 25 Nov '24

25 Nov '24

Module: kamailio Branch: master Commit: c9ec6cad7300d40beef095116bcdd361bc9690c4 URL: https://github.com/kamailio/kamailio/commit/c9ec6cad7300d40beef095116bcdd36… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-25T19:58:06+01:00 dispatcher: function to fetch by group id and uri --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/c9ec6cad7300d40beef095116bcdd36… Patch: https://github.com/kamailio/kamailio/commit/c9ec6cad7300d40beef095116bcdd36… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index d9626000ddc..852296bbad1 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -185,6 +185,7 @@ static int w_ds_reload(struct sip_msg* msg, char*, char*); static int w_ds_is_active(sip_msg_t *msg, char *pset, char *p2); static int w_ds_is_active_uri(sip_msg_t *msg, char *pset, char *puri); static int w_ds_dsg_fetch(sip_msg_t *msg, char *pset, char *p2); +static int w_ds_dsg_fetch_uri(sip_msg_t *msg, char *pset, char *puri); static int w_ds_oc_set_attrs(sip_msg_t*, char*, char*, char*, char*, char*); static int fixup_ds_is_from_list(void** param, int param_no); @@ -199,6 +200,7 @@ static int pv_parse_dsv(pv_spec_p sp, str *in); static int pv_get_dsg(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); static int pv_parse_dsg(pv_spec_p sp, str *in); static void ds_dsg_fetch(int dg); +static void ds_dsg_fetch_uri(int dg, str *uri); static pv_export_t mod_pvs[] = { { {"dsv", (sizeof("dsv")-1)}, PVT_OTHER, pv_get_dsv, 0, @@ -266,6 +268,8 @@ static cmd_export_t cmds[]={ fixup_isiii, fixup_free_isiii, ANY_ROUTE}, {"ds_dsg_fetch", (cmd_function)w_ds_dsg_fetch, 1, fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + {"ds_dsg_fetch_uri", (cmd_function)w_ds_dsg_fetch_uri, 2, + fixup_igp_spve, fixup_free_igp_spve, ANY_ROUTE}, {0,0,0,0,0,0} }; @@ -1367,14 +1371,32 @@ static int pv_parse_dsv(pv_spec_p sp, str *in) /** * */ -static int _pv_dsg_fetch = 1; +static int _pv_dsg_fetch_dg = 1; +static str _pv_dsg_fetch_uri = STR_NULL; /** * */ static void ds_dsg_fetch(int dg) { - _pv_dsg_fetch = dg; + _pv_dsg_fetch_dg = dg; + if(_pv_dsg_fetch_uri.s != NULL) { + pkg_free(_pv_dsg_fetch_uri.s); + } + _pv_dsg_fetch_uri.s = NULL; + _pv_dsg_fetch_uri.len = 0; +} + +/** + * + */ +static void ds_dsg_fetch_uri(int dg, str *uri) +{ + _pv_dsg_fetch_dg = dg; + if(_pv_dsg_fetch_uri.s != NULL) { + pkg_free(_pv_dsg_fetch_uri.s); + } + pkg_str_dup(&_pv_dsg_fetch_uri, uri); } /** @@ -1393,6 +1415,28 @@ static int w_ds_dsg_fetch(sip_msg_t *msg, char *pset, char *p2) return 1; } +/** + * + */ +static int w_ds_dsg_fetch_uri(sip_msg_t *msg, char *pset, char *puri) +{ + int set; + str suri = STR_NULL; + + if(fixup_get_ivalue(msg, (gparam_p)pset, &set) != 0) { + LM_ERR("cannot get set id param value\n"); + return -1; + } + if(fixup_get_svalue(msg, (gparam_p)puri, &suri) != 0) { + LM_ERR("cannot get uri param value\n"); + return -1; + } + + ds_dsg_fetch_uri(set, &suri); + + return 1; +} + /** * */ @@ -1439,16 +1483,19 @@ static int pv_get_dsg(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) int active = 0; int inactive = 0; int j = 0; + ds_ocdata_t ocdata; if(param == NULL) { return -1; } - dsg = ds_list_lookup(_pv_dsg_fetch); + dsg = ds_list_lookup(_pv_dsg_fetch_dg); if(dsg == NULL) { return pv_get_null(msg, param, res); } + memset(&ocdata, 0, sizeof(ds_ocdata_t)); + lock_get(&dsg->lock); count = dsg->nr; for(j = 0; j < dsg->nr; j++) { @@ -1457,6 +1504,14 @@ static int pv_get_dsg(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) } else { active++; } + if(_pv_dsg_fetch_uri.s != NULL && _pv_dsg_fetch_uri.len > 0) { + if((_pv_dsg_fetch_uri.len == dsg->dlist[j].uri.len) + && (strncmp(dsg->dlist[j].uri.s, _pv_dsg_fetch_uri.s, + _pv_dsg_fetch_uri.len) + == 0)) { + memcpy(&ocdata, &dsg->dlist[j].ocdata, sizeof(ds_ocdata_t)); + } + } } lock_release(&dsg->lock);

1 0

git:master:556efcaa: core: tcp - emit async tkv event for read error
by Daniel-Constantin Mierla 25 Nov '24

25 Nov '24

Module: kamailio Branch: master Commit: 556efcaa34367dc689ee653b0de9f22ccef073f9 URL: https://github.com/kamailio/kamailio/commit/556efcaa34367dc689ee653b0de9f22… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-25T19:58:06+01:00 core: tcp - emit async tkv event for read error --- Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/556efcaa34367dc689ee653b0de9f22… Patch: https://github.com/kamailio/kamailio/commit/556efcaa34367dc689ee653b0de9f22… --- diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index cd7790eb958..c08d9bf074f 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -52,6 +52,7 @@ #include "ut.h" #include "trim.h" #include "pt.h" +#include "async_task.h" #include "daemonize.h" #include "cfg/cfg_struct.h" #ifdef CORE_TLS @@ -269,6 +270,9 @@ int tcp_read_data(int fd, struct tcp_connection *c, char *buf, int b_size, strerror(errno), errno, ip_addr2xa(&c->rcv.src_ip), c->rcv.src_port, ip_addr2xa(&c->rcv.dst_ip), c->rcv.dst_port); + async_tkv_emit(1200, "tcp-read-error", + "erno=%d;srcip=%s;dstip=%s", errno, + ip_addr2xa(&c->rcv.src_ip), ip_addr2xa(&c->rcv.dst_ip)); if(errno == ETIMEDOUT) { c->event = TCP_CLOSED_TIMEOUT; } else if(errno == ECONNRESET) {

1 0

[kamailio/kamailio] cdp: fixes for various issues found with Coverity (PR #4030)
by Dragos Vingarzan 25 Nov '24

25 Nov '24

#### Pre-Submission Checklist    - [ ] 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) - [ ] 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:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Various fixes for issues discovered with the Coverity static analysis tooling. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4030 -- Commit Summary -- * cdp: fixes for various issues found with coverity -- File Changes -- M src/modules/cdp/authstatemachine.c (2) M src/modules/cdp/common.c (8) M src/modules/cdp/diameter_peer.c (6) M src/modules/cdp/receiver.c (4) M src/modules/cdp/session.c (12) M src/modules/cdp/session.h (13) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4030.patch https://github.com/kamailio/kamailio/pull/4030.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4030 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4030(a)github.com>

4 15

git:master:1ceeba73: cdp: fixed issues discovered during static code analysis
by Dragos Vingarzan 25 Nov '24

25 Nov '24

Module: kamailio Branch: master Commit: 1ceeba7364b745b6ca2840e830d006a37460d10e URL: https://github.com/kamailio/kamailio/commit/1ceeba7364b745b6ca2840e830d006a… Author: Dragos Vingarzan <vingarzan(a)gmail.com> Committer: Dragos Vingarzan <dragos(a)neatpath.net> Date: 2024-11-25T13:33:40+01:00 cdp: fixed issues discovered during static code analysis This fixes: - 4-bytes (typically uint32_t) used for time_t storage (Y2K38) - print of time_t with %d instead of %ld - reuse of same loop index variable in a sub-loop - use of random(), when kam_rand() could theoretically be better - copy-paste mistake in sp2/sp parameter, where sp2 was meant and sp is probably NULL --- Modified: src/modules/cdp/authstatemachine.c Modified: src/modules/cdp/common.c Modified: src/modules/cdp/diameter_peer.c Modified: src/modules/cdp/receiver.c Modified: src/modules/cdp/session.c Modified: src/modules/cdp/session.h --- Diff: https://github.com/kamailio/kamailio/commit/1ceeba7364b745b6ca2840e830d006a… Patch: https://github.com/kamailio/kamailio/commit/1ceeba7364b745b6ca2840e830d006a…

1 0

git:master:55691f82: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 25 Nov '24

25 Nov '24

Module: kamailio Branch: master Commit: 55691f82666f361bac5efb6355e6f32afb508660 URL: https://github.com/kamailio/kamailio/commit/55691f82666f361bac5efb6355e6f32… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-11-25T10:46:10+01:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/55691f82666f361bac5efb6355e6f32… Patch: https://github.com/kamailio/kamailio/commit/55691f82666f361bac5efb6355e6f32…

1 0

[kamailio/kamailio] Add timer to ping rtpengine (PR #4016)
by Xenofon Karamanos 25 Nov '24

25 Nov '24

- Added parameter to control the interval   #### Pre-Submission Checklist    - [ ] 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) - [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 adds a timer that its interval can be controlled with the param `ping_interval`. The timer pings all registered rtpengines and disables if any are found not responsive and vice versa. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4016 -- Commit Summary -- * Add timer to ping rtpengines -- File Changes -- M src/modules/rtpengine/rtpengine.c (50) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4016.patch https://github.com/kamailio/kamailio/pull/4016.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4016 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4016(a)github.com>

4 27

git:master:f7fa3a39: rtpengine/docs: Add ping_interval docs
by Xenofon Karamanos 25 Nov '24

25 Nov '24

Module: kamailio Branch: master Commit: f7fa3a39f6c97ca8323a70f30ad4e33699ede23e URL: https://github.com/kamailio/kamailio/commit/f7fa3a39f6c97ca8323a70f30ad4e33… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-11-25T11:31:56+02:00 rtpengine/docs: Add ping_interval docs --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f7fa3a39f6c97ca8323a70f30ad4e33… Patch: https://github.com/kamailio/kamailio/commit/f7fa3a39f6c97ca8323a70f30ad4e33… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index 9a57c2e551e..a6c58ce401e 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2404,6 +2404,25 @@ modparam("rtpengine", "ping_mode", 0) </section> +<section id="rtpengine.p.ping_interval"> + <title><varname>ping_interval</varname> (integer)</title> + <para> + Specify the interval in seconds between pings to all rtpengines registered. + </para> + <para> + <emphasis> + Default value is <quote>60</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>ping_interval</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("rtpengine", "ping_interval", 10) +... + </programlisting> + </example> +</section> <section> <title>Functions</title>

1 0

git:master:a29afb3d: rtpengine: Add doxygen function descriptions
by Xenofon Karamanos 25 Nov '24

25 Nov '24

Module: kamailio Branch: master Commit: a29afb3de6d9dd1491667a5858187ae782d8d56d URL: https://github.com/kamailio/kamailio/commit/a29afb3de6d9dd1491667a5858187ae… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-11-25T11:31:56+02:00 rtpengine: Add doxygen function descriptions --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/a29afb3de6d9dd1491667a5858187ae… Patch: https://github.com/kamailio/kamailio/commit/a29afb3de6d9dd1491667a5858187ae…

1 0

git:master:e183a3e2: rtpengine: Re-enable down servers (but not disabled ones)
by Xenofon Karamanos 25 Nov '24

25 Nov '24

Module: kamailio Branch: master Commit: e183a3e25c3f2088435b3911d13fcb376a89f5c0 URL: https://github.com/kamailio/kamailio/commit/e183a3e25c3f2088435b3911d13fcb3… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-11-25T11:31:56+02:00 rtpengine: Re-enable down servers (but not disabled ones) --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/e183a3e25c3f2088435b3911d13fcb3… Patch: https://github.com/kamailio/kamailio/commit/e183a3e25c3f2088435b3911d13fcb3… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index cd3a76b1403..bdb4b76e4f1 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -1898,6 +1898,12 @@ static int rtpengine_iter_cb_ping( *found_rtpp_disabled = 1; crt_rtpp->rn_disabled = 1; } + /* if ping success, enable the rtpp and reset ticks, ONLY IF was not disabled manually */ + else if(crt_rtpp->rn_recheck_ticks != RTPENGINE_MAX_RECHECK_TICKS) { + crt_rtpp->rn_recheck_ticks = RTPENGINE_MIN_RECHECK_TICKS; + crt_rtpp->rn_disabled = 0; + *found_rtpp_disabled = 0; + } return 0; }

1 0

git:master:38234797: rtpengine: Add timer to ping rtpengine
by Xenofon Karamanos 25 Nov '24

25 Nov '24

Module: kamailio Branch: master Commit: 38234797332c79b81522c18cc7c6f83be86c0e9b URL: https://github.com/kamailio/kamailio/commit/38234797332c79b81522c18cc7c6f83… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-11-25T11:31:56+02:00 rtpengine: Add timer to ping rtpengine - Added parameter to control the interval --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/38234797332c79b81522c18cc7c6f83… Patch: https://github.com/kamailio/kamailio/commit/38234797332c79b81522c18cc7c6f83…

1 0

git:master:e58dc893: core: tcp read - convert ips to different buffers for log messages
by Daniel-Constantin Mierla 25 Nov '24

25 Nov '24

Module: kamailio Branch: master Commit: e58dc89324b30f09853a7430620e632ec5efaad5 URL: https://github.com/kamailio/kamailio/commit/e58dc89324b30f09853a7430620e632… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-25T10:27:11+01:00 core: tcp read - convert ips to different buffers for log messages --- Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/e58dc89324b30f09853a7430620e632… Patch: https://github.com/kamailio/kamailio/commit/e58dc89324b30f09853a7430620e632… --- diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index fd60918fe34..cd7790eb958 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -265,10 +265,10 @@ int tcp_read_data(int fd, struct tcp_connection *c, char *buf, int b_size, } } LOG(cfg_get(core, core_cfg, corelog), - "error reading: %s (%d) ([%s]:%u ->", strerror(errno), - errno, ip_addr2a(&c->rcv.src_ip), c->rcv.src_port); - LOG(cfg_get(core, core_cfg, corelog), "-> [%s]:%u)\n", - ip_addr2a(&c->rcv.dst_ip), c->rcv.dst_port); + "error reading: %s (%d) ([%s]:%u -> [%s]:%u)\n", + strerror(errno), errno, ip_addr2xa(&c->rcv.src_ip), + c->rcv.src_port, ip_addr2xa(&c->rcv.dst_ip), + c->rcv.dst_port); if(errno == ETIMEDOUT) { c->event = TCP_CLOSED_TIMEOUT; } else if(errno == ECONNRESET) { @@ -280,8 +280,8 @@ int tcp_read_data(int fd, struct tcp_connection *c, char *buf, int b_size, LM_DBG("EOF on connection %p (state: %u, flags: %x) - FD %d," " bytes %d, rd-flags %x ([%s]:%u -> [%s]:%u)", c, c->state, c->flags, fd, bytes_read, *flags, - ip_addr2a(&c->rcv.src_ip), c->rcv.src_port, - ip_addr2a(&c->rcv.dst_ip), c->rcv.dst_port); + ip_addr2xa(&c->rcv.src_ip), c->rcv.src_port, + ip_addr2xa(&c->rcv.dst_ip), c->rcv.dst_port); c->state = S_CONN_EOF; *flags |= RD_CONN_EOF; c->event = TCP_CLOSED_EOF;

1 0

git:master:c82aa6e9: core: helper functions to convert ip to string using a pool of buffers
by Daniel-Constantin Mierla 25 Nov '24

25 Nov '24

Module: kamailio Branch: master Commit: c82aa6e92d3475bb56db761ba65abb64e8f712fd URL: https://github.com/kamailio/kamailio/commit/c82aa6e92d3475bb56db761ba65abb6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-25T10:16:07+01:00 core: helper functions to convert ip to string using a pool of buffers --- Modified: src/core/ip_addr.c Modified: src/core/ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/c82aa6e92d3475bb56db761ba65abb6… Patch: https://github.com/kamailio/kamailio/commit/c82aa6e92d3475bb56db761ba65abb6… --- diff --git a/src/core/ip_addr.c b/src/core/ip_addr.c index 02c26f969d5..8e2ae6cf42d 100644 --- a/src/core/ip_addr.c +++ b/src/core/ip_addr.c @@ -298,6 +298,52 @@ char *ip_addr2strz(struct ip_addr *ip) return buff; } +#define IP_ADDR_BUF_NR 8 +static char _ksr_addr2x_buff[IP_ADDR_BUF_NR][IP_ADDR_MAX_STR_SIZE]; +static int _ksr_addr2x_idx = 0; + +/* fast ip_addr -> string converter; + * it uses an internal buffer + */ +char *ip_addr2xa(struct ip_addr *ip) +{ + int len; + char *buff; + + buff = _ksr_addr2x_buff[_ksr_addr2x_idx]; + _ksr_addr2x_idx = (_ksr_addr2x_idx + 1) % IP_ADDR_BUF_NR; + + len = ip_addr2sbuf(ip, buff, sizeof(buff) - 1); + buff[len] = 0; + + return buff; +} + + +/* full address in text representation, including [] for ipv6 */ +char *ip_addr2xstrz(struct ip_addr *ip) +{ + char *p; + int len; + char *buff; + + buff = _ksr_addr2x_buff[_ksr_addr2x_idx]; + _ksr_addr2x_idx = (_ksr_addr2x_idx + 1) % IP_ADDR_BUF_NR; + + p = buff; + if(ip->af == AF_INET6) { + *p++ = '['; + } + len = ip_addr2sbuf(ip, p, sizeof(buff) - 3); + p += len; + if(ip->af == AF_INET6) { + *p++ = ']'; + } + *p = 0; + + return buff; +} + /* returns an asciiz string containing the ip and the port * (<ip_addr>:port or [<ipv6_addr>]:port) diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index 4a266391190..b55c78bd8bc 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -614,14 +614,18 @@ int ip_addr2sbufz(struct ip_addr *ip, char *buff, int len); #define IP_ADDR_MAX_STR_SIZE (IP6_MAX_STR_SIZE + 1) /* ip62ascii + \0*/ #define IP_ADDR_MAX_STRZ_SIZE (IP6_MAX_STR_SIZE + 3) /* ip62ascii + [ + ] + \0*/ -/* fast ip_addr -> string converter; - * it uses an internal buffer - */ +/* ip addr to string converter; it uses an internal static buffer */ char *ip_addr2a(struct ip_addr *ip); +/* ip addr to string converter; it uses a pool of internal static buffers */ +char *ip_addr2xa(struct ip_addr *ip); -/* full address in text representation, including [] for ipv6 */ +/* full address in text representation, including [] for ipv6 + * - it uses an internal static buffer */ char *ip_addr2strz(struct ip_addr *ip); +/* full address in text representation, including [] for ipv6 + * - it uses a pool of internal static buffers */ +char *ip_addr2xstrz(struct ip_addr *ip); #define SU2A_MAX_STR_SIZE \

1 0

git:master:8d12a04b: async: fixed name of pv in log message
by Daniel-Constantin Mierla 25 Nov '24

25 Nov '24

Module: kamailio Branch: master Commit: 8d12a04b57db2f3da6f522b6685161b38ff40d5e URL: https://github.com/kamailio/kamailio/commit/8d12a04b57db2f3da6f522b6685161b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-25T09:16:30+01:00 async: fixed name of pv in log message --- Modified: src/modules/async/async_sleep.c --- Diff: https://github.com/kamailio/kamailio/commit/8d12a04b57db2f3da6f522b6685161b… Patch: https://github.com/kamailio/kamailio/commit/8d12a04b57db2f3da6f522b6685161b… --- diff --git a/src/modules/async/async_sleep.c b/src/modules/async/async_sleep.c index 5fb8861a861..26d2e067597 100644 --- a/src/modules/async/async_sleep.c +++ b/src/modules/async/async_sleep.c @@ -701,7 +701,7 @@ int pv_parse_async_name(pv_spec_t *sp, str *in) return 0; error: - LM_ERR("unknown PV time name %.*s\n", in->len, in->s); + LM_ERR("unknown PV async name %.*s\n", in->len, in->s); return -1; }

1 0

git:master:bebf3782: corex: fixed name of pv in log message
by Daniel-Constantin Mierla 25 Nov '24

25 Nov '24

Module: kamailio Branch: master Commit: bebf378252484f770f2dbc9a27e6ad2b7ff7f880 URL: https://github.com/kamailio/kamailio/commit/bebf378252484f770f2dbc9a27e6ad2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-25T09:16:30+01:00 corex: fixed name of pv in log message --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/bebf378252484f770f2dbc9a27e6ad2… Patch: https://github.com/kamailio/kamailio/commit/bebf378252484f770f2dbc9a27e6ad2… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index c5008bfb445..115e50f8a03 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -1533,7 +1533,7 @@ static int pv_parse_atkv_name(pv_spec_t *sp, str *in) return 0; error: - LM_ERR("unknown PV time name %.*s\n", in->len, in->s); + LM_ERR("unknown PV atkv name %.*s\n", in->len, in->s); return -1; }

1 0

git:master:619b1f80: log_custom: add fixup_free* to exported functions
by Federico Cabiddu 25 Nov '24

25 Nov '24

Module: kamailio Branch: master Commit: 619b1f80d648e5869389b431e17c12f7b730634e URL: https://github.com/kamailio/kamailio/commit/619b1f80d648e5869389b431e17c12f… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-25T08:34:48+01:00 log_custom: add fixup_free* to exported functions --- Modified: src/modules/log_custom/log_custom_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/619b1f80d648e5869389b431e17c12f… Patch: https://github.com/kamailio/kamailio/commit/619b1f80d648e5869389b431e17c12f… --- diff --git a/src/modules/log_custom/log_custom_mod.c b/src/modules/log_custom/log_custom_mod.c index f7ae9a228c5..abb3ababd3b 100644 --- a/src/modules/log_custom/log_custom_mod.c +++ b/src/modules/log_custom/log_custom_mod.c @@ -47,25 +47,28 @@ static int w_log_udp(struct sip_msg *msg, char *txt, char *p2); void _lc_core_log_udp(int lpriority, const char *format, ...); +/* clang-format off */ static cmd_export_t cmds[] = { - {"log_udp", (cmd_function)w_log_udp, 1, fixup_spve_null, 0, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"log_udp", (cmd_function)w_log_udp, 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = {{0, 0, 0}}; struct module_exports exports = { - "log_custom", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* exported RPC functions */ - 0, /* exported pseudo-variables */ - 0, /* response function */ - mod_init, /* module initialization function */ - child_init, /* per child init function */ - mod_destroy /* destroy function */ + "log_custom", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* exported RPC functions */ + 0, /* exported pseudo-variables */ + 0, /* response function */ + mod_init, /* module initialization function */ + child_init, /* per child init function */ + mod_destroy /* destroy function */ }; +/* clang-format on */ /** * init module function */

1 0

git:master:adffa9e2: ldap: add fixup_free* to exported functions
by Federico Cabiddu 25 Nov '24

25 Nov '24

Module: kamailio Branch: master Commit: adffa9e2b31bf0ad7070420ac821a914fc2bcd6b URL: https://github.com/kamailio/kamailio/commit/adffa9e2b31bf0ad7070420ac821a91… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-25T08:32:48+01:00 ldap: add fixup_free* to exported functions --- Modified: src/modules/ldap/ldap_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/adffa9e2b31bf0ad7070420ac821a91… Patch: https://github.com/kamailio/kamailio/commit/adffa9e2b31bf0ad7070420ac821a91… --- diff --git a/src/modules/ldap/ldap_mod.c b/src/modules/ldap/ldap_mod.c index 27d44b9d88b..8303885f6ba 100644 --- a/src/modules/ldap/ldap_mod.c +++ b/src/modules/ldap/ldap_mod.c @@ -59,6 +59,8 @@ static int child_init(int rank); static int ldap_result_fixup(void **param, int param_no); static int ldap_filter_url_encode_fixup(void **param, int param_no); static int ldap_result_check_fixup(void **param, int param_no); +static int ldap_fixup_free(void **param, int param_no); +static int ldap_filter_url_encode_fixup_free(void **param, int param_no); /* * exported functions @@ -94,25 +96,25 @@ static dictionary *config_vals = NULL; /* clang-format off */ static cmd_export_t cmds[] = { {"ldap_search", (cmd_function)w_ldap_search, 1, - fixup_spve_null, 0, + fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE|LOCAL_ROUTE}, {"ldap_result", (cmd_function)w_ldap_result1, 1, - ldap_result_fixup, 0, + ldap_result_fixup, ldap_fixup_free, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE|LOCAL_ROUTE}, {"ldap_result", (cmd_function)w_ldap_result2, 2, - ldap_result_fixup, 0, + ldap_result_fixup, ldap_fixup_free, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE|LOCAL_ROUTE}, {"ldap_result_next", (cmd_function)w_ldap_result_next, 0, 0, 0, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE|LOCAL_ROUTE}, {"ldap_result_check", (cmd_function)w_ldap_result_check_1, 1, - ldap_result_check_fixup, 0, + ldap_result_check_fixup, ldap_fixup_free, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE|LOCAL_ROUTE}, {"ldap_result_check", (cmd_function)w_ldap_result_check_2, 2, - ldap_result_check_fixup, 0, + ldap_result_check_fixup, ldap_fixup_free, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE|LOCAL_ROUTE}, {"ldap_filter_url_encode", (cmd_function)w_ldap_filter_url_encode, 2, - ldap_filter_url_encode_fixup, 0, + ldap_filter_url_encode_fixup, ldap_filter_url_encode_fixup_free, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE|LOCAL_ROUTE}, {"load_ldap", (cmd_function)load_ldap, 0, 0, 0, 0}, @@ -374,6 +376,14 @@ static int ldap_result_fixup(void **param, int param_no) return 0; } +static int ldap_fixup_free(void **param, int param_no) +{ + if(param_no == 1) { + pkg_free(*param); + } + return 0; +} + static int ldap_result_check_fixup(void **param, int param_no) { struct ldap_result_check_params *lp; @@ -475,6 +485,14 @@ static int ldap_filter_url_encode_fixup(void **param, int param_no) return 0; } +static int ldap_filter_url_encode_fixup_free(void **param, int param_no) +{ + if(param_no == 2) { + pkg_free(*param); + } + return 0; +} + /** * */

1 0

git:master:cdafda78: pkg/kamailio: added support for CentOS 10 [skip-ci]
by Sergey Safarov 23 Nov '24

23 Nov '24

Module: kamailio Branch: master Commit: cdafda78c9fc98d9d9fdb7f94e77c9bc60ebf4d1 URL: https://github.com/kamailio/kamailio/commit/cdafda78c9fc98d9d9fdb7f94e77c9b… Author: Sergey Safarov <s.safarov(a)anycast-lb.net> Committer: Sergey Safarov <s.safarov(a)anycast-lb.net> Date: 2024-11-23T22:03:17+02:00 pkg/kamailio: added support for CentOS 10 [skip-ci] --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/cdafda78c9fc98d9d9fdb7f94e77c9b… Patch: https://github.com/kamailio/kamailio/commit/cdafda78c9fc98d9d9fdb7f94e77c9b… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 04eb6ba9076..9c32a293be2 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -113,21 +113,21 @@ %bcond_without wolfssl %endif -%if 0%{?rhel} == 9 +%if 0%{?rhel} == 9 || 0%{?rhel} == 10 %if 0%{?centos_ver} %define dist_name centos %define dist_version %{?centos} -%define dist .el9.centos +%define dist .el%{?centos_ver}.centos %endif %if 0%{?almalinux_ver} %define dist_name centos %define dist_version %{?almalinux} -%define dist .el9.almalinux +%define dist .el%{?almalinux_ver}.almalinux %endif %if 0%{?rocky_ver} %define dist_name centos %define dist_version %{?rocky} -%define dist .el9.rocky +%define dist .el%{?rocky_ver}.rocky %endif %if 0%{?centos_ver} == 0 && 0%{?almalinux_ver} == 0 && 0%{?rocky_ver} == 0 %define dist_name rhel

1 0

git:master:b1f9fc1d: corex: added $atkv(name) variable
by Daniel-Constantin Mierla 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: b1f9fc1d586975a12f6a6d56a76dbf2d3541124c URL: https://github.com/kamailio/kamailio/commit/b1f9fc1d586975a12f6a6d56a76dbf2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-22T19:30:25+01:00 corex: added $atkv(name) variable - get async type-key-value attributes --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b1f9fc1d586975a12f6a6d56a76dbf2… Patch: https://github.com/kamailio/kamailio/commit/b1f9fc1d586975a12f6a6d56a76dbf2… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 0fdf35060ea..c5008bfb445 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -38,6 +38,7 @@ #include "../../core/forward.h" #include "../../core/dns_cache.h" #include "../../core/data_lump.h" +#include "../../core/async_task.h" #include "../../core/parser/parse_uri.h" #include "../../core/parser/parse_param.h" @@ -101,12 +102,17 @@ static int corex_dns_cache_param_add(str *pval); static int corex_sip_reply_out(sr_event_param_t *evp); +static int pv_get_atkv(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); +static int pv_parse_atkv_name(pv_spec_t *sp, str *in); + /* clang-format off */ static pv_export_t mod_pvs[] = { {{"cfg", (sizeof("cfg") - 1)}, PVT_OTHER, pv_get_cfg, 0, pv_parse_cfg_name, 0, 0, 0}, {{"lsock", (sizeof("lsock") - 1)}, PVT_OTHER, pv_get_lsock, 0, pv_parse_lsock_name, 0, 0, 0}, + {{"atkv", (sizeof("atkv") - 1)}, PVT_OTHER, pv_get_atkv, 0, + pv_parse_atkv_name, 0, 0, 0}, {{0, 0}, 0, 0, 0, 0, 0, 0, 0} }; @@ -1456,6 +1462,81 @@ static int corex_sip_reply_out(sr_event_param_t *evp) return 0; } +/** + * + */ +static int pv_get_atkv(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + async_tkv_param_t *atkvp = NULL; + async_wgroup_t *awg = NULL; + + atkvp = ksr_async_tkv_param_get(); + + if(atkvp == NULL) { + return pv_get_null(msg, param, res); + } + + switch(param->pvn.u.isname.name.n) { + case 0: + return pv_get_sintval(msg, param, res, (long)atkvp->dtype); + case 1: + if(atkvp->skey.s == NULL || atkvp->skey.len < 0) { + return pv_get_null(msg, param, res); + } + return pv_get_strval(msg, param, res, &atkvp->skey); + case 2: + if(atkvp->sval.s == NULL || atkvp->sval.len < 0) { + return pv_get_null(msg, param, res); + } + return pv_get_strval(msg, param, res, &atkvp->sval); + case 3: + awg = async_task_workers_get_crt(); + if(awg == NULL || awg->name.s == NULL || awg->name.len < 0) { + return pv_get_null(msg, param, res); + } + return pv_get_strval(msg, param, res, &awg->name); + default: + return pv_get_null(msg, param, res); + } +} + +/** + * + */ +static int pv_parse_atkv_name(pv_spec_t *sp, str *in) +{ + if(sp == NULL || in == NULL || in->len <= 0) + return -1; + + switch(in->len) { + case 3: + if(strncmp(in->s, "key", 3) == 0) { + sp->pvp.pvn.u.isname.name.n = 1; + } else if(strncmp(in->s, "val", 3) == 0) { + sp->pvp.pvn.u.isname.name.n = 2; + } + break; + case 4: + if(strncmp(in->s, "type", 4) == 0) + sp->pvp.pvn.u.isname.name.n = 0; + break; + case 5: + if(strncmp(in->s, "gname", 5) == 0) + sp->pvp.pvn.u.isname.name.n = 3; + break; + default: + goto error; + } + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = 0; + + return 0; + +error: + LM_ERR("unknown PV time name %.*s\n", in->len, in->s); + return -1; +} + /** *

1 0

git:master:88ca83a5: core: function to get current tkv param
by Daniel-Constantin Mierla 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 88ca83a5379dbaca3a87fdcb26dd2855b5ba871d URL: https://github.com/kamailio/kamailio/commit/88ca83a5379dbaca3a87fdcb26dd285… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-22T19:24:18+01:00 core: function to get current tkv param --- Modified: src/core/async_task.c Modified: src/core/async_task.h --- Diff: https://github.com/kamailio/kamailio/commit/88ca83a5379dbaca3a87fdcb26dd285… Patch: https://github.com/kamailio/kamailio/commit/88ca83a5379dbaca3a87fdcb26dd285… --- diff --git a/src/core/async_task.c b/src/core/async_task.c index 17c385a51fd..e66205335fa 100644 --- a/src/core/async_task.c +++ b/src/core/async_task.c @@ -538,6 +538,14 @@ static async_wgroup_t *_async_tkv_awg = NULL; static async_tkv_param_t *_ksr_async_tkv_param = NULL; static int _ksr_async_tkv_ridx = -1; +/** + * + */ +async_tkv_param_t *ksr_async_tkv_param_get(void) +{ + return _ksr_async_tkv_param; +} + /** * */ diff --git a/src/core/async_task.h b/src/core/async_task.h index b4276c2d27c..67df94d6169 100644 --- a/src/core/async_task.h +++ b/src/core/async_task.h @@ -65,8 +65,9 @@ typedef struct async_tkv_param str sval; } async_tkv_param_t; -#define KSR_ASYNC_TKV_SIZE 512 +#define KSR_ASYNC_TKV_SIZE 1024 void async_tkv_init(void); int async_tkv_emit(int dtype, char *pkey, char *fmt, ...); +async_tkv_param_t *ksr_async_tkv_param_get(void); #endif

1 0

git:master:d2c98b63: core: main - init async type-key-value framework
by Daniel-Constantin Mierla 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: d2c98b63d141a88f29a379f6b5f23122d4997e82 URL: https://github.com/kamailio/kamailio/commit/d2c98b63d141a88f29a379f6b5f2312… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-22T19:17:44+01:00 core: main - init async type-key-value framework --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/d2c98b63d141a88f29a379f6b5f2312… Patch: https://github.com/kamailio/kamailio/commit/d2c98b63d141a88f29a379f6b5f2312… --- diff --git a/src/main.c b/src/main.c index 6aacc523db8..870a334559b 100644 --- a/src/main.c +++ b/src/main.c @@ -3333,6 +3333,7 @@ int main(int argc, char **argv) #endif /* USE_TLS */ #endif /* USE_TCP */ + async_tkv_init(); sr_core_ert_run_xname("core:modinit-before"); if(init_modules() != 0) {

1 0

git:master:f4e04dac: pv: add fixup_free* to exported functions
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: f4e04dac07bc11da08288a8a4a4957c5799c37e9 URL: https://github.com/kamailio/kamailio/commit/f4e04dac07bc11da08288a8a4a4957c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T15:48:18+01:00 pv: add fixup_free* to exported functions --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/f4e04dac07bc11da08288a8a4a4957c… Patch: https://github.com/kamailio/kamailio/commit/f4e04dac07bc11da08288a8a4a4957c… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 3feedf66cda..e014cf37449 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -535,9 +535,9 @@ int pv_register_api(pv_api_t *); /* clang-format off */ static cmd_export_t cmds[] = { {"pv_isset", (cmd_function)pv_isset, 1, - fixup_pvar_null, 0, ANY_ROUTE}, + fixup_pvar_null, fixup_free_pvar_null, ANY_ROUTE}, {"pv_unset", (cmd_function)pv_unset, 1, - fixup_pvar_null, 0, ANY_ROUTE}, + fixup_pvar_null, fixup_free_pvar_null, ANY_ROUTE}, {"pv_xavp_print", (cmd_function)pv_xavp_print, 0, 0, 0, ANY_ROUTE}, {"pv_xavu_print", (cmd_function)pv_xavu_print, 0, 0, 0, ANY_ROUTE}, {"pv_xavi_print", (cmd_function)pv_xavi_print, 0, 0, 0, ANY_ROUTE}, @@ -552,9 +552,9 @@ static cmd_export_t cmds[] = { {"not_empty", (cmd_function)pv_not_empty, 1, fixup_pvar_null, fixup_free_pvar_null, ANY_ROUTE}, {"xavp_copy", (cmd_function)w_xavp_copy, 3, - pv_xavp_copy_fixup, 0, ANY_ROUTE}, + pv_xavp_copy_fixup, fixup_free_fparam_all, ANY_ROUTE}, {"xavp_copy", (cmd_function)w_xavp_copy_dst, 4, - pv_xavp_copy_fixup, 0, ANY_ROUTE}, + pv_xavp_copy_fixup, fixup_free_fparam_all, ANY_ROUTE}, {"xavp_slist_explode", (cmd_function)w_xavp_slist_explode, 4, fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, {"xavp_params_explode", (cmd_function)w_xavp_params_explode, 2,

1 0

git:master:8ff56760: pv: reformat exported structures
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 8ff567606175fe2d1c1509a9e0d61c0cf2c87b07 URL: https://github.com/kamailio/kamailio/commit/8ff567606175fe2d1c1509a9e0d61c0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T15:45:24+01:00 pv: reformat exported structures --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/8ff567606175fe2d1c1509a9e0d61c0… Patch: https://github.com/kamailio/kamailio/commit/8ff567606175fe2d1c1509a9e0d61c0…

1 0

git:master:389e22db: qos: reformat exported structures
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 389e22db478bb9d36e1fe0d75801b8602f746350 URL: https://github.com/kamailio/kamailio/commit/389e22db478bb9d36e1fe0d75801b86… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T15:39:47+01:00 qos: reformat exported structures --- Modified: src/modules/qos/qos.c --- Diff: https://github.com/kamailio/kamailio/commit/389e22db478bb9d36e1fe0d75801b86… Patch: https://github.com/kamailio/kamailio/commit/389e22db478bb9d36e1fe0d75801b86… --- diff --git a/src/modules/qos/qos.c b/src/modules/qos/qos.c index 4aa0a9bd2ee..ee44e45929a 100644 --- a/src/modules/qos/qos.c +++ b/src/modules/qos/qos.c @@ -47,29 +47,33 @@ static int qos_flag = -1; struct dlg_binds dialog_st; struct dlg_binds *dlg_binds = &dialog_st; - +/* clang-format off */ static cmd_export_t cmds[] = { - {"load_qos", (cmd_function)load_qos, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}}; + {"load_qos", (cmd_function)load_qos, 0, 0, 0, 0}, + {0, 0, 0, 0, 0, 0} +}; /* * Script parameters */ static param_export_t mod_params[] = { - {"qos_flag", PARAM_INT, &qos_flag}, {0, 0, 0}}; - + {"qos_flag", PARAM_INT, &qos_flag}, + {0, 0, 0} +}; struct module_exports exports = { - "qos", /* module's name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - mod_params, /* param exports */ - 0, /* exported RPC functions */ - 0, /* exported pseudo-variables */ - 0, /* reply processing function */ - mod_init, /* module initialization function */ - 0, /* per-child init function */ - mod_destroy /* module destroy function */ + "qos", /* module's name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + mod_params, /* exported parameters */ + 0, /* RPC method exports */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + 0, /* per-child init function */ + mod_destroy /* module destroy function */ }; +/* clang-format on */ int load_qos(struct qos_binds *qosb) {

1 0

git:master:5484965b: rabbitmq: reformat exported structures
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 5484965bb912c96dec57b701af0030b03ccdeb44 URL: https://github.com/kamailio/kamailio/commit/5484965bb912c96dec57b701af0030b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T15:37:49+01:00 rabbitmq: reformat exported structures --- Modified: src/modules/rabbitmq/rabbitmq.c --- Diff: https://github.com/kamailio/kamailio/commit/5484965bb912c96dec57b701af0030b… Patch: https://github.com/kamailio/kamailio/commit/5484965bb912c96dec57b701af0030b… --- diff --git a/src/modules/rabbitmq/rabbitmq.c b/src/modules/rabbitmq/rabbitmq.c index 709055dc9ab..5008625b939 100644 --- a/src/modules/rabbitmq/rabbitmq.c +++ b/src/modules/rabbitmq/rabbitmq.c @@ -127,34 +127,40 @@ static int rbmq_fixup_free_params(void **param, int param_no) return -1; } +/* clang-format off */ /* module commands */ static cmd_export_t cmds[] = { - {"rabbitmq_publish", (cmd_function)rabbitmq_publish, 4, fixup_spve_all, - fixup_free_spve_all, ANY_ROUTE}, - {"rabbitmq_publish_consume", (cmd_function)rabbitmq_publish_consume, 5, - rbmq_fixup_params, rbmq_fixup_free_params, REQUEST_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"rabbitmq_publish", (cmd_function)rabbitmq_publish, 4, + fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, + {"rabbitmq_publish_consume", (cmd_function)rabbitmq_publish_consume, 5, + rbmq_fixup_params, rbmq_fixup_free_params, REQUEST_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; /* module parameters */ -static param_export_t params[] = {{"url", PARAM_STRING, &amqp_url}, - {"amqps_ca_file", PARAM_STRING, &rmq_amqps_ca_file}, - {"timeout_sec", PARAM_INT, &timeout_sec}, - {"timeout_usec", PARAM_INT, &timeout_usec}, - {"direct_reply_to", PARAM_INT, &direct_reply_to}, {0, 0, 0}}; +static param_export_t params[] = { + {"url", PARAM_STRING, &amqp_url}, + {"amqps_ca_file", PARAM_STRING, &rmq_amqps_ca_file}, + {"timeout_sec", PARAM_INT, &timeout_sec}, + {"timeout_usec", PARAM_INT, &timeout_usec}, + {"direct_reply_to", PARAM_INT, &direct_reply_to}, + {0, 0, 0} +}; /* module exports */ struct module_exports exports = { - "rabbitmq", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* RPC method exports */ - 0, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module initialization function */ - mod_child_init, /* per-child init function */ - 0 /* module destroy function */ + "rabbitmq", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + mod_child_init, /* per-child init function */ + 0 /* module destroy function */ }; +/* clang-format on */ /* module init */ static int mod_init(void)

1 0

git:master:5680e3ac: ratelimit: add fixup_free* to exported functions
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 5680e3acb5964952ed0b084f7e946bf28f817d61 URL: https://github.com/kamailio/kamailio/commit/5680e3acb5964952ed0b084f7e946bf… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T15:35:38+01:00 ratelimit: add fixup_free* to exported functions --- Modified: src/modules/ratelimit/ratelimit.c --- Diff: https://github.com/kamailio/kamailio/commit/5680e3acb5964952ed0b084f7e946bf… Patch: https://github.com/kamailio/kamailio/commit/5680e3acb5964952ed0b084f7e946bf… --- diff --git a/src/modules/ratelimit/ratelimit.c b/src/modules/ratelimit/ratelimit.c index 90065b56698..f67d8a6c3fc 100644 --- a/src/modules/ratelimit/ratelimit.c +++ b/src/modules/ratelimit/ratelimit.c @@ -218,7 +218,7 @@ static cmd_export_t cmds[] = { {"rl_check", (cmd_function)w_rl_check_forced, 1, fixup_igp_null, fixup_free_pvar_null, REQUEST_ROUTE | LOCAL_ROUTE}, {"rl_check_pipe", (cmd_function)w_rl_check_forced_pipe, 1, - fixup_igp_null, 0, ANY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} };

1 0

git:master:0595feb1: ratelimit: reformat exported structures
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 0595feb17da5632a24f1e44a992335ff66d0b30e URL: https://github.com/kamailio/kamailio/commit/0595feb17da5632a24f1e44a992335f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T15:34:22+01:00 ratelimit: reformat exported structures --- Modified: src/modules/ratelimit/ratelimit.c --- Diff: https://github.com/kamailio/kamailio/commit/0595feb17da5632a24f1e44a992335f… Patch: https://github.com/kamailio/kamailio/commit/0595feb17da5632a24f1e44a992335f… --- diff --git a/src/modules/ratelimit/ratelimit.c b/src/modules/ratelimit/ratelimit.c index 0d31d36b6eb..90065b56698 100644 --- a/src/modules/ratelimit/ratelimit.c +++ b/src/modules/ratelimit/ratelimit.c @@ -212,39 +212,42 @@ static int ki_rl_check_pipe(struct sip_msg *msg, int pipe); static int set_load_source(modparam_t, void *); */ static void destroy(void); - +/* clang-format off */ static cmd_export_t cmds[] = { - {"rl_check", (cmd_function)w_rl_check_default, 0, 0, 0, ANY_ROUTE}, - {"rl_check", (cmd_function)w_rl_check_forced, 1, fixup_igp_null, - fixup_free_pvar_null, REQUEST_ROUTE | LOCAL_ROUTE}, - {"rl_check_pipe", (cmd_function)w_rl_check_forced_pipe, 1, - fixup_igp_null, 0, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"rl_check", (cmd_function)w_rl_check_default, 0, 0, 0, ANY_ROUTE}, + {"rl_check", (cmd_function)w_rl_check_forced, 1, + fixup_igp_null, fixup_free_pvar_null, REQUEST_ROUTE | LOCAL_ROUTE}, + {"rl_check_pipe", (cmd_function)w_rl_check_forced_pipe, 1, + fixup_igp_null, 0, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; + static param_export_t params[] = { - {"timer_interval", PARAM_INT, &timer_interval}, - {"queue", PARAM_STRING | PARAM_USE_FUNC, (void *)add_queue_params}, - {"pipe", PARAM_STRING | PARAM_USE_FUNC, (void *)add_pipe_params}, - /* RESERVED for future use + {"timer_interval", PARAM_INT, &timer_interval}, + {"queue", PARAM_STRING | PARAM_USE_FUNC, (void *)add_queue_params}, + {"pipe", PARAM_STRING | PARAM_USE_FUNC, (void *)add_pipe_params}, + /* RESERVED for future use {"load_source", PARAM_STRING|PARAM_USE_FUNC, (void *)set_load_source}, */ - {0, 0, 0}}; + {0, 0, 0} +}; static rpc_export_t rpc_methods[]; /** module exports */ struct module_exports exports = { - "ratelimit", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* cmd (cfg function) exports */ - params, /* param exports */ - 0, /* exported RPC functions */ - 0, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module initialization function */ - 0, /* per-child init function */ - destroy /* module exit function */ + "ratelimit", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + 0, /* per-child init function */ + destroy /* module destroy function */ }; - +/* clang-format on */ /** * converts a mapped str to an int

1 0

git:master:5bebde17: regex: add fixup_free* to exported functions
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 5bebde177c357e2aaf5f24537d0d44da51ac914a URL: https://github.com/kamailio/kamailio/commit/5bebde177c357e2aaf5f24537d0d44d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T15:29:00+01:00 regex: add fixup_free* to exported functions --- Modified: src/modules/regex/regex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5bebde177c357e2aaf5f24537d0d44d… Patch: https://github.com/kamailio/kamailio/commit/5bebde177c357e2aaf5f24537d0d44d… --- diff --git a/src/modules/regex/regex_mod.c b/src/modules/regex/regex_mod.c index 11c055c1d10..4c378bb28f0 100644 --- a/src/modules/regex/regex_mod.c +++ b/src/modules/regex/regex_mod.c @@ -116,13 +116,13 @@ static int w_pcre_match_group(struct sip_msg *_msg, char *_s1, char *_s2); /* clang-format off */ static cmd_export_t cmds[] = { {"pcre_match", (cmd_function)w_pcre_match, 2, - fixup_spve_spve, 0, + fixup_spve_spve, fixup_free_spve_spve, REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE | LOCAL_ROUTE}, {"pcre_match_group", (cmd_function)w_pcre_match_group, 2, - fixup_spve_spve, 0, + fixup_spve_spve, fixup_free_spve_spve, REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE | LOCAL_ROUTE}, {"pcre_match_group", (cmd_function)w_pcre_match_group, 1, - fixup_spve_null, 0, + fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE | LOCAL_ROUTE}, {0, 0, 0, 0, 0, 0} };

1 0

git:master:71197e76: regex: reformat exported structures
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 71197e76e02818d8e7e016cefbda3886bec9afb1 URL: https://github.com/kamailio/kamailio/commit/71197e76e02818d8e7e016cefbda388… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T15:28:11+01:00 regex: reformat exported structures --- Modified: src/modules/regex/regex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/71197e76e02818d8e7e016cefbda388… Patch: https://github.com/kamailio/kamailio/commit/71197e76e02818d8e7e016cefbda388… --- diff --git a/src/modules/regex/regex_mod.c b/src/modules/regex/regex_mod.c index 904342ff7fc..11c055c1d10 100644 --- a/src/modules/regex/regex_mod.c +++ b/src/modules/regex/regex_mod.c @@ -115,21 +115,18 @@ static int w_pcre_match_group(struct sip_msg *_msg, char *_s1, char *_s2); */ /* clang-format off */ static cmd_export_t cmds[] = { - {"pcre_match", (cmd_function)w_pcre_match, 2, fixup_spve_spve, 0, - REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE - | LOCAL_ROUTE}, + {"pcre_match", (cmd_function)w_pcre_match, 2, + fixup_spve_spve, 0, + REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE | LOCAL_ROUTE}, {"pcre_match_group", (cmd_function)w_pcre_match_group, 2, - fixup_spve_spve, 0, - REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE - | LOCAL_ROUTE}, + fixup_spve_spve, 0, + REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE | LOCAL_ROUTE}, {"pcre_match_group", (cmd_function)w_pcre_match_group, 1, - fixup_spve_null, 0, - REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE - | LOCAL_ROUTE}, + fixup_spve_null, 0, + REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE | LOCAL_ROUTE}, {0, 0, 0, 0, 0, 0} }; - /* * Exported parameters */ @@ -144,21 +141,20 @@ static param_export_t params[] = { {0, 0, 0} }; - /* * Module interface */ struct module_exports exports = { - "regex", /*!< module name */ - DEFAULT_DLFLAGS, /*!< dlopen flags */ - cmds, /*!< exported functions */ - params, /*!< exported parameters */ - 0, /*!< exported RPC functions */ - 0, /*!< exported pseudo-variables */ - 0, /*!< response handling function */ - mod_init, /*!< module initialization function */ - 0, /*!< per-child init function */ - destroy /*!< destroy function */ + "regex", /*!< module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + 0, /* per-child init function */ + destroy /* module destroy function */ }; /* clang-format on */

1 0

git:master:a0f09749: registrar: reformat exported structures
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: a0f09749f7607b764523004663e0dd8f23675c22 URL: https://github.com/kamailio/kamailio/commit/a0f09749f7607b764523004663e0dd8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T15:25:45+01:00 registrar: reformat exported structures --- Modified: src/modules/registrar/registrar.c --- Diff: https://github.com/kamailio/kamailio/commit/a0f09749f7607b764523004663e0dd8… Patch: https://github.com/kamailio/kamailio/commit/a0f09749f7607b764523004663e0dd8…

1 0

git:master:7f3207cc: rls: add fixup_free* to exported functions
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 7f3207ccd2757fbdbed53bab5841808c4fc5c1cf URL: https://github.com/kamailio/kamailio/commit/7f3207ccd2757fbdbed53bab5841808… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T15:09:35+01:00 rls: add fixup_free* to exported functions --- Modified: src/modules/rls/rls.c Modified: src/modules/rls/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/7f3207ccd2757fbdbed53bab5841808… Patch: https://github.com/kamailio/kamailio/commit/7f3207ccd2757fbdbed53bab5841808… --- diff --git a/src/modules/rls/rls.c b/src/modules/rls/rls.c index c11d3da3476..4a4457dfc7e 100644 --- a/src/modules/rls/rls.c +++ b/src/modules/rls/rls.c @@ -209,15 +209,16 @@ void rlsubs_table_update(unsigned int ticks, void *param); int add_rls_event(modparam_t type, void *val); int rls_update_subs(struct sip_msg *msg, char *puri, char *pevent); int fixup_update_subs(void **param, int param_no); +int fixup_free_update_subs(void **param, int param_no); /* clang-format off */ static cmd_export_t cmds[] = { {"rls_handle_subscribe", (cmd_function)w_rls_handle_subscribe0, 0, 0, 0, REQUEST_ROUTE}, {"rls_handle_subscribe", (cmd_function)w_rls_handle_subscribe1, 1, - fixup_spve_null, 0, REQUEST_ROUTE}, + fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE}, {"rls_handle_notify", (cmd_function)w_rls_handle_notify, 0, 0, 0, REQUEST_ROUTE}, {"rls_update_subs", (cmd_function)w_rls_update_subs, 2, - fixup_update_subs, 0, ANY_ROUTE}, + fixup_update_subs, fixup_free_update_subs, ANY_ROUTE}, {"bind_rls", (cmd_function)bind_rls, 1, 0, 0, 0}, {0, 0, 0, 0, 0, 0} }; diff --git a/src/modules/rls/subscribe.c b/src/modules/rls/subscribe.c index b1d2b9a6582..f96238dbc1c 100644 --- a/src/modules/rls/subscribe.c +++ b/src/modules/rls/subscribe.c @@ -1051,6 +1051,16 @@ int fixup_update_subs(void **param, int param_no) return 0; } +int fixup_free_update_subs(void **param, int param_no) +{ + if(param_no == 1) { + return fixup_free_spve_null(param, 1); + } else if(param_no == 2) { + return fixup_free_spve_null(param, 1); + } + return 0; +} + void update_a_sub(subs_t *subs_copy) { xmlDocPtr doc = NULL;

1 0

git:master:e56f003a: rls: reformat exported structures
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: e56f003abaa1f8589193ac1826992929aea6f0b2 URL: https://github.com/kamailio/kamailio/commit/e56f003abaa1f8589193ac182699292… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T15:09:29+01:00 rls: reformat exported structures --- Modified: src/modules/rls/rls.c --- Diff: https://github.com/kamailio/kamailio/commit/e56f003abaa1f8589193ac182699292… Patch: https://github.com/kamailio/kamailio/commit/e56f003abaa1f8589193ac182699292…

1 0

git:master:5b852254: core: framework to execute async event route with type-key-value
by Daniel-Constantin Mierla 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 5b852254e75365c2886baf1e4be8829ac10b9917 URL: https://github.com/kamailio/kamailio/commit/5b852254e75365c2886baf1e4be8829… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-22T13:28:20+01:00 core: framework to execute async event route with type-key-value - execute event_route[core:tkv] in async fashion, with data passed in the form of [type, key, value] - the events have to be emitted from parts of the code and the execution of the event route should not block the emitting process --- Modified: src/core/async_task.c Modified: src/core/async_task.h --- Diff: https://github.com/kamailio/kamailio/commit/5b852254e75365c2886baf1e4be8829… Patch: https://github.com/kamailio/kamailio/commit/5b852254e75365c2886baf1e4be8829… --- diff --git a/src/core/async_task.c b/src/core/async_task.c index bce7ed51faa..17c385a51fd 100644 --- a/src/core/async_task.c +++ b/src/core/async_task.c @@ -34,11 +34,15 @@ #include <arpa/inet.h> #include <fcntl.h> #include <errno.h> +#include <stdarg.h> #include "dprint.h" #include "sr_module.h" #include "ut.h" #include "pt.h" +#include "kemi.h" +#include "fmsg.h" +#include "receive.h" #include "cfg/cfg_struct.h" #include "parser/parse_param.h" @@ -525,3 +529,126 @@ int async_task_run(async_wgroup_t *awg, int idx) return 0; } + + +/** + * + */ +static async_wgroup_t *_async_tkv_awg = NULL; +static async_tkv_param_t *_ksr_async_tkv_param = NULL; +static int _ksr_async_tkv_ridx = -1; + +/** + * + */ +void async_tkv_init(void) +{ + str gname = str_init("tkv"); + str evname = str_init("core:tkv"); + + _async_tkv_awg = async_task_group_find(&gname); + + _ksr_async_tkv_ridx = route_lookup(&event_rt, evname.s); + if(_ksr_async_tkv_ridx <= 0 + || event_rt.rlist[_ksr_async_tkv_ridx] == NULL) { + LM_DBG("event_route[%s] not defined - skipping\n", evname.s); + _ksr_async_tkv_ridx = -2; + return; + } +} + +/** + * + */ +void async_exec_tkv(void *param) +{ + async_tkv_param_t *adp; + sr_kemi_eng_t *keng = NULL; + sip_msg_t *fmsg = NULL; + str evname = str_init("core:tkv"); + str cbname = str_init("ksr_core_tkv"); + int rtype = 0; + + adp = (async_tkv_param_t *)param; + fmsg = faked_msg_next(); + rtype = get_route_type(); + _ksr_async_tkv_param = adp; + set_route_type(REQUEST_ROUTE); + keng = sr_kemi_eng_get(); + if(keng != NULL) { + if(sr_kemi_route(keng, fmsg, EVENT_ROUTE, &cbname, &evname) < 0) { + LM_ERR("error running event route kemi callback [%.*s]\n", + cbname.len, cbname.s); + } + } else { + if(_ksr_async_tkv_ridx >= 0) { + run_top_route(event_rt.rlist[_ksr_async_tkv_ridx], fmsg, 0); + } + } + ksr_msg_env_reset(); + set_route_type(rtype); + _ksr_async_tkv_param = NULL; + /* param is freed along with the async task strucutre in core */ +} + +/** + * + */ +int async_tkv_emit(int dtype, char *pkey, char *fmt, ...) +{ + async_task_t *at = NULL; + int dsize = 0; + async_tkv_param_t *adp; + va_list va; + char buf[KSR_ASYNC_TKV_SIZE]; + int n = 0; + int klen = 0; + sr_kemi_eng_t *keng = NULL; + + if(_async_tkv_awg == NULL) { + LM_DBG("the async group has not been set\n"); + return -1; + } + keng = sr_kemi_eng_get(); + if(keng == NULL && _ksr_async_tkv_ridx == -2) { + LM_DBG("the event_route[core:tkv] has not been defined\n"); + return -1; + } + + va_start(va, fmt); + n = vsnprintf(buf, KSR_ASYNC_TKV_SIZE, fmt, va); + va_end(va); + + if(n < 0 || n > KSR_ASYNC_TKV_SIZE) { + LM_ERR("failed to print the arguments for key: %s\n", pkey); + return -1; + } + + klen = strlen(pkey); + dsize = sizeof(async_task_t) + sizeof(async_tkv_param_t) + klen + 1 + n + 1; + at = (async_task_t *)shm_malloc(dsize); + if(at == NULL) { + SHM_MEM_ERROR; + return -1; + } + memset(at, 0, dsize); + at->exec = async_exec_tkv; + at->param = (char *)at + sizeof(async_task_t); + adp = (async_tkv_param_t *)at->param; + adp->dtype = dtype; + adp->skey.s = (char *)adp + sizeof(async_tkv_param_t); + adp->skey.len = klen; + memcpy(adp->skey.s, pkey, klen); + adp->skey.len = klen; + adp->sval.s = (char *)adp->skey.s + klen + 1; + memcpy(adp->sval.s, buf, n); + adp->sval.len = n; + + if(async_task_group_send(_async_tkv_awg, at) < 0) { + LM_ERR("failed to send task with key: %s\n", pkey); + shm_free(at); + return -1; + } + + return 0; +} diff --git a/src/core/async_task.h b/src/core/async_task.h index 58386bba8bd..b4276c2d27c 100644 --- a/src/core/async_task.h +++ b/src/core/async_task.h @@ -58,4 +58,15 @@ async_wgroup_t *async_task_group_find(str *gname); int async_task_group_push(str *gname, async_task_t *task); int async_task_group_send(async_wgroup_t *awg, async_task_t *task); +typedef struct async_tkv_param +{ + int dtype; + str skey; + str sval; +} async_tkv_param_t; + +#define KSR_ASYNC_TKV_SIZE 512 +void async_tkv_init(void); +int async_tkv_emit(int dtype, char *pkey, char *fmt, ...); + #endif

1 0

git:master:ecb99f2f: jwt: add fixup_free* to exported functions
by Federico Cabiddu 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: ecb99f2ff1babe3871af5fba7d7f94e8b0df68cd URL: https://github.com/kamailio/kamailio/commit/ecb99f2ff1babe3871af5fba7d7f94e… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-22T12:37:09+01:00 jwt: add fixup_free* to exported functions --- Modified: src/modules/jwt/jwt_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ecb99f2ff1babe3871af5fba7d7f94e… Patch: https://github.com/kamailio/kamailio/commit/ecb99f2ff1babe3871af5fba7d7f94e… --- diff --git a/src/modules/jwt/jwt_mod.c b/src/modules/jwt/jwt_mod.c index 90d8fa5bd03..64c78e63555 100644 --- a/src/modules/jwt/jwt_mod.c +++ b/src/modules/jwt/jwt_mod.c @@ -65,39 +65,45 @@ typedef struct jwt_fcache static jwt_fcache_t *_jwt_fcache_list = NULL; -static cmd_export_t cmds[] = {{"jwt_generate", (cmd_function)w_jwt_generate_4, - 4, fixup_spve_all, 0, ANY_ROUTE}, - {"jwt_generate", (cmd_function)w_jwt_generate_3, 3, fixup_spve_all, 0, - ANY_ROUTE}, - {"jwt_verify", (cmd_function)w_jwt_verify, 4, fixup_spve_all, 0, - ANY_ROUTE}, - {"jwt_verify_key", (cmd_function)w_jwt_verify_key, 4, fixup_spve_all, 0, - ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; - -static param_export_t params[] = {{"key_mode", PARAM_INT, &_jwt_key_mode}, +/* clang-format off */ +static cmd_export_t cmds[] = { + {"jwt_generate", (cmd_function)w_jwt_generate_4, 4, fixup_spve_all, fixup_free_spve_all, + ANY_ROUTE}, + {"jwt_generate", (cmd_function)w_jwt_generate_3, 3, fixup_spve_all, fixup_free_spve_all, + ANY_ROUTE}, + {"jwt_verify", (cmd_function)w_jwt_verify, 4, fixup_spve_all, fixup_free_spve_all, + ANY_ROUTE}, + {"jwt_verify_key", (cmd_function)w_jwt_verify_key, 4, fixup_spve_all, fixup_free_spve_all, + ANY_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; - {0, 0, 0}}; +static param_export_t params[] = { + {"key_mode", PARAM_INT, &_jwt_key_mode}, + {0, 0, 0} +}; static int jwt_pv_get(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); static int jwt_pv_parse_name(pv_spec_t *sp, str *in); static pv_export_t mod_pvs[] = { - {{"jwt", sizeof("jwt") - 1}, PVT_OTHER, jwt_pv_get, 0, - jwt_pv_parse_name, 0, 0, 0}, - {{0, 0}, 0, 0, 0, 0, 0, 0, 0}}; + {{"jwt", sizeof("jwt") - 1}, PVT_OTHER, jwt_pv_get, 0, + jwt_pv_parse_name, 0, 0, 0}, + {{0, 0}, 0, 0, 0, 0, 0, 0, 0} +}; struct module_exports exports = { - "jwt", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* cmd (cfg function) exports */ - params, /* param exports */ - 0, /* RPC method exports */ - mod_pvs, /* pseudo-variables exports */ - 0, /* response handling function */ - mod_init, /* module init function */ - child_init, /* per-child init function */ - mod_destroy /* module destroy function */ + "jwt", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* cmd (cfg function) exports */ + params, /* param exports */ + 0, /* RPC method exports */ + mod_pvs, /* pseudo-variables exports */ + 0, /* response handling function */ + mod_init, /* module init function */ + child_init, /* per-child init function */ + mod_destroy /* module destroy function */ }; +/* clang-format on */ /**

1 0

git:master:20a2d57e: jsonrpcs: add fixup_free* to exported functions
by Federico Cabiddu 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 20a2d57e295c6329c0f8358f36915cd6a4cd5783 URL: https://github.com/kamailio/kamailio/commit/20a2d57e295c6329c0f8358f36915cd… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-22T12:33:45+01:00 jsonrpcs: add fixup_free* to exported functions --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/20a2d57e295c6329c0f8358f36915cd… Patch: https://github.com/kamailio/kamailio/commit/20a2d57e295c6329c0f8358f36915cd… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index ec8c8f4ad17..3400869249a 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -141,34 +141,38 @@ static rpc_t func_param; char jsonrpc_error_buf[JSONRPC_ERROR_REASON_BUF_LEN]; +/* clang-format off */ static cmd_export_t cmds[] = { - {"jsonrpc_dispatch", (cmd_function)jsonrpc_dispatch, 0, 0, 0, - REQUEST_ROUTE}, - {"jsonrpc_exec", (cmd_function)jsonrpc_exec, 1, fixup_spve_null, 0, - ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"jsonrpc_dispatch", (cmd_function)jsonrpc_dispatch, 0, 0, 0, + REQUEST_ROUTE}, + {"jsonrpc_exec", (cmd_function)jsonrpc_exec, 1, fixup_spve_null, fixup_free_spve_null, + ANY_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = { - {"pretty_format", PARAM_INT, &jsonrpc_pretty_format}, - {"transport", PARAM_INT, &jsonrpc_transport}, - {"fifo_name", PARAM_STRING, &jsonrpc_fifo}, - {"fifo_mode", PARAM_INT, &jsonrpc_fifo_mode}, - {"fifo_group", PARAM_STRING, &jsonrpc_fifo_gid_s}, - {"fifo_group", PARAM_INT, &jsonrpc_fifo_gid}, - {"fifo_user", PARAM_STRING, &jsonrpc_fifo_uid_s}, - {"fifo_user", PARAM_INT, &jsonrpc_fifo_uid}, - {"fifo_reply_dir", PARAM_STRING, &jsonrpc_fifo_reply_dir}, - {"dgram_socket", PARAM_STRING, &jsonrpc_dgram_socket}, - {"dgram_workers", PARAM_INT, &jsonrpc_dgram_workers}, - {"dgram_timeout", PARAM_INT, &jsonrpc_dgram_timeout}, - {"dgram_mode", PARAM_INT, &jsonrpc_dgram_unix_socket_mode}, - {"dgram_group", PARAM_STRING, &jsonrpc_dgram_unix_socket_gid_s}, - {"dgram_group", PARAM_INT, &jsonrpc_dgram_unix_socket_gid}, - {"dgram_user", PARAM_STRING, &jsonrpc_dgram_unix_socket_uid_s}, - {"dgram_user", PARAM_INT, &jsonrpc_dgram_unix_socket_uid}, - {"tcp_socket", PARAM_STRING, &jsonrpc_tcp_socket}, - - {0, 0, 0}}; + {"pretty_format", PARAM_INT, &jsonrpc_pretty_format}, + {"transport", PARAM_INT, &jsonrpc_transport}, + {"fifo_name", PARAM_STRING, &jsonrpc_fifo}, + {"fifo_mode", PARAM_INT, &jsonrpc_fifo_mode}, + {"fifo_group", PARAM_STRING, &jsonrpc_fifo_gid_s}, + {"fifo_group", PARAM_INT, &jsonrpc_fifo_gid}, + {"fifo_user", PARAM_STRING, &jsonrpc_fifo_uid_s}, + {"fifo_user", PARAM_INT, &jsonrpc_fifo_uid}, + {"fifo_reply_dir", PARAM_STRING, &jsonrpc_fifo_reply_dir}, + {"dgram_socket", PARAM_STRING, &jsonrpc_dgram_socket}, + {"dgram_workers", PARAM_INT, &jsonrpc_dgram_workers}, + {"dgram_timeout", PARAM_INT, &jsonrpc_dgram_timeout}, + {"dgram_mode", PARAM_INT, &jsonrpc_dgram_unix_socket_mode}, + {"dgram_group", PARAM_STRING, &jsonrpc_dgram_unix_socket_gid_s}, + {"dgram_group", PARAM_INT, &jsonrpc_dgram_unix_socket_gid}, + {"dgram_user", PARAM_STRING, &jsonrpc_dgram_unix_socket_uid_s}, + {"dgram_user", PARAM_INT, &jsonrpc_dgram_unix_socket_uid}, + {"tcp_socket", PARAM_STRING, &jsonrpc_tcp_socket}, + + {0, 0, 0} +}; +/* clang-format on */ static int jsonrpc_pv_get_jrpl( sip_msg_t *msg, pv_param_t *param, pv_value_t *res);

1 0

git:master:436e7921: jsonrpcc: reformat exported structures
by Federico Cabiddu 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 436e79216a448b0a270a53f867d89b84269557d9 URL: https://github.com/kamailio/kamailio/commit/436e79216a448b0a270a53f867d89b8… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-22T12:31:36+01:00 jsonrpcc: reformat exported structures --- Modified: src/modules/jsonrpcc/jsonrpcc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/436e79216a448b0a270a53f867d89b8… Patch: https://github.com/kamailio/kamailio/commit/436e79216a448b0a270a53f867d89b8… --- diff --git a/src/modules/jsonrpcc/jsonrpcc_mod.c b/src/modules/jsonrpcc/jsonrpcc_mod.c index f374cf4f8c8..308c0f6432e 100644 --- a/src/modules/jsonrpcc/jsonrpcc_mod.c +++ b/src/modules/jsonrpcc/jsonrpcc_mod.c @@ -55,15 +55,16 @@ extern int _jsonrpcc_max_conn_retry; /* max retries to connect */ struct tm_binds tmb; +/* clang-format off */ /* * Exported Functions */ static cmd_export_t cmds[] = { - {"jsonrpc_request", (cmd_function)jsonrpc_request, 5, fixup_request, - fixup_request_free, ANY_ROUTE}, - {"jsonrpc_notification", (cmd_function)jsonrpc_notification, 2, - fixup_notification, 0, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"jsonrpc_request", (cmd_function)jsonrpc_request, 5, fixup_request, + fixup_request_free, ANY_ROUTE}, + {"jsonrpc_notification", (cmd_function)jsonrpc_notification, 2, fixup_notification, + fixup_free_spve_null, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0}}; /* @@ -77,17 +78,18 @@ static param_export_t mod_params[] = {{"servers", PARAM_STRING, &servers_param}, * Exports */ struct module_exports exports = { - "jsonrpcc", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* cmd (cfg function) exports */ - mod_params, /* param exports */ - 0, /* RPC method exports */ - 0, /* pseudo-variables exports */ - 0, /* response handling function */ - mod_init, /* module init function */ - child_init, /* per-child init function */ - 0 /* module destroy function */ + "jsonrpcc", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* cmd (cfg function) exports */ + mod_params, /* param exports */ + 0, /* RPC method exports */ + 0, /* pseudo-variables exports */ + 0, /* response handling function */ + mod_init, /* module init function */ + child_init, /* per-child init function */ + 0 /* module destroy function */ }; +/* clang-format off */ static int mod_init(void)

1 0

git:master:a9acbdd9: json: reformat exported structures
by Federico Cabiddu 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: a9acbdd92032dc8adf2f2aa5a584a8a188bc9e7a URL: https://github.com/kamailio/kamailio/commit/a9acbdd92032dc8adf2f2aa5a584a8a… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-22T12:26:40+01:00 json: reformat exported structures --- Modified: src/modules/json/json_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a9acbdd92032dc8adf2f2aa5a584a8a… Patch: https://github.com/kamailio/kamailio/commit/a9acbdd92032dc8adf2f2aa5a584a8a… --- diff --git a/src/modules/json/json_mod.c b/src/modules/json/json_mod.c index 89b5d580fe1..d267e5029c7 100644 --- a/src/modules/json/json_mod.c +++ b/src/modules/json/json_mod.c @@ -38,33 +38,35 @@ static int fixup_get_field_free(void **param, int param_no); str tr_json_escape_str = str_init("%"); char tr_json_escape_char = '%'; +/* clang-format off */ /* Exported functions */ static tr_export_t mod_trans[] = { - {{"json", sizeof("json") - 1}, json_tr_parse}, {{0, 0}, 0}}; + {{"json", sizeof("json") - 1}, json_tr_parse}, {{0, 0}, 0}}; static cmd_export_t cmds[] = { - {"json_get_field", (cmd_function)json_get_field, 3, fixup_get_field, - fixup_get_field_free, ANY_ROUTE}, - {"json_get_string", (cmd_function)json_get_string, 3, fixup_get_field, - fixup_get_field_free, ANY_ROUTE}, - {"bind_json", (cmd_function)bind_json, 0, 0, 0, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"json_get_field", (cmd_function)json_get_field, 3, fixup_get_field, + fixup_get_field_free, ANY_ROUTE}, + {"json_get_string", (cmd_function)json_get_string, 3, fixup_get_field, + fixup_get_field_free, ANY_ROUTE}, + {"bind_json", (cmd_function)bind_json, 0, 0, 0, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0}}; static param_export_t params[] = { {"json_escape_char", PARAM_STR, &tr_json_escape_str}, {0, 0, 0}}; struct module_exports exports = { - "json", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* cmd (cfg function) exports */ - params, /* param exports */ - 0, /* RPC method exports */ - 0, /* pseudo-variables exports */ - 0, /* response handling function */ - 0, /* module init function */ - 0, /* per-child init function */ - 0 /* module destroy function */ + "json", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* cmd (cfg function) exports */ + params, /* param exports */ + 0, /* RPC method exports */ + 0, /* pseudo-variables exports */ + 0, /* response handling function */ + 0, /* module init function */ + 0, /* per-child init function */ + 0 /* module destroy function */ }; +/* clang-format on */ int _json_extract_field(struct json_object *json_obj, char *json_name, str *val) {

1 0

git:master:8328024c: janssonrpcc: reformat exported structures
by Federico Cabiddu 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 8328024cd41b2c8a3cffa69db28ab21eed47b2c5 URL: https://github.com/kamailio/kamailio/commit/8328024cd41b2c8a3cffa69db28ab21… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-22T11:57:40+01:00 janssonrpcc: reformat exported structures --- Modified: src/modules/janssonrpcc/janssonrpcc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8328024cd41b2c8a3cffa69db28ab21… Patch: https://github.com/kamailio/kamailio/commit/8328024cd41b2c8a3cffa69db28ab21… --- diff --git a/src/modules/janssonrpcc/janssonrpcc_mod.c b/src/modules/janssonrpcc/janssonrpcc_mod.c index 703f055a9cf..d36b0193878 100644 --- a/src/modules/janssonrpcc/janssonrpcc_mod.c +++ b/src/modules/janssonrpcc/janssonrpcc_mod.c @@ -71,56 +71,57 @@ jansson_to_val_f jsontoval; pv_spec_t jsonrpc_result_pv; #endif + +/* clang-format off */ /* * Exported Functions */ -int jsonrpc_request_no_options( - struct sip_msg *msg, char *conn, char *method, char *params) -{ +int jsonrpc_request_no_options(struct sip_msg *msg, char *conn, char *method, char *params) { return jsonrpc_request(msg, conn, method, params, NULL); } static cmd_export_t cmds[] = { - {"janssonrpc_request", (cmd_function)jsonrpc_request, 4, fixup_req, - fixup_req_free, ANY_ROUTE}, - {"jsansonrpc_request", (cmd_function)jsonrpc_request_no_options, 3, - fixup_req, fixup_req_free, ANY_ROUTE}, - {"janssonrpc_notification", (cmd_function)jsonrpc_notification, 3, - fixup_notify, fixup_notify_free, ANY_ROUTE}, - {"mod_janssonrpc_request", (cmd_function)mod_jsonrpc_request, 0, 0, 0, - 0}, - {0, 0, 0, 0, 0, 0}}; + {"janssonrpc_request", (cmd_function)jsonrpc_request, 4, fixup_req, + fixup_req_free, ANY_ROUTE}, + {"jsansonrpc_request", (cmd_function)jsonrpc_request_no_options, 3, + fixup_req, fixup_req_free, ANY_ROUTE}, + {"janssonrpc_notification", (cmd_function)jsonrpc_notification, 3, + fixup_notify, fixup_notify_free, ANY_ROUTE}, + {"mod_janssonrpc_request", (cmd_function)mod_jsonrpc_request, 0, 0, 0, + 0}, + {0, 0, 0, 0, 0, 0}}; /* * Script Parameters */ static param_export_t mod_params[] = { - {"server", PARAM_STRING | PARAM_USE_FUNC, (void *)parse_server_param}, - {"retry_codes", PARAM_STRING | PARAM_USE_FUNC, - (void *)parse_retry_codes_param}, - {"min_srv_ttl", PARAM_INT | PARAM_USE_FUNC, - (void *)parse_min_ttl_param}, - {"result_pv", PARAM_STRING, &result_pv_str.s}, - {"keep_alive", PARAM_INT | PARAM_USE_FUNC, - (void *)parse_keep_alive_param}, - {0, 0, 0}}; + {"server", PARAM_STRING | PARAM_USE_FUNC, (void *)parse_server_param}, + {"retry_codes", PARAM_STRING | PARAM_USE_FUNC, + (void *)parse_retry_codes_param}, + {"min_srv_ttl", PARAM_INT | PARAM_USE_FUNC, + (void *)parse_min_ttl_param}, + {"result_pv", PARAM_STRING, &result_pv_str.s}, + {"keep_alive", PARAM_INT | PARAM_USE_FUNC, + (void *)parse_keep_alive_param}, + {0, 0, 0}}; /* * Exports */ struct module_exports exports = { - "janssonrpcc", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* cmd (cfg function) exports */ - mod_params, /* param exports */ - 0, /* RPC method exports */ - 0, /* pseudo-variables exports */ - 0, /* response handling function */ - mod_init, /* module init function */ - child_init, /* per-child init function */ - mod_destroy /* module destroy function */ + "janssonrpcc", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* cmd (cfg function) exports */ + mod_params, /* param exports */ + 0, /* RPC method exports */ + 0, /* pseudo-variables exports */ + 0, /* response handling function */ + mod_init, /* module init function */ + child_init, /* per-child init function */ + mod_destroy /* module destroy function */ }; +/* clang-format on */ static int mod_init(void) {

1 0

git:master:e742232a: influxdb: add fixup_free* to exported functions
by Federico Cabiddu 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: e742232ab6646ced170ccda5209a4d3ca46103bc URL: https://github.com/kamailio/kamailio/commit/e742232ab6646ced170ccda5209a4d3… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-11-22T11:47:05+01:00 influxdb: add fixup_free* to exported functions --- Modified: src/modules/influxdbc/influxdbc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e742232ab6646ced170ccda5209a4d3… Patch: https://github.com/kamailio/kamailio/commit/e742232ab6646ced170ccda5209a4d3… --- diff --git a/src/modules/influxdbc/influxdbc_mod.c b/src/modules/influxdbc/influxdbc_mod.c index 5261b5ea5c4..0b6f2c53874 100644 --- a/src/modules/influxdbc/influxdbc_mod.c +++ b/src/modules/influxdbc/influxdbc_mod.c @@ -63,21 +63,21 @@ static void mod_destroy(void); /* clang-format off */ static cmd_export_t cmds[] = { {"influxdbc_measure", (cmd_function)w_influxdbc_measure, - 1, fixup_spve_null, 0, ANY_ROUTE}, + 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"influxdbc_measureend", (cmd_function)w_influxdbc_measureend, 0, 0, 0, ANY_ROUTE}, {"influxdbc_sub", (cmd_function)w_influxdbc_sub, - 1, fixup_spve_null, 0, ANY_ROUTE}, + 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"influxdbc_subend", (cmd_function)w_influxdbc_subend, 0, 0, 0, ANY_ROUTE}, {"influxdbc_push", (cmd_function)w_influxdbc_push, 0, 0, 0, ANY_ROUTE}, {"influxdbc_long", (cmd_function)w_influxdbc_long, - 2, fixup_spve_igp, 0, ANY_ROUTE}, + 2, fixup_spve_igp, fixup_free_spve_igp, ANY_ROUTE}, {"influxdbc_string", (cmd_function)w_influxdbc_string, - 2, fixup_spve_spve, 0, ANY_ROUTE}, + 2, fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, {"influxdbc_double", (cmd_function)w_influxdbc_double, - 2, fixup_spve_spve, 0, ANY_ROUTE}, + 2, fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, {"influxdbc_division", (cmd_function)w_influxdbc_division, 3, fixup_sii, fixup_free_sii, ANY_ROUTE},

1 0

[kamailio/kamailio] rtpengine: use to-tag for NG message when rtpp-flags (PR #4036)
by Donat Zenichev 22 Nov '24

22 Nov '24

#### 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 (v5.8.2, v5.8.3, v5.8.4) - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Always use to-tag for NG message with rtpp-flags, if presented. This change is caused by the processing logic being moved to rtpengine with rtpp-flags. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4036 -- Commit Summary -- * rtpengine: use to-tag for NG message when rtpp-flags -- File Changes -- M src/modules/rtpengine/rtpengine.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4036.patch https://github.com/kamailio/kamailio/pull/4036.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4036 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4036(a)github.com>

2 1

git:master:d92d12c0: rtpengine: use to-tag for NG message when rtpp-flags
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: d92d12c055d23c167d5caa38511e5ad3b0a06148 URL: https://github.com/kamailio/kamailio/commit/d92d12c055d23c167d5caa38511e5ad… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T11:19:49+01:00 rtpengine: use to-tag for NG message when rtpp-flags Always use to-tag for NG message with rtpp-flags, if presented. This change is caused by the processing logic being moved to rtpengine with rtpp-flags. --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/d92d12c055d23c167d5caa38511e5ad… Patch: https://github.com/kamailio/kamailio/commit/d92d12c055d23c167d5caa38511e5ad… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 7626af31f88..1d710b30324 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3187,7 +3187,7 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, */ /* affects to-tag parsing */ - ng_flags.to = (op == OP_DELETE) ? 0 : 1; + ng_flags.to = (!parse_by_module || op != OP_DELETE) ? 1 : 0; /* module specific parsing */ if(parse_by_module && flags && parse_flags(&ng_flags, msg, &op, flags->s))

1 0

git:master:8a46cb6b: async: removed unused param from async data processing
by Daniel-Constantin Mierla 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 8a46cb6babed5384d09b3dfc07fe15940128d1a3 URL: https://github.com/kamailio/kamailio/commit/8a46cb6babed5384d09b3dfc07fe159… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-22T11:16:18+01:00 async: removed unused param from async data processing --- Modified: src/modules/async/async_mod.c Modified: src/modules/async/async_sleep.c Modified: src/modules/async/async_sleep.h --- Diff: https://github.com/kamailio/kamailio/commit/8a46cb6babed5384d09b3dfc07fe159… Patch: https://github.com/kamailio/kamailio/commit/8a46cb6babed5384d09b3dfc07fe159… --- diff --git a/src/modules/async/async_mod.c b/src/modules/async/async_mod.c index 9d6b5da3cca..bd31880064f 100644 --- a/src/modules/async/async_mod.c +++ b/src/modules/async/async_mod.c @@ -577,7 +577,7 @@ int ki_async_task_group_data(sip_msg_t *msg, str *rn, str *gn, str *sdata) } } - if(async_send_data(msg, act, rn, gn, sdata) < 0) + if(async_send_data(act, rn, gn, sdata) < 0) return -1; /* ok */ return 1; diff --git a/src/modules/async/async_sleep.c b/src/modules/async/async_sleep.c index 605118be3da..5fb8861a861 100644 --- a/src/modules/async/async_sleep.c +++ b/src/modules/async/async_sleep.c @@ -603,8 +603,7 @@ void async_exec_data(void *param) /** * */ -int async_send_data( - sip_msg_t *msg, cfg_action_t *act, str *cbname, str *gname, str *sdata) +int async_send_data(cfg_action_t *act, str *cbname, str *gname, str *sdata) { async_task_t *at; int dsize; diff --git a/src/modules/async/async_sleep.h b/src/modules/async/async_sleep.h index 0dd268889a5..0b5466f8331 100644 --- a/src/modules/async/async_sleep.h +++ b/src/modules/async/async_sleep.h @@ -51,8 +51,7 @@ int async_ms_sleep( void async_mstimer_exec(unsigned int ticks, void *param); int async_send_task(sip_msg_t *msg, cfg_action_t *act, str *cbname, str *gname); -int async_send_data( - sip_msg_t *msg, cfg_action_t *act, str *cbname, str *gname, str *sdata); +int async_send_data(cfg_action_t *act, str *cbname, str *gname, str *sdata); int pv_get_async(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); int pv_parse_async_name(pv_spec_t *sp, str *in);

1 0

git:master:cfb20d3c: core: added event_route[core:modinit-before]
by Daniel-Constantin Mierla 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: cfb20d3ca3bc87199664b34754b15526d49bbff7 URL: https://github.com/kamailio/kamailio/commit/cfb20d3ca3bc87199664b34754b1552… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-22T11:16:18+01:00 core: added event_route[core:modinit-before] - executed by core once before the module-init callbacks are run --- Modified: src/core/events.c Modified: src/core/events.h Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/cfb20d3ca3bc87199664b34754b1552… Patch: https://github.com/kamailio/kamailio/commit/cfb20d3ca3bc87199664b34754b1552… --- diff --git a/src/core/events.c b/src/core/events.c index 6f108914ba1..4274bce58e0 100644 --- a/src/core/events.c +++ b/src/core/events.c @@ -26,6 +26,7 @@ #include "dprint.h" #include "mem/mem.h" #include "route.h" +#include "fmsg.h" #include "events.h" static sr_event_cb_t _sr_events_list; @@ -77,6 +78,36 @@ void sr_core_ert_run(sip_msg_t *msg, int e) } } +/** + * + */ +int sr_core_ert_run_xname(char *evname) +{ + struct run_act_ctx ctx; + int rtb; + int ridx; + sip_msg_t *fmsg; + + fmsg = faked_msg_get_next_clear(); + if(fmsg == NULL) { + LM_ERR("cannot create a fake message\n"); + return -1; + } + ridx = route_lookup(&event_rt, evname); + if(ridx <= 0 || event_rt.rlist[ridx] == NULL) { + LM_DBG("event_route[%s] not defined - skipping\n", evname); + return 0; + } + + rtb = get_route_type(); + set_route_type(REQUEST_ROUTE); + init_run_actions_ctx(&ctx); + run_top_route(event_rt.rlist[ridx], fmsg, &ctx); + set_route_type(rtb); + + return 0; +} + /** * */ diff --git a/src/core/events.h b/src/core/events.h index 083acdcec81..cf1ec91d554 100644 --- a/src/core/events.h +++ b/src/core/events.h @@ -89,6 +89,7 @@ int sr_event_enabled(int type); void sr_core_ert_init(void); void sr_core_ert_run(sip_msg_t *msg, int e); +int sr_core_ert_run_xname(char *evname); typedef void (*sr_corecb_void_f)(void); typedef struct sr_corecb diff --git a/src/main.c b/src/main.c index 1b9e599fe5c..6aacc523db8 100644 --- a/src/main.c +++ b/src/main.c @@ -3333,6 +3333,8 @@ int main(int argc, char **argv) #endif /* USE_TLS */ #endif /* USE_TCP */ + sr_core_ert_run_xname("core:modinit-before"); + if(init_modules() != 0) { fprintf(stderr, "ERROR: error while initializing modules\n"); goto error;

1 0

git:master:1580d0b0: rr: add fixup_free* to exported functions
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 1580d0b0f8742269c6f5b6bb99ac7a96b9f83276 URL: https://github.com/kamailio/kamailio/commit/1580d0b0f8742269c6f5b6bb99ac7a9… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T11:10:53+01:00 rr: add fixup_free* to exported functions --- Modified: src/modules/rr/rr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1580d0b0f8742269c6f5b6bb99ac7a9… Patch: https://github.com/kamailio/kamailio/commit/1580d0b0f8742269c6f5b6bb99ac7a9… --- diff --git a/src/modules/rr/rr_mod.c b/src/modules/rr/rr_mod.c index 78d335695c6..8bce1dea3dc 100644 --- a/src/modules/rr/rr_mod.c +++ b/src/modules/rr/rr_mod.c @@ -73,6 +73,7 @@ static void mod_destroy(void); /* fixup functions */ static int direction_fixup(void **param, int param_no); static int it_list_fixup(void **param, int param_no); +static int it_list_fixup_free(void **param, int param_no); /* wrapper functions */ static int w_loose_route(struct sip_msg *, char *, char *); static int w_loose_route_preloaded(struct sip_msg *, char *, char *); @@ -106,15 +107,15 @@ static cmd_export_t cmds[] = { {"record_route", (cmd_function)w_record_route, 0, 0, 0, REQUEST_ROUTE | BRANCH_ROUTE | FAILURE_ROUTE}, {"record_route", (cmd_function)w_record_route, 1, - it_list_fixup, 0, REQUEST_ROUTE | BRANCH_ROUTE | FAILURE_ROUTE}, + it_list_fixup, it_list_fixup_free, REQUEST_ROUTE | BRANCH_ROUTE | FAILURE_ROUTE}, {"record_route_preset", (cmd_function)w_record_route_preset, 1, - it_list_fixup, 0, REQUEST_ROUTE | BRANCH_ROUTE | FAILURE_ROUTE}, + it_list_fixup, it_list_fixup_free, REQUEST_ROUTE | BRANCH_ROUTE | FAILURE_ROUTE}, {"record_route_preset", (cmd_function)w_record_route_preset, 2, - it_list_fixup, 0, REQUEST_ROUTE | BRANCH_ROUTE | FAILURE_ROUTE}, + it_list_fixup, it_list_fixup_free, REQUEST_ROUTE | BRANCH_ROUTE | FAILURE_ROUTE}, {"record_route_advertised_address", (cmd_function)w_record_route_advertised_address, 1, - it_list_fixup, 0, REQUEST_ROUTE | BRANCH_ROUTE | FAILURE_ROUTE}, + it_list_fixup, it_list_fixup_free, REQUEST_ROUTE | BRANCH_ROUTE | FAILURE_ROUTE}, {"add_rr_param", (cmd_function)w_add_rr_param, 1, - it_list_fixup, 0, REQUEST_ROUTE | BRANCH_ROUTE | FAILURE_ROUTE}, + it_list_fixup, it_list_fixup_free, REQUEST_ROUTE | BRANCH_ROUTE | FAILURE_ROUTE}, {"check_route_param", (cmd_function)w_check_route_param, 1, fixup_regexp_null, fixup_free_regexp_null, REQUEST_ROUTE}, {"is_direction", (cmd_function)w_is_direction, 1, @@ -233,6 +234,11 @@ static int it_list_fixup(void **param, int param_no) return 0; } +static int it_list_fixup_free(void **param, int param_no) +{ + pv_elem_free_all(*param); + return 0; +} static int direction_fixup(void **param, int param_no) {

1 0

git:master:4c157538: rr: reformat exported structures
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 4c157538046dcc70aebf549522a960bca2c25bfd URL: https://github.com/kamailio/kamailio/commit/4c157538046dcc70aebf549522a960b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T11:08:31+01:00 rr: reformat exported structures --- Modified: src/modules/rr/rr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4c157538046dcc70aebf549522a960b… Patch: https://github.com/kamailio/kamailio/commit/4c157538046dcc70aebf549522a960b…

1 0

git:master:fcf8454c: rtimer: reformat exported structures
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: fcf8454c982c09c6cc89669b7327d000b5c154d9 URL: https://github.com/kamailio/kamailio/commit/fcf8454c982c09c6cc89669b7327d00… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T11:05:03+01:00 rtimer: reformat exported structures --- Modified: src/modules/rtimer/rtimer_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fcf8454c982c09c6cc89669b7327d00… Patch: https://github.com/kamailio/kamailio/commit/fcf8454c982c09c6cc89669b7327d00… --- diff --git a/src/modules/rtimer/rtimer_mod.c b/src/modules/rtimer/rtimer_mod.c index b5b122a6829..5d2249106d4 100644 --- a/src/modules/rtimer/rtimer_mod.c +++ b/src/modules/rtimer/rtimer_mod.c @@ -80,27 +80,34 @@ void stm_main_timer_exec(unsigned int ticks, void *param); int stm_get_worker(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); static int default_interval = 120; - +/* clang-format off */ static pv_export_t rtimer_pvs[] = { - {{"rtimer_worker", (sizeof("rtimer_worker") - 1)}, PVT_OTHER, - stm_get_worker, 0, 0, 0, 0, 0}, - {{0, 0}, 0, 0, 0, 0, 0, 0, 0}}; + {{"rtimer_worker", (sizeof("rtimer_worker") - 1)}, PVT_OTHER, + stm_get_worker, 0, 0, 0, 0, 0}, + {{0, 0}, 0, 0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = { - {"default_interval", PARAM_INT, &default_interval}, - {"timer", PARAM_STRING | PARAM_USE_FUNC, (void *)stm_t_param}, - {"exec", PARAM_STRING | PARAM_USE_FUNC, (void *)stm_e_param}, - {0, 0, 0}}; - + {"default_interval", PARAM_INT, &default_interval}, + {"timer", PARAM_STRING | PARAM_USE_FUNC, (void *)stm_t_param}, + {"exec", PARAM_STRING | PARAM_USE_FUNC, (void *)stm_e_param}, + {0, 0, 0} +}; /** module exports */ -struct module_exports exports = {"rtimer", DEFAULT_DLFLAGS, /* dlopen flags */ - 0, params, 0, /* exported RPC methods */ - rtimer_pvs, /* exported pseudo-variables */ - 0, mod_init, /* module initialization function */ - child_init, /* per-child init function */ - 0}; - +struct module_exports exports = { + "rtimer", + DEFAULT_DLFLAGS, /* dlopen flags */ + 0, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + rtimer_pvs, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + child_init, /* per-child init function */ + 0 /* module destroy function */ +}; +/* clang-format on */ /** * init module function

1 0

git:master:1ce99a24: rtjson: add fixup_free* to exported functions
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 1ce99a243e22eb8acdc94cc8f7ec98a6846760bf URL: https://github.com/kamailio/kamailio/commit/1ce99a243e22eb8acdc94cc8f7ec98a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T10:58:55+01:00 rtjson: add fixup_free* to exported functions --- Modified: src/modules/rtjson/rtjson_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1ce99a243e22eb8acdc94cc8f7ec98a… Patch: https://github.com/kamailio/kamailio/commit/1ce99a243e22eb8acdc94cc8f7ec98a… --- diff --git a/src/modules/rtjson/rtjson_mod.c b/src/modules/rtjson/rtjson_mod.c index 48da0e9f9fa..60ace41542f 100644 --- a/src/modules/rtjson/rtjson_mod.c +++ b/src/modules/rtjson/rtjson_mod.c @@ -49,7 +49,7 @@ static int w_rtjson_update_branch(sip_msg_t *msg, char *p1, char *p2); /* clang-format off */ static cmd_export_t cmds[] = { {"rtjson_init_routes", (cmd_function)w_rtjson_init_routes, 1, - fixup_spve_null, 0, REQUEST_ROUTE}, + fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE}, {"rtjson_push_routes", (cmd_function)w_rtjson_push_routes, 0, 0, 0, REQUEST_ROUTE}, {"rtjson_next_route", (cmd_function)w_rtjson_next_route, 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE}, {"rtjson_update_branch", (cmd_function)w_rtjson_update_branch, 0, 0, 0, BRANCH_ROUTE},

1 0

git:master:82206086: rtjson: reformat exported structures
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 82206086f4adf17fa25dae248b49d930532bddd3 URL: https://github.com/kamailio/kamailio/commit/82206086f4adf17fa25dae248b49d93… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T10:58:24+01:00 rtjson: reformat exported structures --- Modified: src/modules/rtjson/rtjson_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/82206086f4adf17fa25dae248b49d93… Patch: https://github.com/kamailio/kamailio/commit/82206086f4adf17fa25dae248b49d93… --- diff --git a/src/modules/rtjson/rtjson_mod.c b/src/modules/rtjson/rtjson_mod.c index 4661b2ca386..48da0e9f9fa 100644 --- a/src/modules/rtjson/rtjson_mod.c +++ b/src/modules/rtjson/rtjson_mod.c @@ -46,29 +46,34 @@ static int w_rtjson_push_routes(sip_msg_t *msg, char *p1, char *p2); static int w_rtjson_next_route(sip_msg_t *msg, char *p1, char *p2); static int w_rtjson_update_branch(sip_msg_t *msg, char *p1, char *p2); +/* clang-format off */ static cmd_export_t cmds[] = { - {"rtjson_init_routes", (cmd_function)w_rtjson_init_routes, 1, - fixup_spve_null, 0, REQUEST_ROUTE}, - {"rtjson_push_routes", (cmd_function)w_rtjson_push_routes, 0, 0, 0, - REQUEST_ROUTE}, - {"rtjson_next_route", (cmd_function)w_rtjson_next_route, 0, 0, 0, - REQUEST_ROUTE | FAILURE_ROUTE}, - {"rtjson_update_branch", (cmd_function)w_rtjson_update_branch, 0, 0, 0, - BRANCH_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"rtjson_init_routes", (cmd_function)w_rtjson_init_routes, 1, + fixup_spve_null, 0, REQUEST_ROUTE}, + {"rtjson_push_routes", (cmd_function)w_rtjson_push_routes, 0, 0, 0, REQUEST_ROUTE}, + {"rtjson_next_route", (cmd_function)w_rtjson_next_route, 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE}, + {"rtjson_update_branch", (cmd_function)w_rtjson_update_branch, 0, 0, 0, BRANCH_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = { - {"xavp_cfg", PARAM_STR, &_rtjson_xavp_name}, {0, 0, 0}}; + {"xavp_cfg", PARAM_STR, &_rtjson_xavp_name}, + {0, 0, 0} +}; struct module_exports exports = { - "rtjson", DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, params, 0, /* exported RPC methods */ - 0, /* exported pseudo-variables */ - 0, /* response function */ - mod_init, /* module initialization function */ - child_init, /* per child init function */ - mod_destroy /* destroy function */ + "rtjson", + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + child_init, /* per-child init function */ + mod_destroy /* module destroy function */ }; +/* clang-format on */ /** * init module function

1 0

git:master:07134cb4: rtp_media_server: add fixup_free* to exported functions
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 07134cb4c2cf66cf2e7e6ba738559c3c1209645a URL: https://github.com/kamailio/kamailio/commit/07134cb4c2cf66cf2e7e6ba738559c3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T10:55:49+01:00 rtp_media_server: add fixup_free* to exported functions --- Modified: src/modules/rtp_media_server/rtp_media_server.c --- Diff: https://github.com/kamailio/kamailio/commit/07134cb4c2cf66cf2e7e6ba738559c3… Patch: https://github.com/kamailio/kamailio/commit/07134cb4c2cf66cf2e7e6ba738559c3… --- diff --git a/src/modules/rtp_media_server/rtp_media_server.c b/src/modules/rtp_media_server/rtp_media_server.c index 3e5de0635a6..07a0ebd068b 100644 --- a/src/modules/rtp_media_server/rtp_media_server.c +++ b/src/modules/rtp_media_server/rtp_media_server.c @@ -43,8 +43,11 @@ static int child_init(int); static rms_dialog_info_t *rms_dialog_create_leg( rms_dialog_info_t *di, struct sip_msg *msg); static int fixup_rms_action_play(void **param, int param_no); +static int fixup_free_rms_action_play(void **param, int param_no); static int fixup_rms_bridge(void **param, int param_no); +static int fixup_free_rms_bridge(void **param, int param_no); static int fixup_rms_answer(void **param, int param_no); +static int fixup_free_rms_answer(void **param, int param_no); static int rms_hangup_call(rms_dialog_info_t *di); static int rms_bridging_call(rms_dialog_info_t *di, rms_action_t *a); static int rms_bridged_call(rms_dialog_info_t *di, rms_action_t *a); @@ -62,15 +65,15 @@ static int rms_update_media_sockets( /* clang-format off */ static cmd_export_t cmds[] = { {"rms_answer", (cmd_function)rms_answer_f, 1, - fixup_rms_answer, 0, EVENT_ROUTE}, + fixup_rms_answer, fixup_free_rms_answer, EVENT_ROUTE}, {"rms_sip_request", (cmd_function)rms_sip_request_f, 0, 0, 0, EVENT_ROUTE}, {"rms_play", (cmd_function)rms_action_play_f, 2, - fixup_rms_action_play, 0, ANY_ROUTE}, + fixup_rms_action_play, fixup_free_rms_action_play, ANY_ROUTE}, {"rms_dialog_check", (cmd_function)rms_dialog_check_f, 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE}, {"rms_hangup", (cmd_function)rms_hangup_f, 0, 0, 0, EVENT_ROUTE}, {"rms_bridge", (cmd_function)rms_bridge_f, 2, - fixup_rms_bridge, 0, ANY_ROUTE}, + fixup_rms_bridge, fixup_free_rms_bridge, ANY_ROUTE}, {"rms_dialogs_dump", (cmd_function)rms_dialogs_dump_f, 0, 0, 0, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -156,6 +159,13 @@ static int fixup_rms_bridge(void **param, int param_no) return -1; } +static int fixup_free_rms_bridge(void **param, int param_no) +{ + if(param_no == 1 || param_no == 2) + return fixup_free_spve_null(param, 1); + return 0; +} + static int fixup_rms_answer(void **param, int param_no) { if(param_no == 1 || param_no == 2) @@ -164,6 +174,13 @@ static int fixup_rms_answer(void **param, int param_no) return -1; } +static int fixup_free_rms_answer(void **param, int param_no) +{ + if(param_no == 1 || param_no == 2) + return fixup_free_spve_null(param, 1); + return 0; +} + static int fixup_rms_action_play(void **param, int param_no) { if(param_no == 1 || param_no == 2 || param_no == 3) @@ -172,6 +189,13 @@ static int fixup_rms_action_play(void **param, int param_no) return -1; } +static int fixup_free_rms_action_play(void **param, int param_no) +{ + if(param_no == 1 || param_no == 2) + return fixup_free_spve_null(param, 1); + return 0; +} + /** * @return 0 to continue to load Kamailio, -1 to stop the loading * and abort Kamailio.

1 0

git:master:744243d2: rtp_media_server: reformat exported structures
by Victor Seva 22 Nov '24

22 Nov '24

Module: kamailio Branch: master Commit: 744243d290946644fe0248b2eaa5591d5f9e985f URL: https://github.com/kamailio/kamailio/commit/744243d290946644fe0248b2eaa5591… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T10:52:14+01:00 rtp_media_server: reformat exported structures --- Modified: src/modules/rtp_media_server/rtp_media_server.c --- Diff: https://github.com/kamailio/kamailio/commit/744243d290946644fe0248b2eaa5591… Patch: https://github.com/kamailio/kamailio/commit/744243d290946644fe0248b2eaa5591… --- diff --git a/src/modules/rtp_media_server/rtp_media_server.c b/src/modules/rtp_media_server/rtp_media_server.c index a41b5715022..3e5de0635a6 100644 --- a/src/modules/rtp_media_server/rtp_media_server.c +++ b/src/modules/rtp_media_server/rtp_media_server.c @@ -59,20 +59,21 @@ static int rms_bridge_f(struct sip_msg *, char *, char *); static int rms_update_media_sockets( struct sip_msg *msg, rms_dialog_info_t *di, rms_sdp_info_t *sdp_info); -static cmd_export_t cmds[] = {{"rms_answer", (cmd_function)rms_answer_f, 1, - fixup_rms_answer, 0, EVENT_ROUTE}, - {"rms_sip_request", (cmd_function)rms_sip_request_f, 0, 0, 0, - EVENT_ROUTE}, - {"rms_play", (cmd_function)rms_action_play_f, 2, fixup_rms_action_play, - 0, ANY_ROUTE}, - {"rms_dialog_check", (cmd_function)rms_dialog_check_f, 0, 0, 0, - REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE}, - {"rms_hangup", (cmd_function)rms_hangup_f, 0, 0, 0, EVENT_ROUTE}, - {"rms_bridge", (cmd_function)rms_bridge_f, 2, fixup_rms_bridge, 0, - ANY_ROUTE}, - {"rms_dialogs_dump", (cmd_function)rms_dialogs_dump_f, 0, 0, 0, - ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; +/* clang-format off */ +static cmd_export_t cmds[] = { + {"rms_answer", (cmd_function)rms_answer_f, 1, + fixup_rms_answer, 0, EVENT_ROUTE}, + {"rms_sip_request", (cmd_function)rms_sip_request_f, 0, 0, 0, EVENT_ROUTE}, + {"rms_play", (cmd_function)rms_action_play_f, 2, + fixup_rms_action_play, 0, ANY_ROUTE}, + {"rms_dialog_check", (cmd_function)rms_dialog_check_f, 0, + 0, 0, REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE}, + {"rms_hangup", (cmd_function)rms_hangup_f, 0, 0, 0, EVENT_ROUTE}, + {"rms_bridge", (cmd_function)rms_bridge_f, 2, + fixup_rms_bridge, 0, ANY_ROUTE}, + {"rms_dialogs_dump", (cmd_function)rms_dialogs_dump_f, 0, 0, 0, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; static param_export_t mod_params[] = { {"log_file_name", PARAM_STR, &log_fn}, {0, 0, 0}}; @@ -89,6 +90,7 @@ struct module_exports exports = { child_init, mod_destroy, }; +/* clang-format on */ static void run_action_route(rms_dialog_info_t *di, char *route) {

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev