- sr-dev - kamailio.org

[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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev