- sr-dev - kamailio.org

[kamailio/kamailio] core/tcp_main: Match protocol when lookup tcp/tls connections (PR #3810)
by Xenofon Karamanos 21 Sep '24

21 Sep '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, ...) - [ ] 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) - [x] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue [reported in lists](https://lists.kamailio.org/mailman3/hyperkitty/list/sr-users@lists.k… #### Description  This PR aims to fix a bug/security issue where data that was supposed to be encrypted and transferred through TLS, were transferred instead with TCP protocol. More information and how to replicate can be found in the above [issue](https://lists.kamailio.org/mailman3/hyperkitty/list/sr-users@lists.k… in list. This PR suggests using also the protocol to match if a TCP connection exists, and when doing connection lookups, otherwise, it might return a wrong connection, ie a TCP one when we are asking for a TLS one (a case when source ip/port and dest IP are same but dest port is set 0 (wildcard) ). `tcpconn_get` was left unchanged due to being used by some modules and not wanting to break them. Please advise whether it should be beneficial to also change it. In some cases like, `tcpconn_add_alias` and `tcpconn_get` we used the `PROTO_NONE` which preserves the original behavior. `tcpconn_add_alias` we do have the protocol available, should it be also used? `tcpconn_get` does not have the protocol available unless we pass it as an argument. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3810 -- Commit Summary -- * tcp_main: Add protocol argument for searching tcp/tls connections * tcp_main: Add proto argument to tcpconn_exists function * tcp_main: Update comment docs * core/forward: Match protocol when forwarding * tcp_main: Match wss protocol -- File Changes -- M src/core/forward.h (3) M src/core/tcp_conn.h (3) M src/core/tcp_main.c (43) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3810.patch https://github.com/kamailio/kamailio/pull/3810.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3810 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3810(a)github.com>

5 10

git:5.7:85988887: tm: remove extra + used before MAXFWD_HEADER_LEN
by Daniel-Constantin Mierla 19 Sep '24

19 Sep '24

Module: kamailio Branch: 5.7 Commit: 859888876418605abdffcc57bea8b5988860476d URL: https://github.com/kamailio/kamailio/commit/859888876418605abdffcc57bea8b59… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-19T08:56:09+02:00 tm: remove extra + used before MAXFWD_HEADER_LEN (cherry picked from commit 307d6db88c218ffd5dc9d6e7de6425ac4ef24748) (cherry picked from commit 672c3e75c4679681c1ddfb42f852682d93e42c31) --- Modified: src/modules/tm/t_msgbuilder.c --- Diff: https://github.com/kamailio/kamailio/commit/859888876418605abdffcc57bea8b59… Patch: https://github.com/kamailio/kamailio/commit/859888876418605abdffcc57bea8b59… --- diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index 6ff3d8d61d5..5f0f9575f4d 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -1246,7 +1246,7 @@ char *build_dlg_ack(struct sip_msg *rpl, struct cell *Trans, /* headers */ *len += Trans->from_hdr.len + Trans->callid_hdr.len + to->len - + Trans->cseq_hdr_n.len + 1 + ACK_LEN + +MAXFWD_HEADER_LEN + + Trans->cseq_hdr_n.len + 1 + ACK_LEN + MAXFWD_HEADER_LEN + CRLF_LEN; /* copy'n'paste Route headers */

1 0

git:5.8:672c3e75: tm: remove extra + used before MAXFWD_HEADER_LEN
by Daniel-Constantin Mierla 19 Sep '24

19 Sep '24

Module: kamailio Branch: 5.8 Commit: 672c3e75c4679681c1ddfb42f852682d93e42c31 URL: https://github.com/kamailio/kamailio/commit/672c3e75c4679681c1ddfb42f852682… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-19T08:55:43+02:00 tm: remove extra + used before MAXFWD_HEADER_LEN (cherry picked from commit 307d6db88c218ffd5dc9d6e7de6425ac4ef24748) --- Modified: src/modules/tm/t_msgbuilder.c --- Diff: https://github.com/kamailio/kamailio/commit/672c3e75c4679681c1ddfb42f852682… Patch: https://github.com/kamailio/kamailio/commit/672c3e75c4679681c1ddfb42f852682… --- diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index 1aa680aa9a4..65c7be46a0e 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -1246,7 +1246,7 @@ char *build_dlg_ack(struct sip_msg *rpl, struct cell *Trans, /* headers */ *len += Trans->from_hdr.len + Trans->callid_hdr.len + to->len - + Trans->cseq_hdr_n.len + 1 + ACK_LEN + +MAXFWD_HEADER_LEN + + Trans->cseq_hdr_n.len + 1 + ACK_LEN + MAXFWD_HEADER_LEN + CRLF_LEN; /* copy'n'paste Route headers */

1 0

git:master:307d6db8: tm: remove extra + used before MAXFWD_HEADER_LEN
by Daniel-Constantin Mierla 19 Sep '24

19 Sep '24

Module: kamailio Branch: master Commit: 307d6db88c218ffd5dc9d6e7de6425ac4ef24748 URL: https://github.com/kamailio/kamailio/commit/307d6db88c218ffd5dc9d6e7de6425a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-19T08:54:32+02:00 tm: remove extra + used before MAXFWD_HEADER_LEN --- Modified: src/modules/tm/t_msgbuilder.c --- Diff: https://github.com/kamailio/kamailio/commit/307d6db88c218ffd5dc9d6e7de6425a… Patch: https://github.com/kamailio/kamailio/commit/307d6db88c218ffd5dc9d6e7de6425a… --- diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index 9adc4613421..2092d7dd5ff 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -1320,7 +1320,7 @@ char *build_dlg_ack(struct sip_msg *rpl, struct cell *Trans, /* headers */ *len += Trans->from_hdr.len + Trans->callid_hdr.len + to->len - + Trans->cseq_hdr_n.len + 1 + ACK_LEN + +MAXFWD_HEADER_LEN + + Trans->cseq_hdr_n.len + 1 + ACK_LEN + MAXFWD_HEADER_LEN + CRLF_LEN; /* copy'n'paste Route headers */

1 0

git:master:f7045d1c: core: reqorked check for incompatible modes of bind_ipv6_link_local
by Daniel-Constantin Mierla 18 Sep '24

18 Sep '24

Module: kamailio Branch: master Commit: f7045d1c08d37e91ee7e96e415c06b218aee98fd URL: https://github.com/kamailio/kamailio/commit/f7045d1c08d37e91ee7e96e415c06b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-18T19:23:28+02:00 core: reqorked check for incompatible modes of bind_ipv6_link_local --- Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/f7045d1c08d37e91ee7e96e415c06b2… Patch: https://github.com/kamailio/kamailio/commit/f7045d1c08d37e91ee7e96e415c06b2… --- diff --git a/src/core/cfg.y b/src/core/cfg.y index 8bb77351230..afb07b415dd 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -1001,7 +1001,8 @@ assign_stm: | IPV6_HEX_STYLE error { yyerror("string value expected"); } | BIND_IPV6_LINK_LOCAL EQUAL NUMBER { sr_bind_ipv6_link_local = $3; - if(!(sr_bind_ipv6_link_local && (KSR_IPV6_LINK_LOCAL_BIND|KSR_IPV6_LINK_LOCAL_SKIP))) { + if((sr_bind_ipv6_link_local & KSR_IPV6_LINK_LOCAL_BIND) + && (sr_bind_ipv6_link_local & KSR_IPV6_LINK_LOCAL_SKIP)) { yyerror("incompatible modes set"); } }

1 0

git:5.7:30776c97: tm: add mandatory Max-Forwards header to local AC
by Xenofon Karamanos 18 Sep '24

18 Sep '24

Module: kamailio Branch: 5.7 Commit: 30776c97b97f0b6836b313af3f4d385fd6492073 URL: https://github.com/kamailio/kamailio/commit/30776c97b97f0b6836b313af3f4d385… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-09-18T14:27:30Z tm: add mandatory Max-Forwards header to local AC (cherry picked from commit 3a34b468ad93904c507bd0fc7ef592b25321807f) --- Modified: src/modules/tm/t_msgbuilder.c --- Diff: https://github.com/kamailio/kamailio/commit/30776c97b97f0b6836b313af3f4d385… Patch: https://github.com/kamailio/kamailio/commit/30776c97b97f0b6836b313af3f4d385… --- diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index 22289830df9..6ff3d8d61d5 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -1246,7 +1246,8 @@ char *build_dlg_ack(struct sip_msg *rpl, struct cell *Trans, /* headers */ *len += Trans->from_hdr.len + Trans->callid_hdr.len + to->len - + Trans->cseq_hdr_n.len + 1 + ACK_LEN + CRLF_LEN; + + Trans->cseq_hdr_n.len + 1 + ACK_LEN + +MAXFWD_HEADER_LEN + + CRLF_LEN; /* copy'n'paste Route headers */ @@ -1291,6 +1292,8 @@ char *build_dlg_ack(struct sip_msg *rpl, struct cell *Trans, append_str(p, Trans->callid_hdr.s, Trans->callid_hdr.len); append_str(p, to->s, to->len); + append_str(p, MAXFWD_HEADER, MAXFWD_HEADER_LEN); + append_str(p, Trans->cseq_hdr_n.s, Trans->cseq_hdr_n.len); append_str(p, " ", 1); append_str(p, ACK, ACK_LEN);

1 0

git:master:ba6ab04e: pkg/kamailio: removed geoip module rpm packaging [skip ci]
by Sergey Safarov 18 Sep '24

18 Sep '24

Module: kamailio Branch: master Commit: ba6ab04e06b0dfd66874749e0cb1225f2ee273ac URL: https://github.com/kamailio/kamailio/commit/ba6ab04e06b0dfd66874749e0cb1225… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2024-09-18T13:59:37+03:00 pkg/kamailio: removed geoip module rpm packaging [skip ci] fixes #GH3886 --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/ba6ab04e06b0dfd66874749e0cb1225… Patch: https://github.com/kamailio/kamailio/commit/ba6ab04e06b0dfd66874749e0cb1225… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index c182edb28a7..bf1d35bc50c 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -8,7 +8,6 @@ %bcond_without cnxcc %bcond_with dnssec %bcond_without evapi -%bcond_without geoip %bcond_without http_async_client %bcond_without ims %bcond_without jansson @@ -45,7 +44,6 @@ %bcond_without cnxcc %bcond_with dnssec %bcond_without evapi -%bcond_without geoip %bcond_without http_async_client %bcond_without ims %bcond_without jansson @@ -92,7 +90,6 @@ %bcond_without cnxcc %bcond_with dnssec %bcond_without evapi -%bcond_without geoip %bcond_without http_async_client %bcond_without ims %bcond_without jansson @@ -139,7 +136,6 @@ %bcond_without cnxcc %bcond_with dnssec %bcond_without evapi -%bcond_without geoip %bcond_without http_async_client %bcond_without ims %bcond_without jansson @@ -169,7 +165,6 @@ %bcond_without cnxcc %bcond_with dnssec %bcond_with evapi -%bcond_without geoip %bcond_without http_async_client %bcond_without ims %bcond_without jansson @@ -466,16 +461,14 @@ suspended when sending the event, to be resumed at a later point, maybe triggere %endif -%if %{with geoip} %package geoip Summary: MaxMind GeoIP support for Kamailio Group: %{PKGGROUP} -Requires: GeoIP, libmaxminddb, kamailio = %ver -BuildRequires: GeoIP-devel, libmaxminddb-devel +Requires: libmaxminddb, kamailio = %ver +BuildRequires: libmaxminddb-devel %description geoip MaxMind GeoIP support for Kamailio. -%endif %package gzcompress @@ -1226,10 +1219,7 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ %if %{with evapi} kev \ %endif -%if %{with geoip} - kgeoip \ kgeoip2 \ -%endif kgzcompress \ %if %{with http_async_client} khttp_async \ @@ -1339,10 +1329,7 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ %if %{with evapi} kev \ %endif -%if %{with geoip} - kgeoip \ kgeoip2 \ -%endif kgzcompress \ %if %{with http_async_client} khttp_async \ @@ -1935,14 +1922,10 @@ fi %endif -%if %{with geoip} %files geoip %defattr(-,root,root) -%doc %{_docdir}/kamailio/modules/README.geoip %doc %{_docdir}/kamailio/modules/README.geoip2 -%{_libdir}/kamailio/modules/geoip.so %{_libdir}/kamailio/modules/geoip2.so -%endif %files gzcompress

1 0

git:master:7e8e6e32: modules: readme files regenerated - kafka ... [skip ci]
by Kamailio Dev 18 Sep '24

18 Sep '24

Module: kamailio Branch: master Commit: 7e8e6e32a348120bc8e4eef42a4304b3473091a4 URL: https://github.com/kamailio/kamailio/commit/7e8e6e32a348120bc8e4eef42a4304b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-09-18T10:16:10+02:00 modules: readme files regenerated - kafka ... [skip ci] --- Modified: src/modules/kafka/README Modified: src/modules/sca/README --- Diff: https://github.com/kamailio/kamailio/commit/7e8e6e32a348120bc8e4eef42a4304b… Patch: https://github.com/kamailio/kamailio/commit/7e8e6e32a348120bc8e4eef42a4304b…

1 0

git:master:16f8f093: modules: readme files regenerated - acc ... [skip ci]
by The Root 18 Sep '24

18 Sep '24

Module: kamailio Branch: master Commit: 16f8f093df6af14528e18425553784d97999dc6e URL: https://github.com/kamailio/kamailio/commit/16f8f093df6af14528e18425553784d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: The Root <root(a)kamailio.org> Date: 2024-09-18T10:16:02+02:00 modules: readme files regenerated - acc ... [skip ci] --- Modified: src/modules/acc/README Modified: src/modules/call_control/README Modified: src/modules/cnxcc/README Modified: src/modules/dialog/README Modified: src/modules/mediaproxy/README Modified: src/modules/nat_traversal/README Modified: src/modules/pua_dialoginfo/README Modified: src/modules/qos/README Modified: src/modules/sst/README --- Diff: https://github.com/kamailio/kamailio/commit/16f8f093df6af14528e18425553784d… Patch: https://github.com/kamailio/kamailio/commit/16f8f093df6af14528e18425553784d…

1 0

[kamailio/kamailio] sca: contact-fallback (PR #3958)
by Victor Seva 18 Sep '24

18 Sep '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 - [ ] 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 #### Description Another step to merge the functionality that is already used in Sipwise kamailio flavor: be able to define a fallback contact to be used when message processed has no contact You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3958 -- Commit Summary -- * sca: contact_fallback parameter * sca: documentation for contact_fallback parameter [skip ci] -- File Changes -- M src/modules/sca/doc/sca_admin.xml (20) M src/modules/sca/sca.c (6) M src/modules/sca/sca.h (1) M src/modules/sca/sca_call_info.c (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3958.patch https://github.com/kamailio/kamailio/pull/3958.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3958 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3958(a)github.com>

2 2

git:master:cb8c3221: sca: documentation for contact_fallback parameter [skip ci]
by Victor Seva 18 Sep '24

18 Sep '24

Module: kamailio Branch: master Commit: cb8c3221119a580a16f633fdb2d968a67354defc URL: https://github.com/kamailio/kamailio/commit/cb8c3221119a580a16f633fdb2d968a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-09-18T10:10:12+02:00 sca: documentation for contact_fallback parameter [skip ci] --- Modified: src/modules/sca/doc/sca_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/cb8c3221119a580a16f633fdb2d968a… Patch: https://github.com/kamailio/kamailio/commit/cb8c3221119a580a16f633fdb2d968a… --- diff --git a/src/modules/sca/doc/sca_admin.xml b/src/modules/sca/doc/sca_admin.xml index 19be34ce3b9..f419ba86204 100644 --- a/src/modules/sca/doc/sca_admin.xml +++ b/src/modules/sca/doc/sca_admin.xml @@ -306,6 +306,26 @@ modparam("sca", "server_address", "sip:10.10.10.10:5060") </example> </section> + <section id="sca.p.contact_fallback"> + <title><varname>contact_fallback</varname> (string)</title> + <para> + contact used if defined when no contact is found in processed message. + </para> + <para> + <emphasis> + Default value is "" (disabled). + </emphasis> + </para> + <example> + <title>Set <varname>contact_fallback</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("sca", "contact_fallback", "sip:127.0.0.1:5085;transport=udp") +... +</programlisting> + </example> + </section> + <section id="sca.p.from_uri_avp"> <title><varname>from_uri_avp</varname> (string)</title> <para>

1 0

git:master:474f55c2: sca: contact_fallback parameter
by Victor Seva 18 Sep '24

18 Sep '24

Module: kamailio Branch: master Commit: 474f55c2d85f6d407957210ff777e8c38a102b89 URL: https://github.com/kamailio/kamailio/commit/474f55c2d85f6d407957210ff777e8c… Author: Sipwise Development Team <support(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-09-18T10:10:12+02:00 sca: contact_fallback parameter --- Modified: src/modules/sca/sca.c Modified: src/modules/sca/sca.h Modified: src/modules/sca/sca_call_info.c --- Diff: https://github.com/kamailio/kamailio/commit/474f55c2d85f6d407957210ff777e8c… Patch: https://github.com/kamailio/kamailio/commit/474f55c2d85f6d407957210ff777e8c… --- diff --git a/src/modules/sca/sca.c b/src/modules/sca/sca.c index e1e7e0a1c1d..c03df5002a4 100644 --- a/src/modules/sca/sca.c +++ b/src/modules/sca/sca.c @@ -151,6 +151,7 @@ int line_seize_max_expires = 15; int purge_expired_interval = 120; int onhold_bflag = -1; str server_address = STR_NULL; +str contact_fallback = STR_NULL; str from_uri_avp_param = STR_NULL; str to_uri_avp_param = STR_NULL; @@ -165,6 +166,7 @@ static param_export_t params[] = { {"line_seize_max_expires", INT_PARAM, &line_seize_max_expires}, {"purge_expired_interval", INT_PARAM, &purge_expired_interval}, {"onhold_bflag", INT_PARAM, &onhold_bflag}, + {"contact_fallback", PARAM_STR, &contact_fallback}, {"server_address", PARAM_STR, &server_address}, {"from_uri_avp", PARAM_STR, &from_uri_avp_param}, {"to_uri_avp", PARAM_STR, &to_uri_avp_param}, @@ -337,6 +339,10 @@ static int sca_set_config(sca_mod *scam) scam->cfg->server_address = &server_address; } + if(contact_fallback.s) { + scam->cfg->contact_fallback = &contact_fallback; + } + if(from_uri_avp_param.s) { if(sca_process_avps(&from_uri_avp_param, &sca->cfg->from_uri_avp, &sca->cfg->from_uri_avp_type) diff --git a/src/modules/sca/sca.h b/src/modules/sca/sca.h index 79fb4984e88..f1f8bf1aef8 100644 --- a/src/modules/sca/sca.h +++ b/src/modules/sca/sca.h @@ -41,6 +41,7 @@ struct _sca_config int purge_expired_interval; int onhold_bflag; str *server_address; + str *contact_fallback; avp_flags_t from_uri_avp_type; avp_name_t from_uri_avp; avp_flags_t to_uri_avp_type; diff --git a/src/modules/sca/sca_call_info.c b/src/modules/sca/sca_call_info.c index d322476ab0b..b15a7251746 100644 --- a/src/modules/sca/sca_call_info.c +++ b/src/modules/sca/sca_call_info.c @@ -1988,7 +1988,7 @@ int sca_call_info_update( rc = -1; goto done; } - } else if(rc < 0) { + } else if(rc < 0 && !sca->cfg->contact_fallback) { LM_ERR("Bad Contact\n"); goto done; } @@ -2037,6 +2037,13 @@ int sca_call_info_update( LM_DBG("to_aor[%.*s] from_aor[%.*s]\n", STR_FMT(&to_aor), STR_FMT(&from_aor)); + if(contact_uri.s == NULL && sca->cfg->contact_fallback) { + contact_uri.s = sca->cfg->contact_fallback->s; + contact_uri.len = sca->cfg->contact_fallback->len; + LM_DBG("No Contact header, using default owner[%.*s]\n", + STR_FMT(&contact_uri)); + } + // early check to see if we're dealing with any SCA endpoints if(sca_uri_is_shared_appearance(sca, &from_aor)) { if((update_mask & SCA_CALL_INFO_SHARED_CALLER)) {

1 0

[kamailio/kamailio] Kafka producer only tasks (PR #3951)
by Stefan Mititelu 18 Sep '24

18 Sep '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 - [ ] 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  Hello, I recently did some tests with kamailio's kafka module, with focus on what happens when kafka broker goes down. First thing I noticed is that kamailio won't start initially if kafka broker is down. Second thing I noticed syslog overflowing with err logs, when kafka broker is down. Third, I noticed that when it starts, kamailio queries topic metadata and waited up to 100 seconds for any answer. I've added modparams for all these three to change behavior. Updated doc for all the new modparams. I've also updated stats errors counting when exposed cfg functions failed for any reason. And some rework to stats function to accept str* instead of char* topic. Also moved librdkafka's poll() function at the begining of the cfg function logic, so polling happens even when some errors happen with the cfg function. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3951 -- Commit Summary -- * Makefile.defs: version set to 5.8.0-rc0 * pkg/kamailio/deb: version set 5.8.0~rc0 * github: set branch to 5.8 [skip ci] * pkg/docker: set branch 5.8 and refresh [skip ci] * tls: restore early init for other modules that use TLS * tls: fix restore early init * tls: fix OpenSSL 1.1.1 compatibility * OpenSSL integration: manage curl_global_init(...) used by modules * Revert ac4f1be039 - split into per module commits * core/rthreads.h: add thread executor for curl_global_init() * http_async_client: libssl thread executor for curl_global_init() * http_client: libssl thread executor for curl_global_init() * xcap_client: libssl thread executor for curl_global_init() * http_async_client: libssl refactor thread executors for curl * file_out: Add header guards * file_out: Fix leaks * tls: fix OpenSSL 1.1.1 engine keys * tls: make explicit ENGINE deprecation in OpenSSL 3 * tls: clean-up of ENGINE * tlsa: removed the map files used in the past for tls engine * tls: remove unused ENGINE define * tls: basic OpenSSL 3 support of provider keys (replaces ENGINE) * core/rthreads.h: add new option tls_threads_mode = 2 * tls: new option tls_threads_mode = 2 * etc/kamailio.cfg: document tls_threads_mode = 2 to use atfork handler * tls: NULL safety check * ndb_redis: reformat exported structures * evrexec: reformat exported structures * microhttpd: docs - note about variables available in the event route * ndb_redis: init enabled for tcp-main and postchildinit callbacks * tcpops: variables to get active connection attributes * tcpops: if connection not found, return attributes from sip msg rcv * ims_usrloc: make matching of username in contact conditional * ims_registrar_pcscf: update registered state to pending registration if contact exists * core: rthreads - init return variable * influxdbc: copy with buffer size limit * core: ppcfg - jump to end when defexp eval does not get a str val * core: select - handle ws and wss inside select_ip_port() * core: parser rr - check for rr value before serializing * acc: cdr - do not free static empty string in case of error * ctl: reset log prefix on reading ctl traffic * core: main - init local variables used for cli param parsing * presence: docs - remove extra section end tag * tls/docs: Update tls.reload docs * tls/docs: Update certificate generation docs * modules: readme files regenerated - modules ... [skip ci] * ChangeLog: added content from 5.8.0 developent * pkg/kamailio/deb: version set 5.8.0 [skip ci] * pkg/kamailio: version set 5.8.0 for rpms and alpine * Makefile.defs: version set to 5.8.0 * ChangeLog: content set for v5.8.0 * pkg/kamailio/obs: packaged README.file_out * core: set null-terminated char for modparam (backport from master) * Avoid 'qm_strnstr' defined but not used warning * topos: small rearangement by removing else after return in the true block * topos: properly handle cases of no user in contact for mode 1 * pkg/kamailio/obs: Allow builders to disable wolfssl module [skip ci] * file_out: Fix var position and initialize * pdb: Return negative carrierid for failures * pdb server: Return negative carrierid for failures. Clang format * ctl: handle int input for double storage * dispatcher: refine documentation * ims_ipsec_pcscf: TLS support in ipsec_forward() improved * acc: more log messages of failure arsing extra acc string * keepalive: proper storing of last up/down timestamps * keepalive: small formatting updates and comments to the ka dest structure * ndb_redis: clang-format for WITH_SSL code * ndb_redis: fix index on parsing sentinel address inside redisc_reconnect_server() * ndb_redis: break on finding a server via sentinel inside redisc_reconnect_server() * modules: readme files regenerated - modules ... [skip ci] * dmq: fix inter-lock on error * file_out: additional checks for silenting warnings * file_out: Cast to correct type of str * tls: Fix ‘for’ loop initial declarations error * file_out: FIx ‘for’ loop initial declarations error * gcrypt: docs - module name used for section ids * core: socket info - parse advertise ip part to get address family * core: resolve/create_srv_pref_list() - insert at correct position in list * corex: fix conditions for dns_cache modparam srv attributes * keepalive: reformat module exports structures * db_mysql: MYSQL_OPT_RECONNECT is deprecated by MySQL 8.0.34 * db_mysql: right position for define KSR_MYSQL_OPT_RECONNECT * smsops: reformat module exports structures * smsops: short reference section about variables * blst: reformat exported structures * modules: readme files regenerated - modules ... [skip ci] * pkg/kamailio: version set 5.8.1 for rpms and alpine * pkg: deb specs updated for v5.8.1 * core: xavp - added missing closing parenthesis in log messages * core: msg translator - duplicate reply via xavp params and handle errors * Makefile.defs: version set to 5.8.1 * ChangeLog: content updated for v5.8.1 * pdb server: allow carrier id 0 * db_redis: docs - refine docs regarding client certificates [skip ci] * ndb_redis: docs - refine docs regarding client certificates [skip ci] * sdpops: reformat the codecs map * core: parser/sdp - rename parameter to suggest better its role * siputils: tel2sip2() - memset to 0 pkg allocs and recompute len of new uri * ims_ipsec_pcscf: log error message made info * corex: Fix unknown af in list_sockets * rtpengine: fix pkg mem leak in send_rtpp_command() * tcp_main: Add protocol argument for searching tcp/tls connections * tcp_main: Add proto argument to tcpconn_exists function * tcp_main: Update comment docs * core/forward: Match protocol when forwarding * tcp_main: Match wss protocol * usrloc: check on db delete the return value of memchr * core: tcp - keep connection id on event route cb structure * tcpops: reworked some debug messages * core: tcp - set a global shortcut to tcp connection for event route * pv: use global tcp connection callback for event route on $conid * core: fmsg - parse loopback ip when initializing faked msg structure * regex: init globals for safer shutdown on failure * regex: allocate pcres array * regex: reformat exported structures * tcpops: removed unused variable introduced recently * modules: readme files regenerated - modules ... [skip ci] * tls: clear thread-local variables up to tls_pthreads_key_mark * core: spelling fix in comment and log message * uid_auth_db: spelling fix in documentation * ims_usrloc_scscf: reformat exported structures * ims_usrloc_scscf: enclose examples in dotted lines for better visibility * modules/statsd: ensure statsd failures do not stop execution (#3819) * ims_registrar_scscf: init variable to fix analyzer warning * ims_ipsec_pcscf: decouple IPSEC_FORWARD_USEVIA and IPSEC_TCPPORT_UEC for requests * ims_ipsec_pcscf: docs updated for ipsec_forward() flags * ims_ipsec_pcscf: updated comments for ipsec_forward() flags * ims_ipsec_pcscf: handle tls for replies * ims_registrar_scscf: fix uninitialized arguments in save() * ims_registrar_scscf: refactor save_fixup4 * ims_registrar_scscf: fix typo in function name uint_fixup * ims_registrar_scscf: free_uint_fixup: fix memleak/freeing the wrong parameter * ims_ipsec_pcscf: cascade on options to get the uri for fill_contact() * sipcapture: docs - fix default value for parameter * tm: free new buffer on drop for local requests * tm: cb flag to mark local uac on request drop * tm: cb_flags made unsigned for uac_req * pv_headers: print also the new TMCB_LOCAL_REQUEST_DROP in debug function * presence: check if the local notify was dropped in event route * uac: check if local requests are dropped and free the param * pua: check if local requests are dropped and free the param * core: parser/contact - add limit for max number of contacts * core: parser/contact - basic validation tests for contact uri * core: parse/contact: jump to error on too many contacts * ctl: removed level and function names from log messages * ctl: info log on ECONNRESET (connection reset by peer) * modules: readme files regenerated - modules ... [skip ci] * tcpops: note about execution of event routes by TCP main process * modules: readme files regenerated - modules ... [skip ci] * sipcapture: fix default DB URL docs * modules: readme files regenerated - modules ... [skip ci] * etc/kamailio.cfg: remove executable flag * tm: add mandatory Max-Forwards header to local AC * db_cluster: Update log levels * dialplan: don't call free on empty pcre pointer * tcpops: reformat exported structures * sipcapture: use local static buffers for ip address and port * db_mysql: fixed build on CentOS 7 * usrloc: delete location_attrs in db_only mode on delete_urecord * htable: error on not finding htable in pv set * htable: error on not finding htable in pv get * rtpengine: Fix extra process in pkg.stats * siputils: free head of params list for get_uri_param() * siputils: free head of params list for get_uri_param() * regex: fix pcre2 migration * geoip2: init MMDB_s global pointer and check on destroy * geoip2: do not close global MMDB_s on destroy * geoip2: rename global lock variable * geoip2: keep global structure per process * geoip2: clang format module file * geoip2: Reload database before accessing it * iims_registrar_scscf: include header for common c functions * core/resolve: Check dns_cache_init and choose appropriate functions * nathelper: fixed handle_ruri_alias_mode(1) cannot proper handle multi alias * nathelper: remove magic constant * dmq_usrloc: reformat exported structures * ims_ipsec_pcscf: Fix typo * pua_dialoginfo: Fix ruri length * modules: readme files regenerated - modules ... [skip ci] * pkg/kamailio: version set 5.8.2 for rpms and alpine * pkg: deb specs updated for v5.8.2 * Makefile.defs: version set to 5.8.2 * ChangeLog: content updated for v5.8.2 * kafka: add modparam init_without_kafka * kafka: add modparam log_without_overflow * kafka: add modparam metadata_timeout * kafka: export statistics for total/err messages * kafka: Update kfk_stats_add() to use str topic * kafka: Update doc with the new modparams -- File Changes -- M .devcontainer/devcontainer.json (2) M .github/workflows/devcontainer.yaml (2) M .github/workflows/main.yml (2) M .gitmodules (1) M ChangeLog (16562) M etc/kamailio.cfg (5) M pkg/docker (2) M pkg/kamailio/alpine/APKBUILD (2) M pkg/kamailio/deb/bionic/changelog (24) M pkg/kamailio/deb/bookworm/changelog (24) M pkg/kamailio/deb/bullseye/changelog (24) M pkg/kamailio/deb/buster/changelog (24) M pkg/kamailio/deb/debian/changelog (24) M pkg/kamailio/deb/focal/changelog (24) M pkg/kamailio/deb/jammy/changelog (24) M pkg/kamailio/deb/jessie/changelog (24) M pkg/kamailio/deb/precise/changelog (24) M pkg/kamailio/deb/sid/changelog (24) M pkg/kamailio/deb/stretch/changelog (24) M pkg/kamailio/deb/trusty/changelog (24) M pkg/kamailio/deb/wheezy/changelog (24) M pkg/kamailio/deb/xenial/changelog (24) M pkg/kamailio/obs/kamailio.spec (24) M src/Makefile.defs (4) M src/core/fmsg.c (11) M src/core/forward.h (3) M src/core/mem/q_malloc.c (2) M src/core/modparam.c (1) M src/core/msg_translator.c (18) M src/core/parser/contact/contact.c (29) M src/core/parser/parse_rr.c (24) M src/core/parser/sdp/sdp_helpr_funcs.c (14) M src/core/ppcfg.c (2) M src/core/resolve.c (60) M src/core/resolve.h (14) M src/core/rthreads.h (58) M src/core/select_core.c (12) M src/core/socket_info.c (5) M src/core/switch.c (2) M src/core/tcp_conn.h (6) M src/core/tcp_main.c (52) M src/core/ut.h (2) M src/core/xavp.c (6) M src/main.c (6) M src/modules/acc/acc_cdr.c (4) M src/modules/acc/acc_extra.c (16) M src/modules/blst/blst.c (49) M src/modules/corex/corex_mod.c (6) M src/modules/corex/corex_rpc.c (4) M src/modules/ctl/binrpc.h (15) M src/modules/ctl/fifo_server.c (1) M src/modules/ctl/io_listener.c (90) M src/modules/db_cluster/dbcl_api.c (83) M src/modules/db_mysql/km_my_con.c (21) M src/modules/db_redis/README (17) M src/modules/db_redis/doc/db_redis_admin.xml (10) M src/modules/dialplan/dp_repl.c (3) M src/modules/dispatcher/README (13) M src/modules/dispatcher/doc/dispatcher_admin.xml (9) M src/modules/dmq/notification_peer.c (6) M src/modules/dmq_usrloc/dmq_usrloc.c (44) M src/modules/evrexec/evrexec_mod.c (40) M src/modules/file_out/file_out.c (69) M src/modules/file_out/types.c (14) M src/modules/file_out/types.h (5) M src/modules/gcrypt/doc/gcrypt_admin.xml (4) M src/modules/geoip2/geoip2_mod.c (25) M src/modules/geoip2/geoip2_pv.c (81) M src/modules/geoip2/geoip2_pv.h (1) M src/modules/htable/ht_var.c (10) M src/modules/http_async_client/http_async_client_mod.c (115) M src/modules/http_client/http_client.c (23) M src/modules/ims_ipsec_pcscf/README (13) M src/modules/ims_ipsec_pcscf/cmd.c (130) M src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml (12) M src/modules/ims_registrar_pcscf/save.c (11) M src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c (55) M src/modules/ims_registrar_scscf/lookup.c (2) M src/modules/ims_registrar_scscf/userdata_parser.c (5) M src/modules/ims_usrloc_pcscf/udomain.c (58) M src/modules/ims_usrloc_scscf/README (29) M src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf_admin.xml (129) M src/modules/ims_usrloc_scscf/ims_usrloc_scscf_mod.c (78) M src/modules/influxdbc/ic.c (16) M src/modules/kafka/doc/kafka_admin.xml (64) M src/modules/kafka/kafka_mod.c (33) M src/modules/kafka/kfk.c (117) M src/modules/keepalive/keepalive.h (12) M src/modules/keepalive/keepalive_core.c (4) M src/modules/keepalive/keepalive_mod.c (56) M src/modules/microhttpd/doc/microhttpd_admin.xml (5) M src/modules/nathelper/nathelper.c (4) M src/modules/ndb_redis/README (17) M src/modules/ndb_redis/doc/ndb_redis_admin.xml (10) M src/modules/ndb_redis/ndb_redis_mod.c (128) M src/modules/ndb_redis/redis_client.c (34) M src/modules/pdb/pdb.c (14) M src/modules/presence/doc/presence_admin.xml (1) M src/modules/presence/notify.c (5) M src/modules/pua/pua.c (5) M src/modules/pua/send_publish.c (3) M src/modules/pua_dialoginfo/pua_dialoginfo.c (1) M src/modules/pv/pv_core.c (7) M src/modules/pv_headers/pv_headers.c (2) M src/modules/regex/regex_mod.c (78) M src/modules/rtpengine/rtpengine.c (7) M src/modules/sdpops/sdpops_data.c (28) M src/modules/sipcapture/README (5) M src/modules/sipcapture/doc/sipcapture_admin.xml (4) M src/modules/sipcapture/hep.c (13) M src/modules/siputils/checks.c (14) M src/modules/smsops/README (13) M src/modules/smsops/doc/smsops_admin.xml (14) M src/modules/smsops/smsops.c (47) M src/modules/statsd/statsd.c (51) M src/modules/tcpops/README (8) M src/modules/tcpops/doc/eventroutes.xml (12) M src/modules/tcpops/tcpops.c (6) M src/modules/tcpops/tcpops_mod.c (155) M src/modules/tls/README (12) M src/modules/tls/doc/rpc.xml (4) M src/modules/tls/doc/tls.xml (10) M src/modules/tls/tls_domain.c (94) D src/modules/tls/tls_map.c (213) D src/modules/tls/tls_map.h (77) M src/modules/tls/tls_mod.c (223) M src/modules/tls/tls_rand.h (2) M src/modules/tls/tls_server.c (24) D src/modules/tlsa/tls_map.c (27) D src/modules/tlsa/tls_map.h (27) M src/modules/tm/t_hooks.h (4) M src/modules/tm/t_msgbuilder.c (5) M src/modules/tm/uac.c (3) M src/modules/tm/uac.h (2) M src/modules/topos/tps_storage.c (71) M src/modules/uac/uac_reg.c (7) M src/modules/uac/uac_send.c (9) M src/modules/uid_auth_db/auth_db.xml (2) M src/modules/usrloc/ucontact.c (36) M src/modules/usrloc/urecord.c (18) M src/modules/xcap_client/xcap_client.c (5) M utils/pdbt/common.h (2) M utils/pdbt/pdb_server.c (330) M utils/pdbt/pdb_server_backend.c (21) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3951.patch https://github.com/kamailio/kamailio/pull/3951.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3951 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3951(a)github.com>

2 8

git:master:556682f8: kafka: Fix per topic stats bug
by Daniel-Constantin Mierla 18 Sep '24

18 Sep '24

Module: kamailio Branch: master Commit: 556682f8e2cf7e064b7df1ff31fdc496dc51b7ac URL: https://github.com/kamailio/kamailio/commit/556682f8e2cf7e064b7df1ff31fdc49… Author: Stefan Mititelu <stefan.mititelu(a)net2phone.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-18T10:01:10+02:00 kafka: Fix per topic stats bug Bug added by me in commit 0b5e6ac310b7acdf96da0ec6bcbdca021a5089a2. --- Modified: src/modules/kafka/kfk.c --- Diff: https://github.com/kamailio/kamailio/commit/556682f8e2cf7e064b7df1ff31fdc49… Patch: https://github.com/kamailio/kamailio/commit/556682f8e2cf7e064b7df1ff31fdc49… --- diff --git a/src/modules/kafka/kfk.c b/src/modules/kafka/kfk.c index d9e8a8b9f6d..f8e9379da80 100644 --- a/src/modules/kafka/kfk.c +++ b/src/modules/kafka/kfk.c @@ -1045,6 +1045,8 @@ static kfk_stats_t *kfk_stats_topic_new(str *topic, rd_kafka_resp_err_t err) goto error; } memcpy(st->topic_name->s, topic->s, topic->len); + st->topic_name->s[topic->len] = '\0'; + st->topic_name->len = topic->len; st->total++; if(err) {

1 0

git:master:bb5bd6e1: kafka: Add interceptor for broker state
by Daniel-Constantin Mierla 18 Sep '24

18 Sep '24

Module: kamailio Branch: master Commit: bb5bd6e137c758e06736764d823f7437b78d6207 URL: https://github.com/kamailio/kamailio/commit/bb5bd6e137c758e06736764d823f743… Author: Stefan Mititelu <stefan.mititelu(a)net2phone.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-18T10:01:10+02:00 kafka: Add interceptor for broker state So far there is no message logged by librdkafka or kamailio when broker is back up again. The only way to find out that broker is back up is to constatntly check kamcmd stats when errors stop growing. Broker state interceptor is available since librdkafka v2.0.0-RC1 (Dec 21 2022). So only if you are using that librdkafka version, or newer than that, this code will be enabled. --- Modified: src/modules/kafka/kfk.c --- Diff: https://github.com/kamailio/kamailio/commit/bb5bd6e137c758e06736764d823f743… Patch: https://github.com/kamailio/kamailio/commit/bb5bd6e137c758e06736764d823f743… --- diff --git a/src/modules/kafka/kfk.c b/src/modules/kafka/kfk.c index b2999a7d721..d9e8a8b9f6d 100644 --- a/src/modules/kafka/kfk.c +++ b/src/modules/kafka/kfk.c @@ -220,6 +220,31 @@ static void kfk_msg_delivered( } } +#if RD_KAFKA_VERSION >= 0x020000ff +static rd_kafka_resp_err_t ic_broker_state_change(rd_kafka_t *rk, + int32_t broker_id, const char *secproto, const char *name, int port, + const char *state, void *ic_opaque) +{ + if(strcmp(state, "UP") == 0) { + LM_NOTICE("Connected broker: id: %d, proto: %s, name: %s, port: %d", + broker_id, secproto, name, port); + } + return RD_KAFKA_RESP_ERR_NO_ERROR; +} +#endif + +static rd_kafka_resp_err_t ic_on_new(rd_kafka_t *rk, + const rd_kafka_conf_t *conf, void *ic_opaque, char *errstr, + size_t errstr_size) +{ + +#if RD_KAFKA_VERSION >= 0x020000ff + rd_kafka_interceptor_add_on_broker_state_change( + rk, "ic_broker_state_change", ic_broker_state_change, NULL); +#endif + return RD_KAFKA_RESP_ERR_NO_ERROR; +} + /** * \brief Initialize kafka functionality. * @@ -256,6 +281,9 @@ int kfk_init(char *brokers) /* Set message delivery callback. */ rd_kafka_conf_set_dr_msg_cb(rk_conf, kfk_msg_delivered); + /* Set interceptors init function. */ + rd_kafka_conf_interceptor_add_on_new(rk_conf, "ic_on_new", ic_on_new, NULL); + /* Configure properties: */ if(kfk_conf_configure()) { LM_ERR("Failed to configure general properties\n");

1 0

git:master:fa92c728: kafka: Add brokers via librdkafka config object
by Daniel-Constantin Mierla 18 Sep '24

18 Sep '24

Module: kamailio Branch: master Commit: fa92c728c10752824ef991d6828c1ddeea92fbe8 URL: https://github.com/kamailio/kamailio/commit/fa92c728c10752824ef991d6828c1dd… Author: Stefan Mititelu <stefan.mititelu(a)net2phone.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-18T10:01:10+02:00 kafka: Add brokers via librdkafka config object This is because rd_kafka_brokers_add() is deprecated and will log a CONFWARN message when kamailio starts. --- Modified: src/modules/kafka/kfk.c --- Diff: https://github.com/kamailio/kamailio/commit/fa92c728c10752824ef991d6828c1dd… Patch: https://github.com/kamailio/kamailio/commit/fa92c728c10752824ef991d6828c1dd… --- diff --git a/src/modules/kafka/kfk.c b/src/modules/kafka/kfk.c index 7ac2b57f49c..b2999a7d721 100644 --- a/src/modules/kafka/kfk.c +++ b/src/modules/kafka/kfk.c @@ -240,6 +240,16 @@ int kfk_init(char *brokers) */ rk_conf = rd_kafka_conf_new(); + /* Add brokers */ + LM_DBG("Adding brokers: %s\n", brokers); + if(rd_kafka_conf_set( + rk_conf, "bootstrap.servers", brokers, errstr, sizeof(errstr)) + != RD_KAFKA_CONF_OK) { + LM_ERR("No valid brokers specified: %s\n", brokers); + return -1; + } + LM_DBG("Added brokers: %s\n", brokers); + /* Set logger */ rd_kafka_conf_set_log_cb(rk_conf, kfk_logger); @@ -267,14 +277,6 @@ int kfk_init(char *brokers) rk_conf = NULL; /* Now owned by producer. */ LM_DBG("Producer handle created\n"); - LM_DBG("Adding broker: %s\n", brokers); - /* Add brokers */ - if(rd_kafka_brokers_add(rk, brokers) == 0) { - LM_ERR("No valid brokers specified: %s\n", brokers); - return -1; - } - LM_DBG("Added broker: %s\n", brokers); - /* Topic creation and configuration. */ if(kfk_topic_list_configure()) { LM_ERR("Failed to configure topics\n");

1 0

git:master:c31c91fc: kafka: Update doc with the new modparams
by Daniel-Constantin Mierla 18 Sep '24

18 Sep '24

Module: kamailio Branch: master Commit: c31c91fc36dda736b0c19f66ac38b1cc500bfe8b URL: https://github.com/kamailio/kamailio/commit/c31c91fc36dda736b0c19f66ac38b1c… Author: Stefan Mititelu <stefan.mititelu(a)net2phone.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-18T10:01:10+02:00 kafka: Update doc with the new modparams --- Modified: src/modules/kafka/doc/kafka_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c31c91fc36dda736b0c19f66ac38b1c… Patch: https://github.com/kamailio/kamailio/commit/c31c91fc36dda736b0c19f66ac38b1c… --- diff --git a/src/modules/kafka/doc/kafka_admin.xml b/src/modules/kafka/doc/kafka_admin.xml index 8ada5e9fe07..666e7c2fc3d 100644 --- a/src/modules/kafka/doc/kafka_admin.xml +++ b/src/modules/kafka/doc/kafka_admin.xml @@ -154,6 +154,70 @@ modparam("kafka", "topic", "name=third_topic") </programlisting> </example> </section> + + <section id="kafka.p.init_without_kafka"> + <title><varname>init_without_kafka</varname> (string)</title> + <para> + Set to anything but 0, specifies if kamailio starts even when kafka brokers are not available at startup time. + </para> + <para> + Default value is <emphasis>0</emphasis> (disabled). + </para> + <example> + <title>Set <varname>init_without_kafka</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("kafka", "init_without_kafka", 1) +... + </programlisting> + </example> + </section> + + <section id="kafka.p.metadata_timeout"> + <title><varname>metadata_timeout</varname> (string)</title> + <para> + Specifies, in milliseconds, how much time kamailio waits to get topic metadata info at startup time. + </para> + <para> + Default value is <emphasis>2000 milliseconds</emphasis> (2 seconds). + </para> + <example> + <title>Set <varname>metadata_timeout</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("kafka", "metadata_timeout", 1000) +... + </programlisting> + </example> + </section> + + <section id="kafka.p.log_without_overflow"> + <title><varname>log_without_overflow</varname> (string)</title> + <para> + Set to anything but 0, will skip logging most of the error messages that may happen to each kafka message sent to the broker. + This is useful when e.g. kafka broker goes down, not to overflow syslog with error messages. + </para> + <para> + One can alwyas check this module's stats e.g. via RPC commands and see that errors happened or not. + Those errors can have 2 causes: + <itemizedlist> + <listitem>Some errors happened with the config functions kafka_send()/kafka_send_key(). This means that the message wasn't even enqueued by librdkafka.</listitem> + <listitem>Some errors happened on delivery callback, managed by librdkafka. This means that the message was enqueued by librdkafka, but not managed to be delivered to the broker.</listitem> + </itemizedlist> + </para> + <para> + Default value is <emphasis>0</emphasis> (disabled). + </para> + <example> + <title>Set <varname>log_without_overflow</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("kafka", "log_without_overflow", 1) +... + </programlisting> + </example> + </section> + </section> <section> <title>Functions</title>

1 0

git:master:43f56e47: kafka: Update kfk_stats_add() to use str topic
by Daniel-Constantin Mierla 18 Sep '24

18 Sep '24

Module: kamailio Branch: master Commit: 43f56e4787c00f78b5ec2c2fb64ebe69c089c440 URL: https://github.com/kamailio/kamailio/commit/43f56e4787c00f78b5ec2c2fb64ebe6… Author: Stefan Mititelu <stefan.mititelu(a)net2phone.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-18T10:01:10+02:00 kafka: Update kfk_stats_add() to use str topic Also count stats on kfk_message_send() errors. Also call rd_kafka_poll() even on kfk_message_send() errors. --- Modified: src/modules/kafka/kfk.c --- Diff: https://github.com/kamailio/kamailio/commit/43f56e4787c00f78b5ec2c2fb64ebe6… Patch: https://github.com/kamailio/kamailio/commit/43f56e4787c00f78b5ec2c2fb64ebe6…

1 0

git:master:6a81d90c: kafka: export statistics for total/err messages
by Daniel-Constantin Mierla 18 Sep '24

18 Sep '24

Module: kamailio Branch: master Commit: 6a81d90c8c0ec0ca7a3c1823c53efb51b0556ed0 URL: https://github.com/kamailio/kamailio/commit/6a81d90c8c0ec0ca7a3c1823c53efb5… Author: Stefan Mititelu <stefan.mititelu(a)net2phone.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-18T10:01:10+02:00 kafka: export statistics for total/err messages --- Modified: src/modules/kafka/kafka_mod.c Modified: src/modules/kafka/kfk.c --- Diff: https://github.com/kamailio/kamailio/commit/6a81d90c8c0ec0ca7a3c1823c53efb5… Patch: https://github.com/kamailio/kamailio/commit/6a81d90c8c0ec0ca7a3c1823c53efb5… --- diff --git a/src/modules/kafka/kafka_mod.c b/src/modules/kafka/kafka_mod.c index 43504c7b7cc..108ff3c126b 100644 --- a/src/modules/kafka/kafka_mod.c +++ b/src/modules/kafka/kafka_mod.c @@ -45,6 +45,7 @@ #include "../../core/kemi.h" #include "../../core/rpc.h" #include "../../core/rpc_lookup.h" +#include "../../core/counters.h" #include "kfk.h" @@ -64,6 +65,8 @@ static int w_kafka_send_key( /* * Variables and functions to deal with module parameters. */ +stat_var *total_messages; +stat_var *total_messages_err; int child_init_ok = 0; int init_without_kafka = 0; int log_without_overflow = 0; @@ -105,6 +108,10 @@ struct module_exports exports = { mod_destroy /* destroy function */ }; +/*! \brief We expose internal variables via the statistic framework below.*/ +stat_export_t mod_stats[] = {{"total_messages", 0, &total_messages}, + {"total_messages_err", 0, &total_messages_err}, {0, 0, 0}}; + static int mod_init(void) { /* Register RPC commands. */ @@ -119,6 +126,14 @@ static int mod_init(void) return -1; } +#ifdef STATISTICS + /* register statistics */ + if(register_module_stats("kafka", mod_stats) != 0) { + LM_ERR("Failed to register core statistics\n"); + return -1; + } +#endif + return 0; } diff --git a/src/modules/kafka/kfk.c b/src/modules/kafka/kfk.c index ed406385e5e..eb9b166d28c 100644 --- a/src/modules/kafka/kfk.c +++ b/src/modules/kafka/kfk.c @@ -35,7 +35,10 @@ #include "../../core/mem/pkg.h" #include "../../core/mem/shm_mem.h" #include "../../core/locking.h" +#include "../../core/counters.h" +extern stat_var *total_messages; +extern stat_var *total_messages_err; extern int child_init_ok; extern int init_without_kafka; extern int log_without_overflow; @@ -1045,9 +1048,11 @@ static int kfk_stats_add(const char *topic, rd_kafka_resp_err_t err) lock_get(stats_lock); stats_general->total++; + update_stat(total_messages, 1); if(err) { stats_general->error++; + update_stat(total_messages_err, 1); } LM_DBG("General stats: total = %" PRIu64 " error = %" PRIu64 "\n",

1 0

git:master:d104324e: kafka: add modparam metadata_timeout
by Daniel-Constantin Mierla 18 Sep '24

18 Sep '24

Module: kamailio Branch: master Commit: d104324ec86190d8ce0886f11fea9b131f46a877 URL: https://github.com/kamailio/kamailio/commit/d104324ec86190d8ce0886f11fea9b1… Author: Stefan Mititelu <stefan.mititelu(a)net2phone.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-18T10:01:10+02:00 kafka: add modparam metadata_timeout --- Modified: src/modules/kafka/kafka_mod.c Modified: src/modules/kafka/kfk.c --- Diff: https://github.com/kamailio/kamailio/commit/d104324ec86190d8ce0886f11fea9b1… Patch: https://github.com/kamailio/kamailio/commit/d104324ec86190d8ce0886f11fea9b1… --- diff --git a/src/modules/kafka/kafka_mod.c b/src/modules/kafka/kafka_mod.c index 89f3fcd3c42..43504c7b7cc 100644 --- a/src/modules/kafka/kafka_mod.c +++ b/src/modules/kafka/kafka_mod.c @@ -67,6 +67,7 @@ static int w_kafka_send_key( int child_init_ok = 0; int init_without_kafka = 0; int log_without_overflow = 0; +int metadata_timeout = 2000; char *brokers_param = NULL; /**< List of brokers. */ static int kafka_conf_param(modparam_t type, void *val); static int kafka_topic_param(modparam_t type, void *val); @@ -88,7 +89,8 @@ static param_export_t params[] = {{"brokers", PARAM_STRING, &brokers_param}, (void *)kafka_conf_param}, {"topic", PARAM_STRING | USE_FUNC_PARAM, (void *)kafka_topic_param}, {"init_without_kafka", PARAM_INT, &init_without_kafka}, - {"log_without_overflow", PARAM_INT, &log_without_overflow}, {0, 0, 0}}; + {"log_without_overflow", PARAM_INT, &log_without_overflow}, + {"metadata_timeout", PARAM_INT, &metadata_timeout}, {0, 0, 0}}; /** * \brief Kafka :: Module interface diff --git a/src/modules/kafka/kfk.c b/src/modules/kafka/kfk.c index 68014b8b4fb..ed406385e5e 100644 --- a/src/modules/kafka/kfk.c +++ b/src/modules/kafka/kfk.c @@ -39,6 +39,7 @@ extern int child_init_ok; extern int init_without_kafka; extern int log_without_overflow; +extern int metadata_timeout; /** * \brief data type for a configuration property. @@ -730,11 +731,6 @@ static int kfk_topic_list_configure() return 0; } -/* -1 means RD_POLL_INFINITE */ -/* 100000 means 100 seconds */ -#define METADATA_TIMEOUT \ - 100000 /**< Timeout when asking for metadata in milliseconds. */ - /** * \brief check that a topic exists in cluster. * @@ -756,7 +752,7 @@ static int kfk_topic_exist(str *topic_name) /* Get metadata for all topics. */ rd_kafka_resp_err_t res; - res = rd_kafka_metadata(rk, 1, NULL, &metadatap, METADATA_TIMEOUT); + res = rd_kafka_metadata(rk, 1, NULL, &metadatap, metadata_timeout); if(res != RD_KAFKA_RESP_ERR_NO_ERROR) { LM_ERR("Failed to get metadata: %s\n", rd_kafka_err2str(res)); goto error;

1 0

git:master:a544b14e: kafka: add modparam log_without_overflow
by Daniel-Constantin Mierla 18 Sep '24

18 Sep '24

Module: kamailio Branch: master Commit: a544b14e0bdc331820a505517a52477879734e7c URL: https://github.com/kamailio/kamailio/commit/a544b14e0bdc331820a505517a52477… Author: Stefan Mititelu <stefan.mititelu(a)net2phone.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-18T10:01:10+02:00 kafka: add modparam log_without_overflow --- Modified: src/modules/kafka/kafka_mod.c Modified: src/modules/kafka/kfk.c --- Diff: https://github.com/kamailio/kamailio/commit/a544b14e0bdc331820a505517a52477… Patch: https://github.com/kamailio/kamailio/commit/a544b14e0bdc331820a505517a52477… --- diff --git a/src/modules/kafka/kafka_mod.c b/src/modules/kafka/kafka_mod.c index e88bd37384b..89f3fcd3c42 100644 --- a/src/modules/kafka/kafka_mod.c +++ b/src/modules/kafka/kafka_mod.c @@ -66,6 +66,7 @@ static int w_kafka_send_key( */ int child_init_ok = 0; int init_without_kafka = 0; +int log_without_overflow = 0; char *brokers_param = NULL; /**< List of brokers. */ static int kafka_conf_param(modparam_t type, void *val); static int kafka_topic_param(modparam_t type, void *val); @@ -86,7 +87,8 @@ static param_export_t params[] = {{"brokers", PARAM_STRING, &brokers_param}, {"configuration", PARAM_STRING | USE_FUNC_PARAM, (void *)kafka_conf_param}, {"topic", PARAM_STRING | USE_FUNC_PARAM, (void *)kafka_topic_param}, - {"init_without_kafka", PARAM_INT, &init_without_kafka}, {0, 0, 0}}; + {"init_without_kafka", PARAM_INT, &init_without_kafka}, + {"log_without_overflow", PARAM_INT, &log_without_overflow}, {0, 0, 0}}; /** * \brief Kafka :: Module interface diff --git a/src/modules/kafka/kfk.c b/src/modules/kafka/kfk.c index 76a5fea75d9..68014b8b4fb 100644 --- a/src/modules/kafka/kfk.c +++ b/src/modules/kafka/kfk.c @@ -38,6 +38,7 @@ extern int child_init_ok; extern int init_without_kafka; +extern int log_without_overflow; /** * \brief data type for a configuration property. @@ -124,6 +125,12 @@ static void kfk_logger( const rd_kafka_t *rk, int level, const char *fac, const char *buf) { + if(log_without_overflow && strstr(buf, "Connection refused") != NULL) { + // libkafka will keep retrying to connect if kafka server is down + // FIX: ignore these types of errors not to get overflowed + return; + } + switch(level) { case LOG_EMERG: LM_NPRL("RDKAFKA fac: %s : %s : %s\n", fac, @@ -190,8 +197,14 @@ static void kfk_msg_delivered( kfk_stats_add(topic_name, rkmessage->err); if(rkmessage->err) { - LM_ERR("RDKAFKA Message delivery failed: %s\n", - rd_kafka_err2str(rkmessage->err)); + if(log_without_overflow) { + // libkafka will log all undelivered msgs as ERR + // FIX: ignore these types of errors not to get overflowed; check stats instead + ; + } else { + LM_ERR("RDKAFKA Message delivery failed: %s\n", + rd_kafka_err2str(rkmessage->err)); + } } else { LM_DBG("RDKAFKA Message delivered (%zd bytes, offset %" PRId64 ", " "partition %" PRId32 "): %.*s\n", @@ -865,7 +878,11 @@ int kfk_message_send(str *topic_name, str *message, str *key) NULL) == -1) { rd_kafka_resp_err_t err = rd_kafka_last_error(); - LM_ERR("Error sending message: %s\n", rd_kafka_err2str(err)); + if(!log_without_overflow) { + LM_ERR("Error sending message: %s\n", rd_kafka_err2str(err)); + } else { + return 0; + } return -1; }

1 0

git:master:741bb148: kafka: add modparam init_without_kafka
by Daniel-Constantin Mierla 18 Sep '24

18 Sep '24

Module: kamailio Branch: master Commit: 741bb148ddf4311679cfa6e379fa8bdbc8fac5e5 URL: https://github.com/kamailio/kamailio/commit/741bb148ddf4311679cfa6e379fa8bd… Author: Stefan Mititelu <stefan.mititelu(a)net2phone.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-18T10:01:10+02:00 kafka: add modparam init_without_kafka --- Modified: src/modules/kafka/kafka_mod.c Modified: src/modules/kafka/kfk.c --- Diff: https://github.com/kamailio/kamailio/commit/741bb148ddf4311679cfa6e379fa8bd… Patch: https://github.com/kamailio/kamailio/commit/741bb148ddf4311679cfa6e379fa8bd… --- diff --git a/src/modules/kafka/kafka_mod.c b/src/modules/kafka/kafka_mod.c index 26369d6ca31..e88bd37384b 100644 --- a/src/modules/kafka/kafka_mod.c +++ b/src/modules/kafka/kafka_mod.c @@ -64,6 +64,8 @@ static int w_kafka_send_key( /* * Variables and functions to deal with module parameters. */ +int child_init_ok = 0; +int init_without_kafka = 0; char *brokers_param = NULL; /**< List of brokers. */ static int kafka_conf_param(modparam_t type, void *val); static int kafka_topic_param(modparam_t type, void *val); @@ -84,7 +86,7 @@ static param_export_t params[] = {{"brokers", PARAM_STRING, &brokers_param}, {"configuration", PARAM_STRING | USE_FUNC_PARAM, (void *)kafka_conf_param}, {"topic", PARAM_STRING | USE_FUNC_PARAM, (void *)kafka_topic_param}, - {0, 0, 0}}; + {"init_without_kafka", PARAM_INT, &init_without_kafka}, {0, 0, 0}}; /** * \brief Kafka :: Module interface @@ -125,9 +127,15 @@ static int child_init(int rank) if(rank == PROC_INIT || rank == PROC_TCP_MAIN) return 0; + child_init_ok = 1; if(kfk_init(brokers_param)) { - LM_ERR("Failed to initialize Kafka\n"); - return -1; + child_init_ok = 0; + if(init_without_kafka) { + LM_ERR("Failed to initialize Kafka - continue\n"); + } else { + LM_ERR("Failed to initialize Kafka\n"); + return -1; + } } return 0; } diff --git a/src/modules/kafka/kfk.c b/src/modules/kafka/kfk.c index c6dc8398da2..76a5fea75d9 100644 --- a/src/modules/kafka/kfk.c +++ b/src/modules/kafka/kfk.c @@ -36,6 +36,9 @@ #include "../../core/mem/shm_mem.h" #include "../../core/locking.h" +extern int child_init_ok; +extern int init_without_kafka; + /** * \brief data type for a configuration property. */ @@ -587,7 +590,9 @@ static int kfk_topic_configure(kfk_topic_t *ktopic) } int topic_found = kfk_topic_exist(ktopic->topic_name); - if(topic_found == -1) { + if(init_without_kafka) { + ; + } else if(topic_found == -1) { LM_ERR("Failed to search for topic %.*s in cluster\n", ktopic->topic_name->len, ktopic->topic_name->s); goto error; @@ -828,6 +833,12 @@ int kfk_message_send(str *topic_name, str *message, str *key) /* Get topic from name. */ rd_kafka_topic_t *rkt = kfk_topic_get(topic_name); + if(!child_init_ok) { + LM_ERR("kafka module is unusable: child init NOT ok! Skip sending " + "message, message lost!"); + return -1; + } + if(!rkt) { LM_ERR("Topic not found: %.*s\n", topic_name->len, topic_name->s); return -1;

1 0

[kamailio/kamailio] topos_redis : show redis error for post mortem analysis (PR #3965)
by ThomasSevestre 18 Sep '24

18 Sep '24

#### 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) - [ ] 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 Small log improvement, in order to make easier to find the origin of redis errors. Log sample : ``` WARNING: topos_redis [topos_redis_storage.c:834]: tps_redis_load_branch(): invalid redis result type: 6 WARNING: topos [tps_storage.c:626]: tps_storage_record(): no local address - do record routing for all initial requests ERROR: topos [tps_storage.c:637]: tps_storage_record(): failed to store ``` The root cause is probaly in redis error message and it whould be nice to log it You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3965 -- Commit Summary -- * topos_redis : show redis error for post mortem analysis -- File Changes -- M src/modules/topos_redis/topos_redis_storage.c (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3965.patch https://github.com/kamailio/kamailio/pull/3965.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3965 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3965(a)github.com>

2 3

git:master:72889e94: topos_redis : show redis error for post mortem analysis
by Daniel-Constantin Mierla 18 Sep '24

18 Sep '24

Module: kamailio Branch: master Commit: 72889e945041b6475a43c371aa4e20e99f5d1240 URL: https://github.com/kamailio/kamailio/commit/72889e945041b6475a43c371aa4e20e… Author: Thomas <1258170+ThomasSevestre(a)users.noreply.github.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-18T09:57:55+02:00 topos_redis : show redis error for post mortem analysis --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/72889e945041b6475a43c371aa4e20e… Patch: https://github.com/kamailio/kamailio/commit/72889e945041b6475a43c371aa4e20e… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index 8009d8a006d..dd4ce1b7674 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -677,6 +677,9 @@ int tps_redis_load_initial_method_branch( if(rrpl->type != REDIS_REPLY_ARRAY) { LM_WARN("invalid redis result type: %d\n", rrpl->type); + if(rrpl->type == REDIS_REPLY_ERROR) { + LM_ERR("Redis error:%s\n", rrpl->str); + } freeReplyObject(rrpl); return -1; } @@ -832,6 +835,9 @@ int tps_redis_load_branch( if(rrpl->type != REDIS_REPLY_ARRAY) { LM_WARN("invalid redis result type: %d\n", rrpl->type); + if(rrpl->type == REDIS_REPLY_ERROR) { + LM_ERR("Redis error:%s\n", rrpl->str); + } freeReplyObject(rrpl); return -1; } @@ -1037,6 +1043,9 @@ int tps_redis_load_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) if(rrpl->type != REDIS_REPLY_ARRAY) { LM_WARN("invalid redis result type: %d\n", rrpl->type); + if(rrpl->type == REDIS_REPLY_ERROR) { + LM_ERR("Redis error:%s\n", rrpl->str); + } freeReplyObject(rrpl); return -1; }

1 0

git:master:abaf42a7: core: use advertise port only when set for via header
by Daniel-Constantin Mierla 18 Sep '24

18 Sep '24

Module: kamailio Branch: master Commit: abaf42a735b00af8cbfec90888d2ef3397e5040d URL: https://github.com/kamailio/kamailio/commit/abaf42a735b00af8cbfec90888d2ef3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-18T09:52:32+02:00 core: use advertise port only when set for via header --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/abaf42a735b00af8cbfec90888d2ef3… Patch: https://github.com/kamailio/kamailio/commit/abaf42a735b00af8cbfec90888d2ef3… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 4f88150e11b..f74e4ce3258 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2940,12 +2940,17 @@ char *via_builder(unsigned int *len, sip_msg_t *msg, } } if(port_str == NULL) { - if(hp && hp->port->len) + if(hp && hp->port->len) { port_str = hp->port; - else if(send_sock->useinfo.port_no > 0) - port_str = &(send_sock->useinfo.port_no_str); - else - port_str = &(send_sock->port_no_str); + } else if(send_sock->useinfo.name.len > 0) { + if(send_sock->useinfo.port_no > 0) { + port_str = &(send_sock->useinfo.port_no_str); + } + } else { + if(send_sock->port_no != SIP_PORT) { + port_str = &(send_sock->port_no_str); + } + } } proto = PROTO_NONE; if(msg && (msg->msg_flags & FL_USE_XAVP_VIA_FIELDS) @@ -2989,7 +2994,7 @@ char *via_builder(unsigned int *len, sip_msg_t *msg, via_prefix_len = MY_VIA_LEN + (proto == PROTO_SCTP); max_len = via_prefix_len + address_str->len /* space in MY_VIA */ + 2 /* just in case it is a v6 address ... [ ] */ - + 1 /*':'*/ + port_str->len + + 1 /*':'*/ + (port_str ? port_str->len : 0) + (branch ? (MY_BRANCH_LEN + branch->len) : 0) + (extra_params ? extra_params->len : 0) + comp_len + comp_name_len + CRLF_LEN + 1; @@ -3074,8 +3079,7 @@ char *via_builder(unsigned int *len, sip_msg_t *msg, } memcpy(line_buf + via_prefix_len + extra_len, address_str->s, address_str->len); - if((send_sock->port_no != SIP_PORT) - || (port_str != &send_sock->port_no_str)) { + if(port_str != NULL && port_str->len > 0) { line_buf[via_len] = ':'; via_len++; memcpy(line_buf + via_len, port_str->s, port_str->len);

1 0

git:master:d9ae203c: pkg/kamailio/deb: remove geoip package
by Victor Seva 18 Sep '24

18 Sep '24

Module: kamailio Branch: master Commit: d9ae203c637f53725556fea0ba82f7ae014ee508 URL: https://github.com/kamailio/kamailio/commit/d9ae203c637f53725556fea0ba82f7a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-09-18T08:54:01+02:00 pkg/kamailio/deb: remove geoip package related #3886 --- Modified: pkg/kamailio/deb/bionic/control Modified: pkg/kamailio/deb/bionic/rules Modified: pkg/kamailio/deb/bookworm/control Modified: pkg/kamailio/deb/bookworm/rules Modified: pkg/kamailio/deb/bullseye/control Modified: pkg/kamailio/deb/bullseye/rules Modified: pkg/kamailio/deb/buster/control Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/focal/control Modified: pkg/kamailio/deb/focal/rules Modified: pkg/kamailio/deb/jammy/control Modified: pkg/kamailio/deb/jammy/rules Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/noble/control Modified: pkg/kamailio/deb/noble/rules Modified: pkg/kamailio/deb/precise/control Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/control Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/control Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/d9ae203c637f53725556fea0ba82f7a… Patch: https://github.com/kamailio/kamailio/commit/d9ae203c637f53725556fea0ba82f7a…

1 0

[kamailio/kamailio] Pseudo-variables are erroneous for tm.cancel function. (Issue #3977)
by JuanPascual2 17 Sep '24

17 Sep '24

Hello Following the correction of issue #383, pseudo-variables are erroneous for tm.cancel function. The pseudo variables in “tm:local-request” correspond to the INVITE equest and not to the CANCEL request. Example: $rm = INVITE BR Juan -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3977 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3977(a)github.com>

1 2

git:master:1d2b4d5e: core: relocate core rpc, cfg locks and shutdown var initialization
by Daniel-Constantin Mierla 17 Sep '24

17 Sep '24

Module: kamailio Branch: master Commit: 1d2b4d5ed6cd31c5cd6d6a60d80b86a1f66fac79 URL: https://github.com/kamailio/kamailio/commit/1d2b4d5ed6cd31c5cd6d6a60d80b86a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-17T10:16:25+02:00 core: relocate core rpc, cfg locks and shutdown var initialization - done now after shm initialization, shm being used for rpc reload delta, the locks need also shm --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/1d2b4d5ed6cd31c5cd6d6a60d80b86a… Patch: https://github.com/kamailio/kamailio/commit/1d2b4d5ed6cd31c5cd6d6a60d80b86a… --- diff --git a/src/main.c b/src/main.c index 993181c7326..c91908baed6 100644 --- a/src/main.c +++ b/src/main.c @@ -2761,17 +2761,17 @@ int main(int argc, char **argv) listen_field_count = 0; /* split listen arguments */ tbuf = pkg_char_dup(optarg); - if (tbuf == NULL) { + if(tbuf == NULL) { fprintf(stderr, "error during processing -l parameter\n"); } tbuf_tmp = tbuf; - while ((p = strsep(&tbuf, "/")) != NULL && listen_field_count < 3) { + while((p = strsep(&tbuf, "/")) != NULL + && listen_field_count < 3) { listen_fields[listen_field_count++] = p; } /* empty advertise only allowed with a name field */ - if (listen_field_count == 2 && strlen(listen_fields[1]) <= 0) { - fprintf(stderr, - "listen value with invalid advertise: %s\n", + if(listen_field_count == 2 && strlen(listen_fields[1]) <= 0) { + fprintf(stderr, "listen value with invalid advertise: %s\n", optarg); pkg_free(tbuf_tmp); goto error; @@ -2779,9 +2779,10 @@ int main(int argc, char **argv) ahost = NULL; aport = 0; aproto = PROTO_NONE; - if (listen_field_count > 1 && strlen(listen_fields[1]) > 0) { + if(listen_field_count > 1 && strlen(listen_fields[1]) > 0) { /* advertise not empty */ - if(parse_phostport(listen_fields[1], &ahost, &tmp_len, &aport, &aproto) + if(parse_phostport(listen_fields[1], &ahost, &tmp_len, + &aport, &aproto) < 0) { fprintf(stderr, "listen value with invalid advertise: %s\n", @@ -2794,9 +2795,9 @@ int main(int argc, char **argv) } } /* socket name */ - if (listen_field_count == 3 && listen_fields[2] != NULL) { - if (strlen(listen_fields[2]) > 0) { - socket_name=listen_fields[2]; + if(listen_field_count == 3 && listen_fields[2] != NULL) { + if(strlen(listen_fields[2]) > 0) { + socket_name = listen_fields[2]; } else { fprintf(stderr, "listen value with invalid socket name: %s\n", @@ -2817,8 +2818,8 @@ int main(int argc, char **argv) goto error; } /* add a new addr. to our address list */ - if(add_listen_advertise_iface_name(n_lst->name, n_lst->next, port, - proto, aproto, ahost, aport, socket_name, + if(add_listen_advertise_iface_name(n_lst->name, n_lst->next, + port, proto, aproto, ahost, aport, socket_name, n_lst->flags) != 0) { fprintf(stderr, "failed to add new listen address: %s\n", @@ -2962,14 +2963,6 @@ int main(int argc, char **argv) if(pv_reinit_buffer() < 0) goto error; - if(register_core_rpcs() != 0) - goto error; - - if(ksr_route_locks_set_init() < 0) - goto error; - - ksr_shutdown_phase_init(); - /* init lookup for core event routes */ sr_core_ert_init(); @@ -3127,6 +3120,15 @@ int main(int argc, char **argv) goto error; pkg_print_manager(); shm_print_manager(); + + if(register_core_rpcs() != 0) + goto error; + + if(ksr_route_locks_set_init() < 0) + goto error; + + ksr_shutdown_phase_init(); + if(init_atomic_ops() == -1) goto error; if(init_basex() != 0) {

1 0

[kamailio/kamailio] app_jsdt: add support for loong64 arch (Issue #3976)
by Victor Seva 16 Sep '24

16 Sep '24

From https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1060901 It has a patch like: ``` diff -ruN kamailio-5.7.3-bk/src/modules/app_jsdt/duk_config.h kamailio-5.7.3/src/modules/app_jsdt/duk_config.h --- kamailio-5.7.3-bk/src/modules/app_jsdt/duk_config.h 2023-11-17 19:30:23.000000000 +0800 +++ kamailio-5.7.3/src/modules/app_jsdt/duk_config.h 2024-01-16 17:22:10.659716319 +0800 @@ -304,6 +304,10 @@ #endif #endif /* __riscv */ +#if defined(__loongarch64) +#define DUK_F_LOONGARCH64 +#endif + /* SuperH */ #if defined(__sh__) || defined(__sh1__) || defined(__SH1__) \ || defined(__sh2__) || defined(__SH2__) || defined(__sh3__) \ @@ -979,6 +983,11 @@ /* SPARC byte order varies so rely on autodetection. */ #undef DUK_USE_PACKED_TVAL #define DUK_F_PACKED_TVAL_PROVIDED +#elif defined(DUK_F_LOONGARCH64) +#define DUK_USE_ARCH_STRING "loongarch64" +#define DUK_USE_BYTEORDER 1 +#define DUK_USE_PACKED_TVAL +#define DUK_F_PACKED_TVAL_PROVIDED #elif defined(DUK_F_RISCV32) /* --- RISC-V 32-bit --- */ #define DUK_USE_ARCH_STRING "riscv32" ``` I imagine that is coming from https://github.com/svaarala/duktape/commit/1dcb1c23429208de8d6693dec55f2cbf… merged upstream -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3976 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3976(a)github.com>

1 1

git:master:5746db1c: app_jsdt: add support for loong64
by Victor Seva 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: 5746db1c5a99eaeaf7f97d520232f014548c912d URL: https://github.com/kamailio/kamailio/commit/5746db1c5a99eaeaf7f97d520232f01… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-09-16T19:39:09+02:00 app_jsdt: add support for loong64 From: liuxiang <liuxiang(a)loongson.cn> > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1060901 fixes #3976 --- Modified: src/modules/app_jsdt/duk_config.h --- Diff: https://github.com/kamailio/kamailio/commit/5746db1c5a99eaeaf7f97d520232f01… Patch: https://github.com/kamailio/kamailio/commit/5746db1c5a99eaeaf7f97d520232f01… --- diff --git a/src/modules/app_jsdt/duk_config.h b/src/modules/app_jsdt/duk_config.h index 690f7019912..331d778684b 100644 --- a/src/modules/app_jsdt/duk_config.h +++ b/src/modules/app_jsdt/duk_config.h @@ -304,6 +304,11 @@ #endif #endif /* __riscv */ +/* LOONGARCH64, https://loongson.github.io/LoongArch-Documentation/LoongArch-ELF-ABI-EN.html */ +#if defined(__loongarch64) +#define DUK_F_LOONGARCH64 +#endif + /* SuperH */ #if defined(__sh__) || defined(__sh1__) || defined(__SH1__) \ || defined(__sh2__) || defined(__SH2__) || defined(__sh3__) \ @@ -979,6 +984,11 @@ /* SPARC byte order varies so rely on autodetection. */ #undef DUK_USE_PACKED_TVAL #define DUK_F_PACKED_TVAL_PROVIDED +#elif defined(DUK_F_LOONGARCH64) +#define DUK_USE_ARCH_STRING "loongarch64" +#define DUK_USE_BYTEORDER 1 +#undef DUK_USE_PACKED_TVAL +#define DUK_F_PACKED_TVAL_PROVIDED #elif defined(DUK_F_RISCV32) /* --- RISC-V 32-bit --- */ #define DUK_USE_ARCH_STRING "riscv32"

1 0

git:master:99710daa: core: proper condition for bind_ipv6_link_local modes
by Daniel-Constantin Mierla 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: 99710daa8b05a0a37ef3bb35e2ffd723908037f4 URL: https://github.com/kamailio/kamailio/commit/99710daa8b05a0a37ef3bb35e2ffd72… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-16T15:28:14+02:00 core: proper condition for bind_ipv6_link_local modes --- Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/99710daa8b05a0a37ef3bb35e2ffd72… Patch: https://github.com/kamailio/kamailio/commit/99710daa8b05a0a37ef3bb35e2ffd72… --- diff --git a/src/core/cfg.y b/src/core/cfg.y index ae1c9ec4b0b..8bb77351230 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -1001,7 +1001,7 @@ assign_stm: | IPV6_HEX_STYLE error { yyerror("string value expected"); } | BIND_IPV6_LINK_LOCAL EQUAL NUMBER { sr_bind_ipv6_link_local = $3; - if(sr_bind_ipv6_link_local && (KSR_IPV6_LINK_LOCAL_BIND|KSR_IPV6_LINK_LOCAL_SKIP)) { + if(!(sr_bind_ipv6_link_local && (KSR_IPV6_LINK_LOCAL_BIND|KSR_IPV6_LINK_LOCAL_SKIP))) { yyerror("incompatible modes set"); } }

1 0

[kamailio/kamailio] tm: Emit request event when tm.cancel is called (PR #3962)
by Xenofon Karamanos 16 Sep '24

16 Sep '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 - [x] Tested changes locally - [x] Related to issue #3831 #### Description  The `tm` currently does not trigger the `tm:local-request` event for CANCEL requests that are created by the tm.cancel RPC function. This pull request adds support for triggering the tm:local-request event for CANCEL requests. According to [docs](https://www.kamailio.org/docs/modules/devel/modules/tm#tm.e.local-req… an event `tm:local-request` should be created for every request that is originates from kamailio and creates a transaction. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3962 -- Commit Summary -- * tm: Emit request event when cancel is called -- File Changes -- M src/modules/tm/t_cancel.c (62) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3962.patch https://github.com/kamailio/kamailio/pull/3962.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3962 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3962(a)github.com>

3 7

git:master:faca8e7a: tm: Emit request event when cancel is called
by Henning Westerholt 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: faca8e7a20255d90a4786fd4043005ead9dfc5df URL: https://github.com/kamailio/kamailio/commit/faca8e7a20255d90a4786fd4043005e… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-09-16T15:21:51+02:00 tm: Emit request event when cancel is called --- Modified: src/modules/tm/t_cancel.c --- Diff: https://github.com/kamailio/kamailio/commit/faca8e7a20255d90a4786fd4043005e… Patch: https://github.com/kamailio/kamailio/commit/faca8e7a20255d90a4786fd4043005e… --- diff --git a/src/modules/tm/t_cancel.c b/src/modules/tm/t_cancel.c index 68dae04fbc8..03e919f6abe 100644 --- a/src/modules/tm/t_cancel.c +++ b/src/modules/tm/t_cancel.c @@ -29,6 +29,7 @@ #include "t_funcs.h" #include "../../core/dprint.h" #include "../../core/ut.h" +#include "../../core/kemi.h" #include "t_reply.h" #include "t_cancel.h" #include "t_msgbuilder.h" @@ -36,6 +37,8 @@ #include "t_hooks.h" +extern str tm_event_callback; + typedef struct cancel_reason_map { int code; @@ -86,6 +89,11 @@ void prepare_to_cancel( int i; int branches_no; branch_bm_t mask; + int rt, backup_rt; + struct run_act_ctx ctx; + sip_msg_t msg; + sr_kemi_eng_t *keng = NULL; + str evname = str_init("tm:local-request"); *cancel_bm = 0; branches_no = t->nr_of_outgoings; @@ -95,6 +103,49 @@ void prepare_to_cancel( *cancel_bm |= ((mask & (1 << i)) && prepare_cancel_branch(t, i, 1)) << i; } + + rt = -1; + if(tm_event_callback.s == NULL || tm_event_callback.len <= 0) { + rt = route_lookup(&event_rt, "tm:local-request"); + if(rt < 0 || event_rt.rlist[rt] == NULL) { + LM_DBG("tm:local-request not found\n"); + return; + } + } else { + keng = sr_kemi_eng_get(); + if(keng == NULL) { + LM_DBG("event callback (%s) set, but no cfg engine\n", + tm_event_callback.s); + return; + } + } + + /* Check if msg is null */ + if(build_sip_msg_from_buf( + &msg, t->uac->request.buffer, t->uac->request.buffer_len, 0) + < 0) { + LM_ERR("fail to parse msg\n"); + return; + } + + /* Call event */ + backup_rt = get_route_type(); + set_route_type(REQUEST_ROUTE); + init_run_actions_ctx(&ctx); + if(rt >= 0) { + run_top_route(event_rt.rlist[rt], &msg, 0); + } else { + if(keng != NULL) { + + if(sr_kemi_route( + keng, &msg, EVENT_ROUTE, &tm_event_callback, &evname) + < 0) { + LM_ERR("error running event route kemi callback\n"); + } + } + } + set_route_type(backup_rt); + free_sip_msg(&msg); }

1 0

git:master:45a93b46: sst: small white space change in docs after dialog flag removal (commit 7e139951dc)
by Henning Westerholt 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: 45a93b46f0845867fdc1fd07a798eda6a9480816 URL: https://github.com/kamailio/kamailio/commit/45a93b46f0845867fdc1fd07a798eda… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-09-16T11:45:11Z sst: small white space change in docs after dialog flag removal (commit 7e139951dc) --- Modified: src/modules/sst/doc/sst_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/45a93b46f0845867fdc1fd07a798eda… Patch: https://github.com/kamailio/kamailio/commit/45a93b46f0845867fdc1fd07a798eda… --- diff --git a/src/modules/sst/doc/sst_admin.xml b/src/modules/sst/doc/sst_admin.xml index 751dd3a2f49..6b44916ab78 100644 --- a/src/modules/sst/doc/sst_admin.xml +++ b/src/modules/sst/doc/sst_admin.xml @@ -54,7 +54,7 @@ All of this happens with a properly configured dialog and sst module. You need to call the dlg_manage() function and set the sst flag at the time any INVITE sip message is seen. - There is no &kamailioconfig; script function call required to + There is no &kamailioconfig; script function call required to set the dialog expire timeout value. See the <quote>dialog module</quote> users guide for more information. @@ -312,7 +312,7 @@ modparam("sst", "sst_flag", 6) route { ... if (method=="INVITE") { - dlg_manage(); # Track the dialog + dlg_manage(); # Track the dialog setflag(6); # set the sst flag } ...

1 0

[kamailio/kamailio] Dialog flag (PR #3961)
by Xenofon Karamanos 16 Sep '24

16 Sep '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 - [ ] 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 - [x] Tested changes locally - [x] Related to issue #2593 #### Description  This PR removes the `dlg_flag` from the dialog module and recommends `dlg_manage()` instead in the docs. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3961 -- Commit Summary -- * dialog: Drop support for dlg_flag parameter * dialog/doc: Remove dlg_flag docs and suggest dlg_manage() instead. -- File Changes -- M src/modules/dialog/dialog.c (13) M src/modules/dialog/dlg_handlers.c (22) M src/modules/dialog/dlg_handlers.h (3) M src/modules/dialog/doc/dialog_admin.xml (24) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3961.patch https://github.com/kamailio/kamailio/pull/3961.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3961 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3961(a)github.com>

4 13

git:master:30a362bd: nat_traversal: Remove dlg_flag and update docs
by Henning Westerholt 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: 30a362bd5d91205135721bf8bce129e41cef9651 URL: https://github.com/kamailio/kamailio/commit/30a362bd5d91205135721bf8bce129e… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-09-16T13:39:06+02:00 nat_traversal: Remove dlg_flag and update docs --- Modified: src/modules/nat_traversal/doc/nat_traversal_admin.xml Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/30a362bd5d91205135721bf8bce129e… Patch: https://github.com/kamailio/kamailio/commit/30a362bd5d91205135721bf8bce129e…

1 0

git:master:60a5ea45: mediaproxy: Remove dlg_flag and update docs
by Henning Westerholt 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: 60a5ea45c5cc18b7074330da52ed1944cfbf3fbb URL: https://github.com/kamailio/kamailio/commit/60a5ea45c5cc18b7074330da52ed194… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-09-16T13:39:06+02:00 mediaproxy: Remove dlg_flag and update docs --- Modified: src/modules/mediaproxy/doc/mediaproxy_admin.xml Modified: src/modules/mediaproxy/mediaproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/60a5ea45c5cc18b7074330da52ed194… Patch: https://github.com/kamailio/kamailio/commit/60a5ea45c5cc18b7074330da52ed194… --- diff --git a/src/modules/mediaproxy/doc/mediaproxy_admin.xml b/src/modules/mediaproxy/doc/mediaproxy_admin.xml index d89207b33a3..c75ed86e629 100644 --- a/src/modules/mediaproxy/doc/mediaproxy_admin.xml +++ b/src/modules/mediaproxy/doc/mediaproxy_admin.xml @@ -349,7 +349,6 @@ modparam("mediaproxy", "ice_candidate_avp", "$avp(ice_candidate)") called internally on dialog callbacks, so for this function to work, the dialog module must be loaded and configured. </para> - <para> This function is an advanced mechanism to use a media relay without having to manually call a function on each message that @@ -371,6 +370,11 @@ modparam("mediaproxy", "ice_candidate_avp", "$avp(ice_candidate)") This function can be used from REQUEST_ROUTE. </para> + <note> + The <emphasis>dlg_manage()</emphasis> function must be called + in the configuration file before using this function. + </note> + <example> <title>Using the <function>engage_media_proxy</function> function</title> <programlisting format="linespecific"> @@ -378,6 +382,7 @@ modparam("mediaproxy", "ice_candidate_avp", "$avp(ice_candidate)") if (method==INVITE && !has_totag()) { # We can also use a specific media relay if we need to #$avp(media_relay) = "1.2.3.4"; + dlg_manage() engage_media_proxy(); } ... @@ -466,4 +471,3 @@ if (method==BYE) { </section> </chapter> - diff --git a/src/modules/mediaproxy/mediaproxy.c b/src/modules/mediaproxy/mediaproxy.c index 7b4e301bdc7..c7ccd901a1d 100644 --- a/src/modules/mediaproxy/mediaproxy.c +++ b/src/modules/mediaproxy/mediaproxy.c @@ -207,7 +207,6 @@ static MediaproxySocket mediaproxy_socket = { struct dlg_binds dlg_api; Bool have_dlg_api = False; -static int dialog_flag = -1; // The AVP where the caller signaling IP is stored (if defined) static AVP_Param signaling_ip_avp = {str_init(SIGNALING_IP_AVP_SPEC), {0}, 0}; @@ -1996,7 +1995,6 @@ static int EngageMediaProxy(struct sip_msg *msg) return -1; } msg->msg_flags |= FL_USE_MEDIA_PROXY; - setflag(msg, dialog_flag); // have the dialog module trace this dialog return 1; } @@ -2049,9 +2047,6 @@ static int w_EndMediaSession(struct sip_msg *msg, char *p1, char *p2) static int mod_init(void) { pv_spec_t avp_spec; - int *param; - modparam_t type; - // initialize the signaling_ip_avp structure if(!signaling_ip_avp.spec.s || signaling_ip_avp.spec.len <= 0) { LM_WARN("missing/empty signaling_ip_avp parameter. will use " @@ -2130,21 +2125,6 @@ static int mod_init(void) if(load_dlg_api(&dlg_api) == 0) { have_dlg_api = True; - // load dlg_flag and default_timeout parameters from the dialog module - param = find_param_export( - find_module_by_name("dialog"), "dlg_flag", INT_PARAM, &type); - if(!param) { - LM_CRIT("cannot find dlg_flag parameter in the dialog module\n"); - return -1; - } - - if(type != INT_PARAM) { - LM_CRIT("dlg_flag parameter found but with wrong type: %d\n", type); - return -1; - } - - dialog_flag = *param; - // register dialog creation callback if(dlg_api.register_dlgcb( NULL, DLGCB_CREATED, __dialog_created, NULL, NULL)

1 0

git:master:013c3f1c: cnxcc: Remove dlg_flag and update docs
by Henning Westerholt 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: 013c3f1cc52d4ae2c68496cddf0f1122ffc079e1 URL: https://github.com/kamailio/kamailio/commit/013c3f1cc52d4ae2c68496cddf0f112… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-09-16T13:39:06+02:00 cnxcc: Remove dlg_flag and update docs --- Modified: src/modules/cnxcc/cnxcc_mod.c Modified: src/modules/cnxcc/cnxcc_mod.h Modified: src/modules/cnxcc/doc/cnxcc_admin.xml Modified: src/modules/cnxcc/example/kamailio-cnxcc.cfg --- Diff: https://github.com/kamailio/kamailio/commit/013c3f1cc52d4ae2c68496cddf0f112… Patch: https://github.com/kamailio/kamailio/commit/013c3f1cc52d4ae2c68496cddf0f112…

1 0

git:master:5115ea20: call_control: Remove dlg_flag and update docs
by Henning Westerholt 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: 5115ea20322ef32d581c1dd8f581dfd780a5094c URL: https://github.com/kamailio/kamailio/commit/5115ea20322ef32d581c1dd8f581dfd… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-09-16T13:39:06+02:00 call_control: Remove dlg_flag and update docs --- Modified: src/modules/call_control/call_control.c Modified: src/modules/call_control/doc/call_control_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5115ea20322ef32d581c1dd8f581dfd… Patch: https://github.com/kamailio/kamailio/commit/5115ea20322ef32d581c1dd8f581dfd… --- diff --git a/src/modules/call_control/call_control.c b/src/modules/call_control/call_control.c index f1614b04254..41b36eeedd6 100644 --- a/src/modules/call_control/call_control.c +++ b/src/modules/call_control/call_control.c @@ -146,7 +146,6 @@ static AVP_Param sip_application_avp = { struct dlg_binds dlg_api; -static int dialog_flag = -1; AVP_List *cc_init_avps = NULL, *cc_start_avps = NULL, *cc_stop_avps = NULL; @@ -1080,7 +1079,6 @@ static int ki_call_control(sip_msg_t *msg) if(result == 1) { // A call with a time limit that will be traced by callcontrol msg->msg_flags |= FL_USE_CALL_CONTROL; - setflag(msg, dialog_flag); // have the dialog module trace this dialog } return result; @@ -1171,20 +1169,6 @@ static int mod_init(void) return -1; } - // load dlg_flag and default_timeout parameters from the dialog module - param = find_param_export( - find_module_by_name("dialog"), "dlg_flag", INT_PARAM, &type); - if(!param) { - LOG(L_CRIT, "cannot find dlg_flag parameter in the dialog module\n"); - return -1; - } - if(type != INT_PARAM) { - LOG(L_CRIT, "dlg_flag parameter found but with wrong type: %d\n", type); - return -1; - } - - dialog_flag = *param; - // register dialog creation callback if(dlg_api.register_dlgcb(NULL, DLGCB_CREATED, __dialog_created, NULL, NULL) != 0) { diff --git a/src/modules/call_control/doc/call_control_admin.xml b/src/modules/call_control/doc/call_control_admin.xml index f673413ed0b..01d56ebe0d4 100644 --- a/src/modules/call_control/doc/call_control_admin.xml +++ b/src/modules/call_control/doc/call_control_admin.xml @@ -410,6 +410,10 @@ route { This function can be used from REQUEST_ROUTE. </para> + <note> + The <emphasis>dlg_manage()</emphasis> (dialog module) function must be called in the configuration file before using this function. + </note> + <example> <title>Using the <function>call_control</function> function</title> <programlisting format="linespecific"> @@ -424,6 +428,7 @@ if (is_avp_set("$avp(i:805)")) { if (method==INVITE && !has_totag() && is_domain_local("$avp(s:billing_party_domain)")) { + dlg_manage(); call_control(); switch ($retcode) { case 2: @@ -460,4 +465,3 @@ t_relay(); </section> </chapter> -

1 0

git:master:7e139951: sst: Remove dlg_flag docs
by Henning Westerholt 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: 7e139951dc925f60bdd37ce699b38188cb223888 URL: https://github.com/kamailio/kamailio/commit/7e139951dc925f60bdd37ce699b3818… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-09-16T13:39:06+02:00 sst: Remove dlg_flag docs --- Modified: src/modules/sst/doc/sst_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7e139951dc925f60bdd37ce699b3818… Patch: https://github.com/kamailio/kamailio/commit/7e139951dc925f60bdd37ce699b3818… --- diff --git a/src/modules/sst/doc/sst_admin.xml b/src/modules/sst/doc/sst_admin.xml index 9c905f9e3c0..751dd3a2f49 100644 --- a/src/modules/sst/doc/sst_admin.xml +++ b/src/modules/sst/doc/sst_admin.xml @@ -50,12 +50,15 @@ request the use of session timers if the UAC does not request it.</para> - <para>All of this happens with a properly configured dialog - and sst module and setting the dialog flag and the sst flag at - the time any INVITE sip message is seen. There is no - &kamailioconfig; script function call required to set the dialog - expire timeout value. See the <quote>dialog module</quote> users guide for - more information.</para> + <para> + All of this happens with a properly configured dialog and sst + module. You need to call the dlg_manage() function and set the + sst flag at the time any INVITE sip message is seen. + There is no &kamailioconfig; script function call required to + set the dialog expire timeout value. + See the <quote>dialog module</quote> users guide for + more information. + </para> <para>The <quote>sstCheckMin()</quote> script function can be used to verify that the Session-expires / MIN-SE header field values are not too @@ -287,9 +290,9 @@ modparam("sst", "reject_to_small", 0) need to tell the sst module which flag value you are assigning to sst.</para> - <para>In most cases whenever you set the dialog flag - you will want to set the sst flag. If the dialog flag - is not set and the sst flag is set, it will not have + <para>In most cases whenever you call dlg_manage() function + you will want to set the sst flag. If the dialog is not tracked + and the sst flag is set, it will not have any effect.</para> <para><emphasis>This parameter must be set or the module will @@ -304,13 +307,12 @@ modparam("sst", "reject_to_small", 0) <title>Set <varname>sst_flag</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("dialog", "dlg_flag", 5) modparam("sst", "sst_flag", 6) ... route { ... if (method=="INVITE") { - setflag(5); # set the dialog flag + dlg_manage(); # Track the dialog setflag(6); # set the sst flag } ... @@ -353,7 +355,6 @@ route { ... modparam("dialog", "timeout_avp", "$avp(i:4242)") -modparam("dialog", "dlg_flag", 5) ... modparam("sst", "sst_flag", 6) modparam("sst", "timeout_avp", "$avp(i:4242)") @@ -367,7 +368,7 @@ route { exit; } # track the session timers via the dialog module - setflag(5); + dlg_manage(); setflag(6); } } @@ -381,7 +382,7 @@ route { exit; } # track the session timers via the dialog module - setflag(5); + dlg_manage(); setflag(6); } } @@ -407,4 +408,3 @@ route { <para>Just load the module and remember to set the timeout_avp and sst_flag values.</para> </section> </chapter> -

1 0

git:master:435fa668: pua_dialoginfo: Remove dlg_flag docs
by Henning Westerholt 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: 435fa668e1709df8c3025961fa7a38224483914e URL: https://github.com/kamailio/kamailio/commit/435fa668e1709df8c3025961fa7a382… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-09-16T13:39:06+02:00 pua_dialoginfo: Remove dlg_flag docs --- Modified: src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/435fa668e1709df8c3025961fa7a382… Patch: https://github.com/kamailio/kamailio/commit/435fa668e1709df8c3025961fa7a382… --- diff --git a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml index 6093c3516b6..ac5d3ba41d3 100644 --- a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml +++ b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml @@ -165,8 +165,8 @@ <para>This module is directly coupled with the dialog module. Thus, if the module is loaded, it is automatically active for all calls tracked by the dialog module. Thus, make sure that you activate the dialog module for a certain call if you want dialog-state - to be PUBLISHED. This means, the dlg_flag of the dialog module must be configured - and the respective flag must be set during call processing. + to be PUBLISHED. This means, use the <emphasis>dlg_manage()</emphasis> function of the dialog + module to have it tracked. </para> </section> <section>

1 0

git:master:f612c958: qos: Remove dlg_flag docs
by Henning Westerholt 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: f612c9583072eb22dc477c11d000541ab8b944ad URL: https://github.com/kamailio/kamailio/commit/f612c9583072eb22dc477c11d000541… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-09-16T13:39:06+02:00 qos: Remove dlg_flag docs --- Modified: src/modules/qos/doc/qos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f612c9583072eb22dc477c11d000541… Patch: https://github.com/kamailio/kamailio/commit/f612c9583072eb22dc477c11d000541… --- diff --git a/src/modules/qos/doc/qos_admin.xml b/src/modules/qos/doc/qos_admin.xml index 38d33a99f00..908ab5d5f84 100644 --- a/src/modules/qos/doc/qos_admin.xml +++ b/src/modules/qos/doc/qos_admin.xml @@ -32,12 +32,10 @@ </para> <para> - All of this happens with a properly configured dialog - and qos module and setting the dialog flag and the qos flag at - the time any INVITE SIP message is seen. There is no - config script function call required to set the SDP session - tracking mechanism. See the dialog module users guide for - more information. + All of this happens with a properly configured dialog and qos + module. You need to call the dlg_manage() function and set the + qos flag at the time any INVITE sip message is seen. + See the <quote>dialog module</quote> users guide for information. </para> <para> @@ -126,9 +124,9 @@ before you can do that, you need to tell the qos module which flag value you are assigning to qos.</para> - <para>In most cases when ever you set the dialog flag - you will want to set the qos flag. If the dialog flag - is not set and the qos flag is set, it will not have + <para>In most cases when ever you call dlg_manage() function + you will want to set the qos flag. If the dialog is not tracked + and the qos flag is set, it will not have any effect.</para> <para><emphasis>This parameter must be set or the module will @@ -143,13 +141,12 @@ <title>Set <varname>qos_flag</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("dialog", "dlg_flag", 5) modparam("qos", "qos_flag", 7) ... route { ... if (method=="INVITE") { - setflag(5); # set the dialog flag + dlg_manage(); # Track the dialog setflag(7); # Set the qos flag } ... @@ -182,4 +179,3 @@ route { </para> </section> </chapter> -

1 0

git:master:fbe3aede: acc: Remove dlg_flag docs
by Henning Westerholt 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: fbe3aedee492ceb23ef53c967f1fe256a94d876f URL: https://github.com/kamailio/kamailio/commit/fbe3aedee492ceb23ef53c967f1fe25… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-09-16T13:39:06+02:00 acc: Remove dlg_flag docs --- Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/fbe3aedee492ceb23ef53c967f1fe25… Patch: https://github.com/kamailio/kamailio/commit/fbe3aedee492ceb23ef53c967f1fe25… --- diff --git a/src/modules/acc/doc/acc_admin.xml b/src/modules/acc/doc/acc_admin.xml index 37a1365627e..493ae6323f3 100644 --- a/src/modules/acc/doc/acc_admin.xml +++ b/src/modules/acc/doc/acc_admin.xml @@ -327,7 +327,7 @@ if (uri=~"sip:+40") /* calls to Romania */ { <para> The dialog module needs to be engaged on the dialogs that should be accounted, that they will be tracked by the server. This is usally done by calling the function - <emphasis>dlg_manage()</emphasis> or setting the <emphasis>dlg_flag</emphasis>. + <emphasis>dlg_manage()</emphasis>. Refer to the documentation of the dialog module for more information. </para> @@ -1611,4 +1611,3 @@ acc_db_request("$var(code) $avp(reason)", "acc"); </section> </section> </chapter> -

1 0

git:master:81f96617: dialog/doc: Remove dlg_flag docs and suggest dlg_manage() instead.
by Henning Westerholt 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: 81f966174275b715608f50aae606d40a791dd67c URL: https://github.com/kamailio/kamailio/commit/81f966174275b715608f50aae606d40… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-09-16T13:39:06+02:00 dialog/doc: Remove dlg_flag docs and suggest dlg_manage() instead. --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/81f966174275b715608f50aae606d40… Patch: https://github.com/kamailio/kamailio/commit/81f966174275b715608f50aae606d40… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index 07116e70a63..d1547b367a6 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -46,9 +46,8 @@ <title>How it works</title> <para> To create the dialog associated with an initial INVITE request, execute - the function <quote>dlg_manage()</quote> or set the flag specified by - parameter <quote>dlg_flag</quote> (<xref linkend="dialog.p.flag"/>) - before creating the corresponding transaction. + the function <quote>dlg_manage()</quote> before creating the + corresponding transaction. </para> <para> The dialog is automatically destroyed when a <quote>BYE</quote> is @@ -253,28 +252,17 @@ modparam("dialog", "rr_param", "xyz") <section id="dialog.p.flag"> <title><varname>dlg_flag</varname> (integer)</title> <para> - Flag to be used for marking if a dialog should be constructed for the - current request (this makes sense only for initial requests). - </para> - <para> - Note: it is not needed to set this parameter and its corresponding flag + Note: This flag has beed deprecated and not used anyymore. + it is not needed to set this parameter and its corresponding flag for initial request in case the <quote>dlg_manage()</quote> function - is used. In other words, using <quote>dlg_manage()</quote> alone is - enough. + is used. + In other words, use <quote>dlg_manage()</quote>. </para> <para> <emphasis> Default value is <quote>none</quote>. </emphasis> </para> - <example> - <title>Set <varname>dlg_flag</varname> parameter</title> - <programlisting format="linespecific"> -... -modparam("dialog", "dlg_flag", 4) -... -</programlisting> - </example> </section> <section id="dialog.p.timeout_avp">

1 0

git:master:e60a0646: dialog: Drop support for dlg_flag parameter
by Henning Westerholt 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: e60a06469503c566d40437e69cf3374aad361251 URL: https://github.com/kamailio/kamailio/commit/e60a06469503c566d40437e69cf3374… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-09-16T13:39:06+02:00 dialog: Drop support for dlg_flag parameter --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_handlers.c Modified: src/modules/dialog/dlg_handlers.h --- Diff: https://github.com/kamailio/kamailio/commit/e60a06469503c566d40437e69cf3374… Patch: https://github.com/kamailio/kamailio/commit/e60a06469503c566d40437e69cf3374…

1 0

[kamailio/kamailio] cdp: export all functions in KEMI module (PR #3949)
by bazrafshan.m.h 16 Sep '24

16 Sep '24

- Added `cdp_has_app` function: - Accepts a single parameter: - `application`: The Application ID. - Added `cdp_has_app2` function: - Accepts two parameters: - `vendorid`: The Vendor ID associated with the application. - `application`: The Application ID. - Added cdp_check_peer function: - Accepts one parameter: - `fqdn`: the Fully qualified domain name of the peer, that should be checked. The parameter may contain pseudovariables. NOTE: All parameters are passed as standard strings.   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  - The cdp functions are exported to KEMI You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3949 -- Commit Summary -- * cdp: export all functions in KEMI module -- File Changes -- M src/modules/cdp/cdp_mod.c (49) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3949.patch https://github.com/kamailio/kamailio/pull/3949.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3949 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3949(a)github.com>

2 3

git:master:11f20730: cdp: export all functions in KEMI module
by Henning Westerholt 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: 11f207306a1da400f4252a1fafd456cda015fb3b URL: https://github.com/kamailio/kamailio/commit/11f207306a1da400f4252a1fafd456c… Author: Moheb <bazrafshan.m.h(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-09-16T13:35:01+02:00 cdp: export all functions in KEMI module - Added `cdp_has_app` function: - Accepts a single parameter: - `application`: The Application ID. - Added `cdp_has_app2` function: - Accepts two parameters: - `vendorid`: The Vendor ID associated with the application. - `application`: The Application ID. - Added cdp_check_peer function: - Accepts one parameter: - `fqdn`: the Fully qualified domain name of the peer, that should be checked. The parameter may contain pseudovariables. NOTE: All parameters are passed as standard strings. --- Modified: src/modules/cdp/cdp_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/11f207306a1da400f4252a1fafd456c… Patch: https://github.com/kamailio/kamailio/commit/11f207306a1da400f4252a1fafd456c… --- diff --git a/src/modules/cdp/cdp_mod.c b/src/modules/cdp/cdp_mod.c index 4685d2af511..b32e4ea7bf4 100644 --- a/src/modules/cdp/cdp_mod.c +++ b/src/modules/cdp/cdp_mod.c @@ -57,6 +57,7 @@ #include "cdp_functions.h" #include "cdp_tls.h" #include "../../core/mod_fix.h" +#include "../../core/kemi.h" MODULE_VERSION @@ -301,7 +302,10 @@ int w_cdp_check_peer(sip_msg_t *msg, char *peer, char *p2) } return -1; } - +int ki_cdp_check_peer(sip_msg_t *msg, str *peer) +{ + return w_cdp_check_peer(msg, peer->s, "NULL"); +} static int w_cdp_has_app(sip_msg_t *msg, char *appid, char *param) { unsigned int app_flags; @@ -324,6 +328,10 @@ static int w_cdp_has_app(sip_msg_t *msg, char *appid, char *param) return check_application(-1, a); } +static int ki_cdp_has_app(sip_msg_t *msg, str *appid) +{ + return w_cdp_has_app(msg, appid->s, "NULL"); +} static int w_cdp_has_app2(sip_msg_t *msg, char *vendor, char *appid) { unsigned int vendor_flags, app_flags; @@ -359,3 +367,42 @@ static int w_cdp_has_app2(sip_msg_t *msg, char *vendor, char *appid) } return check_application(v, a); } +static int ki_cdp_has_app2(sip_msg_t *msg, str *vendor, str *appid) +{ + return w_cdp_has_app2(msg, vendor->s, appid->s); +} + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_cdp_exports[] = { + { str_init("cdp"), str_init("cdp_check_peer"), + SR_KEMIP_INT, ki_cdp_check_peer, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("cdp"), str_init("cdp_has_app"), + SR_KEMIP_INT, ki_cdp_has_app, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("cdp"), str_init("cdp_has_app2"), + SR_KEMIP_INT, ki_cdp_has_app2, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; +/* clang-format on */ + +/** + * + */ + +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_cdp_exports); + return 0; +}

1 0

git:master:15d81a01: core: use macro to check send_port_str value
by Daniel-Constantin Mierla 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: 15d81a0151aa46a20f95fb8c6dc2665d03e741aa URL: https://github.com/kamailio/kamailio/commit/15d81a0151aa46a20f95fb8c6dc2665… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-16T12:18:54+02:00 core: use macro to check send_port_str value --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/15d81a0151aa46a20f95fb8c6dc2665… Patch: https://github.com/kamailio/kamailio/commit/15d81a0151aa46a20f95fb8c6dc2665… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index bc68a920ef6..4f88150e11b 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -728,7 +728,7 @@ static inline int lumps_len( }; \ break; \ case SUBST_SND_PORT: \ - if(send_port_str != NULL) { \ + if(STR_WITHVAL(send_port_str)) { \ new_len += send_port_str->len; \ } else { \ LM_CRIT("null send sock port\n"); \ @@ -772,7 +772,7 @@ static inline int lumps_len( send_address_str->len) \ != NULL)) \ new_len += 2; \ - if(send_port_str != NULL) { \ + if(STR_WITHVAL(send_port_str)) { \ /* add :port_no */ \ new_len += 1 + send_port_str->len; \ } \ @@ -1175,7 +1175,7 @@ void process_lumps(struct sip_msg *msg, struct lump *lumps, char *new_buf, }; \ break; \ case SUBST_SND_PORT: \ - if(send_port_str != NULL) { \ + if(STR_WITHVAL(send_port_str)) { \ memcpy(new_buf + offset, send_port_str->s, \ send_port_str->len); \ offset += send_port_str->len; \ @@ -1205,7 +1205,7 @@ void process_lumps(struct sip_msg *msg, struct lump *lumps, char *new_buf, offset++; \ } \ /* :port */ \ - if(send_port_str != NULL) { \ + if(STR_WITHVAL(send_port_str)) { \ new_buf[offset] = ':'; \ offset++; \ memcpy(new_buf + offset, send_port_str->s, \

1 0

git:master:c09a2936: core: use advertised port for recv socket only when set
by Daniel-Constantin Mierla 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: c09a29369f03f6c5e621a94b5b853047490568aa URL: https://github.com/kamailio/kamailio/commit/c09a29369f03f6c5e621a94b5b85304… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-16T10:42:19+02:00 core: use advertised port for recv socket only when set --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/c09a29369f03f6c5e621a94b5b85304… Patch: https://github.com/kamailio/kamailio/commit/c09a29369f03f6c5e621a94b5b85304… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 19713e1b1cc..bc68a920ef6 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -631,7 +631,7 @@ static inline int lumps_len( }; \ break; \ case SUBST_RCV_PORT: \ - if(msg->rcv.bind_address && STR_WITHVAL(recv_port_str)) { \ + if(STR_WITHVAL(recv_port_str)) { \ new_len += recv_port_str->len; \ } else { \ LM_CRIT(" rcv port - null bind_address\n"); \ @@ -864,9 +864,11 @@ static inline int lumps_len( recv_address_str = &(msg->rcv.bind_address->address_str); recv_af = msg->rcv.bind_address->address.af; } - if(msg->rcv.bind_address->useinfo.port_no > 0) { - recv_port_str = &(msg->rcv.bind_address->useinfo.port_no_str); - recv_port_no = msg->rcv.bind_address->useinfo.port_no; + if(msg->rcv.bind_address->useinfo.name.len > 0) { + if(msg->rcv.bind_address->useinfo.port_no > 0) { + recv_port_str = &(msg->rcv.bind_address->useinfo.port_no_str); + recv_port_no = msg->rcv.bind_address->useinfo.port_no; + } } else { recv_port_str = &(msg->rcv.bind_address->port_no_str); recv_port_no = msg->rcv.bind_address->port_no; @@ -1055,7 +1057,7 @@ void process_lumps(struct sip_msg *msg, struct lump *lumps, char *new_buf, }; \ break; \ case SUBST_RCV_PORT: \ - if(msg->rcv.bind_address && STR_WITHVAL(recv_port_str)) { \ + if(STR_WITHVAL(recv_port_str)) { \ memcpy(new_buf + offset, recv_port_str->s, \ recv_port_str->len); \ offset += recv_port_str->len; \ @@ -1396,9 +1398,11 @@ void process_lumps(struct sip_msg *msg, struct lump *lumps, char *new_buf, recv_address_str = &(msg->rcv.bind_address->address_str); recv_af = msg->rcv.bind_address->address.af; } - if(msg->rcv.bind_address->useinfo.port_no > 0) { - recv_port_str = &(msg->rcv.bind_address->useinfo.port_no_str); - recv_port_no = msg->rcv.bind_address->useinfo.port_no; + if(msg->rcv.bind_address->useinfo.name.len > 0) { + if(msg->rcv.bind_address->useinfo.port_no > 0) { + recv_port_str = &(msg->rcv.bind_address->useinfo.port_no_str); + recv_port_no = msg->rcv.bind_address->useinfo.port_no; + } } else { recv_port_str = &(msg->rcv.bind_address->port_no_str); recv_port_no = msg->rcv.bind_address->port_no;

1 0

git:master:0f423f97: core: use advertised port only when explicitely set
by Daniel-Constantin Mierla 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: 0f423f97607416edcff8d0f1612fad7af29b6064 URL: https://github.com/kamailio/kamailio/commit/0f423f97607416edcff8d0f1612fad7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-16T09:17:09+02:00 core: use advertised port only when explicitely set - do not fallback to socket port --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/0f423f97607416edcff8d0f1612fad7… Patch: https://github.com/kamailio/kamailio/commit/0f423f97607416edcff8d0f1612fad7…

1 0

[kamailio/kamailio] move app_mono to archive (PR #3964)
by Victor Seva 16 Sep '24

16 Sep '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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [x] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [x] Related to issue #3963 #### Description steps to remove app_mono You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3964 -- Commit Summary -- * Makefile.groups: remove app_mono * app_mono: module relocated to archive -- File Changes -- M src/Makefile.groups (8) D src/modules/app_mono/Makefile (17) D src/modules/app_mono/README (223) D src/modules/app_mono/app_mono_api.c (907) D src/modules/app_mono/app_mono_api.h (63) D src/modules/app_mono/app_mono_mod.c (203) D src/modules/app_mono/doc/Makefile (4) D src/modules/app_mono/doc/app_mono.xml (41) D src/modules/app_mono/doc/app_mono_admin.xml (231) D src/modules/app_mono/lib/SR.cs (41) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3964.patch https://github.com/kamailio/kamailio/pull/3964.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3964 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3964(a)github.com>

2 3

[kamailio/kamailio] app_mono: maybe time to move it to archive repo? (Issue #3963)
by Victor Seva 16 Sep '24

16 Sep '24

### Description From https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1079882 ``` From: "Chris Hofstaedtler" <zeha(a)debian.org> Source: kamailio Priority: wishlist Control: block 1010445 by -1 Hi, kamailio currently (build-)depends on mono libraries. Please drop these relations, probably turning off mono support altogether. The mono stack in Debian is not maintained in any way, so we'd like to reduce packages relying on it. Chris ``` I'll remove app_mono from sid and >= trixie builds -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3963 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3963(a)github.com>

2 2

git:master:6cf255de: app_mono: module relocated to archive
by Victor Seva 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: 6cf255dee8620ffa1a5be1bb23a1b767015218fa URL: https://github.com/kamailio/kamailio/commit/6cf255dee8620ffa1a5be1bb23a1b76… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-09-16T09:13:02+02:00 app_mono: module relocated to archive fixes #3963 --- Removed: src/modules/app_mono/Makefile Removed: src/modules/app_mono/README Removed: src/modules/app_mono/app_mono_api.c Removed: src/modules/app_mono/app_mono_api.h Removed: src/modules/app_mono/app_mono_mod.c Removed: src/modules/app_mono/doc/Makefile Removed: src/modules/app_mono/doc/app_mono.xml Removed: src/modules/app_mono/doc/app_mono_admin.xml Removed: src/modules/app_mono/lib/SR.cs --- Diff: https://github.com/kamailio/kamailio/commit/6cf255dee8620ffa1a5be1bb23a1b76… Patch: https://github.com/kamailio/kamailio/commit/6cf255dee8620ffa1a5be1bb23a1b76…

1 0

git:master:f0dbb620: Makefile.groups: remove app_mono
by Victor Seva 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: f0dbb620c1de59732b5f379af16b37713afffc56 URL: https://github.com/kamailio/kamailio/commit/f0dbb620c1de59732b5f379af16b377… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-09-16T09:13:02+02:00 Makefile.groups: remove app_mono related #3963 --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/f0dbb620c1de59732b5f379af16b377… Patch: https://github.com/kamailio/kamailio/commit/f0dbb620c1de59732b5f379af16b377… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index bda4f36a258..83c4bdb2a47 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -163,9 +163,6 @@ mod_list_jansson_event=janssonrpcc # - modules depending on redis library mod_list_redis=db_redis ndb_redis topos_redis -# - modules depending on mono library -mod_list_mono=app_mono - # - modules related to IMS extensions mod_list_ims=cdp cdp_avp ims_dialog ims_auth ims_isc ims_icscf ims_qos ims_qos_npn \ ims_registrar_pcscf ims_registrar_scscf ims_usrloc_pcscf \ @@ -263,7 +260,7 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_geoip) $(mod_list_sqlite) \ $(mod_list_json) $(mod_list_json_event) \ $(mod_list_redis) \ - $(mod_list_mono) $(mod_list_ims) \ + $(mod_list_ims) \ $(mod_list_cassandra) $(mod_list_oracle) \ $(mod_list_outbound) \ $(mod_list_java) $(mod_list_dnssec) \ @@ -465,9 +462,6 @@ module_group_kjansson=$(mod_list_jansson) $(mod_list_jansson_event) # pkg redis module module_group_kredis=$(mod_list_redis) -# pkg mono module -module_group_kmono=$(mod_list_mono) - # pkg IMS modules module_group_kims=$(mod_list_ims)

1 0

git:master:fa17af66: core: skip interfaces with index over max iface limit
by Daniel-Constantin Mierla 16 Sep '24

16 Sep '24

Module: kamailio Branch: master Commit: fa17af660dc754cd46c747ec8c3216ef52fd4fcc URL: https://github.com/kamailio/kamailio/commit/fa17af660dc754cd46c747ec8c3216e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-16T08:29:59+02:00 core: skip interfaces with index over max iface limit --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/fa17af660dc754cd46c747ec8c3216e… Patch: https://github.com/kamailio/kamailio/commit/fa17af660dc754cd46c747ec8c3216e… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 446878d6b23..281defecffc 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1493,6 +1493,7 @@ static int build_iface_list(void) int families[] = {AF_INET, AF_INET6}; char name[MAX_IF_LEN]; int is_link_local = 0; + int num = 0; if(ifaces == NULL) { if((ifaces = (struct idxlist *)pkg_malloc( @@ -1554,9 +1555,11 @@ static int build_iface_list(void) rtl = IFA_PAYLOAD(nlp); index = ifi->ifa_index; + num++; if(index >= MAX_IFACE_NO) { - LM_ERR("Invalid interface index returned: %d\n", index); - goto error; + LM_ERR("Invalid interface index returned: %d (n: %d) - skip\n", + index, num); + continue; } entry = (struct idx *)pkg_malloc(sizeof(struct idx)); @@ -1564,6 +1567,7 @@ static int build_iface_list(void) PKG_MEM_ERROR; goto error; } + LM_DBG("trying network interface index: %d (n: %d)\n", index, num); entry->next = 0; entry->family = families[i];

1 0

git:5.7:bb770156: pkg/kamailio: fixed python module build on RHEL based dists
by Sergey Safarov 14 Sep '24

14 Sep '24

Module: kamailio Branch: 5.7 Commit: bb770156f7f73485fb523576cc6639b334da4aa5 URL: https://github.com/kamailio/kamailio/commit/bb770156f7f73485fb523576cc6639b… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2024-09-14T17:52:02+03:00 pkg/kamailio: fixed python module build on RHEL based dists (cherry picked from commit b1c9dac2c382a98997d5771921af5aa3235876c0) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/bb770156f7f73485fb523576cc6639b… Patch: https://github.com/kamailio/kamailio/commit/bb770156f7f73485fb523576cc6639b… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 9ee068b9900..7e15f95fdc8 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1343,7 +1343,7 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ FREERADIUS=1 \ %endif %if 0%{?rhel} >= 8 - PYTHON3=python3.9 \ + PYTHON3=python3.12 \ %endif group_include="kstandard kautheph kberkeley kcarrierroute \ %if %{with cnxcc}

1 0

git:5.7:58732164: app_python3: bump to 3.12 for el8/el9
by Sergey Safarov 14 Sep '24

14 Sep '24

Module: kamailio Branch: 5.7 Commit: 58732164c199ed6c565ea650998d6e34e5dcb451 URL: https://github.com/kamailio/kamailio/commit/58732164c199ed6c565ea650998d6e3… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2024-09-14T17:51:47+03:00 app_python3: bump to 3.12 for el8/el9 (cherry picked from commit 4d87f29248d36d873784827204f272116050343d) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/58732164c199ed6c565ea650998d6e3… Patch: https://github.com/kamailio/kamailio/commit/58732164c199ed6c565ea650998d6e3… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 814de137d9a..9ee068b9900 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -847,9 +847,9 @@ Requires: python2, kamailio = %ver BuildRequires: python2, python2-devel %endif %if %{with python3} -%if 0%{?rhel} == 8 -Requires: python39, kamailio = %ver -BuildRequires: python39, python39-devel +%if 0%{?rhel} == 8 || 0%{?rhel} == 9 +Requires: python3.12, kamailio = %ver +BuildRequires: python3.12, python3.12-devel %else Requires: python3, kamailio = %ver BuildRequires: python3, python3-devel @@ -1236,7 +1236,7 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ FREERADIUS=1 \ %endif %if 0%{?rhel} >= 8 - PYTHON3=python3.9 \ + PYTHON3=python3.12 \ %endif group_include="kstandard kautheph kberkeley kcarrierroute \ %if %{with cnxcc}

1 0

git:5.8:ab3530e7: pkg/kamailio: fixed python module build on RHEL based dists
by Sergey Safarov 13 Sep '24

13 Sep '24

Module: kamailio Branch: 5.8 Commit: ab3530e753dece24e7b2851b0943fa23154d62ef URL: https://github.com/kamailio/kamailio/commit/ab3530e753dece24e7b2851b0943fa2… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2024-09-13T23:32:04+03:00 pkg/kamailio: fixed python module build on RHEL based dists (cherry picked from commit b1c9dac2c382a98997d5771921af5aa3235876c0) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/ab3530e753dece24e7b2851b0943fa2… Patch: https://github.com/kamailio/kamailio/commit/ab3530e753dece24e7b2851b0943fa2… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 30aa2f2f1c4..22d577d1d79 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1325,7 +1325,7 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ FREERADIUS=1 \ %endif %if 0%{?rhel} >= 8 - PYTHON3=python3.9 \ + PYTHON3=python3.12 \ %endif WOLFSSL_INTERNAL=no \ group_include="kstandard kautheph kberkeley kcarrierroute \

1 0

git:5.8:98e09433: app_python3: bump to 3.12 for el8/el9
by Sergey Safarov 13 Sep '24

13 Sep '24

Module: kamailio Branch: 5.8 Commit: 98e094331d09b573985e98a54ff442166bc86594 URL: https://github.com/kamailio/kamailio/commit/98e094331d09b573985e98a54ff4421… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2024-09-13T23:31:53+03:00 app_python3: bump to 3.12 for el8/el9 (cherry picked from commit 4d87f29248d36d873784827204f272116050343d) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/98e094331d09b573985e98a54ff4421… Patch: https://github.com/kamailio/kamailio/commit/98e094331d09b573985e98a54ff4421… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 17a91dde0f2..30aa2f2f1c4 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -812,9 +812,9 @@ Requires: python2, kamailio = %ver BuildRequires: python2, python2-devel %endif %if %{with python3} -%if 0%{?rhel} == 8 -Requires: python39, kamailio = %ver -BuildRequires: python39, python39-devel +%if 0%{?rhel} == 8 || 0%{?rhel} == 9 +Requires: python3.12, kamailio = %ver +BuildRequires: python3.12, python3.12-devel %else Requires: python3, kamailio = %ver BuildRequires: python3, python3-devel @@ -1212,7 +1212,7 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ FREERADIUS=1 \ %endif %if 0%{?rhel} >= 8 - PYTHON3=python3.9 \ + PYTHON3=python3.12 \ %endif WOLFSSL_INTERNAL=no \ group_include="kstandard kautheph kberkeley kcarrierroute \

1 0

[kamailio/kamailio] build: unused-variable (Issue #3974)
by sergey-safarov 13 Sep '24

13 Sep '24

``` ldap_mod.c: In function 'child_init': ldap_mod.c:156:13: warning: unused variable 'ret' [-Wunused-variable] 156 | int ret = 0; | ^~~ LD (gcc) [M ldap.so] ldap.so which: no lua-config in (/root/.local/bin:/root/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin) which: no lua-config in (/root/.local/bin:/root/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin) CC (gcc) [M app_lua.so] app_lua_api.o CC (gcc) [M app_lua.so] app_lua_kemi_export.o CC (gcc) [M app_lua.so] app_lua_mod.o LD (gcc) [M app_lua.so] app_lua.so CC (gcc) [M lwsc.so] lwsc_mod.o LD (gcc) [M lwsc.so] lwsc.so ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3974 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3974(a)github.com>

2 1

git:master:a078f140: ldap: remove unused variable in child_init
by Victor Seva 13 Sep '24

13 Sep '24

Module: kamailio Branch: master Commit: a078f14050b6d31bfbcd3562306923c0c4ad73e3 URL: https://github.com/kamailio/kamailio/commit/a078f14050b6d31bfbcd3562306923c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-09-13T22:07:26+02:00 ldap: remove unused variable in child_init fixes #3974 > ldap_mod.c: In function ��child_init��: > ldap_mod.c:156:13: warning: unused variable ��ret�� [-Wunused-variable] > 156 | int ret = 0; --- Modified: src/modules/ldap/ldap_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a078f14050b6d31bfbcd3562306923c… Patch: https://github.com/kamailio/kamailio/commit/a078f14050b6d31bfbcd3562306923c… --- diff --git a/src/modules/ldap/ldap_mod.c b/src/modules/ldap/ldap_mod.c index de0e25b1545..27d44b9d88b 100644 --- a/src/modules/ldap/ldap_mod.c +++ b/src/modules/ldap/ldap_mod.c @@ -153,7 +153,6 @@ static int child_init(int rank) { int i = 0, ld_count = 0; char *ld_name; - int ret = 0; /* don't do anything for non-worker processes */ if(rank == PROC_INIT || rank == PROC_MAIN || rank == PROC_TCP_MAIN)

1 0

git:master:8257f042: pkg/kamailio: RPM packaged ims_qos_npn
by Sergey Safarov 13 Sep '24

13 Sep '24

Module: kamailio Branch: master Commit: 8257f042f6bc7b59955b3d103cad55f8be4dac26 URL: https://github.com/kamailio/kamailio/commit/8257f042f6bc7b59955b3d103cad55f… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2024-09-13T22:43:43+03:00 pkg/kamailio: RPM packaged ims_qos_npn --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/8257f042f6bc7b59955b3d103cad55f… Patch: https://github.com/kamailio/kamailio/commit/8257f042f6bc7b59955b3d103cad55f… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 8917bf1c045..c182edb28a7 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1980,6 +1980,7 @@ fi %doc %{_docdir}/kamailio/modules/README.ims_isc %doc %{_docdir}/kamailio/modules/README.ims_ocs %doc %{_docdir}/kamailio/modules/README.ims_qos +%doc %{_docdir}/kamailio/modules/README.ims_qos_npn %doc %{_docdir}/kamailio/modules/README.ims_registrar_pcscf %doc %{_docdir}/kamailio/modules/README.ims_registrar_scscf %doc %{_docdir}/kamailio/modules/README.ims_usrloc_pcscf @@ -1995,6 +1996,7 @@ fi %{_libdir}/kamailio/modules/ims_isc.so %{_libdir}/kamailio/modules/ims_ocs.so %{_libdir}/kamailio/modules/ims_qos.so +%{_libdir}/kamailio/modules/ims_qos_npn.so %{_libdir}/kamailio/modules/ims_registrar_pcscf.so %{_libdir}/kamailio/modules/ims_registrar_scscf.so %{_libdir}/kamailio/modules/ims_usrloc_pcscf.so

1 0

git:master:b1c9dac2: pkg/kamailio: fixed python module build on RHEL based dists
by Sergey Safarov 13 Sep '24

13 Sep '24

Module: kamailio Branch: master Commit: b1c9dac2c382a98997d5771921af5aa3235876c0 URL: https://github.com/kamailio/kamailio/commit/b1c9dac2c382a98997d5771921af5aa… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2024-09-13T22:08:17+03:00 pkg/kamailio: fixed python module build on RHEL based dists --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/b1c9dac2c382a98997d5771921af5aa… Patch: https://github.com/kamailio/kamailio/commit/b1c9dac2c382a98997d5771921af5aa… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index f642623b4eb..8917bf1c045 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1325,7 +1325,7 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ FREERADIUS=1 \ %endif %if 0%{?rhel} >= 8 - PYTHON3=python3.9 \ + PYTHON3=python3.12 \ %endif WOLFSSL_INTERNAL=no \ group_include="kstandard kautheph kberkeley kcarrierroute \

1 0

git:master:86770d20: core: check for incompatible modes for bind_ipv6_link_local
by Daniel-Constantin Mierla 13 Sep '24

13 Sep '24

Module: kamailio Branch: master Commit: 86770d203bde6859284ec8862be66d78efd2715a URL: https://github.com/kamailio/kamailio/commit/86770d203bde6859284ec8862be66d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-13T08:50:35+02:00 core: check for incompatible modes for bind_ipv6_link_local - a few more debug messages --- Modified: src/core/cfg.y Modified: src/core/socket_info.c Modified: src/core/tcp_main.c Modified: src/core/udp_server.c --- Diff: https://github.com/kamailio/kamailio/commit/86770d203bde6859284ec8862be66d7… Patch: https://github.com/kamailio/kamailio/commit/86770d203bde6859284ec8862be66d7… --- diff --git a/src/core/cfg.y b/src/core/cfg.y index a6ad69b3148..ae1c9ec4b0b 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -999,7 +999,12 @@ assign_stm: ksr_ipv6_hex_style.len = strlen(ksr_ipv6_hex_style.s); } | IPV6_HEX_STYLE error { yyerror("string value expected"); } - | BIND_IPV6_LINK_LOCAL EQUAL NUMBER {sr_bind_ipv6_link_local = $3;} + | BIND_IPV6_LINK_LOCAL EQUAL NUMBER { + sr_bind_ipv6_link_local = $3; + if(sr_bind_ipv6_link_local && (KSR_IPV6_LINK_LOCAL_BIND|KSR_IPV6_LINK_LOCAL_SKIP)) { + yyerror("incompatible modes set"); + } + } | BIND_IPV6_LINK_LOCAL error { yyerror("number expected"); } | DST_BLST_INIT EQUAL NUMBER { IF_DST_BLOCKLIST(dst_blocklist_init=$3); } | DST_BLST_INIT error { yyerror("boolean value expected"); } diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 4cf1693560a..446878d6b23 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1609,11 +1609,15 @@ static int build_iface_list(void) if(is_link_local) { if(sr_bind_ipv6_link_local & KSR_IPV6_LINK_LOCAL_SKIP) { /* skip - config option */ + LM_DBG("skip binding on '%s' (bind mode: %d)\n", + entry->addr, sr_bind_ipv6_link_local); pkg_free(entry); continue; } if(!(sr_bind_ipv6_link_local & KSR_IPV6_LINK_LOCAL_BIND)) { /* skip - link local addresses are not bindable without scope */ + LM_DBG("not set to on '%s' (bind mode: %d)\n", entry->addr, + sr_bind_ipv6_link_local); pkg_free(entry); continue; } diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index f5ca2d9ad55..9daaf1ce641 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -3148,7 +3148,8 @@ int tcp_init(struct socket_info *sock_info) if((addr->s.sa_family == AF_INET6) && (sr_bind_ipv6_link_local & KSR_IPV6_LINK_LOCAL_SKIP) && IN6_IS_ADDR_LINKLOCAL(&addr->sin6.sin6_addr)) { - LM_DBG("skip binding on %s\n", sock_info->address_str.s); + LM_DBG("skip binding on %s (bind mode: %d)\n", sock_info->address_str.s, + sr_bind_ipv6_link_local); return 0; } /* sock_info->proto=PROTO_TCP; */ @@ -3219,7 +3220,8 @@ int tcp_init(struct socket_info *sock_info) /* continue since this is not critical */ } if(sr_bind_ipv6_link_local & KSR_IPV6_LINK_LOCAL_BIND) { - LM_INFO("setting scope of %s\n", sock_info->address_str.s); + LM_INFO("setting scope of %s (bind mode: %d)\n", + sock_info->address_str.s, sr_bind_ipv6_link_local); addr->sin6.sin6_scope_id = ipv6_get_netif_scope(sock_info->address_str.s); } diff --git a/src/core/udp_server.c b/src/core/udp_server.c index ef7d2894d0d..476ff0fd9e9 100644 --- a/src/core/udp_server.c +++ b/src/core/udp_server.c @@ -418,7 +418,8 @@ int udp_init(struct socket_info *sock_info) if((addr->s.sa_family == AF_INET6) && (sr_bind_ipv6_link_local & KSR_IPV6_LINK_LOCAL_SKIP) && IN6_IS_ADDR_LINKLOCAL(&addr->sin6.sin6_addr)) { - LM_DBG("skip binding on %s\n", sock_info->address_str.s); + LM_DBG("skip binding on %s (mode: %d)\n", sock_info->address_str.s, + sr_bind_ipv6_link_local); return 0; } @@ -465,7 +466,8 @@ int udp_init(struct socket_info *sock_info) /* continue since this is not critical */ } if(sr_bind_ipv6_link_local & KSR_IPV6_LINK_LOCAL_BIND) { - LM_INFO("setting scope of %s\n", sock_info->address_str.s); + LM_INFO("setting scope of %s (bind mode: %d)\n", + sock_info->address_str.s, sr_bind_ipv6_link_local); addr->sin6.sin6_scope_id = ipv6_get_netif_scope(sock_info->address_str.s); }

1 0

git:master:fd95b950: core: socket info - set address also for link local items
by Daniel-Constantin Mierla 12 Sep '24

12 Sep '24

Module: kamailio Branch: master Commit: fd95b95035a7da088a94888132326d463191da83 URL: https://github.com/kamailio/kamailio/commit/fd95b95035a7da088a94888132326d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-12T16:23:02+02:00 core: socket info - set address also for link local items - updates to log messages --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/fd95b95035a7da088a94888132326d4… Patch: https://github.com/kamailio/kamailio/commit/fd95b95035a7da088a94888132326d4… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 120f99b1e49..4cf1693560a 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1574,24 +1574,24 @@ static int build_iface_list(void) for(; RTA_OK(rtap, rtl); rtap = RTA_NEXT(rtap, rtl)) { switch(rtap->rta_type) { case IFA_ADDRESS: + inet_ntop(families[i], RTA_DATA(rtap), entry->addr, + MAX_IF_LEN); if((*(int *)RTA_DATA(rtap)) == htons(0xfe80)) { - LM_DBG("Link Local Address, ignoring ...\n"); + LM_DBG("Link Local Address is '%s'\n", entry->addr); is_link_local = 1; - break; } - inet_ntop(families[i], RTA_DATA(rtap), entry->addr, - MAX_IF_LEN); - LM_DBG("iface <IFA_ADDRESS> addr is %s\n", + LM_DBG("iface <IFA_ADDRESS> address is '%s'\n", entry->addr); break; case IFA_LOCAL: + inet_ntop(families[i], RTA_DATA(rtap), entry->addr, + MAX_IF_LEN); if((*(int *)RTA_DATA(rtap)) == htons(0xfe80)) { - LM_DBG("Link Local Address, ignoring ...\n"); + LM_DBG("Link Local Address is '%s'\n", entry->addr); is_link_local = 1; } - inet_ntop(families[i], RTA_DATA(rtap), entry->addr, - MAX_IF_LEN); - LM_DBG("iface <IFA_LOCAL> addr is %s\n", entry->addr); + LM_DBG("iface <IFA_LOCAL> address is '%s'\n", + entry->addr); break; case IFA_LABEL: LM_DBG("iface name is %s\n", (char *)RTA_DATA(rtap)); @@ -1691,7 +1691,7 @@ int add_interfaces_via_netlink(char *if_name, int family, unsigned short port, if(family && family == tmp->family) { /* check if loopback */ if(ifaces[i].flags & IFF_LOOPBACK) { - LM_DBG("INTERFACE '%s' is loopback", ifaces[i].name); + LM_DBG("INTERFACE '%s' is loopback\n", ifaces[i].name); flags |= SI_IS_LO; } /* save the info */

1 0

git:master:bd4c068e: core: check for items with emtpy address when discovering the network interfaces
by Daniel-Constantin Mierla 12 Sep '24

12 Sep '24

Module: kamailio Branch: master Commit: bd4c068ee9c8e18dc76f8154d3fa4c438972b79c URL: https://github.com/kamailio/kamailio/commit/bd4c068ee9c8e18dc76f8154d3fa4c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-12T10:34:55+02:00 core: check for items with emtpy address when discovering the network interfaces - it may be returned on some OSes, preventing to start --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/bd4c068ee9c8e18dc76f8154d3fa4c4… Patch: https://github.com/kamailio/kamailio/commit/bd4c068ee9c8e18dc76f8154d3fa4c4… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index a181e43dad8..120f99b1e49 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -207,6 +207,10 @@ static int init_addr_info(struct addr_info *a, char *name, enum si_flags flags) memset(a, 0, sizeof(*a)); a->name.len = strlen(name); + if(a->name.len <= 0) { + LM_ERR("invalid or empty name value\n"); + return -1; + } a->name.s = pkg_malloc(a->name.len + 1); /* include \0 */ if(a->name.s == 0) goto error; @@ -224,16 +228,15 @@ static inline struct addr_info *new_addr_info(char *name, enum si_flags gf) { struct addr_info *al; - al = pkg_malloc(sizeof(*al)); - if(al == 0) + al = pkg_mallocxz(sizeof(*al)); + if(al == 0) { + PKG_MEM_ERROR; goto error; - al->next = 0; - al->prev = 0; + } if(init_addr_info(al, name, gf) != 0) goto error; return al; error: - PKG_MEM_ERROR; if(al) { if(al->name.s) pkg_free(al->name.s); @@ -1677,13 +1680,18 @@ int add_interfaces_via_netlink(char *if_name, int family, unsigned short port, //if(! (ifaces[i].flags & IFF_UP) ) continue; for(tmp = ifaces[i].addresses; tmp; tmp = tmp->next) { - LM_DBG("in add_iface_via_netlink Name %s Address %s\n", + LM_DBG("in add_iface_via_netlink Name '%s' Address '%s'\n", ifaces[i].name, tmp->addr); + if(strlen(tmp->addr) == 0) { + LM_DBG("interface '%s' - skip item with empty address\n", + ifaces[i].name); + continue; + } /* match family */ if(family && family == tmp->family) { /* check if loopback */ if(ifaces[i].flags & IFF_LOOPBACK) { - LM_DBG("INTERFACE %s is loopback", ifaces[i].name); + LM_DBG("INTERFACE '%s' is loopback", ifaces[i].name); flags |= SI_IS_LO; } /* save the info */

1 0

git:master:15823c3e: core: log message about interface flags made info
by Daniel-Constantin Mierla 12 Sep '24

12 Sep '24

Module: kamailio Branch: master Commit: 15823c3eda3a332d22d9132a873d755aa024892f URL: https://github.com/kamailio/kamailio/commit/15823c3eda3a332d22d9132a873d755… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-12T10:10:33+02:00 core: log message about interface flags made info - small updates to a couple of error messages --- Modified: src/core/resolve.c Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/15823c3eda3a332d22d9132a873d755… Patch: https://github.com/kamailio/kamailio/commit/15823c3eda3a332d22d9132a873d755… --- diff --git a/src/core/resolve.c b/src/core/resolve.c index da247952fd9..19b05db90ff 100644 --- a/src/core/resolve.c +++ b/src/core/resolve.c @@ -1792,7 +1792,8 @@ int str2ipbuf(str *st, ip_addr_t *ipb) /* just in case that e.g. the VIA parser get confused */ if(unlikely(!st->s || st->len <= 0)) { - LM_ERR("invalid name, no conversion to IP address possible\n"); + LM_ERR("invalid name (%p,%d), no conversion to IP address possible\n", + st->s, st->len); return -1; } s = (unsigned char *)st->s; @@ -1902,7 +1903,8 @@ int str2ip6buf(str *st, ip_addr_t *ipb) /* just in case that e.g. the VIA parser get confused */ if(unlikely(!st->s || st->len <= 0)) { - LM_ERR("invalid name, no conversion to IP address possible\n"); + LM_ERR("invalid name (%p,%d), no conversion to IP address possible\n", + st->s, st->len); return -1; } /* init */ diff --git a/src/core/socket_info.c b/src/core/socket_info.c index a2b3c05c641..a181e43dad8 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1443,7 +1443,7 @@ static int get_flags(int family) if(nlp->nlmsg_len < NLMSG_LENGTH(sizeof(ifi))) goto error; - LM_ERR("Interface with index %d has flags %d\n", ifi->ifi_index, + LM_INFO("Interface with index %d has flags %d\n", ifi->ifi_index, ifi->ifi_flags); if(ifaces == NULL) { LM_ERR("get_flags must not be called on empty interface list"); @@ -1769,7 +1769,7 @@ static int fix_hostname(str *name, struct ip_addr *address, str *address_str, /* get "official hostnames", all the aliases etc. */ he = resolvehost(name->s); if(he == 0) { - LM_ERR("could not resolve %s\n", name->s); + LM_ERR("could not resolve '%s'\n", name->s); goto error; } /* check if we got the official name */

1 0

[kamaillio/kamaillio] Option to create a domain via RPC
by auke＠noppe.nl 12 Sep '24

12 Sep '24

Hi, We want our multi-tenant system to integrate with Kamaillio, and we are trying to use json-rpc to interact with Kamaillio. However, it seems that it is not possible to create a domain using a rpc call, according to the docs it's only possible to issue a reload or dump command. Is it possible to create a domain remotely, preferably using json-RPC? Regards, Auke Noppe

1 0

Service crashed for IMS VoLTE MT call
by Ken Kam 11 Sep '24

11 Sep '24

Dear Kamailio community, ### Description Recently, we are testing IMS VoLTE MT call using a Kamailio release 5.8.2, however the Kamailio service is crashed for several times during handling MT IMS SIP Call. We would like to ask if any idea on why getting the "abort error" in Kamailio (as shown in attached core dump) and also how to solve the issue. Thanks Ken

1 0

git:master:2bcd29a7: core: option to skip auto-bind on ipv6 local link
by Daniel-Constantin Mierla 10 Sep '24

10 Sep '24

Module: kamailio Branch: master Commit: 2bcd29a7a2981670baea0b7fb2e8454b5ad9f4d7 URL: https://github.com/kamailio/kamailio/commit/2bcd29a7a2981670baea0b7fb2e8454… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-10T18:01:57+02:00 core: option to skip auto-bind on ipv6 local link - set bind_ipv6_link_local=2 --- Modified: src/core/cfg.y Modified: src/core/socket_info.c Modified: src/core/socket_info.h Modified: src/core/tcp_main.c Modified: src/core/udp_server.c --- Diff: https://github.com/kamailio/kamailio/commit/2bcd29a7a2981670baea0b7fb2e8454… Patch: https://github.com/kamailio/kamailio/commit/2bcd29a7a2981670baea0b7fb2e8454…

1 0

git:master:42c107b9: permissions: reformat rpc exports
by Daniel-Constantin Mierla 10 Sep '24

10 Sep '24

Module: kamailio Branch: master Commit: 42c107b9e5d5822cd2bd16f7b5d57b66bcde0861 URL: https://github.com/kamailio/kamailio/commit/42c107b9e5d5822cd2bd16f7b5d57b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-10T11:26:13+02:00 permissions: reformat rpc exports --- Modified: src/modules/permissions/permissions.c --- Diff: https://github.com/kamailio/kamailio/commit/42c107b9e5d5822cd2bd16f7b5d57b6… Patch: https://github.com/kamailio/kamailio/commit/42c107b9e5d5822cd2bd16f7b5d57b6… --- diff --git a/src/modules/permissions/permissions.c b/src/modules/permissions/permissions.c index fadedc4fe53..33c0f4acb18 100644 --- a/src/modules/permissions/permissions.c +++ b/src/modules/permissions/permissions.c @@ -1036,44 +1036,58 @@ int allow_test(char *file, char *uri, char *contact) return 1; } +/* clang-format off */ static const char *rpc_trusted_reload_doc[2] = { - "Reload permissions trusted table", 0}; + "Reload permissions trusted table", + 0 +}; static const char *rpc_address_reload_doc[2] = { - "Reload permissions address table", 0}; + "Reload permissions address table", + 0 +}; static const char *rpc_trusted_dump_doc[2] = { - "Dump permissions trusted table", 0}; + "Dump permissions trusted table", + 0 +}; static const char *rpc_address_dump_doc[2] = { - "Dump permissions address table", 0}; + "Dump permissions address table", + 0 +}; static const char *rpc_subnet_dump_doc[2] = { - "Dump permissions subnet table", 0}; + "Dump permissions subnet table", + 0 +}; static const char *rpc_domain_name_dump_doc[2] = { - "Dump permissions domain name table", 0}; - + "Dump permissions domain name table", + 0 +}; static const char *rpc_test_uri_doc[2] = { - "Tests if (URI, Contact) pair is allowed according to allow/deny files", - 0}; + "Tests if (URI, Contact) pair is allowed according to allow/deny files", + 0 +}; rpc_export_t permissions_rpc[] = { - {"permissions.trustedReload", rpc_trusted_reload, - rpc_trusted_reload_doc, RPC_EXEC_DELTA}, - {"permissions.addressReload", rpc_address_reload, - rpc_address_reload_doc, RPC_EXEC_DELTA}, - {"permissions.trustedDump", rpc_trusted_dump, rpc_trusted_dump_doc, 0}, - {"permissions.addressDump", rpc_address_dump, rpc_address_dump_doc, - RET_ARRAY}, - {"permissions.subnetDump", rpc_subnet_dump, rpc_subnet_dump_doc, - RET_ARRAY}, - {"permissions.domainDump", rpc_domain_name_dump, - rpc_domain_name_dump_doc, 0}, - {"permissions.testUri", rpc_test_uri, rpc_test_uri_doc, 0}, - {"permissions.allowUri", rpc_test_uri, rpc_test_uri_doc, 0}, - {0, 0, 0, 0}}; + {"permissions.trustedReload", rpc_trusted_reload, rpc_trusted_reload_doc, + RPC_EXEC_DELTA}, + {"permissions.addressReload", rpc_address_reload, rpc_address_reload_doc, + RPC_EXEC_DELTA}, + {"permissions.trustedDump", rpc_trusted_dump, rpc_trusted_dump_doc, 0}, + {"permissions.addressDump", rpc_address_dump, rpc_address_dump_doc, + RET_ARRAY}, + {"permissions.subnetDump", rpc_subnet_dump, rpc_subnet_dump_doc, RET_ARRAY}, + {"permissions.domainDump", rpc_domain_name_dump, + rpc_domain_name_dump_doc, 0}, + {"permissions.testUri", rpc_test_uri, rpc_test_uri_doc, 0}, + {"permissions.allowUri", rpc_test_uri, rpc_test_uri_doc, 0}, + {0, 0, 0, 0} +}; +/* clang-format on */ static int permissions_init_rpc(void) {

1 0

git:master:4534d71f: permissions: use core fixup function
by Daniel-Constantin Mierla 10 Sep '24

10 Sep '24

Module: kamailio Branch: master Commit: 4534d71f0e3f53d3f13ecd760e07d6d402b666c4 URL: https://github.com/kamailio/kamailio/commit/4534d71f0e3f53d3f13ecd760e07d6d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-10T07:51:05+02:00 permissions: use core fixup function - add a few fixup-free functions to exports --- Modified: src/modules/permissions/permissions.c --- Diff: https://github.com/kamailio/kamailio/commit/4534d71f0e3f53d3f13ecd760e07d6d… Patch: https://github.com/kamailio/kamailio/commit/4534d71f0e3f53d3f13ecd760e07d6d… --- diff --git a/src/modules/permissions/permissions.c b/src/modules/permissions/permissions.c index f91f1a0f112..fadedc4fe53 100644 --- a/src/modules/permissions/permissions.c +++ b/src/modules/permissions/permissions.c @@ -114,8 +114,6 @@ static int single_fixup(void **param, int param_no); */ static int double_fixup(void **param, int param_no); -static int fixup_allow_address(void **param, int param_no); - static int allow_routing_0(struct sip_msg *msg, char *str1, char *str2); static int allow_routing_1(struct sip_msg *msg, char *basename, char *str2); static int allow_routing_2( @@ -159,10 +157,10 @@ static cmd_export_t cmds[] = { fixup_free_spve_all, ANY_ROUTE}, {"allow_uri", (cmd_function)allow_uri, 2, double_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE}, - {"allow_address", (cmd_function)w_allow_address, 3, fixup_allow_address, - 0, ANY_ROUTE}, + {"allow_address", (cmd_function)w_allow_address, 3, fixup_isi, + fixup_free_isi, ANY_ROUTE}, {"allow_source_address", (cmd_function)w_allow_source_address, 1, - fixup_igp_null, 0, ANY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, {"allow_source_address", (cmd_function)w_allow_source_address, 0, 0, 0, ANY_ROUTE}, {"allow_source_address_group", (cmd_function)allow_source_address_group, @@ -1038,20 +1036,6 @@ int allow_test(char *file, char *uri, char *contact) return 1; } -/** - * - */ -static int fixup_allow_address(void **param, int param_no) -{ - if(param_no == 1) - return fixup_igp_null(param, 1); - if(param_no == 2) - return fixup_spve_null(param, 1); - if(param_no == 3) - return fixup_igp_null(param, 1); - return 0; -} - static const char *rpc_trusted_reload_doc[2] = { "Reload permissions trusted table", 0};

1 0

[kamailio/kamailio] 5.8.2++: TCP/TLS connection for WebSocket could not be found (Issue #3969)
by schoberw 09 Sep '24

09 Sep '24

### Description Kamailio is setup as a WebRTC to SIP(UDP) gateway. It forwards WSS to UDP and UDP to WSS connections. This was doing fine until 5.8.2 (so 5.8.1 is running perfectly). Since 5.8.2 (and 5.8.3) the following message is printed on sending towards a connected WSS connection: ``` Sep 4 17:02:20 p01t-1 kamailio.webrtc[336177]: WARNING: webrtc:tm [../../core/forward.h:204]: msg_send_buffer(): TCP/TLS connection for WebSocket could not be found Sep 4 17:02:20 p01t-1 kamailio.webrtc[336177]: WARNING: webrtc:tm [t_fwd.c:1586]: t_send_branch(): sending request on branch 0 failed Sep 4 17:02:20 p01t-1 kamailio.webrtc[336177]: WARNING: webrtc:<script>: Forwarding request failed Sep 4 17:02:20 p01t-1 kamailio.webrtc[336177]: INFO: webrtc:sl [sl_funcs.c:420]: sl_reply_error(): message marked with delayed-reply flag ``` ### Troubleshooting Code: - handle_ruri_alias() sets the $du from the alias parameter and looks good: - $fs sets the local socket (saved on incoming register to the Contact URI) (optional, removed, same result) - set_forward_no_connect() we cannot connect outbound, the connection must exists - tcp_get_conid("$dd:$dp", "$var(conid)") and well: it is existing! - reset the R-URI to the contact - and send out with t_relay() ``` # $ru = INVITE sip:43130110221@192.168.48.131:5063;transport=udp;ntv3=4;alias=1.2.3.4~51820~6;fs=tls:100.100.100.100:443;uri=sip:43130110221%40192.168.63.105%3bline%3dwc-x9u7ra%3bx-ts;line=wc-x9u7ra;x-ts if ($(ru{uri.param,alias}{s.len}) && $(ru{uri.param,uri}{s.len})) { $var(target) = $rU; if (!handle_ruri_alias()) { xlog("L_ERR", ">> Bad alias <$ru>"); sl_send_reply("400", "Bad Request"); exit; } if ($(ru{uri.param,fs}{s.len})) { xlog("L_INFO", ">> setting local socket to $(ru{uri.param,fs})"); $fs = $(ru{uri.param,fs}); } if ($dP =~ "ws|tls|tcp") { set_forward_no_connect(); xlog("L_INFO", ">> checking tcp connection to $dd:$dp"); if(tcp_get_conid("$dd:$dp", "$var(conid)")) { xlog("L_INFO", ">> connection id to $dd:$dp is: $var(conid)"); } else { if (is_method("NOTIFY")) { xlog("L_ERR", ">> connection to $dd:$dp is no longer connected. Client must resubscribe!"); sl_send_reply("604", "Please Remove Subscription"); } else { xlog("L_ERR", ">> connection to $dd:$dp is no longer connected. Client must reregister!"); sl_send_reply("480", "TCP not connected"); } exit; } } $ru = $(ru{uri.param,uri}{s.unescape.param}); $rU = $var(target); xlog("L_INFO", ">> OUT-CONTACT: $rm $ru ($du) - rP=$rP -> dp=$dP nh(P)=$nh(P)"); route(FORWARD); # route that call immediately } route[FORWARD] { xlog("L_INFO", "ROUTE[FORWARD] - R-URI/D-URI: $rm $ru ($du): $mf"); ... xlog("L_INFO", ">> Forwarding request now"); if (!t_relay()) { xlog("L_WARN", "Forwarding request failed"); ... onsend_route { if ($mt==1) { xlog("L_INFO", ">>> Sending Request: $rm $ru ($sndfrom(ip):$sndfrom(port) -> $sndto(ip):$sndto(port): $du)"); xlog("L_INFO", "$sndto(buf)"); #!ifdef WITH_HOMER # for some reason the ACK flagged in FORWARD is not traced on sending out if (isflagset(FL_TRACE)) { xlog("L_INFO", ">> FL_TRACE on $rm set!"); } if (is_method("ACK") && isflagset(FL_TRACE)) { sip_trace(); } #!endif } else { xlog("L_INFO", ">>> Sending Reply: $rs $rr ($sndfrom(ip):$sndfrom(port) -> $sndto(ip):$sndto(port))"); xlog("L_INFO", "$sndto(buf)"); } } ``` #### Reproduction Any call to the WebSocket is rejected now. Working fine before 5.8.2. #### Log Messages ``` kamailio.webrtc[338351]: INFO: webrtc:<script>: ROUTE[OUTBOUND] - route to registered contact: INVITE sip:15551234521@192.168.48.131:5063;transport=udp;ntv3=4;alias=101.100.100.129~52201~6;fs=tls:100.100.100.131:443;uri=sip:15551234521%40192.168.63.105%3bline%3dwc-x9u7ra%3bx-ts;line=wc-x9u7ra;x-ts kamailio.webrtc[338351]: INFO: webrtc:<script>: >> read domain from P-Called-Party-ID: ws2.ipbx.tld kamailio.webrtc[338351]: INFO: webrtc:<script>: >> Reduce Session Timer from 1800 to 120 kamailio.webrtc[338351]: INFO: webrtc:<script>: >> setting local socket to tls:100.100.100.131:443 optional. same without $fs=tls:100.100.100.131:443 (ws: and wss: are invalid for $fs) kamailio.webrtc[338351]: INFO: webrtc:<script>: >> checking tcp connection to 101.100.100.129:52201 kamailio.webrtc[338351]: INFO: webrtc:<script>: >> connection id to 101.100.100.129:52201 is: 1 The connection is found and alive! kamailio.webrtc[338351]: INFO: webrtc:<script>: >> OUT-CONTACT: INVITE sip:15551234521@192.168.63.105;line=wc-x9u7ra;x-ts (sip:101.100.100.129:52201;transport=ws) - rP=UDP -> dp=ws nh(P)=ws kamailio.webrtc[338351]: INFO: webrtc:<script>: ROUTE[FORWARD] - R-URI/D-URI: INVITE sip:15551234521@192.168.63.105;line=wc-x9u7ra;x-ts (sip:101.100.100.129:52201;transport=ws): 8388624 kamailio.webrtc[338351]: INFO: webrtc:<script>: ROUTE[RTPP_REQ] kamailio.webrtc[338351]: INFO: webrtc:<script>: ROUTE[RTP_MANAGE] kamailio.webrtc[338351]: INFO: webrtc:<script>: > SIP -> WebRTC, bridging RTP->SRTP-DTLS and adding ICE - o-313732353436333239323434393936-ytpwonh6n9aq kamailio.webrtc[338351]: INFO: webrtc:<script>: ROUTE[RTP_MANAGE] method:INVITE, ruri:sip:15551234521@192.168.63.105;line=wc-x9u7ra;x-ts, callid:o-313732353436333239323434393936-ytpwonh6n9aq, rtpengine_manage:call-id=o-313732353436333239323434393936-ytpwonh6n9aq via-branch=auto trust-address r eplace-origin replace-session-connection rtcp-mux-accept rtcp-mux-require generate-mid SDES-off ICE=force ICE-lite=forward UDP/TLS/RTP/SAVPF pad-crypto kamailio.webrtc[338351]: INFO: webrtc:<script>: > rtpengine(): SUCCESS kamailio.webrtc[338351]: INFO: webrtc:<script>: >> Forwarding request now 100 trying ... kamailio.webrtc[338351]: INFO: webrtc:<script>: >>> Sending Request: INVITE sip:15551234521@192.168.63.105;line=wc-x9u7ra;x-ts (100.100.100.131:443 -> 101.100.100.129:52201: sip:101.100.100.129:52201;transport=ws) kamailio.webrtc[338351]: INFO: webrtc:<script>: INVITE sip:15551234521@192.168.63.105;line=wc-x9u7ra;x-ts SIP/2.0 Record-Route: <sip:100.100.100.131:443;transport=ws;r2=on;lr;ftag=ly9574qrtx;x-dir=o;x-rtpp=1> Record-Route: <sip:192.168.48.131:5063;r2=on;lr;ftag=ly9574qrtx;x-dir=o;x-rtpp=1> Via: SIP/2.0/WSS 100.100.100.131:443;branch=z9hG4bK727a.06944932aa61c384f55e7cbc0a59ec0a.0 Via: SIP/2.0/UDP 192.168.48.74:5060;branch=z9hG4bKgWoe~Gc5kT Via: SIP/2.0/UDP 192.168.48.74:5060;branch=z9hG4bKvA3weqaC-e;internal=6715591-1 From: "Walter 22" <sip:22@ws2.ipbx.tld>;tag=ly9574qrtx To: <sip:21@ws2.ipbx.tld;user=phone> Call-ID: 313732353436333239323434393936-ytpwonh6n9aq-UASession-p1EoqWEkFt-CQ-100- CSeq: 1 INVITE Max-Forwards: 67 Supported: replaces,from-change,timer,histinfo Allow: INVITE,ACK,CANCEL,BYE,INFO,REFER,PRACK,NOTIFY Contact: <sip:192.168.48.74:5060;internal=6715591-1;type=tpcc> Content-Length: 649 Content-Type: application/sdp Record-Route: <sip:192.168.48.74:5060;transport=udp;lr> Allow-Events: talk,hold,refer Accept: application/sdp Session-Expires: 90;refresher=uas [...] shortened SDP body kamailio.webrtc[338351]: INFO: webrtc:<script>: >> FL_TRACE on INVITE set! kamailio.webrtc[338351]: INFO: webrtc:<script>: Network sending: >>>>>>>>>>>>>>>>>>>>>>>>>>>>>> INVITE sip:15551234521@192.168.63.105;line=wc-x9u7ra;x-ts SIP/2.0 Record-Route: <sip:100.100.100.131:443;transport=ws;r2=on;lr;ftag=ly9574qrtx;x-dir=o;x-rtpp=1> Record-Route: <sip:192.168.48.131:5063;r2=on;lr;ftag=ly9574qrtx;x-dir=o;x-rtpp=1> Via: SIP/2.0/WSS 100.100.100.131:443;branch=z9hG4bK727a.06944932aa61c384f55e7cbc0a59ec0a.0 Via: SIP/2.0/UDP 192.168.48.74:5060;branch=z9hG4bKgWoe~Gc5kT Via: SIP/2.0/UDP 192.168.48.74:5060;branch=z9hG4bKvA3weqaC-e;internal=6715591-1 From: "Walter 22" <sip:22@ws2.ipbx.tld>;tag=ly9574qrtx To: <sip:21@ws2.ipbx.tld;user=phone> Call-ID: 313732353436333239323434393936-ytpwonh6n9aq-UASession-p1EoqWEkFt-CQ-100- CSeq: 1 INVITE Max-Forwards: 67 Supported: replaces,from-change,timer,histinfo Allow: INVITE,ACK,CANCEL,BYE,INFO,REFER,PRACK,NOTIFY Contact: <sip:192.168.48.74:5060;internal=6715591-1;type=tpcc> Content-Length: 649 Content-Type: application/sdp Record-Route: <sip:192.168.48.74:5060;transport=udp;lr> Allow-Events: talk,hold,refer Accept: application/sdp Session-Expires: 90;refresher=uas [...] shortened SDP body >>>>>>>>>>>>>>>>>>>>>>>>>>>>>> kamailio.webrtc[338351]: WARNING: webrtc:tm [../../core/forward.h:204]: msg_send_buffer(): TCP/TLS connection for WebSocket could not be found kamailio.webrtc[338351]: WARNING: webrtc:tm [t_fwd.c:1586]: t_send_branch(): sending request on branch 0 failed kamailio.webrtc[338351]: WARNING: webrtc:<script>: Forwarding request failed ``` ### ~~Possible~~ Solutions Downgrade to 5.8.1 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3969 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3969(a)github.com>

3 15

[kamailio/kamailio] core: parser - use sip_parser_log (PR #3967)
by Lucian Balaceanu 09 Sep '24

09 Sep '24

Silencing messages that tend to appear when processing HEP.   #### 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) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3967 -- Commit Summary -- * core: parser - use sip_parser_log -- File Changes -- M src/core/parser/msg_parser.c (5) M src/core/parser/parse_hname2.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3967.patch https://github.com/kamailio/kamailio/pull/3967.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3967 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3967(a)github.com>

2 4

git:master:e6a3b355: core: parser - use sip_parser_log
by Lucian Balaceanu 09 Sep '24

09 Sep '24

Module: kamailio Branch: master Commit: e6a3b3554af01e5141ba063df408a06b28261927 URL: https://github.com/kamailio/kamailio/commit/e6a3b3554af01e5141ba063df408a06… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2024-09-09T14:01:48+03:00 core: parser - use sip_parser_log Silencing messages that tend to appear when processing HEP. --- Modified: src/core/parser/msg_parser.c Modified: src/core/parser/parse_hname2.c --- Diff: https://github.com/kamailio/kamailio/commit/e6a3b3554af01e5141ba063df408a06… Patch: https://github.com/kamailio/kamailio/commit/e6a3b3554af01e5141ba063df408a06… --- diff --git a/src/core/parser/msg_parser.c b/src/core/parser/msg_parser.c index a8504873073..3e094c50907 100644 --- a/src/core/parser/msg_parser.c +++ b/src/core/parser/msg_parser.c @@ -95,7 +95,7 @@ char *get_hdr_field( tmp = parse_hname(buf, end, hdr); if(hdr->type == HDR_ERROR_T) { - ERR("bad header\n"); + LOG(cfg_get(core, core_cfg, sip_parser_log), "bad header\n"); goto error; } @@ -336,7 +336,8 @@ int parse_headers( rest = get_hdr_field(tmp, end, hf); switch(hf->type) { case HDR_ERROR_T: - ERR("bad header field [%.*s]\n", + LOG(cfg_get(core, core_cfg, sip_parser_log), + "bad header field [%.*s]\n", (end - tmp > 100) ? 100 : (int)(end - tmp), tmp); goto error; case HDR_EOH_T: diff --git a/src/core/parser/parse_hname2.c b/src/core/parser/parse_hname2.c index e7d0792e988..49c62d3d181 100644 --- a/src/core/parser/parse_hname2.c +++ b/src/core/parser/parse_hname2.c @@ -278,7 +278,8 @@ char *parse_sip_header_name(char *const begin, const char *const end, if(*p != ' ' && *p != '\t') { /* no white space - bad header name format */ if(likely(logmode)) { - LM_ERR("invalid header name for [%.*s]\n", (int)(end - begin), + LOG(cfg_get(core, core_cfg, sip_parser_log), + "invalid header name for [%.*s]\n", (int)(end - begin), begin); } hdr->type = HDR_ERROR_T;

1 0

RFC: Support for icc or suncc compilers
by Daniel-Constantin Mierla 09 Sep '24

09 Sep '24

Hello, I was wondering if icc or suncc compilers are still used in the community, and by that if it still worth trying to support them via Makefiles and compile time flags (defines). Personally I haven't had to deal with them for more than 10-15 years, I have no access with a system offering them. Furthermore, I am not even sure if the code compiles with them. Maybe someone (or many) in the community use one or the other and confirm that they still worth to be kept. If not, maybe we can consider them for removing, it can be a good task to be done during Kamailio development meeting planned in Dusseldorf, Germany during November. Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services -- asipto.com Kamailio Advanced Training, October 8-10, 2024 -- asipto.com

1 0

cdp: Should "poll" be used instead of "select"?
by whliu＠citictel.com 09 Sep '24

09 Sep '24

Hi All, I am using kamailio 5.8.3 as IMS-PCSCF. It connects to PCRF and uses module. It is found that in module cdp, "select" is used in receiving message, which has a limitation in the value for file descriptor. It does not work if the value of fd is greater than 1023. Any idea on how to tackle the case when the value of fd is greater than 1023? Please advise. Thank you. Regards, Hong

1 0

git:master:c5c84099: core: dprint - add possibility to set the structured log function
by Daniel-Constantin Mierla 09 Sep '24

09 Sep '24

Module: kamailio Branch: master Commit: c5c84099fc29623c4f0b8faf9e6151eeaf4421c1 URL: https://github.com/kamailio/kamailio/commit/c5c84099fc29623c4f0b8faf9e6151e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-09T11:29:20+02:00 core: dprint - add possibility to set the structured log function --- Modified: src/core/dprint.c Modified: src/core/dprint.h --- Diff: https://github.com/kamailio/kamailio/commit/c5c84099fc29623c4f0b8faf9e6151e… Patch: https://github.com/kamailio/kamailio/commit/c5c84099fc29623c4f0b8faf9e6151e… --- diff --git a/src/core/dprint.c b/src/core/dprint.c index 83d1e30f3ca..f167fac0fc4 100644 --- a/src/core/dprint.c +++ b/src/core/dprint.c @@ -828,6 +828,14 @@ void ksr_slog_init(char *ename) } } +/** + * + */ +void km_slog_func_set(ksr_slog_f f) +{ + _ksr_slog_func = f; +} + static void log_callid_set(sip_msg_t *msg) { if(!(_ksr_slog_json_flags & KSR_SLOGJSON_FL_CALLID)) { diff --git a/src/core/dprint.h b/src/core/dprint.h index 13957b269c9..a72b297e194 100644 --- a/src/core/dprint.h +++ b/src/core/dprint.h @@ -112,7 +112,8 @@ /** * */ -typedef struct ksr_loglevels { +typedef struct ksr_loglevels +{ int ll_alert; int ll_bug; int ll_crit; @@ -123,8 +124,10 @@ typedef struct ksr_loglevels { int ll_dbg; } ksr_loglevels_t; -#define KSR_LOGLEVELS_DEFAULTS {L_ALERT, L_BUG, L_CRIT2, L_ERR, L_WARN, \ - L_NOTICE, L_INFO, L_DBG} +#define KSR_LOGLEVELS_DEFAULTS \ + { \ + L_ALERT, L_BUG, L_CRIT2, L_ERR, L_WARN, L_NOTICE, L_INFO, L_DBG \ + } /** * data fileds used for structured logging */ @@ -148,6 +151,7 @@ typedef void (*ksr_slog_f)(ksr_logdata_t *, const char *, ...); void ksr_slog_init(char *ename); extern ksr_slog_f _ksr_slog_func; +void km_slog_func_set(ksr_slog_f f); /** @brief my_pid(), process_no are from pt.h but we cannot \#include it here because of circular dependencies */ @@ -458,9 +462,9 @@ void log_prefix_init(void); #ifdef MOD_NAMEID -#define KSR_LLMODVAR_COMBINEZ(X,Y) X##Y -#define KSR_LLMODVAR_COMBINE(X,Y) KSR_LLMODVAR_COMBINEZ(X,Y) -#define KSR_LLMODVAR KSR_LLMODVAR_COMBINE(_ksr_loglevels_,MOD_NAMEID) +#define KSR_LLMODVAR_COMBINEZ(X, Y) X##Y +#define KSR_LLMODVAR_COMBINE(X, Y) KSR_LLMODVAR_COMBINEZ(X, Y) +#define KSR_LLMODVAR KSR_LLMODVAR_COMBINE(_ksr_loglevels_, MOD_NAMEID) /* use local log level mapping */ #define LLM_ALERT(fmt, args...) LOG(KSR_LLMODVAR.alert, fmt, ##args)

1 0

[kamailio/kamailio] New weighted distribution over hash algorithm for dispatcher module. (Issue #3916)
by Ben Kaufman 08 Sep '24

08 Sep '24

### Description Feature request/suggestion: Currently, the predicative hashing algorithm for dispatcher gives equal weight to all members of the set. It would be convenient to use the rweight attribute to allow something like [weighted rendezvous hashing](https://en.wikipedia.org/wiki/Rendezvous_hashing#Weighted_rendezvo… to provide weighted load balancing will still keeping correct routing for stateless messages (most specifically CANCELs). -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3916 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3916(a)github.com>

2 2

git:master:8a13a1d8: utils/kamctl: regenerate db table definitions
by Daniel-Constantin Mierla 06 Sep '24

06 Sep '24

Module: kamailio Branch: master Commit: 8a13a1d8301aa22baa9b3a52b891fd04a04c3768 URL: https://github.com/kamailio/kamailio/commit/8a13a1d8301aa22baa9b3a52b891fd0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-06T10:16:50+02:00 utils/kamctl: regenerate db table definitions --- Modified: utils/kamctl/db_sqlite/htable-create.sql Modified: utils/kamctl/mysql/htable-create.sql Modified: utils/kamctl/oracle/htable-create.sql Modified: utils/kamctl/postgres/htable-create.sql Modified: utils/kamctl/xhttp_pi/acc-mod Modified: utils/kamctl/xhttp_pi/alias_db-mod Modified: utils/kamctl/xhttp_pi/auth_db-mod Modified: utils/kamctl/xhttp_pi/avpops-mod Modified: utils/kamctl/xhttp_pi/carrierroute-mod Modified: utils/kamctl/xhttp_pi/cpl-mod Modified: utils/kamctl/xhttp_pi/dialog-mod Modified: utils/kamctl/xhttp_pi/dialplan-mod Modified: utils/kamctl/xhttp_pi/dispatcher-mod Modified: utils/kamctl/xhttp_pi/domain-mod Modified: utils/kamctl/xhttp_pi/domainpolicy-mod Modified: utils/kamctl/xhttp_pi/drouting-mod Modified: utils/kamctl/xhttp_pi/group-mod Modified: utils/kamctl/xhttp_pi/htable-mod Modified: utils/kamctl/xhttp_pi/imc-mod Modified: utils/kamctl/xhttp_pi/lcr-mod Modified: utils/kamctl/xhttp_pi/matrix-mod Modified: utils/kamctl/xhttp_pi/mohqueue-mod Modified: utils/kamctl/xhttp_pi/msilo-mod Modified: utils/kamctl/xhttp_pi/mtree-mod Modified: utils/kamctl/xhttp_pi/pdt-mod Modified: utils/kamctl/xhttp_pi/permissions-mod Modified: utils/kamctl/xhttp_pi/pi_framework.xml Modified: utils/kamctl/xhttp_pi/pipelimit-mod Modified: utils/kamctl/xhttp_pi/presence-mod Modified: utils/kamctl/xhttp_pi/purple-mod Modified: utils/kamctl/xhttp_pi/registrar-mod Modified: utils/kamctl/xhttp_pi/rls-mod Modified: utils/kamctl/xhttp_pi/rtpengine-mod Modified: utils/kamctl/xhttp_pi/rtpproxy-mod Modified: utils/kamctl/xhttp_pi/sca-mod Modified: utils/kamctl/xhttp_pi/secfilter-mod Modified: utils/kamctl/xhttp_pi/siptrace-mod Modified: utils/kamctl/xhttp_pi/speeddial-mod Modified: utils/kamctl/xhttp_pi/standard-mod Modified: utils/kamctl/xhttp_pi/topos-mod Modified: utils/kamctl/xhttp_pi/uac-mod Modified: utils/kamctl/xhttp_pi/uid_auth_db-mod Modified: utils/kamctl/xhttp_pi/uid_avp_db-mod Modified: utils/kamctl/xhttp_pi/uid_domain-mod Modified: utils/kamctl/xhttp_pi/uid_gflags-mod Modified: utils/kamctl/xhttp_pi/uid_uri_db-mod Modified: utils/kamctl/xhttp_pi/uri_db-mod Modified: utils/kamctl/xhttp_pi/userblocklist-mod Modified: utils/kamctl/xhttp_pi/usrloc-mod --- Diff: https://github.com/kamailio/kamailio/commit/8a13a1d8301aa22baa9b3a52b891fd0… Patch: https://github.com/kamailio/kamailio/commit/8a13a1d8301aa22baa9b3a52b891fd0…

1 0

git:master:12cdb896: lib/srdb1/schema: increase default size of columns for htable
by Daniel-Constantin Mierla 06 Sep '24

06 Sep '24

Module: kamailio Branch: master Commit: 12cdb896fed98a38bfd9b77e1ace1dd346901cc3 URL: https://github.com/kamailio/kamailio/commit/12cdb896fed98a38bfd9b77e1ace1dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-06T10:07:41+02:00 lib/srdb1/schema: increase default size of columns for htable - same type, version kept, code nca work with different size already --- Modified: src/lib/srdb1/schema/htable.xml --- Diff: https://github.com/kamailio/kamailio/commit/12cdb896fed98a38bfd9b77e1ace1dd… Patch: https://github.com/kamailio/kamailio/commit/12cdb896fed98a38bfd9b77e1ace1dd… --- diff --git a/src/lib/srdb1/schema/htable.xml b/src/lib/srdb1/schema/htable.xml index 9ee35d2fe71..ab60cc7fd3c 100644 --- a/src/lib/srdb1/schema/htable.xml +++ b/src/lib/srdb1/schema/htable.xml @@ -36,7 +36,7 @@ <column id="key_name"> <name>key_name</name> <type>string</type> - <size>64</size> + <size>256</size> <default/> <description>Name of the hash key</description> </column> @@ -58,7 +58,7 @@ <column id="attribute"> <name>key_value</name> <type>string</type> - <size>128</size> + <size>512</size> <default/> <description>The value of the key</description> </column>

1 0

[kamailio/kamailio] [htable] db_sql "key_value" length = 128 too small, what if change to 1024 ? (Issue #3944)
by gao114882 06 Sep '24

06 Sep '24

### Description  ### Expected behavior large "key_value" can store to db_sql。 #### Actual observed behavior the key_value = "{\"id\":1,\"in_port\":\"5263\",\"in_ptl\":\"udp\",\"rate_limit\":\"\",\"out_port\":\"5262\",\"out_ptl\":\"udp\",\"mode\":2,\"proxied_ip\":\"172.16.4.114\",\"proxied_port\":\"5080\",\"in_gateway_ip\":\"116.198.229.196\",\"in_gateway_port\":\"5080\",\"black_list\":{\"ip\":[\"127.0.0.1\"],\"user\":[]},\"white_list\":{\"ip\":[\"127.0.0.1\"],\"user\":[]},\"called_prefix\":[{\"match_num\":\"\",\"caller_rule\":{\"start_pos\":0,\"length\":2,\"new_num\":\"\",\"type\":2},\"called_rule\":{\"start_pos\":0,\"length\":0,\"new_num\":\"\",\"type\":0}}],\"caller_prefix\":[{\"match_num\":\"\",\"caller_rule\":{\"start_pos\":0,\"length\":2,\"new_num\":\"\",\"type\":1},\"called_rule\":{\"start_pos\":0,\"length\":0,\"new_num\":\"\",\"type\":0}}]}" <img width="913" alt="企业微信截图_17234562508919" src="https://github.com/user-attachments/assets/ab0acd4b-980a-4dc5-95b3-8e8afb7a…"> #### Debugging Data ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.8.2 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_SEND_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: compiled on 11:50:37 Aug 9 2024 with gcc 4.8.5 ``` * **Operating System**:  ``` (paste your output here) ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3944 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3944(a)github.com>

2 2

git:master:60165196: registrar: safety check for uri and remove duplicated aor extract
by Daniel-Constantin Mierla 05 Sep '24

05 Sep '24

Module: kamailio Branch: master Commit: 60165196ad3144597c24eb9f7bb7fb0cd56f8c25 URL: https://github.com/kamailio/kamailio/commit/60165196ad3144597c24eb9f7bb7fb0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-05T11:28:08+02:00 registrar: safety check for uri and remove duplicated aor extract - follow up of changes from previous commit --- Modified: src/modules/registrar/save.c --- Diff: https://github.com/kamailio/kamailio/commit/60165196ad3144597c24eb9f7bb7fb0… Patch: https://github.com/kamailio/kamailio/commit/60165196ad3144597c24eb9f7bb7fb0… --- diff --git a/src/modules/registrar/save.c b/src/modules/registrar/save.c index 4bd4a1505a1..1f5b7e0acbd 100644 --- a/src/modules/registrar/save.c +++ b/src/modules/registrar/save.c @@ -936,7 +936,7 @@ int save(struct sip_msg *_m, udomain_t *_d, int _cflags, str *_uri) int novariation = 0; - if(_uri->len > 0) { + if(_uri != NULL && _uri->len > 0) { if(extract_aor(_uri, &aor, &turi) < 0) { LM_ERR("failed to extract Address Of Record\n"); return -1; @@ -1043,11 +1043,6 @@ int save(struct sip_msg *_m, udomain_t *_d, int _cflags, str *_uri) get_act_time(); c = get_first_contact(_m); - if(extract_aor((_uri) ? _uri : &get_to(_m)->uri, &aor, NULL) < 0) { - LM_ERR("failed to extract Address Of Record\n"); - goto error; - } - mem_only = is_cflag_set(REG_SAVE_MEM_FL) ? FL_MEM : FL_NONE; novariation = is_cflag_set(REG_SAVE_NOVARIATION_FL) ? 1 : 0; @@ -1118,7 +1113,7 @@ int unregister(struct sip_msg *_m, udomain_t *_d, str *_uri, str *_ruid) if(_ruid == NULL || _ruid->len <= 0) { /* No ruid provided - remove all contacts for aor */ - if(_uri->len > 0) { + if(_uri != NULL && _uri->len > 0) { if(extract_aor(_uri, &aor, &turi) < 0) { LM_ERR("failed to extract Address Of Record\n"); return -1; @@ -1142,9 +1137,7 @@ int unregister(struct sip_msg *_m, udomain_t *_d, str *_uri, str *_ruid) } } else { /* ruid provided - remove a specific contact */ - - if(_uri->len > 0) { - + if(_uri != NULL && _uri->len > 0) { if(extract_aor(_uri, &aor, NULL) < 0) { LM_ERR("failed to extract Address Of Record\n"); return -1; @@ -1162,9 +1155,7 @@ int unregister(struct sip_msg *_m, udomain_t *_d, str *_uri, str *_ruid) return -2; } _reg_ul.unlock_udomain(_d, &aor); - } else { - res = _reg_ul.delete_urecord_by_ruid(_d, _ruid); switch(res) { case -1:

1 0

[kamailio/kamailio] Kamailio 5.8.3 breaks IPv6 endpoints (Issue #3968)
by Sebastian Damm 05 Sep '24

05 Sep '24

### Description  We are running Kamailio in front of a backend farm, REGISTERs go directly to the backend. After registration, the backend sends out OPTIONS requests periodically. This worked with 5.8.2. Now when running a 5.8.3 server (taken from your apt repository), I get the following errors in the log: ``` Sep 04 14:41:36 sipproxy /usr/sbin/kamailio[124]: ERROR: tm [ut.h:235]: uri2dst2(): bad_uri: [sip:[[2001:16e0:affe:affe:24a2:55a2:15bf:23d1]]:59580;transport=tls] Sep 04 14:41:36 sipproxy /usr/sbin/kamailio[124]: ERROR: tm [t_fwd.c:1764]: t_forward_nonack(): failure to add branches ``` There are extra square brackets in the URI. I compared the REGISTERs from old and new Kamailio to the backend, and also the OPTIONS packets sent by the backend, the are identical except for the obvious differences. ### Troubleshooting #### Reproduction  * Have a Kamailio with nathelper enabled. * Do something like this for nat detection: ``` def ksr_route_natdetect(self, msg): KSR.force_rport() # Checks if request goes to backend or not if not msg.is_internal_message(): KSR.setbflag(FLB_NATB) KSR.setflag(FLT_NATS) if KSR.textops.is_present_hf("Contact") > 0: if KSR.nathelper.set_contact_alias() < 0: msg.log("Error in aliasing contact") KSR.sl.sl_send_reply(400,"Bad request") return False else: if msg.is_request(): KSR.nathelper.handle_ruri_alias() return 1 ``` * register a phone to the backend (e.g. an Asterisk server) * send an OPTIONS packet from the backend to the registered device. #### SIP The REGISTER from Kamailio to the backend looks like this: ``` REGISTER sip:domain;transport=tcp SIP/2.0 Via: SIP/2.0/TCP 100.74.11.1:5063;branch=z9hG4bK6c3e.2cedb59e7724d263255c1996d9d2d4fa.0;i=6 Via: SIP/2.0/TLS [2001:16e0:affe:affe:24a2:55a2:15bf:23d1]:61391;received=2001:16e0:affe:affe:24a2:55a2:15bf:23d1;rport=61391;branch=z9hG4bKPjAB7F905A-A6A2-491D-A456-89C8FD4C5183;alias Max-Forwards: 69 From: <sip:dZmIQyb70tzt2J9@sdammone>;tag=AAA80708-4968-4B49-95B8-7DBCEFCC5E62 To: <sip:dZmIQyb70tzt2J9@sdammone> Call-ID: 4922AA11-F4BA-49D0-AE64-EECF49735684 CSeq: 44208 REGISTER User-Agent: foobar Supported: outbound, path Contact: <sip:dZmIQyb70tzt2J9@[2001:16e0:affe:affe:24a2:55a2:15bf:23d1]:61391;transport=TLS;p-xs=6eb17056fba34ce6bc7d458a1a7a80ba;ob;alias=[2001:16e0:affe:affe:24a2:55a2:15bf:23d1]~61391~3>;reg-id=1;+sip.instance="<urn:uuid:00000000-0000-0000-0000-00000c73bfc6>" Expires: 300 Allow: PRACK, INVITE, ACK, BYE, CANCEL, UPDATE, INFO, SUBSCRIBE, NOTIFY, REFER, MESSAGE, OPTIONS Content-Length: 0 Path: <sip:100.74.11.1:5063;transport=tcp;lr;xep=true> ``` The OPTIONS packet from backend to the client looks like this: ``` OPTIONS sip:dZmIQyb70tzt2J9@[2001:16e0:affe:affe:24a2:55a2:15bf:23d1]:61391;transport=TLS;p-xs=6eb17056fba34ce6bc7d458a1a7a80ba;ob;alias=[2001:16e0:affe:affe:24a2:55a2:15bf:23d1]~61391~3 SIP/2.0 Via: SIP/2.0/TCP 100.74.130.66:5060;rport;branch=z9hG4bKPj3e558221-2506-4a2b-9daa-ff7e73d05e8c;alias From: <sip:dZmIQyb70tzt2J9@sdammone>;tag=18c9809a-4775-4c35-8e88-5c5a7bdcf1fe To: <sip:dZmIQyb70tzt2J9@[2001:16e0:affe:affe:24a2:55a2:15bf:23d1];p-xs=6eb17056fba34ce6bc7d458a1a7a80ba;ob;alias=[2001:16e0:affe:affe:24a2:55a2:15bf:23d1]~61391~3> Contact: <sip:dZmIQyb70tzt2J9@100.74.130.66:5060;transport=TCP> Call-ID: 2e1efbd3-9366-4542-b909-83429266b6ef CSeq: 2989 OPTIONS Supported: path Route: <sip:100.74.11.1:5063;transport=tcp;lr;xep=true> Max-Forwards: 70 User-Agent: barfoo Content-Length: 0 ``` #### Log Messages ``` Sep 04 14:41:36 sipproxy /usr/sbin/kamailio[124]: ERROR: tm [ut.h:235]: uri2dst2(): bad_uri: [sip:[[2001:16e0:affe:affe:24a2:55a2:15bf:23d1]]:59580;transport=tls] Sep 04 14:41:36 sipproxy /usr/sbin/kamailio[124]: ERROR: tm [t_fwd.c:1764]: t_forward_nonack(): failure to add branches ``` ### Possible Solutions Downgrading to 5.8.2 again works. I suppose, the problem comes from this commit by @vingarzan: https://github.com/kamailio/kamailio/commit/52ab6f3dcf5ad8d967be8bdecaa64ef… ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.8.3 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_SEND_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 11.4.0 ``` * **Operating System**:  ``` Ubuntu Jammy ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3968 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3968(a)github.com>

3 6

git:5.8:be1fe948: nathelper: add_contact_alias() with parameters to enclose ipv6 in square brackets
by Daniel-Constantin Mierla 05 Sep '24

05 Sep '24

Module: kamailio Branch: 5.8 Commit: be1fe948b188ba84ec542e5622377d3772463e5b URL: https://github.com/kamailio/kamailio/commit/be1fe948b188ba84ec542e5622377d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-05T09:44:37+02:00 nathelper: add_contact_alias() with parameters to enclose ipv6 in square brackets - the add_contact_alias() without parameters was doing it already - discovered while investigating GH #3968 (cherry picked from commit 744e5ac9678c0c9ef07bfb0de44c7c478a2debdc) --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/be1fe948b188ba84ec542e5622377d3… Patch: https://github.com/kamailio/kamailio/commit/be1fe948b188ba84ec542e5622377d3… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 9ee73e62a21..99904557847 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -998,6 +998,8 @@ static int add_contact_alias_3( struct lump *anchor; struct sip_uri uri; char *bracket, *lt, *param, *at, *start; + int is_ipv6 = 0; + int i; /* Do nothing if Contact header does not exist */ if(!msg->contact) { @@ -1058,8 +1060,8 @@ static int add_contact_alias_3( } /* Create ;alias param */ - param_len = _ksr_contact_salias.len + IP6_MAX_STR_SIZE - + 1 /* ~ */ + 5 /* port */ + param_len = _ksr_contact_salias.len + 1 /* [ */ + IP6_MAX_STR_SIZE + + 1 /* ] */ + 1 /* ~ */ + 5 /* port */ + 1 /* ~ */ + 1 /* proto */ + 1 /* closing > */; param = (char *)pkg_malloc(param_len); if(!param) { @@ -1068,8 +1070,20 @@ static int add_contact_alias_3( } at = param; /* ip address */ + for(i = 0; i < ip_str->len; i++) { + if(ip_str->s[i] == ':') { + is_ipv6 = 1; + break; + } + } + if(is_ipv6 && ip_str->s[0] != '[') { + append_chr(at, '['); + } append_str(at, _ksr_contact_salias.s, _ksr_contact_salias.len); append_str(at, ip_str->s, ip_str->len); + if(is_ipv6 && ip_str->s[0] != '[') { + append_chr(at, ']'); + } /* port */ append_chr(at, '~'); append_str(at, port_str->s, port_str->len);

1 0

git:master:aa794581: core: try to lookup connection for WSS when TCPCONN_MATCH_STRICT is set
by Daniel-Constantin Mierla 05 Sep '24

05 Sep '24

Module: kamailio Branch: master Commit: aa794581ecf105b5313d2f5b8bcfe516ab337936 URL: https://github.com/kamailio/kamailio/commit/aa794581ecf105b5313d2f5b8bcfe51… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-05T09:01:52+02:00 core: try to lookup connection for WSS when TCPCONN_MATCH_STRICT is set - URIs have always transport ws, but most likely the connection is wss - GH #3969 --- Modified: src/core/forward.h --- Diff: https://github.com/kamailio/kamailio/commit/aa794581ecf105b5313d2f5b8bcfe51… Patch: https://github.com/kamailio/kamailio/commit/aa794581ecf105b5313d2f5b8bcfe51… --- diff --git a/src/core/forward.h b/src/core/forward.h index 31086c6512b..8d96e4df5cb 100644 --- a/src/core/forward.h +++ b/src/core/forward.h @@ -137,6 +137,7 @@ static inline int msg_send_buffer( union sockaddr_union local_addr; struct tcp_connection *con = NULL; struct ws_event_info wsev; + int dproto; int ret; #endif @@ -192,9 +193,21 @@ static inline int msg_send_buffer( if(likely(port)) { su2ip_addr(&ip, &dst->to); if(tcp_connection_match == TCPCONN_MATCH_STRICT) { + /* lookup first for WSS, because transport=ws is in URI, + * but WS is less likely */ + if(dst->proto == PROTO_WSS || dst->proto == PROTO_WS) { + dproto = PROTO_WSS; + } else { + dproto = dst->proto; + } con = tcpconn_lookup(dst->id, &ip, port, from, (dst->send_sock) ? dst->send_sock->port_no : 0, 0, - dst->proto); + dproto); + if(con == NULL && dst->proto == PROTO_WS) { + con = tcpconn_lookup(dst->id, &ip, port, from, + (dst->send_sock) ? dst->send_sock->port_no : 0, 0, + PROTO_WS); + } } else { con = tcpconn_get(dst->id, &ip, port, from, 0); }

1 0

git:master:744e5ac9: nathelper: add_contact_alias() with parameters to enclose ipv6 in square brackets
by Daniel-Constantin Mierla 04 Sep '24

04 Sep '24

Module: kamailio Branch: master Commit: 744e5ac9678c0c9ef07bfb0de44c7c478a2debdc URL: https://github.com/kamailio/kamailio/commit/744e5ac9678c0c9ef07bfb0de44c7c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-04T19:36:34+02:00 nathelper: add_contact_alias() with parameters to enclose ipv6 in square brackets - the add_contact_alias() without parameters was doing it already - discovered while investigating GH #3968 --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/744e5ac9678c0c9ef07bfb0de44c7c4… Patch: https://github.com/kamailio/kamailio/commit/744e5ac9678c0c9ef07bfb0de44c7c4… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 1188dbeb04b..bf4b3b21893 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -998,6 +998,8 @@ static int add_contact_alias_3( struct lump *anchor; struct sip_uri uri; char *bracket, *lt, *param, *at, *start; + int is_ipv6 = 0; + int i; /* Do nothing if Contact header does not exist */ if(!msg->contact) { @@ -1058,8 +1060,8 @@ static int add_contact_alias_3( } /* Create ;alias param */ - param_len = _ksr_contact_salias.len + IP6_MAX_STR_SIZE - + 1 /* ~ */ + 5 /* port */ + param_len = _ksr_contact_salias.len + 1 /* [ */ + IP6_MAX_STR_SIZE + + 1 /* ] */ + 1 /* ~ */ + 5 /* port */ + 1 /* ~ */ + 1 /* proto */ + 1 /* closing > */; param = (char *)pkg_malloc(param_len); if(!param) { @@ -1068,8 +1070,20 @@ static int add_contact_alias_3( } at = param; /* ip address */ + for(i = 0; i < ip_str->len; i++) { + if(ip_str->s[i] == ':') { + is_ipv6 = 1; + break; + } + } + if(is_ipv6 && ip_str->s[0] != '[') { + append_chr(at, '['); + } append_str(at, _ksr_contact_salias.s, _ksr_contact_salias.len); append_str(at, ip_str->s, ip_str->len); + if(is_ipv6 && ip_str->s[0] != '[') { + append_chr(at, ']'); + } /* port */ append_chr(at, '~'); append_str(at, port_str->s, port_str->len);

1 0

git:5.8:3c89405e: nathelper: check if alias ipv6 has already square brackets
by Daniel-Constantin Mierla 04 Sep '24

04 Sep '24

Module: kamailio Branch: 5.8 Commit: 3c89405ed74152fd59365ad7dacb144092f5516a URL: https://github.com/kamailio/kamailio/commit/3c89405ed74152fd59365ad7dacb144… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-04T18:58:00+02:00 nathelper: check if alias ipv6 has already square brackets - GH #3968 (cherry picked from commit 6e01172a138d395fa3f7c3f25238647934137dba) --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/3c89405ed74152fd59365ad7dacb144… Patch: https://github.com/kamailio/kamailio/commit/3c89405ed74152fd59365ad7dacb144… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 9c0bebad3a7..9ee73e62a21 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1140,6 +1140,7 @@ static int ki_handle_ruri_alias_mode(struct sip_msg *msg, int mode) *trans, *start; unsigned int len, rest_len, val_len, alias_len, proto_type, cur_uri_len, ip_len, ip_port_len, port_len, i; + int is_ipv6 = 0; if(parse_sip_msg_uri(msg) < 0) { LM_ERR("while parsing Request-URI\n"); @@ -1188,7 +1189,6 @@ static int ki_handle_ruri_alias_mode(struct sip_msg *msg, int mode) // IPv6 needs some [] added when composing a SIP URI, which further // complicates this code. ip_len = port - val; - int is_ipv6 = 0; for(i = 0; i < ip_len; i++) { if(val[i] == ':') { is_ipv6 = 1; @@ -1206,7 +1206,7 @@ static int ki_handle_ruri_alias_mode(struct sip_msg *msg, int mode) append_str(at, "sip:", 4); ip_port_len = trans - val; alias_len = _ksr_contact_salias.len + ip_port_len + 2 /* ~n */; - if(is_ipv6) { + if(is_ipv6 && val[0] != '[') { // IPv6 - add '[' ']' around IP // then append ':' and copy the port append_chr(at, '[');

1 0

git:master:6e01172a: nathelper: check if alias ipv6 has already square brackets
by Daniel-Constantin Mierla 04 Sep '24

04 Sep '24

Module: kamailio Branch: master Commit: 6e01172a138d395fa3f7c3f25238647934137dba URL: https://github.com/kamailio/kamailio/commit/6e01172a138d395fa3f7c3f25238647… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-04T18:54:22+02:00 nathelper: check if alias ipv6 has already square brackets - GH #3968 --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/6e01172a138d395fa3f7c3f25238647… Patch: https://github.com/kamailio/kamailio/commit/6e01172a138d395fa3f7c3f25238647… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 3c829709c0f..1188dbeb04b 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1140,6 +1140,7 @@ static int ki_handle_ruri_alias_mode(struct sip_msg *msg, int mode) *trans, *start; unsigned int len, rest_len, val_len, alias_len, proto_type, cur_uri_len, ip_len, ip_port_len, port_len, i; + int is_ipv6 = 0; if(parse_sip_msg_uri(msg) < 0) { LM_ERR("while parsing Request-URI\n"); @@ -1188,7 +1189,6 @@ static int ki_handle_ruri_alias_mode(struct sip_msg *msg, int mode) // IPv6 needs some [] added when composing a SIP URI, which further // complicates this code. ip_len = port - val; - int is_ipv6 = 0; for(i = 0; i < ip_len; i++) { if(val[i] == ':') { is_ipv6 = 1; @@ -1206,7 +1206,7 @@ static int ki_handle_ruri_alias_mode(struct sip_msg *msg, int mode) append_str(at, "sip:", 4); ip_port_len = trans - val; alias_len = _ksr_contact_salias.len + ip_port_len + 2 /* ~n */; - if(is_ipv6) { + if(is_ipv6 && val[0] != '[') { // IPv6 - add '[' ']' around IP // then append ':' and copy the port append_chr(at, '[');

1 0

git:master:21e2d966: registrar: use parsed uri parameter when provided for save()
by Daniel-Constantin Mierla 04 Sep '24

04 Sep '24

Module: kamailio Branch: master Commit: 21e2d96672ccbe65eebdf64f839a1ce465a11b7c URL: https://github.com/kamailio/kamailio/commit/21e2d96672ccbe65eebdf64f839a1ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-04T13:02:19+02:00 registrar: use parsed uri parameter when provided for save() - instead of to-uri, aor being built from uri parameter --- Modified: src/modules/registrar/save.c --- Diff: https://github.com/kamailio/kamailio/commit/21e2d96672ccbe65eebdf64f839a1ce… Patch: https://github.com/kamailio/kamailio/commit/21e2d96672ccbe65eebdf64f839a1ce… --- diff --git a/src/modules/registrar/save.c b/src/modules/registrar/save.c index 2e25c8e000a..4bd4a1505a1 100644 --- a/src/modules/registrar/save.c +++ b/src/modules/registrar/save.c @@ -926,6 +926,7 @@ int save(struct sip_msg *_m, udomain_t *_d, int _cflags, str *_uri) str aor; int ret; sip_uri_t *u; + sip_uri_t turi; rr_t *route; struct sip_uri puri; param_hooks_t hooks; @@ -935,7 +936,23 @@ int save(struct sip_msg *_m, udomain_t *_d, int _cflags, str *_uri) int novariation = 0; - u = parse_to_uri(_m); + if(_uri->len > 0) { + if(extract_aor(_uri, &aor, &turi) < 0) { + LM_ERR("failed to extract Address Of Record\n"); + return -1; + } + u = &turi; + } else { + u = parse_to_uri(_m); + if(u == NULL) { + LM_ERR("failed to extract Address Of Record\n"); + return -1; + } + if(extract_aor(&(get_to(_m)->uri), &aor, NULL) < 0) { + LM_ERR("failed to extract Address Of Record\n"); + return -1; + } + } if(u == NULL) goto error;

1 0

git:master:29686758: auth_xkey: use memcpy() instead of strncpy()
by Daniel-Constantin Mierla 04 Sep '24

04 Sep '24

Module: kamailio Branch: master Commit: 29686758e1ce51abb8d8dd5bebb0d7fa1a019dc6 URL: https://github.com/kamailio/kamailio/commit/29686758e1ce51abb8d8dd5bebb0d7f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-04T12:43:59+02:00 auth_xkey: use memcpy() instead of strncpy() --- Modified: src/modules/auth_xkeys/auth_xkeys.c --- Diff: https://github.com/kamailio/kamailio/commit/29686758e1ce51abb8d8dd5bebb0d7f… Patch: https://github.com/kamailio/kamailio/commit/29686758e1ce51abb8d8dd5bebb0d7f… --- diff --git a/src/modules/auth_xkeys/auth_xkeys.c b/src/modules/auth_xkeys/auth_xkeys.c index 9f63ed7b993..a89faa4ce31 100644 --- a/src/modules/auth_xkeys/auth_xkeys.c +++ b/src/modules/auth_xkeys/auth_xkeys.c @@ -250,10 +250,10 @@ int auth_xkeys_add(sip_msg_t *msg, str *hdr, str *key, str *alg, str *data) return -1; } - strncpy(xdata.s, hdr->s, hdr->len); + memcpy(xdata.s, hdr->s, hdr->len); xdata.s[hdr->len] = ':'; xdata.s[hdr->len + 1] = ' '; - strncpy(xdata.s + hdr->len + 2, xout, xdata.len); + memcpy(xdata.s + hdr->len + 2, xout, xdata.len); xdata.len += hdr->len + 2; xdata.s[xdata.len] = '\r'; xdata.s[xdata.len + 1] = '\n';

1 0

Kamailio v5.8.3 Released
by Daniel-Constantin Mierla 04 Sep '24

04 Sep '24

Hello, Kamailio SIP Server v5.8.3 stable release is out. This is a maintenance release of the latest stable branch, 5.8, that includes fixes since the release of v5.8.2. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.8.x. Deployments running previous v5.8.x versions are strongly recommended to be upgraded to v5.8.3. For more details about version 5.8.3 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2024/09/kamailio-v5-8-3-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services -- asipto.com Kamailio Advanced Training, October 8-10, 2024 -- asipto.com

1 0

git:5.8:6f8a04e8: ChangeLog: content updated for v5.8.3
by Daniel-Constantin Mierla 04 Sep '24

04 Sep '24

Module: kamailio Branch: 5.8 Commit: 6f8a04e8b05cf014ac2ac6b54103420f5da051eb URL: https://github.com/kamailio/kamailio/commit/6f8a04e8b05cf014ac2ac6b54103420… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-04T10:51:34+02:00 ChangeLog: content updated for v5.8.3 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/6f8a04e8b05cf014ac2ac6b54103420… Patch: https://github.com/kamailio/kamailio/commit/6f8a04e8b05cf014ac2ac6b54103420…

1 0

git:5.8:38b407b3: pkg/kamailio: version set 5.8.3 for rpms and alpine
by Daniel-Constantin Mierla 04 Sep '24

04 Sep '24

Module: kamailio Branch: 5.8 Commit: 38b407b353131b74032892e6eb0269731d00145f URL: https://github.com/kamailio/kamailio/commit/38b407b353131b74032892e6eb02697… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-04T09:49:20+02:00 pkg/kamailio: version set 5.8.3 for rpms and alpine --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/38b407b353131b74032892e6eb02697… Patch: https://github.com/kamailio/kamailio/commit/38b407b353131b74032892e6eb02697… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index f68763c8c3a..885ba533674 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.8.2 +pkgver=5.8.3 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 53831a5d27b..17a91dde0f2 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.8.2 +%define ver 5.8.3 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

git:5.8:6b0e0e0d: Makefile.defs: version set to 5.8.3
by Daniel-Constantin Mierla 04 Sep '24

04 Sep '24

Module: kamailio Branch: 5.8 Commit: 6b0e0e0dd0415077371a45a63dc00b13f9611d7e URL: https://github.com/kamailio/kamailio/commit/6b0e0e0dd0415077371a45a63dc00b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-04T09:49:20+02:00 Makefile.defs: version set to 5.8.3 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/6b0e0e0dd0415077371a45a63dc00b1… Patch: https://github.com/kamailio/kamailio/commit/6b0e0e0dd0415077371a45a63dc00b1… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 07fa021aa59..9f8ee168eef 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,8 +106,8 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 8 -SUBLEVEL = 2 -EXTRAVERSION = +SUBLEVEL = 3 +EXTRAVERSION = # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:5.8:abedff80: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 04 Sep '24

04 Sep '24

Module: kamailio Branch: 5.8 Commit: abedff80d532b3b9896ff46fd28e1c9a68da0702 URL: https://github.com/kamailio/kamailio/commit/abedff80d532b3b9896ff46fd28e1c9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-09-04T09:46:17+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/abedff80d532b3b9896ff46fd28e1c9… Patch: https://github.com/kamailio/kamailio/commit/abedff80d532b3b9896ff46fd28e1c9… --- diff --git a/src/modules/secsipid/README b/src/modules/secsipid/README index 5883eaa100c..53e8e86c358 100644 --- a/src/modules/secsipid/README +++ b/src/modules/secsipid/README @@ -472,12 +472,9 @@ request_route { The module needs "secsipdi_proc.so" module that depends on "libsecsipid", which is a component of "sipsecidx" project from https://github.com/asipto/secsipidx/. The library is implemented in Go - language, with generated C API and library. Until the libsecsipid is - going to be packaged in OS distributions, the secsipid_proc module can - be compiled by copying secsipid.h libsecsipid.h and libsecsipid.a files - in the folder of the module. + language, with generated C API and library. - To generate the libsecsipid.a file, it requires to have Go language + To generate the libsecsipid files, it requires to have Go language installed and its environment configured, then run the following commands: @@ -486,9 +483,8 @@ request_route { export GO111MODULE=off go get https://github.com/asipto/secsipidx cd $GOPATH/src/github.com/asipto/secsipidx/csecsipid/ -make liba -cp secsipid.h libsecsipid.h libsecsipid.a \ - /path/to/kamailio/src/modules/secsipid_proc/ +make all +make install cd /path/to/kamailio/ make include_modules="secsipid secsipid_proc ..." cfg

1 0

git:master:637d53ff: tls: improvement to openssl version output and FIPS mode logging
by Henning Westerholt 04 Sep '24

04 Sep '24

Module: kamailio Branch: master Commit: 637d53ff2e02273fe35901a42d021c976467514b URL: https://github.com/kamailio/kamailio/commit/637d53ff2e02273fe35901a42d021c9… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-09-04T07:37:56Z tls: improvement to openssl version output and FIPS mode logging - output numerical openssl version also for openssl 3.x for easier comparison - change log level for deactivated FIPS mode to DBG, as its rarely used --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/637d53ff2e02273fe35901a42d021c9… Patch: https://github.com/kamailio/kamailio/commit/637d53ff2e02273fe35901a42d021c9… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 84d9ff33412..b247b336900 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -494,13 +494,14 @@ static int mod_init(void) #if OPENSSL_VERSION_NUMBER < 0x030000000L LM_INFO("compiled with OpenSSL version: %08x\n", (uint32_t)(OPENSSL_VERSION_NUMBER)); #elif OPENSSL_VERSION_NUMBER >= 0x030000000L - LM_INFO("compiled with OpenSSL: %s\n", OPENSSL_VERSION_TEXT); + LM_INFO("compiled with OpenSSL version: %08x\n", (uint32_t)(OPENSSL_VERSION_NUMBER)); + LM_INFO("compile-time OpenSSL library: %s\n", OPENSSL_VERSION_TEXT); LM_INFO("run-time OpenSSL library: %s\n", OpenSSL_version(OPENSSL_VERSION)); if(EVP_default_properties_is_fips_enabled(NULL) == 1) { LM_INFO("FIPS mode enabled in OpenSSL library\n"); } else { - LM_INFO("FIPS mode not enabled in OpenSSL library\n"); + LM_DBG("FIPS mode not enabled in OpenSSL library\n"); } #endif

1 0

git:5.8:4f891e53: secsipid: docs update about libsecsipid installation
by Daniel-Constantin Mierla 04 Sep '24

04 Sep '24

Module: kamailio Branch: 5.8 Commit: 4f891e5343ba74b4ca459285438c2a064a363a60 URL: https://github.com/kamailio/kamailio/commit/4f891e5343ba74b4ca459285438c2a0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-04T09:38:48+02:00 secsipid: docs update about libsecsipid installation (cherry picked from commit 7abbc93d8db807077ca2afc10b026be0835f4b65) --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4f891e5343ba74b4ca459285438c2a0… Patch: https://github.com/kamailio/kamailio/commit/4f891e5343ba74b4ca459285438c2a0… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index 7ea74f525a0..647afb0da93 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -503,13 +503,10 @@ request_route { The module needs "secsipdi_proc.so" module that depends on "libsecsipid", which is a component of "sipsecidx" project from https://github.com/asipto/secsipidx/. The library is - implemented in Go language, with generated C API and library. Until the - libsecsipid is going to be packaged in OS distributions, the secsipid_proc - module can be compiled by copying secsipid.h libsecsipid.h and libsecsipid.a - files in the folder of the module. + implemented in Go language, with generated C API and library. </para> <para> - To generate the libsecsipid.a file, it requires to have Go language + To generate the libsecsipid files, it requires to have Go language installed and its environment configured, then run the following commands: </para> <example> @@ -519,9 +516,8 @@ request_route { export GO111MODULE=off go get https://github.com/asipto/secsipidx cd $GOPATH/src/github.com/asipto/secsipidx/csecsipid/ -make liba -cp secsipid.h libsecsipid.h libsecsipid.a \ - /path/to/kamailio/src/modules/secsipid_proc/ +make all +make install cd /path/to/kamailio/ make include_modules="secsipid secsipid_proc ..." cfg

1 0

git:5.8:60423dbe: http_client: clang-format
by Daniel-Constantin Mierla 04 Sep '24

04 Sep '24

Module: kamailio Branch: 5.8 Commit: 60423dbe90d3603fa98e0aaf161b7bef7f8b2a23 URL: https://github.com/kamailio/kamailio/commit/60423dbe90d3603fa98e0aaf161b7be… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-04T09:38:48+02:00 http_client: clang-format (cherry picked from commit fde8bd21dca9c8b45b314b04b21f742363f028b1) --- Modified: src/modules/http_client/curlcon.c --- Diff: https://github.com/kamailio/kamailio/commit/60423dbe90d3603fa98e0aaf161b7be… Patch: https://github.com/kamailio/kamailio/commit/60423dbe90d3603fa98e0aaf161b7be… --- diff --git a/src/modules/http_client/curlcon.c b/src/modules/http_client/curlcon.c index 2b5a69fcddd..16dfb6cc09b 100644 --- a/src/modules/http_client/curlcon.c +++ b/src/modules/http_client/curlcon.c @@ -861,17 +861,16 @@ void curl_conn_list_fixup(void) { curl_con_t *cc; cc = _curl_con_root; - while (cc) { - if (!(timeout_mode == 1 || timeout_mode == 2)) { + while(cc) { + if(!(timeout_mode == 1 || timeout_mode == 2)) { /* Timeout is disabled globally. Set timeout to 0 for all connections to reflect this. */ - if (cc->timeout > 0) { + if(cc->timeout > 0) { LM_WARN("curl connection [%.*s]: configured timeout is ignored " - "because timeouts are disabled (timeout_mode)\n", - cc->name.len, cc->name.s); + "because timeouts are disabled (timeout_mode)\n", + cc->name.len, cc->name.s); cc->timeout = 0; } - } - else if (cc->timeout == 0) { + } else if(cc->timeout == 0) { /* Timeout is not configured for that connection. * Use as default global connection_timeout (which can be seconds or milliseconds). */

1 0

git:5.8:6ee9bc2f: sca: remove function name from log message
by Daniel-Constantin Mierla 04 Sep '24

04 Sep '24

Module: kamailio Branch: 5.8 Commit: 6ee9bc2f34f9b20b576510e2e81a96bbfcc5a3be URL: https://github.com/kamailio/kamailio/commit/6ee9bc2f34f9b20b576510e2e81a96b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-04T09:38:48+02:00 sca: remove function name from log message (cherry picked from commit 4a57efa0f7ed2560420e10d0fe70037a14a12c12) --- Modified: src/modules/sca/sca_subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/6ee9bc2f34f9b20b576510e2e81a96b… Patch: https://github.com/kamailio/kamailio/commit/6ee9bc2f34f9b20b576510e2e81a96b… --- diff --git a/src/modules/sca/sca_subscribe.c b/src/modules/sca/sca_subscribe.c index 895141e1e25..9e212f01e2c 100644 --- a/src/modules/sca/sca_subscribe.c +++ b/src/modules/sca/sca_subscribe.c @@ -1306,8 +1306,7 @@ int ki_sca_handle_subscribe(sip_msg_t *msg) released = sca_appearance_owner_release_all( &req_sub.target_aor, &req_sub.subscriber); if(released) { - LM_INFO("sca_handle_subscribe: released %d appearances " - "for subscriber %.*s\n", + LM_INFO("released %d appearances for subscriber %.*s\n", released, STR_FMT(&req_sub.subscriber)); } }

1 0

Re: [kamailio/kamailio] tls: extend startup information for OpenSSL library (0420809)
by Daniel-Constantin Mierla 04 Sep '24

04 Sep '24

A modparam would be useful in the context of people willing to get more and more details (e.g., available providers, cyphers, ... or whatever else can be extracted from the lib). Otherwise, fine for me. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/04208090638a639cdf03fafb1df161c… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/04208090638a639cdf03fafb1df161cd71f74c7e/146217938(a)github.com>

1 0

git:5.8:d86350ea: pkg/kamailio/deb: set version to 5.8.3
by Victor Seva 04 Sep '24

04 Sep '24

Module: kamailio Branch: 5.8 Commit: d86350ea9078b89677323ac86053b0f37b7d1722 URL: https://github.com/kamailio/kamailio/commit/d86350ea9078b89677323ac86053b0f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-09-04T09:30:26+02:00 pkg/kamailio/deb: set version to 5.8.3 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bookworm/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jammy/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/d86350ea9078b89677323ac86053b0f… Patch: https://github.com/kamailio/kamailio/commit/d86350ea9078b89677323ac86053b0f…

1 0

Re: [kamailio/kamailio] tls: extend startup information for OpenSSL library (0420809)
by Henning Westerholt 04 Sep '24

04 Sep '24

Sure, I can also output the "number" version, will add another commit. About the FIPS, other projects do it in a similar way (e.g. haproxy). But one simple change would be to have LM_INFO if FIPS is in fact enabled (this is rarely done), and DBG for FIPS mode not enabled, without the need for a new module parameter. Will change it. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/04208090638a639cdf03fafb1df161c… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/04208090638a639cdf03fafb1df161cd71f74c7e/146217533(a)github.com>

1 0

Re: [kamailio/kamailio] tls: extend startup information for OpenSSL library (0420809)
by Daniel-Constantin Mierla 04 Sep '24

04 Sep '24

I would prefer to keep logging the OPENSSL_VERSION_NUMBER even for OPENSSL_VERSION_NUMBER >= 0x030000000L, it is something easy to extract by regex/grepping. In addition, the detailed version info can be printed. I am not sure if FIPS logging is commonly used and relevant to be INFO, there will be questions when not enabled. IMO, DEBUG should do it here or a modparam (e.g., `libinfo`) can be introduced to dump exhaustive details about ssl library at startup (e.g., the version text, fips mode, ...). -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/04208090638a639cdf03fafb1df161c… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/04208090638a639cdf03fafb1df161cd71f74c7e/146217391(a)github.com>

1 0

Re: [kamailio/kamailio] tls: replace em dash with hyphen (reported from Bastian Triller, GH #3966) (228c598)
by Henning Westerholt 04 Sep '24

04 Sep '24

I found and commited the mistake already before I saw the PR, then I amended the commit message to have it linked to it. I will split it in two lines then if required in the future, sure. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/228c59851878fed15d8b34e43938c28… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/228c59851878fed15d8b34e43938c281729e518d/146217108(a)github.com>

1 0

Re: [kamailio/kamailio] tls: replace em dash with hyphen (reported from Bastian Triller, GH #3966) (228c598)
by Daniel-Constantin Mierla 04 Sep '24

04 Sep '24

Credits and reference to issues or PRs have to be done in the description content of the commit message, not in the first line, as per contributing guidelines. Also, as I could see if I haven't missed something, in this case the PR was proposing exactly the same change, with proper commit message, so it could have just been merged directly, not doing a separate commit and reference the PR. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/228c59851878fed15d8b34e43938c28… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/228c59851878fed15d8b34e43938c281729e518d/146216488(a)github.com>

1 0

[kamailio/kamailio] tls: Replace em dash with hyphen (PR #3966)
by Bastian Triller 04 Sep '24

04 Sep '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:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3966 -- Commit Summary -- * tls: Replace em dash with hyphen -- File Changes -- M src/modules/tls/tls_mod.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3966.patch https://github.com/kamailio/kamailio/pull/3966.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3966 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3966(a)github.com>

2 2

git:master:228c5985: tls: replace em dash with hyphen (reported from Bastian Triller, GH #3966)
by Henning Westerholt 04 Sep '24

04 Sep '24

Module: kamailio Branch: master Commit: 228c59851878fed15d8b34e43938c281729e518d URL: https://github.com/kamailio/kamailio/commit/228c59851878fed15d8b34e43938c28… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-09-04T06:53:31Z tls: replace em dash with hyphen (reported from Bastian Triller, GH #3966) --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/228c59851878fed15d8b34e43938c28… Patch: https://github.com/kamailio/kamailio/commit/228c59851878fed15d8b34e43938c28… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index f46d4aaddfd..84d9ff33412 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -508,7 +508,7 @@ static int mod_init(void) LM_INFO("OpenSSL supports Diffie-Hellman\n"); #endif #ifndef OPENSSL_NO_ECDH - LM_INFO("OpenSSL supports Elliptic-curve Diffie��Hellman\n"); + LM_INFO("OpenSSL supports Elliptic-curve Diffie-Hellman\n"); #endif if(sr_tls_event_callback.s == NULL || sr_tls_event_callback.len <= 0) { tls_lookup_event_routes();

1 0

git:master:5526809c: tls: improve informational messages on startup for DH and ECDH support in OpenSSL
by Henning Westerholt 04 Sep '24

04 Sep '24

Module: kamailio Branch: master Commit: 5526809c2f00a50dfa217d2fbfd688c7abed99f3 URL: https://github.com/kamailio/kamailio/commit/5526809c2f00a50dfa217d2fbfd688c… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-09-04T06:30:45Z tls: improve informational messages on startup for DH and ECDH support in OpenSSL --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5526809c2f00a50dfa217d2fbfd688c… Patch: https://github.com/kamailio/kamailio/commit/5526809c2f00a50dfa217d2fbfd688c… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 3c25eb1cb66..f46d4aaddfd 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -504,11 +504,11 @@ static int mod_init(void) } #endif -#ifndef OPENSSL_NO_ECDH - LM_INFO("With ECDH-Support!\n"); -#endif #ifndef OPENSSL_NO_DH - LM_INFO("With Diffie Hellman\n"); + LM_INFO("OpenSSL supports Diffie-Hellman\n"); +#endif +#ifndef OPENSSL_NO_ECDH + LM_INFO("OpenSSL supports Elliptic-curve Diffie��Hellman\n"); #endif if(sr_tls_event_callback.s == NULL || sr_tls_event_callback.len <= 0) { tls_lookup_event_routes();

1 0

git:master:04208090: tls: extend startup information for OpenSSL library
by Henning Westerholt 04 Sep '24

04 Sep '24

Module: kamailio Branch: master Commit: 04208090638a639cdf03fafb1df161cd71f74c7e URL: https://github.com/kamailio/kamailio/commit/04208090638a639cdf03fafb1df161c… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-09-04T06:23:47Z tls: extend startup information for OpenSSL library - output compiled and run-time library version for OpensSL - also output FIPS mode if activated - needs at least OpenSSL version 3.x --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/04208090638a639cdf03fafb1df161c… Patch: https://github.com/kamailio/kamailio/commit/04208090638a639cdf03fafb1df161c… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index cce34148470..3c25eb1cb66 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -490,7 +490,20 @@ static int mod_init(void) if(tls_check_sockets(*tls_domains_cfg) < 0) goto error; - LM_INFO("use OpenSSL version: %08x\n", (uint32_t)(OPENSSL_VERSION_NUMBER)); + +#if OPENSSL_VERSION_NUMBER < 0x030000000L + LM_INFO("compiled with OpenSSL version: %08x\n", (uint32_t)(OPENSSL_VERSION_NUMBER)); +#elif OPENSSL_VERSION_NUMBER >= 0x030000000L + LM_INFO("compiled with OpenSSL: %s\n", OPENSSL_VERSION_TEXT); + LM_INFO("run-time OpenSSL library: %s\n", OpenSSL_version(OPENSSL_VERSION)); + + if(EVP_default_properties_is_fips_enabled(NULL) == 1) { + LM_INFO("FIPS mode enabled in OpenSSL library\n"); + } else { + LM_INFO("FIPS mode not enabled in OpenSSL library\n"); + } +#endif + #ifndef OPENSSL_NO_ECDH LM_INFO("With ECDH-Support!\n"); #endif

1 0

Releasing v5.8.3
by Daniel-Constantin Mierla 04 Sep '24

04 Sep '24

Hello, I am considering to release Kamailio v5.8.3 (out of branch 5.8) sometime next week, most likely on Wednesday, Sep 4, 2024. If anyone is aware of issues not yet on the bug tracker, report them there asap in order to have a better chance to be fixed. Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services -- asipto.com

1 1

git:master:1c2cb998: registrar: when provided, use host part from uri parameter
by Daniel-Constantin Mierla 04 Sep '24

04 Sep '24

Module: kamailio Branch: master Commit: 1c2cb9980082a6a1a8e3986330d9b80c49ef7801 URL: https://github.com/kamailio/kamailio/commit/1c2cb9980082a6a1a8e3986330d9b80… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-03T23:24:49+02:00 registrar: when provided, use host part from uri parameter - instread of the To URI, which can be different --- Modified: src/modules/registrar/save.c --- Diff: https://github.com/kamailio/kamailio/commit/1c2cb9980082a6a1a8e3986330d9b80… Patch: https://github.com/kamailio/kamailio/commit/1c2cb9980082a6a1a8e3986330d9b80… --- diff --git a/src/modules/registrar/save.c b/src/modules/registrar/save.c index c94f56563b2..2e25c8e000a 100644 --- a/src/modules/registrar/save.c +++ b/src/modules/registrar/save.c @@ -1094,22 +1094,29 @@ int unregister(struct sip_msg *_m, udomain_t *_d, str *_uri, str *_ruid) { str aor = {0, 0}; sip_uri_t *u; + sip_uri_t turi; urecord_t *r; ucontact_t *c; int res; - if(_ruid == NULL) { + if(_ruid == NULL || _ruid->len <= 0) { /* No ruid provided - remove all contacts for aor */ - - if(extract_aor(_uri, &aor, NULL) < 0) { - LM_ERR("failed to extract Address Of Record\n"); - return -1; - } - - u = parse_to_uri(_m); - if(u == NULL) { - LM_ERR("failed to extract Address Of Record\n"); - return -1; + if(_uri->len > 0) { + if(extract_aor(_uri, &aor, &turi) < 0) { + LM_ERR("failed to extract Address Of Record\n"); + return -1; + } + u = &turi; + } else { + u = parse_to_uri(_m); + if(u == NULL) { + LM_ERR("failed to extract Address Of Record\n"); + return -1; + } + if(extract_aor(&(get_to(_m)->uri), &aor, NULL) < 0) { + LM_ERR("failed to extract Address Of Record\n"); + return -1; + } } if(star(_m, _d, &aor, &u->host) < 0) {

1 0

git:master:cf99bd53: modules: readme files regenerated - secsipid ... [skip ci]
by Kamailio Dev 03 Sep '24

03 Sep '24

Module: kamailio Branch: master Commit: cf99bd53379694f9077433e05b5ac00ca43fda85 URL: https://github.com/kamailio/kamailio/commit/cf99bd53379694f9077433e05b5ac00… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-09-03T18:16:10+02:00 modules: readme files regenerated - secsipid ... [skip ci] --- Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/cf99bd53379694f9077433e05b5ac00… Patch: https://github.com/kamailio/kamailio/commit/cf99bd53379694f9077433e05b5ac00… --- diff --git a/src/modules/secsipid/README b/src/modules/secsipid/README index 9297251072a..3cf63aade71 100644 --- a/src/modules/secsipid/README +++ b/src/modules/secsipid/README @@ -505,12 +505,9 @@ request_route { The module needs "secsipdi_proc.so" module that depends on "libsecsipid", which is a component of "sipsecidx" project from https://github.com/asipto/secsipidx/. The library is implemented in Go - language, with generated C API and library. Until the libsecsipid is - going to be packaged in OS distributions, the secsipid_proc module can - be compiled by copying secsipid.h libsecsipid.h and libsecsipid.a files - in the folder of the module. + language, with generated C API and library. - To generate the libsecsipid.a file, it requires to have Go language + To generate the libsecsipid files, it requires to have Go language installed and its environment configured, then run the following commands: @@ -519,9 +516,8 @@ request_route { export GO111MODULE=off go get https://github.com/asipto/secsipidx cd $GOPATH/src/github.com/asipto/secsipidx/csecsipid/ -make liba -cp secsipid.h libsecsipid.h libsecsipid.a \ - /path/to/kamailio/src/modules/secsipid_proc/ +make all +make install cd /path/to/kamailio/ make include_modules="secsipid secsipid_proc ..." cfg

1 0

git:master:7abbc93d: secsipid: docs update about libsecsipid installation
by Daniel-Constantin Mierla 03 Sep '24

03 Sep '24

Module: kamailio Branch: master Commit: 7abbc93d8db807077ca2afc10b026be0835f4b65 URL: https://github.com/kamailio/kamailio/commit/7abbc93d8db807077ca2afc10b026be… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-03T18:08:44+02:00 secsipid: docs update about libsecsipid installation --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7abbc93d8db807077ca2afc10b026be… Patch: https://github.com/kamailio/kamailio/commit/7abbc93d8db807077ca2afc10b026be… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index f8f2e823a21..4009f745149 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -550,13 +550,10 @@ request_route { The module needs "secsipdi_proc.so" module that depends on "libsecsipid", which is a component of "sipsecidx" project from https://github.com/asipto/secsipidx/. The library is - implemented in Go language, with generated C API and library. Until the - libsecsipid is going to be packaged in OS distributions, the secsipid_proc - module can be compiled by copying secsipid.h libsecsipid.h and libsecsipid.a - files in the folder of the module. + implemented in Go language, with generated C API and library. </para> <para> - To generate the libsecsipid.a file, it requires to have Go language + To generate the libsecsipid files, it requires to have Go language installed and its environment configured, then run the following commands: </para> <example> @@ -566,9 +563,8 @@ request_route { export GO111MODULE=off go get https://github.com/asipto/secsipidx cd $GOPATH/src/github.com/asipto/secsipidx/csecsipid/ -make liba -cp secsipid.h libsecsipid.h libsecsipid.a \ - /path/to/kamailio/src/modules/secsipid_proc/ +make all +make install cd /path/to/kamailio/ make include_modules="secsipid secsipid_proc ..." cfg

1 0

[kamailio/kamailio] rtpengine: export api (PR #3948)
by Farzaneh Soltanzadeh 03 Sep '24

03 Sep '24

#### 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) - [* ] 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  Rtpengine module doesn't export api to be used by other modules. Api for four of module functions are added. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3948 -- Commit Summary -- * export api in rtpengine module * Merge branch 'master' into Feature/1-rtpengine-export-api-in-module -- File Changes -- A src/modules/rtpengine/api.h (65) M src/modules/rtpengine/rtpengine.c (22) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3948.patch https://github.com/kamailio/kamailio/pull/3948.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3948 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3948(a)github.com>

6 27

[kamailio/kamailio] rtpengine: fix api using ki functions (PR #3956)
by Farzaneh Soltanzadeh 02 Sep '24

02 Sep '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 - [x ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Exported API functions changed to use the KEMI functions. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3956 -- Commit Summary -- * use ki functions as exported api functions -- File Changes -- M src/modules/rtpengine/api.h (21) M src/modules/rtpengine/rtpengine.c (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3956.patch https://github.com/kamailio/kamailio/pull/3956.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3956 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3956(a)github.com>

4 13

git:master:324611b2: rtpengine: use ki functions as exported api functions (#3956)
by GitHub 02 Sep '24

02 Sep '24

Module: kamailio Branch: master Commit: 324611b2ecfe2fda25abc8114361d00a9e654772 URL: https://github.com/kamailio/kamailio/commit/324611b2ecfe2fda25abc8114361d00… Author: Farzaneh Soltanzadeh <f.soltanzade72(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2024-09-02T08:04:19-04:00 rtpengine: use ki functions as exported api functions (#3956) - remove extra funcs - change functions name Co-authored-by: Farzaneh Soltanzadeh <fr.soltanzadeh(a)resaa.net> --- Modified: src/modules/rtpengine/api.h Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/324611b2ecfe2fda25abc8114361d00… Patch: https://github.com/kamailio/kamailio/commit/324611b2ecfe2fda25abc8114361d00… --- diff --git a/src/modules/rtpengine/api.h b/src/modules/rtpengine/api.h index fa499916238..d5c68e6d871 100644 --- a/src/modules/rtpengine/api.h +++ b/src/modules/rtpengine/api.h @@ -26,18 +26,17 @@ #include "../../core/parser/msg_parser.h" -typedef int (*rtpengine_start_recording_f)( - struct sip_msg *msg, char *str1, char *str2); -typedef int (*rtpengine_answer_f)(struct sip_msg *msg, char *str1, char *str2); -typedef int (*rtpengine_offer_f)(struct sip_msg *msg, char *str1, char *str2); -typedef int (*rtpengine_delete_f)(struct sip_msg *msg, char *str1, char *str2); +typedef int (*rtpengine_start_recording_f)(struct sip_msg *msg); +typedef int (*rtpengine_answer_f)(struct sip_msg *msg, str *str); +typedef int (*rtpengine_offer_f)(struct sip_msg *msg, str *str); +typedef int (*rtpengine_delete_f)(struct sip_msg *msg, str *str); typedef struct rtpengine_api { - rtpengine_start_recording_f start_recording; - rtpengine_answer_f answer; - rtpengine_offer_f offer; - rtpengine_delete_f delete; + rtpengine_start_recording_f rtpengine_start_recording; + rtpengine_answer_f rtpengine_answer; + rtpengine_offer_f rtpengine_offer; + rtpengine_delete_f rtpengine_delete; } rtpengine_api_t; typedef int (*bind_rtpengine_f)(rtpengine_api_t *api); diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 84bf5951752..e31feb3ceeb 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -5794,10 +5794,10 @@ static int bind_rtpengine(rtpengine_api_t *api) LM_ERR("Invalid parameter value\n"); return -1; } - api->start_recording = start_recording_f; - api->answer = rtpengine_answer1_f; - api->offer = rtpengine_offer1_f; - api->delete = rtpengine_delete1_f; + api->rtpengine_start_recording = ki_start_recording; + api->rtpengine_answer = ki_rtpengine_answer; + api->rtpengine_offer = ki_rtpengine_offer; + api->rtpengine_delete = ki_rtpengine_delete; return 0; } \ No newline at end of file

1 0

git:5.8:9e0f6acc: app_python3: Fixes Kemi TypeError thrown when latency_limit_action is exceeded.
by Daniel-Constantin Mierla 02 Sep '24

02 Sep '24

Module: kamailio Branch: 5.8 Commit: 9e0f6acc23313f5b25300660b6a4b75aab5bd168 URL: https://github.com/kamailio/kamailio/commit/9e0f6acc23313f5b25300660b6a4b75… Author: Michel Pelletier <michel(a)voip.ms> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-02T09:37:27+02:00 app_python3: Fixes Kemi TypeError thrown when latency_limit_action is exceeded. Replace PyBytes_AsString(..) calls with calls to PyUnicode_AsUTF8(..) in the PY_VERSION_HEX >= 0x030B0000 block of apy_kemi.c. The PyBytes_AsString expects a Bytes value but receives a Unicode value instead, thus causing the TypeError exception. (cherry picked from commit 6cae3661419d8d79fc8fb0463f6787b06911fa9d) --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/9e0f6acc23313f5b25300660b6a4b75… Patch: https://github.com/kamailio/kamailio/commit/9e0f6acc23313f5b25300660b6a4b75… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index 718d8ecedaf..0c1ab535809 100644 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -379,8 +379,8 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) " took too long [%u ms] (file:%s func:%s line:%d)\n", (ket->mname.len > 0) ? ket->mname.s : "", (ket->mname.len > 0) ? "." : "", ket->fname.s, tdiff, - (pcode) ? PyBytes_AsString(pcode->co_filename) : "", - (pcode) ? PyBytes_AsString(pcode->co_name) : "", + (pcode) ? PyUnicode_AsUTF8(pcode->co_filename) : "", + (pcode) ? PyUnicode_AsUTF8(pcode->co_name) : "", (pframe) ? PyFrame_GetLineNumber(pframe) : 0); #else LOG(cfg_get(core, core_cfg, latency_log),

1 0

git:5.8:661b2670: usrloc: mark contacts with keepalive sent
by Daniel-Constantin Mierla 02 Sep '24

02 Sep '24

Module: kamailio Branch: 5.8 Commit: 661b2670168530c21ee4dd23fcb29abf8b5bc3ba URL: https://github.com/kamailio/kamailio/commit/661b2670168530c21ee4dd23fcb29ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-02T09:37:04+02:00 usrloc: mark contacts with keepalive sent - properly detect if the contact record has to be expired or not (cherry picked from commit 6502872d35d9bd7043bf54cd1d640dd64ae87115) --- Modified: src/modules/usrloc/ul_keepalive.c Modified: src/modules/usrloc/usrloc.h --- Diff: https://github.com/kamailio/kamailio/commit/661b2670168530c21ee4dd23fcb29ab… Patch: https://github.com/kamailio/kamailio/commit/661b2670168530c21ee4dd23fcb29ab… --- diff --git a/src/modules/usrloc/ul_keepalive.c b/src/modules/usrloc/ul_keepalive.c index e5a013b45a3..16fb66021c1 100644 --- a/src/modules/usrloc/ul_keepalive.c +++ b/src/modules/usrloc/ul_keepalive.c @@ -148,7 +148,8 @@ int ul_ka_urecord(urecord_t *ur) } } - if(ul_keepalive_timeout > 0 && uc->last_keepalive > 0) { + if(ul_keepalive_timeout > 0 && uc->last_keepalive > 0 + && (uc->flags & FL_KASENT)) { if(uc->last_keepalive + ul_keepalive_timeout < tnow) { /* set contact as expired in 10s */ LM_DBG("set expired contact on keepalive (%u + %u < %u)" @@ -257,7 +258,9 @@ int ul_ka_urecord(urecord_t *ur) kabuf_len, kabuf); kamsg.s = kabuf; kamsg.len = kabuf_len; - ul_ka_send(&kamsg, &idst); + if(ul_ka_send(&kamsg, &idst) >= 0) { + uc->flags |= FL_KASENT; + } } } return 0; diff --git a/src/modules/usrloc/usrloc.h b/src/modules/usrloc/usrloc.h index 54f7986080d..370baf0da86 100644 --- a/src/modules/usrloc/usrloc.h +++ b/src/modules/usrloc/usrloc.h @@ -63,6 +63,7 @@ typedef enum flags FL_MEM = 1 << 0, /*!< Update memory only */ FL_DMQRPL = 1 << 1, /*!< DMQ replication */ FL_EXPCLB = 1 << 2, /*!< Expired callback executed */ + FL_KASENT = 1 << 3, /*!< Keepalive sent to contact */ FL_ALL = (int)0xFFFFFFFF /*!< All flags set */ } flags_t;

1 0

git:master:c3c75bf2: secfilter: cfg functions execute the kemi functions
by Daniel-Constantin Mierla 02 Sep '24

02 Sep '24

Module: kamailio Branch: master Commit: c3c75bf23fd07db1b5a2b83fa06eddc86ae2ed0f URL: https://github.com/kamailio/kamailio/commit/c3c75bf23fd07db1b5a2b83fa06eddc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-02T08:44:30+02:00 secfilter: cfg functions execute the kemi functions - cfg functions may get the option to have cfg variables, which can break the old approach without any warning - itnernal function rename to not use common cfg wrapper prefix and also have pointer to parameter, not value - small formatting updates --- Modified: src/modules/secfilter/secfilter.c --- Diff: https://github.com/kamailio/kamailio/commit/c3c75bf23fd07db1b5a2b83fa06eddc… Patch: https://github.com/kamailio/kamailio/commit/c3c75bf23fd07db1b5a2b83fa06eddc…

1 0

[kamailio/kamailio] secfilter: export all functions to KEMI (PR #3946)
by bazrafshan.m.h 02 Sep '24

02 Sep '24

- all secfilter functions are exported to KEMI   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  * All secfilter functions are exported to KEMI You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3946 -- Commit Summary -- * secfilter: export all functions to KEMI -- File Changes -- M src/modules/secfilter/secfilter.c (103) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3946.patch https://github.com/kamailio/kamailio/pull/3946.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3946 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3946(a)github.com>

2 3

git:master:5c5bf3a7: secfilter: export all functions to KEMI
by Daniel-Constantin Mierla 02 Sep '24

02 Sep '24

Module: kamailio Branch: master Commit: 5c5bf3a7c974d0378aba0ce07730e54377d69f41 URL: https://github.com/kamailio/kamailio/commit/5c5bf3a7c974d0378aba0ce07730e54… Author: Moheb <bazrafshan.m.h(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-02T08:22:40+02:00 secfilter: export all functions to KEMI - all secfilter functions are exported to KEMI --- Modified: src/modules/secfilter/secfilter.c --- Diff: https://github.com/kamailio/kamailio/commit/5c5bf3a7c974d0378aba0ce07730e54… Patch: https://github.com/kamailio/kamailio/commit/5c5bf3a7c974d0378aba0ce07730e54…

1 0

git:master:fde8bd21: http_client: clang-format
by Victor Seva 30 Aug '24

30 Aug '24

Module: kamailio Branch: master Commit: fde8bd21dca9c8b45b314b04b21f742363f028b1 URL: https://github.com/kamailio/kamailio/commit/fde8bd21dca9c8b45b314b04b21f742… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-30T12:52:46+02:00 http_client: clang-format --- Modified: src/modules/http_client/curlcon.c --- Diff: https://github.com/kamailio/kamailio/commit/fde8bd21dca9c8b45b314b04b21f742… Patch: https://github.com/kamailio/kamailio/commit/fde8bd21dca9c8b45b314b04b21f742… --- diff --git a/src/modules/http_client/curlcon.c b/src/modules/http_client/curlcon.c index 2b5a69fcddd..16dfb6cc09b 100644 --- a/src/modules/http_client/curlcon.c +++ b/src/modules/http_client/curlcon.c @@ -861,17 +861,16 @@ void curl_conn_list_fixup(void) { curl_con_t *cc; cc = _curl_con_root; - while (cc) { - if (!(timeout_mode == 1 || timeout_mode == 2)) { + while(cc) { + if(!(timeout_mode == 1 || timeout_mode == 2)) { /* Timeout is disabled globally. Set timeout to 0 for all connections to reflect this. */ - if (cc->timeout > 0) { + if(cc->timeout > 0) { LM_WARN("curl connection [%.*s]: configured timeout is ignored " - "because timeouts are disabled (timeout_mode)\n", - cc->name.len, cc->name.s); + "because timeouts are disabled (timeout_mode)\n", + cc->name.len, cc->name.s); cc->timeout = 0; } - } - else if (cc->timeout == 0) { + } else if(cc->timeout == 0) { /* Timeout is not configured for that connection. * Use as default global connection_timeout (which can be seconds or milliseconds). */

1 0

git:master:bf138374: corex: removed unused parameter from ki_forward_uac()
by Daniel-Constantin Mierla 30 Aug '24

30 Aug '24

Module: kamailio Branch: master Commit: bf13837461d859887172bf879ab4918f50d12dc6 URL: https://github.com/kamailio/kamailio/commit/bf13837461d859887172bf879ab4918… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-30T11:44:03+02:00 corex: removed unused parameter from ki_forward_uac() --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/bf13837461d859887172bf879ab4918… Patch: https://github.com/kamailio/kamailio/commit/bf13837461d859887172bf879ab4918… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 021ed586253..35715581318 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -277,7 +277,7 @@ static void mod_destroy(void) /** * forward request like initial uac sender, with only one via */ -static int ki_forward_uac(sip_msg_t *msg, str *vuri) +static int ki_forward_uac(sip_msg_t *msg) { int ret;

1 0

git:master:927acf4c: sca: new function that accepts to/from uri so the kemi exports are still valid
by Daniel-Constantin Mierla 30 Aug '24

30 Aug '24

Module: kamailio Branch: master Commit: 927acf4c4e9bfaa97eb2b9d4f3163a26b97244aa URL: https://github.com/kamailio/kamailio/commit/927acf4c4e9bfaa97eb2b9d4f3163a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-30T11:39:58+02:00 sca: new function that accepts to/from uri so the kemi exports are still valid --- Modified: src/modules/sca/sca_subscribe.c Modified: src/modules/sca/sca_subscribe.h --- Diff: https://github.com/kamailio/kamailio/commit/927acf4c4e9bfaa97eb2b9d4f3163a2… Patch: https://github.com/kamailio/kamailio/commit/927acf4c4e9bfaa97eb2b9d4f3163a2… --- diff --git a/src/modules/sca/sca_subscribe.c b/src/modules/sca/sca_subscribe.c index 9453e2de790..ca42fd138e9 100644 --- a/src/modules/sca/sca_subscribe.c +++ b/src/modules/sca/sca_subscribe.c @@ -1155,7 +1155,7 @@ int sca_subscription_from_request(sca_mod *scam, sip_msg_t *msg, int event_type, return rc; } -int ki_sca_handle_subscribe(sip_msg_t *msg, str *uri_to, str *uri_from) +int ki_sca_handle_subscribe_uris(sip_msg_t *msg, str *uri_to, str *uri_from) { sca_subscription req_sub; sca_subscription *sub = NULL; @@ -1423,9 +1423,13 @@ int ki_sca_handle_subscribe(sip_msg_t *msg, str *uri_to, str *uri_from) return (rc); } +int ki_sca_handle_subscribe(sip_msg_t *msg) +{ + return ki_sca_handle_subscribe_uris(msg, NULL, NULL); +} int sca_handle_subscribe(sip_msg_t *msg, str *uri_to, str *uri_from) { - return ki_sca_handle_subscribe(msg, uri_to, uri_from); + return ki_sca_handle_subscribe_uris(msg, uri_to, uri_from); } int sca_subscription_reply(sca_mod *scam, int status_code, char *status_msg, diff --git a/src/modules/sca/sca_subscribe.h b/src/modules/sca/sca_subscribe.h index f4b802c81fc..cd6ab482d0e 100644 --- a/src/modules/sca/sca_subscribe.h +++ b/src/modules/sca/sca_subscribe.h @@ -94,6 +94,7 @@ int sca_subscription_aor_has_subscribers(int, str *); int sca_subscription_delete_subscriber_for_event( sca_mod *, str *, str *, str *); int sca_subscription_terminate(sca_mod *, str *, int, str *, int, int); -int ki_sca_handle_subscribe(sip_msg_t *msg, str *, str *); +int ki_sca_handle_subscribe(sip_msg_t *msg); +int ki_sca_handle_subscribe_uris(sip_msg_t *msg, str *, str *); #endif // SCA_SUBSCRIBE_H

1 0

git:master:4a57efa0: sca: remove function name from log message
by Daniel-Constantin Mierla 30 Aug '24

30 Aug '24

Module: kamailio Branch: master Commit: 4a57efa0f7ed2560420e10d0fe70037a14a12c12 URL: https://github.com/kamailio/kamailio/commit/4a57efa0f7ed2560420e10d0fe70037… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-30T11:36:29+02:00 sca: remove function name from log message --- Modified: src/modules/sca/sca_subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/4a57efa0f7ed2560420e10d0fe70037… Patch: https://github.com/kamailio/kamailio/commit/4a57efa0f7ed2560420e10d0fe70037… --- diff --git a/src/modules/sca/sca_subscribe.c b/src/modules/sca/sca_subscribe.c index e75738872ac..9453e2de790 100644 --- a/src/modules/sca/sca_subscribe.c +++ b/src/modules/sca/sca_subscribe.c @@ -1326,8 +1326,7 @@ int ki_sca_handle_subscribe(sip_msg_t *msg, str *uri_to, str *uri_from) released = sca_appearance_owner_release_all( &req_sub.target_aor, &req_sub.subscriber); if(released) { - LM_INFO("sca_handle_subscribe: released %d appearances " - "for subscriber %.*s\n", + LM_INFO("released %d appearances for subscriber %.*s\n", released, STR_FMT(&req_sub.subscriber)); } }

1 0

git:master:0a2517f6: siputils: export sip_parse_headers() to kemi
by Daniel-Constantin Mierla 29 Aug '24

29 Aug '24

Module: kamailio Branch: master Commit: 0a2517f6e1b6a49eafd1846c1d65b4420ed404f5 URL: https://github.com/kamailio/kamailio/commit/0a2517f6e1b6a49eafd1846c1d65b44… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-29T11:46:23+02:00 siputils: export sip_parse_headers() to kemi --- Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/0a2517f6e1b6a49eafd1846c1d65b44… Patch: https://github.com/kamailio/kamailio/commit/0a2517f6e1b6a49eafd1846c1d65b44… --- diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index ffbeacd00a5..cdae4ff1f18 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -608,6 +608,17 @@ static int w_hdr_date_check(sip_msg_t *msg, char *ptdiff, char *p2) return ki_hdr_date_check(msg, tdiff); } +/** + * + */ +static int ki_sip_parse_headers(sip_msg_t *msg) +{ + if(parse_headers(msg, HDR_EOH_F, 0) < 0) { + return -1; + } + return 1; +} + /** * */ @@ -784,6 +795,11 @@ static sr_kemi_t sr_kemi_siputils_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("siputils"), str_init("sip_parse_headers"), + SR_KEMIP_INT, ki_sip_parse_headers, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:2d790270: pkg/kamailio/deb: remove app_mono from builds
by Victor Seva 29 Aug '24

29 Aug '24

Module: kamailio Branch: master Commit: 2d7902708fa214d34cb4123857eba95257c659b1 URL: https://github.com/kamailio/kamailio/commit/2d7902708fa214d34cb4123857eba95… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-29T11:28:38+02:00 pkg/kamailio/deb: remove app_mono from builds related #3963 --- Modified: pkg/kamailio/deb/bionic/control Modified: pkg/kamailio/deb/bionic/kamailio.postinst Modified: pkg/kamailio/deb/bionic/rules Modified: pkg/kamailio/deb/bookworm/control Modified: pkg/kamailio/deb/bookworm/kamailio.postinst Modified: pkg/kamailio/deb/bookworm/rules Modified: pkg/kamailio/deb/bullseye/control Modified: pkg/kamailio/deb/bullseye/kamailio.postinst Modified: pkg/kamailio/deb/bullseye/rules Modified: pkg/kamailio/deb/buster/control Modified: pkg/kamailio/deb/buster/kamailio.postinst Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/debian/kamailio.postinst Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/focal/control Modified: pkg/kamailio/deb/focal/kamailio.postinst Modified: pkg/kamailio/deb/focal/rules Modified: pkg/kamailio/deb/jammy/control Modified: pkg/kamailio/deb/jammy/kamailio.postinst Modified: pkg/kamailio/deb/jammy/rules Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/jessie/kamailio.postinst Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/noble/control Modified: pkg/kamailio/deb/noble/rules Modified: pkg/kamailio/deb/precise/control Modified: pkg/kamailio/deb/precise/kamailio.postinst Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/sid/kamailio.postinst Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/stretch/kamailio.postinst Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/trusty/kamailio.postinst Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/control Modified: pkg/kamailio/deb/wheezy/kamailio.postinst Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/control Modified: pkg/kamailio/deb/xenial/kamailio.postinst Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/2d7902708fa214d34cb4123857eba95… Patch: https://github.com/kamailio/kamailio/commit/2d7902708fa214d34cb4123857eba95…

1 0

git:master:4d87f292: app_python3: bump to 3.12 for el8/el9
by S-P Chan 29 Aug '24

29 Aug '24

Module: kamailio Branch: master Commit: 4d87f29248d36d873784827204f272116050343d URL: https://github.com/kamailio/kamailio/commit/4d87f29248d36d873784827204f2721… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-08-29T16:27:44+08:00 app_python3: bump to 3.12 for el8/el9 --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/4d87f29248d36d873784827204f2721… Patch: https://github.com/kamailio/kamailio/commit/4d87f29248d36d873784827204f2721… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index a9a33082316..f642623b4eb 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -812,9 +812,9 @@ Requires: python2, kamailio = %ver BuildRequires: python2, python2-devel %endif %if %{with python3} -%if 0%{?rhel} == 8 -Requires: python39, kamailio = %ver -BuildRequires: python39, python39-devel +%if 0%{?rhel} == 8 || 0%{?rhel} == 9 +Requires: python3.12, kamailio = %ver +BuildRequires: python3.12, python3.12-devel %else Requires: python3, kamailio = %ver BuildRequires: python3, python3-devel @@ -1212,7 +1212,7 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ FREERADIUS=1 \ %endif %if 0%{?rhel} >= 8 - PYTHON3=python3.9 \ + PYTHON3=python3.12 \ %endif WOLFSSL_INTERNAL=no \ group_include="kstandard kautheph kberkeley kcarrierroute \

1 0

[kamailio/kamailio] Kemi app_python3 throws a TypeError (Issue #3915)
by michelpelletier07 29 Aug '24

29 Aug '24

### Description I am using Kemi with the app_python3 module. I was getting what appeared to be random TypeError exceptions thrown within the Kamailio app_python3 module. I later discovered that this only happened when calling a Kamailio function that exceeded the duration specified in the latency_limit_action core parameter. Also, the line printed in the logs displayed Null values in the 'file:' and 'func:' fields. #### Reproduction To reproduce the issue: 1. You must be using Kemi with the app_python3 module, with the cfgengine set to python. 2. Set the following in your kamailio.cfg file: ``` latency_log=2 latency_limit_action=100000 ``` 3. Run a Kemi function call that takes more time than the latency_limi_action set above. You may have to lower it if your computer is a fast runner. Here is my suggested code: ``` jsreload = dict() jsreload["jsonrpc"] = "2.0" jsreload["method"] = "tls.reload" jsreload["id"] = 1 KSR.jsonrpcs.exec(json.dumps(jsreload)) ``` 4. Use python version 3.11 #### Log Messages 45(324) INFO: app_python3 [apy_kemi.c:377]: sr_apy_kemi_exec_func(): alert - action KSR.jsonrpcs.exec(...) took too long [752946 ms] (file:(null) func:(null) line:491) 45(324) ERROR: app_python3 [python_support.c:167]: python_handle_exception(): apy_exec: ksr_rtimer_dodebug(rtimer): Unhandled exception in the Python code: TypeError: expected bytes, str found The above exception was the direct cause of the following exception: Traceback (most recent call last): File "/etc/kamailio/kamailio.py", line 491, in ksr_rtimer_dodebug KSR.jsonrpcs.exec(json.dumps(jsreload)) SystemError: <built-in function exec> returned a result with an exception set ### Possible Solutions The solution is to replace PyBytes_AsString(..) calls with calls to PyUnicode_AsUTF8(..) in the PY_VERSION_HEX >= 0x030B0000 block of apy_kemi.c. The PyBytes_AsString expects a Bytes value but reeives a Unicode value instead, thus causing the TypeError exception. Enclosed is a patch file with the fix implemented: [kamailio-5.8.2.patch.txt](https://github.com/user-attachments/files/1619573… ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` # kamailio -v version: kamailio 5.8.2 (x86_64/linux) 3fa5f4 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_SEND_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 3fa5f4 compiled on 09:58:55 Jul 12 2024 with gcc 12.2.0 ``` * **Operating System**:  ``` # uname -a Linux xxxxxxxxxxxxxxxxxxx 5.10.0-30-amd64 #1 SMP Debian 5.10.218-1 (2024-06-01) x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3915 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3915(a)github.com>

4 8

[kamailio/kamailio] app_python3: Fixes Kemi TypeError thrown when latency_limit_action is… (PR #3959)
by michelpelletier07 29 Aug '24

29 Aug '24

- [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [X] Related to issue # 3915 #### Description  Replace PyBytes_AsString(..) calls with calls to PyUnicode_AsUTF8(..) in the PY_VERSION_HEX >= 0x030B0000 block of apy_kemi.c. The PyBytes_AsString expects a Bytes value but receives a Unicode value instead, thus causing the TypeError exception. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3959 -- Commit Summary -- * app_python3: Fixes Kemi TypeError thrown when latency_limit_action is exceeded. -- File Changes -- M src/modules/app_python3/apy_kemi.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3959.patch https://github.com/kamailio/kamailio/pull/3959.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3959 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3959(a)github.com>

2 2

git:master:6cae3661: app_python3: Fixes Kemi TypeError thrown when latency_limit_action is exceeded.
by Daniel-Constantin Mierla 29 Aug '24

29 Aug '24

Module: kamailio Branch: master Commit: 6cae3661419d8d79fc8fb0463f6787b06911fa9d URL: https://github.com/kamailio/kamailio/commit/6cae3661419d8d79fc8fb0463f6787b… Author: Michel Pelletier <michel(a)voip.ms> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-29T10:21:54+02:00 app_python3: Fixes Kemi TypeError thrown when latency_limit_action is exceeded. Replace PyBytes_AsString(..) calls with calls to PyUnicode_AsUTF8(..) in the PY_VERSION_HEX >= 0x030B0000 block of apy_kemi.c. The PyBytes_AsString expects a Bytes value but receives a Unicode value instead, thus causing the TypeError exception. --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/6cae3661419d8d79fc8fb0463f6787b… Patch: https://github.com/kamailio/kamailio/commit/6cae3661419d8d79fc8fb0463f6787b… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index 718d8ecedaf..0c1ab535809 100644 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -379,8 +379,8 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) " took too long [%u ms] (file:%s func:%s line:%d)\n", (ket->mname.len > 0) ? ket->mname.s : "", (ket->mname.len > 0) ? "." : "", ket->fname.s, tdiff, - (pcode) ? PyBytes_AsString(pcode->co_filename) : "", - (pcode) ? PyBytes_AsString(pcode->co_name) : "", + (pcode) ? PyUnicode_AsUTF8(pcode->co_filename) : "", + (pcode) ? PyUnicode_AsUTF8(pcode->co_name) : "", (pframe) ? PyFrame_GetLineNumber(pframe) : 0); #else LOG(cfg_get(core, core_cfg, latency_log),

1 0

[kamailio/kamailio] Start up failed: waiting for child one too long (Issue #3960)
by Chen Ziyan 29 Aug '24

29 Aug '24

### Start up failed with error " waiting for child one too long" execute start up command, and suddenly failed. ` sudo /usr/local/sbin/kamailio -m 128 -M 8 -E -e -dd -f /usr/local/etc/kamailio/kamailio.cfg ` ### Troubleshooting #### Reproduction Maybe the problem of my env. #### Debugging Data #### Log Messages the log: 0(2749) INFO: <core> [core/sctp_core.c:74]: sctp_core_check_support(): SCTP API not enabled - if you want to use it, load sctp module Listening on udp: 192.168.5.167:5061 Aliases: udp: 192.168.5.167:5061 0(2749) INFO: <core> [core/tcp_main.c:5218]: init_tcp(): using epoll_lt as the io watch method (auto detected) 0(2751) INFO: rr [../outbound/api.h:53]: ob_load_api(): unable to import bind_ob - maybe module is not loaded 0(2751) INFO: rr [rr_mod.c:185]: mod_init(): outbound module not available 0(2751) WARNING: db_mysql [km_my_con.c:187]: db_mysql_new_connection(): opt_ssl_ca option not supported by mysql version (value (null)) - ignoring 0(2751) INFO: auth [auth_mod.c:342]: mod_init(): qop set, but nonce-count (nonce_count) support disabled 0(2751) WARNING: db_mysql [km_my_con.c:187]: db_mysql_new_connection(): opt_ssl_ca option not supported by mysql version (value (null)) - ignoring 0(2751) WARNING: tls [tls_mod.c:364]: mod_init(): tls support is disabled (set enable_tls=1 in the config to enable it) 0(2751) INFO: <core> [main.c:3233]: main(): processes (at least): 24 - shm size: 134217728 - pkg size: 8388608 0(2751) INFO: <core> [core/udp_server.c:163]: probe_max_receive_buffer(): SO_RCVBUF is initially 16777216 for fd 9 0(2751) INFO: <core> [core/udp_server.c:233]: probe_max_receive_buffer(): SO_RCVBUF is finally 16777216 on fd 9 0(2751) INFO: <core> [core/udp_server.c:264]: probe_max_send_buffer(): SO_SNDBUF is initially 16777216 for fd 9 0(2751) INFO: <core> [core/udp_server.c:334]: probe_max_send_buffer(): SO_SNDBUF is finally 16777216 on fd 9 1(2754) WARNING: db_mysql [km_my_con.c:187]: db_mysql_new_connection(): opt_ssl_ca option not supported by mysql version (value (null)) - ignoring 1(2754) NOTICE: ndb_redis [redis_client.c:257]: redisc_init(): Connecting to 10.20.80.33:6380 0(2751) ERROR: <core> [main.c:1825]: main_loop(): waiting for child one too long - wait time: 1000000 1(2754) INFO: <core> [main.c:888]: sig_usr(): signal 15 received 0(2751) INFO: snmpstats [snmpstats.c:399]: mod_destroy(): The SNMPStats module got the kill signal 0(2751) INFO: snmpstats [snmpstats.c:403]: mod_destroy(): Shutting down the AgentX Sub-Agent! 0(2751) INFO: <core> [core/sctp_core.c:53]: sctp_core_destroy(): SCTP API not initialized` what does that mean? ` 0(2751) ERROR: <core> [main.c:1825]: main_loop(): waiting for child one too long - wait time: 1000000` How can I solve that? #### SIP Traffic ### Possible Solutions ### Additional Information * **Operating System**: ` LSB Version: :core-4.1-amd64:core-4.1-noarch Distributor ID: CentOS Description: CentOS Linux release 7.9.2009 (Core) Release: 7.9.2009 Codename: Core ` Kamailio-5.8.2 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3960 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3960(a)github.com>

2 2

Build failed in Jenkins: kamailiodev-nightly-binaries » amd64,noble #2750
by kamailio＠sipwise.com 28 Aug '24

28 Aug '24

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> Changes: ------------------------------------------ [...truncated 2.90 MiB...] Setting up libterm-readkey-perl (2.38-2build4) ... Setting up libfont-ttf-perl (1.06-2) ... Setting up libtext-levenshteinxs-perl (0.03-5build4) ... Setting up libperlio-gzip-perl (0.20-1build4) ... Setting up libhtml-html5-entities-perl (0.004-3) ... Setting up libsereal-decoder-perl (5.004+ds-1build3) ... Setting up libmarkdown2:amd64 (2.2.7-2build1) ... Setting up liburi-perl (5.27-1) ... Setting up iso-codes (4.16.0-1) ... Setting up libnet-ipv6addr-perl (1.02-1) ... Setting up gpg (2.4.4-2ubuntu17) ... Setting up libdata-validate-ip-perl (0.31-1) ... Setting up libemail-address-xs-perl (1.05-1build4) ... Setting up libnet-ssleay-perl:amd64 (1.94-1build4) ... Setting up libhttp-date-perl (6.06-1) ... Setting up libfile-basedir-perl (0.09-2) ... Setting up libfile-listing-perl (6.16-1) ... Setting up libnet-http-perl (6.23-1) ... Setting up libtext-markdown-discount-perl (0.16-1build3) ... Setting up libexception-class-perl (1.45-1) ... Setting up libdevel-callchecker-perl:amd64 (0.008-2build3) ... Setting up libxml-sax-perl (1.02+dfsg-3) ... update-perl-sax-parsers: Registering Perl SAX parser XML::SAX::PurePerl with priority 10... update-perl-sax-parsers: Updating overall Perl SAX parser modules info file... Creating config file /etc/perl/XML/SAX/ParserDetails.ini with new version Setting up libdata-validate-uri-perl (0.07-3) ... Setting up libdata-optlist-perl (0.114-1) ... Setting up libxml-libxml-perl (2.0207+dfsg+really+2.0134-1build4) ... update-perl-sax-parsers: Registering Perl SAX parser XML::LibXML::SAX::Parser with priority 50... update-perl-sax-parsers: Registering Perl SAX parser XML::LibXML::SAX with priority 50... update-perl-sax-parsers: Updating overall Perl SAX parser modules info file... Replacing config file /etc/perl/XML/SAX/ParserDetails.ini with new version Setting up libwww-robotrules-perl (6.02-1) ... Setting up libhtml-parser-perl:amd64 (3.81-1build3) ... Setting up libio-socket-ssl-perl (2.085-1) ... Setting up libsub-exporter-perl (0.990-1) ... Setting up libhttp-message-perl (6.45-1ubuntu1) ... Setting up libhtml-form-perl (6.11-1) ... Setting up libiterator-perl (0.03+ds1-2) ... Setting up libhttp-negotiate-perl (6.01-2) ... Setting up libiterator-util-perl (0.02+ds1-2) ... Setting up libhttp-cookies-perl (6.11-1) ... Setting up libhtml-tree-perl (5.07-3) ... Setting up libparams-classify-perl:amd64 (0.015-2build5) ... Setting up libcgi-pm-perl (4.63-1) ... Setting up libmodule-runtime-perl (0.016-2) ... Setting up libconst-fast-perl (0.014-2) ... Setting up libdata-dpath-perl (0.59-1) ... Setting up libmodule-implementation-perl (0.09-2) ... Setting up libpackage-stash-perl (0.40-1) ... Setting up libimport-into-perl (1.002005-2) ... Setting up libmoo-perl (2.005005-1) ... Setting up liblist-someutils-perl (0.59-1) ... Setting up libmoox-aliases-perl (0.001006-2) ... Setting up libb-hooks-endofscope-perl (0.28-1) ... Setting up libnamespace-clean-perl (0.27-2) ... Setting up liblwp-protocol-https-perl (6.13-1) ... Setting up libwww-perl (6.76-1) ... Setting up libhtml-tokeparser-simple-perl (3.16-4) ... Setting up libwww-mechanize-perl (2.18-1ubuntu1) ... Processing triggers for sgml-base (1.31) ... Processing triggers for libc-bin (2.39-0ubuntu8.3) ... Setting up lintian (2.117.0ubuntu1.1) ... Processing triggers for man-db (2.12.0-4build2) ... Not building database; man-db/auto-update is not 'true'. + lintian --version Lintian v2.117.0ubuntu1.1 ++ cd /build/kamailio-6.0.0~dev2+ubuntu24.04.20240828080003.2774/debian/.. ++ pwd -P + package_dir=/build/kamailio-6.0.0~dev2+ubuntu24.04.20240828080003.2774 ++ basename /build/kamailio-6.0.0~dev2+ubuntu24.04.20240828080003.2774 + PACKAGE_NAME=kamailio-6.0.0~dev2+ubuntu24.04.20240828080003.2774 + echo 'Found package name: kamailio-6.0.0~dev2+ubuntu24.04.20240828080003.2774' Found package name: kamailio-6.0.0~dev2+ubuntu24.04.20240828080003.2774 + lintian_out=/build/kamailio-6.0.0~dev2+ubuntu24.04.20240828080003.2774.lintian.txt + DSC_EXIT=0 + ls /build/kamailio_6.0.0~dev2+ubuntu24.04.20240828080003.2774.dsc + su -s /bin/bash -c 'set -o pipefail; lintian "/build"/*.dsc 2>&1 | tee "/build/kamailio-6.0.0~dev2+ubuntu24.04.20240828080003.2774.lintian.txt"' - pbuilder su: warning: cannot change directory to /nonexistent: No such file or directory W: kamailio source: build-depends-on-obsolete-package Build-Depends: libncurses5-dev => libncurses-dev W: kamailio source: build-depends-on-obsolete-package Build-Depends: pkg-config => pkgconf W: kamailio source: package-uses-deprecated-debhelper-compat-version 9 W: kamailio source: space-in-std-shortname-in-dep5-copyright gpl-2 + openssl exception [debian/copyright:257] W: kamailio source: space-in-std-shortname-in-dep5-copyright gpl-2 + openssl exception [debian/copyright:50] W: kamailio source: space-in-std-shortname-in-dep5-copyright gpl-2 + openssl exception [debian/copyright:54] W: kamailio source: superfluous-file-pattern src/code/atomic/* [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/atomic_ops.* [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/basex.* [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/bit_*.c [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/char_msg_val.h [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/compiler_opt.h [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/core_stats.h [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/counters.* [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/endianness.* [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/futexlock.h [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/hashes.h [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/io_wait.* [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/list.h [debian/copyright:115] W: kamailio source: superfluous-file-pattern src/core/mem/dl_* [debian/copyright:210] W: kamailio source: superfluous-file-pattern src/core/mem/ll_malloc.* [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/core/mem/sf_malloc.* [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/core/mem/shm_mem.c [debian/copyright:56] W: kamailio source: superfluous-file-pattern src/core/parser/case_p_* [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/core/parser/case_reas.h [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/lib/srutils/srjson.* [debian/copyright:236] W: kamailio source: superfluous-file-pattern src/modules/malloc_test/malloc_test.c [debian/copyright:27] + CHANGES_EXIT=0 + su -s /bin/bash -c 'set -o pipefail; lintian "/build"/*.changes 2>&1 | tee -a "/build/kamailio-6.0.0~dev2+ubuntu24.04.20240828080003.2774.lintian.txt"' - pbuilder su: warning: cannot change directory to /nonexistent: No such file or directory E: kamailio: depends-on-obsolete-package Depends: lsb-base W: kamailio source: build-depends-on-obsolete-package Build-Depends: libncurses5-dev => libncurses-dev W: kamailio source: build-depends-on-obsolete-package Build-Depends: pkg-config => pkgconf W: kamailio-geoip-modules: description-synopsis-starts-with-article W: kamailio-geoip2-modules: description-synopsis-starts-with-article W: kamailio-lua-modules: description-synopsis-starts-with-article W: kamailio-mono-modules: description-synopsis-starts-with-article W: kamailio-python3-modules: description-synopsis-starts-with-article W: kamailio-ruby-modules: description-synopsis-starts-with-article W: kamailio: extended-description-line-too-long line 13 W: kamailio: extended-description-line-too-long line 8 W: kamailio-erlang-modules: extended-description-line-too-long line 5 W: kamailio-extra-modules: extended-description-line-too-long line 7 W: kamailio-kazoo-modules: extended-description-line-too-long line 5 W: kamailio-ldap-modules: extended-description-line-too-long line 6 W: kamailio-nats-modules: extended-description-line-too-long line 5 W: kamailio-nats-modules: extended-description-line-too-long line 6 W: kamailio-outbound-modules: extended-description-line-too-long line 5 W: kamailio-berkeley-bin: no-manual-page [usr/sbin/kambdb_recover] W: kamailio: package-contains-upstream-installation-documentation [usr/share/doc/kamailio/INSTALL.gz] W: kamailio-autheph-modules: package-has-long-file-name kamailio-autheph-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-berkeley-bin: package-has-long-file-name kamailio-berkeley-bin_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-berkeley-modules: package-has-long-file-name kamailio-berkeley-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-cnxcc-modules: package-has-long-file-name kamailio-cnxcc-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-cpl-modules: package-has-long-file-name kamailio-cpl-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-erlang-modules: package-has-long-file-name kamailio-erlang-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-extra-modules: package-has-long-file-name kamailio-extra-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-geoip-modules: package-has-long-file-name kamailio-geoip-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-geoip2-modules: package-has-long-file-name kamailio-geoip2-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-ims-modules: package-has-long-file-name kamailio-ims-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-json-modules: package-has-long-file-name kamailio-json-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-kazoo-modules: package-has-long-file-name kamailio-kazoo-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-ldap-modules: package-has-long-file-name kamailio-ldap-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-lua-modules: package-has-long-file-name kamailio-lua-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-lwsc-modules: package-has-long-file-name kamailio-lwsc-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-memcached-modules: package-has-long-file-name kamailio-memcached-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-microhttpd-modules: package-has-long-file-name kamailio-microhttpd-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-mongodb-modules: package-has-long-file-name kamailio-mongodb-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-mono-modules: package-has-long-file-name kamailio-mono-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-mqtt-modules: package-has-long-file-name kamailio-mqtt-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-mysql-modules: package-has-long-file-name kamailio-mysql-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-nats-modules: package-has-long-file-name kamailio-nats-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-outbound-modules: package-has-long-file-name kamailio-outbound-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-perl-modules: package-has-long-file-name kamailio-perl-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-phonenum-modules: package-has-long-file-name kamailio-phonenum-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-postgres-modules: package-has-long-file-name kamailio-postgres-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-presence-modules: package-has-long-file-name kamailio-presence-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-python3-modules: package-has-long-file-name kamailio-python3-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-rabbitmq-modules: package-has-long-file-name kamailio-rabbitmq-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-radius-modules: package-has-long-file-name kamailio-radius-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-redis-modules: package-has-long-file-name kamailio-redis-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-ruby-modules: package-has-long-file-name kamailio-ruby-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-sctp-modules: package-has-long-file-name kamailio-sctp-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-secsipid-modules: package-has-long-file-name kamailio-secsipid-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-snmpstats-modules: package-has-long-file-name kamailio-snmpstats-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-sqlite-modules: package-has-long-file-name kamailio-sqlite-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-systemd-modules: package-has-long-file-name kamailio-systemd-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-tls-modules: package-has-long-file-name kamailio-tls-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-tls-wolfssl-modules: package-has-long-file-name kamailio-tls-wolfssl-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-unixodbc-modules: package-has-long-file-name kamailio-unixodbc-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-utils-modules: package-has-long-file-name kamailio-utils-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-websocket-modules: package-has-long-file-name kamailio-websocket-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-xml-modules: package-has-long-file-name kamailio-xml-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio-xmpp-modules: package-has-long-file-name kamailio-xmpp-modules_6.0.0~dev2+ubuntu24.04.20240828080003.2774_amd64.deb W: kamailio: package-has-unnecessary-activation-of-ldconfig-trigger W: kamailio-ims-modules: package-has-unnecessary-activation-of-ldconfig-trigger W: kamailio source: package-uses-deprecated-debhelper-compat-version 9 W: kamailio-dbg: priority-extra-is-replaced-by-priority-optional W: kamailio source: space-in-std-shortname-in-dep5-copyright gpl-2 + openssl exception [debian/copyright:257] W: kamailio source: space-in-std-shortname-in-dep5-copyright gpl-2 + openssl exception [debian/copyright:50] W: kamailio source: space-in-std-shortname-in-dep5-copyright gpl-2 + openssl exception [debian/copyright:54] W: kamailio source: superfluous-file-pattern src/code/atomic/* [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/atomic_ops.* [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/basex.* [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/bit_*.c [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/char_msg_val.h [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/compiler_opt.h [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/core_stats.h [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/counters.* [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/endianness.* [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/futexlock.h [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/hashes.h [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/io_wait.* [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/code/list.h [debian/copyright:115] W: kamailio source: superfluous-file-pattern src/core/mem/dl_* [debian/copyright:210] W: kamailio source: superfluous-file-pattern src/core/mem/ll_malloc.* [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/core/mem/sf_malloc.* [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/core/mem/shm_mem.c [debian/copyright:56] W: kamailio source: superfluous-file-pattern src/core/parser/case_p_* [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/core/parser/case_reas.h [debian/copyright:27] W: kamailio source: superfluous-file-pattern src/lib/srutils/srjson.* [debian/copyright:236] W: kamailio source: superfluous-file-pattern src/modules/malloc_test/malloc_test.c [debian/copyright:27] + CHANGES_EXIT=2 + sed -i 's%\x1B\[[0-9;]*\?[mGKH]%%g' /build/kamailio-6.0.0~dev2+ubuntu24.04.20240828080003.2774.lintian.txt + [[ 0 =~ [01] ]] + [[ 2 =~ [01] ]] + echo 'Error: lintian execution failed [DSC_EXIT=0 CHANGES_EXIT=2]' Error: lintian execution failed [DSC_EXIT=0 CHANGES_EXIT=2] + exit 2 I: unmounting /tmp/apt-jdg_6zCV7q filesystem I: unmounting dev/ptmx filesystem I: unmounting dev/pts filesystem I: unmounting dev/shm filesystem I: unmounting proc filesystem I: unmounting sys filesystem I: Cleaning COW directory I: forking: rm -rf /var/cache/pbuilder/build/cow.2412 + '[' 1 -eq 0 ']' + bailout 1 'Error: Failed to build with cowbuilder.' + '[' -n 1 ']' + EXIT=1 + '[' -n 'Error: Failed to build with cowbuilder.' ']' + echo 'Error: Failed to build with cowbuilder.' Error: Failed to build with cowbuilder. + rm -f /run/lock/noble-amd64.building.2080 + '[' -r /run/lock/noble-amd64.update.2080 ']' + '[' '' = true ']' + echo '*** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. ***' *** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. *** + rm -f '<https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…'> + '[' -n /tmp/tmp.xeas4rqOLf ']' + rm -rf /tmp/tmp.xeas4rqOLf + '[' -n /tmp/apt-jdg_6zCV7q ']' + sudo rm -rf /tmp/apt-jdg_6zCV7q + '[' -n 193 ']' ++ sed -e 's/^$[0-9]*$.*/\1/' + SECONDS=2429 ++ date + echo '*** Finished execution of /usr/bin/build-and-provide-package at Wed Aug 28 08:47:37 UTC 2024 [running 2429 seconds] ***' *** Finished execution of /usr/bin/build-and-provide-package at Wed Aug 28 08:47:37 UTC 2024 [running 2429 seconds] *** + exit 1 Build step 'Execute shell' marked build as failure Archiving artifacts TAP Reports Processing: START Looking for TAP results report in workspace using pattern: report/*.tap Did not find any matching files. Recording test results ERROR: Step ‘Publish JUnit test result report’ failed: No test report files were found. Configuration error? Recording fingerprints

1 1

git:master:98825a7b: pkg/kamailio/deb: fix noble lintian errors [skip ci]
by Victor Seva 28 Aug '24

28 Aug '24

Module: kamailio Branch: master Commit: 98825a7bef452cae015e7491cfba1c7aad6051e2 URL: https://github.com/kamailio/kamailio/commit/98825a7bef452cae015e7491cfba1c7… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-28T11:02:07+02:00 pkg/kamailio/deb: fix noble lintian errors [skip ci] --- Modified: pkg/kamailio/deb/debian/backports/noble Modified: pkg/kamailio/deb/noble/control --- Diff: https://github.com/kamailio/kamailio/commit/98825a7bef452cae015e7491cfba1c7… Patch: https://github.com/kamailio/kamailio/commit/98825a7bef452cae015e7491cfba1c7… --- diff --git a/pkg/kamailio/deb/debian/backports/noble b/pkg/kamailio/deb/debian/backports/noble index 80cbb8cabd8..039846bb1b1 100755 --- a/pkg/kamailio/deb/debian/backports/noble +++ b/pkg/kamailio/deb/debian/backports/noble @@ -29,6 +29,12 @@ sed -i -e '/^ python,/d' -e '/python-dev/d' \ sed -i -e '/^PACKAGE_GROUPS += python$/d' ${DIST}/rules sed -i -e '/--EXCLUDED--/i EXTRA_EXCLUDED_MODULES += python' ${DIST}/rules +# no lsb-base +sed -i -e '/lsb-base/d' ${DIST}/control + +# libncurses +sed -i -e 's/libncurses5-dev/libncurses-dev/g' ${DIST}/control + wrap-and-sort -sat -d ${DIST} # clean backports scripts diff --git a/pkg/kamailio/deb/noble/control b/pkg/kamailio/deb/noble/control index af303e03a89..0991c8676b3 100644 --- a/pkg/kamailio/deb/noble/control +++ b/pkg/kamailio/deb/noble/control @@ -31,7 +31,7 @@ Build-Depends: libmono-2.0-dev [amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x], libmosquitto-dev, libnats-dev, - libncurses5-dev, + libncurses-dev, libpcre2-dev, libperl-dev, libphonenumber-dev (>= 7), @@ -73,7 +73,6 @@ Pre-Depends: ${misc:Pre-Depends}, Depends: adduser, - lsb-base, python3, ${misc:Depends}, ${shlibs:Depends},

1 0

git:master:6502872d: usrloc: mark contacts with keepalive sent
by Daniel-Constantin Mierla 28 Aug '24

28 Aug '24

Module: kamailio Branch: master Commit: 6502872d35d9bd7043bf54cd1d640dd64ae87115 URL: https://github.com/kamailio/kamailio/commit/6502872d35d9bd7043bf54cd1d640dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-28T10:52:55+02:00 usrloc: mark contacts with keepalive sent - properly detect if the contact record has to be expired or not --- Modified: src/modules/usrloc/ul_keepalive.c Modified: src/modules/usrloc/usrloc.h --- Diff: https://github.com/kamailio/kamailio/commit/6502872d35d9bd7043bf54cd1d640dd… Patch: https://github.com/kamailio/kamailio/commit/6502872d35d9bd7043bf54cd1d640dd… --- diff --git a/src/modules/usrloc/ul_keepalive.c b/src/modules/usrloc/ul_keepalive.c index e5a013b45a3..16fb66021c1 100644 --- a/src/modules/usrloc/ul_keepalive.c +++ b/src/modules/usrloc/ul_keepalive.c @@ -148,7 +148,8 @@ int ul_ka_urecord(urecord_t *ur) } } - if(ul_keepalive_timeout > 0 && uc->last_keepalive > 0) { + if(ul_keepalive_timeout > 0 && uc->last_keepalive > 0 + && (uc->flags & FL_KASENT)) { if(uc->last_keepalive + ul_keepalive_timeout < tnow) { /* set contact as expired in 10s */ LM_DBG("set expired contact on keepalive (%u + %u < %u)" @@ -257,7 +258,9 @@ int ul_ka_urecord(urecord_t *ur) kabuf_len, kabuf); kamsg.s = kabuf; kamsg.len = kabuf_len; - ul_ka_send(&kamsg, &idst); + if(ul_ka_send(&kamsg, &idst) >= 0) { + uc->flags |= FL_KASENT; + } } } return 0; diff --git a/src/modules/usrloc/usrloc.h b/src/modules/usrloc/usrloc.h index 54f7986080d..370baf0da86 100644 --- a/src/modules/usrloc/usrloc.h +++ b/src/modules/usrloc/usrloc.h @@ -63,6 +63,7 @@ typedef enum flags FL_MEM = 1 << 0, /*!< Update memory only */ FL_DMQRPL = 1 << 1, /*!< DMQ replication */ FL_EXPCLB = 1 << 2, /*!< Expired callback executed */ + FL_KASENT = 1 << 3, /*!< Keepalive sent to contact */ FL_ALL = (int)0xFFFFFFFF /*!< All flags set */ } flags_t;

1 0

[kamailio/kamailio] kafka: build .deb package with kafka.so (PR #3952)
by Stefan Mititelu 28 Aug '24

28 Aug '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 - [ ] 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:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Noticed that kafka.so is not included in any existing deb packages. However, librdkafka-dev is generally available library in debian. I've added deb package build for "kamailio-kafka-modules", for bullseye, bookworm and sid. Maybe this can be backported to at least 5.8 stable branch?! You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3952 -- Commit Summary -- * kafka: build .deb package with kafka.so -- File Changes -- M pkg/kamailio/deb/bookworm/control (17) M pkg/kamailio/deb/bookworm/rules (1) M pkg/kamailio/deb/bullseye/control (17) M pkg/kamailio/deb/bullseye/rules (1) M pkg/kamailio/deb/sid/control (17) M pkg/kamailio/deb/sid/rules (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3952.patch https://github.com/kamailio/kamailio/pull/3952.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3952 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3952(a)github.com>

3 4

git:master:c2ea356b: pkg/kamailio/deb: add kafka package
by Victor Seva 28 Aug '24

28 Aug '24

Module: kamailio Branch: master Commit: c2ea356b9178c989083111dbc3bf13d993640dc8 URL: https://github.com/kamailio/kamailio/commit/c2ea356b9178c989083111dbc3bf13d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-27T16:11:26+02:00 pkg/kamailio/deb: add kafka package fixes #3952 --- Modified: pkg/kamailio/deb/bionic/rules Modified: pkg/kamailio/deb/bookworm/control Modified: pkg/kamailio/deb/bookworm/rules Modified: pkg/kamailio/deb/bullseye/control Modified: pkg/kamailio/deb/bullseye/rules Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/debian/backports/bionic Modified: pkg/kamailio/deb/debian/backports/buster Modified: pkg/kamailio/deb/debian/backports/jessie Modified: pkg/kamailio/deb/debian/backports/precise Modified: pkg/kamailio/deb/debian/backports/stretch Modified: pkg/kamailio/deb/debian/backports/trusty Modified: pkg/kamailio/deb/debian/backports/wheezy Modified: pkg/kamailio/deb/debian/backports/xenial Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/focal/control Modified: pkg/kamailio/deb/focal/rules Modified: pkg/kamailio/deb/jammy/control Modified: pkg/kamailio/deb/jammy/rules Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/noble/control Modified: pkg/kamailio/deb/noble/rules Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/c2ea356b9178c989083111dbc3bf13d… Patch: https://github.com/kamailio/kamailio/commit/c2ea356b9178c989083111dbc3bf13d…

1 0

Build failed in Jenkins: kamailiodev-nightly-source » nobel,master #2773
by kamailio＠sipwise.com 28 Aug '24

28 Aug '24

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-source/distribution=no…> Changes: ------------------------------------------ Started by upstream project "kamailiodev-nightly-source" build number 2773 originally caused by: Started by an SCM change Running as SYSTEM Building in workspace <https://kamailio.sipwise.com/job/kamailiodev-nightly-source/distribution=no…> The recommended git tool is: NONE No credentials specified Cloning the remote Git repository Cloning repository https://github.com/kamailio/kamailio.git > git init <https://kamailio.sipwise.com/job/kamailiodev-nightly-source/distribution=no…> # timeout=10 Fetching upstream changes from https://github.com/kamailio/kamailio.git > git --version # timeout=10 > git --version # 'git version 2.30.2' > git fetch --tags --force --progress -- https://github.com/kamailio/kamailio.git +refs/heads/*:refs/remotes/origin/* # timeout=10 > git config remote.origin.url https://github.com/kamailio/kamailio.git # timeout=10 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10 Avoid second fetch Checking out Revision 7a390e0a297278b6d319c78f74b8179ed6a25c3b (origin/master) > git config core.sparsecheckout # timeout=10 > git checkout -f 7a390e0a297278b6d319c78f74b8179ed6a25c3b # timeout=10 Commit message: "modules: readme files regenerated - tm ... [skip ci]" First time build. Skipping changelog. [master] $ /bin/sh -xe /tmp/jenkins3068275780796088845.sh + rm -f ./source rm: cannot remove './source': Is a directory + true [master] $ /bin/sh -xe /tmp/jenkins1623617668519911366.sh + /home/admin/kamailio-deb-jenkins/scripts/jdg-generate-source SHELL=/bin/bash RUN_TESTS_DISPLAY_URL=https://kamailio.sipwise.com/job/kamailiodev-nightly-… distribution=nobel JENKINS_SERVER_COOKIE=fcec2c59d7edfc8c RUN_CHANGES_DISPLAY_URL=https://kamailio.sipwise.com/job/kamailiodev-nightl… PWD=<https://kamailio.sipwise.com/job/kamailiodev-nightly-source/distribution=no…> HUDSON_HOME=/var/lib/jenkins LOGNAME=jenkins BUILD_URL=https://kamailio.sipwise.com/job/kamailiodev-nightly-source/distr… JOB_URL=https://kamailio.sipwise.com/job/kamailiodev-nightly-source/distrib… BUILD_NUMBER=2773 BUILD_DISPLAY_NAME=#2773 HOME=/var/lib/jenkins GIT_CHECKOUT_DIR=source LANG=en_US.UTF-8 JENKINS_URL=https://kamailio.sipwise.com/ JOB_BASE_NAME=distribution=nobel,label=master JOB_NAME=kamailiodev-nightly-source/distribution=nobel,label=master INVOCATION_ID=b15ffde9f5b24f79be26749736a9dcc1 RUN_DISPLAY_URL=https://kamailio.sipwise.com/job/kamailiodev-nightly-source… JOB_DISPLAY_URL=https://kamailio.sipwise.com/job/kamailiodev-nightly-source… WORKSPACE=<https://kamailio.sipwise.com/job/kamailiodev-nightly-source/distribution=no…> HUDSON_URL=https://kamailio.sipwise.com/ NODE_NAME=master label=master USER=jenkins HUDSON_SERVER_COOKIE=fcec2c59d7edfc8c GIT_URL=https://github.com/kamailio/kamailio.git SHLVL=1 BUILD_TAG=jenkins-kamailiodev-nightly-source-distribution=nobel,label=master-2773 EXECUTOR_NUMBER=0 HUDSON_COOKIE=fdd22e15-d23d-4ab7-8db3-ee318fc0e02f JENKINS_HOME=/var/lib/jenkins GIT_COMMIT=7a390e0a297278b6d319c78f74b8179ed6a25c3b NODE_LABELS=master JOURNAL_STREAM=8:8417688 WORKSPACE_TMP=<https://kamailio.sipwise.com/job/kamailiodev-nightly-source/distribution=no…> PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin RUN_ARTIFACTS_DISPLAY_URL=https://kamailio.sipwise.com/job/kamailiodev-nigh… CI=true GIT_BRANCH=origin/master BUILD_ID=2773 OLDPWD=<https://kamailio.sipwise.com/job/kamailiodev-nightly-source/distribution=no…> _=/usr/bin/env nobel not supported Build step 'Execute shell' marked build as failure Archiving artifacts Recording fingerprints

1 0

git: new commits in branch 5.8
by Daniel-Constantin Mierla 27 Aug '24

27 Aug '24

- URL: https://github.com/kamailio/kamailio/commit/e11c132cbf57ea1ae6289e734f60110… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:52:15+02:00 stun: check message len for response (cherry picked from commit 87e1a4a7f5d565a59a362f22e9372697f2f2f2af) - URL: https://github.com/kamailio/kamailio/commit/a3f40f3c407d34b25717416b3ac500e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:52:51+02:00 rls: remove unnecessary assignment (cherry picked from commit c97145862119e9001874cd07de9b20ad8e96ff54) - URL: https://github.com/kamailio/kamailio/commit/ffa4eeded62507f15e4e9b26aa5b3ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:53:05+02:00 pua: use long for time value diff operation (cherry picked from commit fc8bee5b87e95e43bda2635e65457b2025eab6f9) - URL: https://github.com/kamailio/kamailio/commit/743ebe918b89a42ce94b10fb9dc2fe2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:53:38+02:00 evrexec: remove unnecessary safety exit loop (cherry picked from commit d5076b557728b3f9d80df391ae71e2eab2c896dc) - URL: https://github.com/kamailio/kamailio/commit/89339b1fa6f08024a44d898ed9877f0… Author: Dragos Vingarzan <vingarzan(a)gmail.com> Date: 2024-08-27T12:54:11+02:00 nathelper: fixed handle_ruri_alias() for alias being an IPv6 (cherry picked from commit 52ab6f3dcf5ad8d967be8bdecaa64ef31cbfbe33) - URL: https://github.com/kamailio/kamailio/commit/fc29c81bbc6e3fb0709e3367e2f1d80… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:54:43+02:00 core: remove unnecessary cleanup when locating a module (cherry picked from commit eda03789f693bb72ec4ee05a8b2b4723e5080504) - URL: https://github.com/kamailio/kamailio/commit/0ffd281b77ac48f24c04655cd962b48… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:55:43+02:00 dispatcher: remove reference to MI in comments (cherry picked from commit 8c3b5ab3818c86b90b02e20aa4631654e0b51745) - URL: https://github.com/kamailio/kamailio/commit/b307c7eb8e58b43dca41deb3493b088… Author: emvondo <106535097+emvondo(a)users.noreply.github.com> Date: 2024-08-27T12:56:17+02:00 siprepo: fix int params and wrong copy data in siprepo_msg_async_pull (#3919) * siprepo: fix int params and wrong copy data in siprepo_msg_async_pull --------- Co-authored-by: emvondo <bycl2332(a)orange.com> (cherry picked from commit a3a63655dbcbf1bc8067f34c36f4a7295b2a1745) - URL: https://github.com/kamailio/kamailio/commit/92a3cc4549073d70b1b229149b29017… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:56:27+02:00 core: init res inside select_cfg_var() (cherry picked from commit a471d34d6162387a1427f5d0c5b3c6079a2b0bdc) - URL: https://github.com/kamailio/kamailio/commit/d69e65fa4e9448701729ac8f41b069d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:56:42+02:00 core: set digit 0 in the md5 buffer in case of error inside char_msg_val() (cherry picked from commit 15b2a5467f11e009ae4efad1ee29af860326095f) - URL: https://github.com/kamailio/kamailio/commit/7ca33c475b52703216f7d8d4e6c7853… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:57:11+02:00 core: remove unnecessary check after using the structure (cherry picked from commit 84ea36b4b79c07c4fc0a8c9e119184433353764e) - URL: https://github.com/kamailio/kamailio/commit/445659c38bd54e26d085d8c5b07bfb8… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Date: 2024-08-27T12:57:27+02:00 tcpops: fix memory leak in $tcp(conid) - reference counter to tcp session not decremented, so shm for session never free (cherry picked from commit acf50d86b502af36e3635d61745feaa5c577231d) - URL: https://github.com/kamailio/kamailio/commit/39d4d48abf9e3e2e1edd2f22780fb1b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:58:09+02:00 core: removed unnecessary destroy (cherry picked from commit 20f2096d314253e7e74688da664de2830289a276) - URL: https://github.com/kamailio/kamailio/commit/fa8f0a401980f5dccdfe35983fb5b55… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:58:26+02:00 topoh: 0-init alocated structures (cherry picked from commit dc71c0a5791ebc1306648b5ed338613050e32f5c) - URL: https://github.com/kamailio/kamailio/commit/e006c2c53d6b013253f6a95b96c0f81… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:58:33+02:00 xprint: check to avoid double free (cherry picked from commit 5a1f80f266069dbc453b44a856f225c254e7c050) - URL: https://github.com/kamailio/kamailio/commit/4732a4a88df9f4cbd2260564b942691… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:58:53+02:00 tls: remove uselss pv format parsing in pv_parse_alt_name() (cherry picked from commit 7c06997a1b6e77ae0642d369f532219dc35ef8e0) - URL: https://github.com/kamailio/kamailio/commit/dd4d5e44a60a658772e8288d9419359… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:59:02+02:00 tls: check lenght when parsing pv alt name (cherry picked from commit 79a668b8bdb0e085adb3581d718e5fd5ae73e2e4) - URL: https://github.com/kamailio/kamailio/commit/e016d1ada08edca0adacd42ffa67ffd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:59:11+02:00 utils: jump to error on pkg allocation failure (cherry picked from commit 34749ab13b31504358761c964f794b283931394c) - URL: https://github.com/kamailio/kamailio/commit/f57accd1820b26b40f14d4204654021… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:59:20+02:00 erlang: init xavps for safety destroy on error (cherry picked from commit 29510872607deb3238411b358c422d004fb307b7) - URL: https://github.com/kamailio/kamailio/commit/c447bf60d528d8fdc1f5aee52a796ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:59:31+02:00 jsonrpcc: free allocated pkg buffer on error (cherry picked from commit 796bcc038d7885e01dbad34abc68bf612062c533) - URL: https://github.com/kamailio/kamailio/commit/5baf49a179194ba0eaa5e7f4caba613… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:59:38+02:00 jsonrpcc: declare variables are the beginning of function (cherry picked from commit 7ba313f6f96ffa6042c163027c0c7bb65106fef7) - URL: https://github.com/kamailio/kamailio/commit/61eb4fe44e66a952ba14e39e1c66487… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:59:50+02:00 core: cfg select - check res before initializing (cherry picked from commit a6c415713bb209b03ff110d4ae891173d04ac471) - URL: https://github.com/kamailio/kamailio/commit/f8201e6d4848081a2dd564e0d5b216f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T13:00:10+02:00 janssonrpcc: free new servers list on error (cherry picked from commit b4efe7725728392d0c8921c006d6fbc6455e9b8f) - URL: https://github.com/kamailio/kamailio/commit/bbfb24d3cb841b37e6e1b84892b68da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T13:00:21+02:00 xprint: return on mod init error case (cherry picked from commit 660a019263b81d318700c205531bf4e042c912cf) - URL: https://github.com/kamailio/kamailio/commit/dfc2531cf7db70e315613b3242d1b5b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T13:00:33+02:00 core: cfg select - check res when getting the variable (cherry picked from commit 3333611a3ef9078cbcb9867db88921f0c48fce1b) - URL: https://github.com/kamailio/kamailio/commit/1eb7db2f18724b91d18c6b30b529b51… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T13:00:40+02:00 db_berkeley: buffer size set to the argument of strftime() (cherry picked from commit e86d6ee30227a3fc5cff98e7983d4a80f0c42c4b) - URL: https://github.com/kamailio/kamailio/commit/bc8ea1022718c94fbdf9bb93c35759e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T13:00:58+02:00 core: tcp - use long long constants for operations (cherry picked from commit fc2f34e8bab022b0c99e8313aee3e4a87c1f2e52) - URL: https://github.com/kamailio/kamailio/commit/2e4920fd292b6f1d064a75503dd3be3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T13:01:06+02:00 cplc: use long long constants for operations (cherry picked from commit 49a9c0a0f391c2e9fc45dff7c37a087dde0f7ba3) - URL: https://github.com/kamailio/kamailio/commit/e14522cab01eba9c5fa636a7c0f6ed4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T13:01:31+02:00 corex: small formatting of iflag list (cherry picked from commit 70606e3ea575228b3ccc662d6f9048aa0eb899ce) - URL: https://github.com/kamailio/kamailio/commit/d102f40856512d2c51707bf5ec5a6c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T13:01:41+02:00 corex: proper check for iflag lookup return code (cherry picked from commit fdb0ef987ca2b013104b06ece006f67bf8ae07d3) - URL: https://github.com/kamailio/kamailio/commit/a024fb3c028b8df18a9b855fff99bcd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T13:01:52+02:00 corex: switch to unsigned long long for iflag lookup (cherry picked from commit 072c44330297c653675b5078fb0facdc399a5ab4) - URL: https://github.com/kamailio/kamailio/commit/57b9c66cb7811c045caceb2f61047e0… Author: Morten Tryfoss <morten(a)tryfoss.no> Date: 2024-08-27T14:22:30+02:00 cdp: Error log caused crash (cherry picked from commit 4aaaca60ef2207100dd3f4e16ae63428aadc7dc5) - URL: https://github.com/kamailio/kamailio/commit/92e999228eb75856911386d280ab483… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T14:22:53+02:00 phonenum: export match_cn() to kemi (cherry picked from commit e9dd041ce6af9ee4b9cc2e29b4417787a8056776) - URL: https://github.com/kamailio/kamailio/commit/e9d5d37271e03cdec6cf87647e488c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T14:23:03+02:00 phonenum: add fixup free functions to exports structure (cherry picked from commit 7d2fd09103680454aaaba30f5e46f83b362513eb) - URL: https://github.com/kamailio/kamailio/commit/ee5853b4eab6553821113ff64e9eed2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T14:23:36+02:00 msilo: added fixup free functions to exports structure (cherry picked from commit b6dea98ada293a3bbad004aa1b194d4bf44a60ab) - URL: https://github.com/kamailio/kamailio/commit/f32d67f1b4b08a8cc8dbae917e1a2d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T14:23:45+02:00 msilo: removed duplicatred exported function (cherry picked from commit b712ddc4db9a9c1bb30b236a0a86082108b23f07) - URL: https://github.com/kamailio/kamailio/commit/b2bfdd8eb6b40b1e70a2876cee46890… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-27T14:24:27+02:00 pua_dialoginfo: add section ID's to documentation (cherry picked from commit aba56a5aa3b8fa4f07d0c52cd7fd2d56103ca56c) - URL: https://github.com/kamailio/kamailio/commit/6a22677e281de00dc0088ad23d7c7a5… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-27T14:24:46+02:00 pua_dialoginfo: reformat exported structures more human friendly (cherry picked from commit 748da56717800c36c43bb6fe3739011f3d3105e0) - URL: https://github.com/kamailio/kamailio/commit/a9769ca3692f11fe36e86b29af37d94… Author: Andrii Pogrebennyk <andrii(a)ng-voice.com> Date: 2024-08-27T14:29:05+02:00 pua_reginfo: free pkg memory after getting the content of each XML attribute - free the memory from the state XML attribute that was returned and immediately used in another function call without freeing leaving one small mem leak; - add comments but keep the dead code regarding parsed but unused attrs. (cherry picked from commit ed6730aa64e0e7c1580584d6f808e76a665e5882) - URL: https://github.com/kamailio/kamailio/commit/2dbc8b5bf3353fdd3b05f265075e6a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T14:30:17+02:00 core: use defined type for flags inside build_req_buf_from_sip_req() - partial backport from 9ff1080cc6452343e6bc2de00350b2f7bcecf6d2

1 0

git:master:7a390e0a: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: 7a390e0a297278b6d319c78f74b8179ed6a25c3b URL: https://github.com/kamailio/kamailio/commit/7a390e0a297278b6d319c78f74b8179… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-08-27T12:46:11+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/7a390e0a297278b6d319c78f74b8179… Patch: https://github.com/kamailio/kamailio/commit/7a390e0a297278b6d319c78f74b8179… --- diff --git a/src/modules/tm/README b/src/modules/tm/README index 35c2e5d0ec0..dbeff43d002 100644 --- a/src/modules/tm/README +++ b/src/modules/tm/README @@ -1631,8 +1631,12 @@ modparam("tm", "e2e_cancel_hop_by_hop", 0) 3.44. headers_mode (int) - Control if headers from incoming CANCEL should be propagated to - hop-by-hop generated CANCEL. + Control how headers from incoming CANCEL should be propagated to + hop-by-hop generated CANCEL. If bit (flag) 1 is set (value 1), + propagate the headers that are not branch specific (e.g., From, To). If + bit (flag) 2 is set, in case processing ends in stateless forwarding by + tm, forward CANCEL with a single Via header (the one added by + Kamailio). Default value: 0 (do not propagate).

1 0

git:master:b67bb7a1: tm: docs for header_mode flag 2
by Daniel-Constantin Mierla 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: b67bb7a1bc4c710d33e242cea94a192297660c75 URL: https://github.com/kamailio/kamailio/commit/b67bb7a1bc4c710d33e242cea94a192… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:42:13+02:00 tm: docs for header_mode flag 2 --- Modified: src/modules/tm/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/b67bb7a1bc4c710d33e242cea94a192… Patch: https://github.com/kamailio/kamailio/commit/b67bb7a1bc4c710d33e242cea94a192… --- diff --git a/src/modules/tm/doc/params.xml b/src/modules/tm/doc/params.xml index ffef9a4eec3..e8a16182e42 100644 --- a/src/modules/tm/doc/params.xml +++ b/src/modules/tm/doc/params.xml @@ -1377,8 +1377,12 @@ modparam("tm", "e2e_cancel_hop_by_hop", 0) <section id="headers_mode"> <title><varname>headers_mode</varname> (int)</title> <para> - Control if headers from incoming CANCEL should be propagated to - hop-by-hop generated CANCEL. + Control how headers from incoming CANCEL should be propagated to + hop-by-hop generated CANCEL. If bit (flag) 1 is set (value 1), + propagate the headers that are not branch specific (e.g., From, To). + If bit (flag) 2 is set, in case processing ends in stateless + forwarding by tm, forward CANCEL with a single Via header (the one + added by &kamailio;). </para> <para> Default value: 0 (do not propagate).

1 0

git:master:f409ffa0: corex: handle return code from core functions for uac forwarding
by Daniel-Constantin Mierla 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: f409ffa05fcefc11dbfaef0cfedcc7cee0911b2a URL: https://github.com/kamailio/kamailio/commit/f409ffa05fcefc11dbfaef0cfedcc7c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:38:25+02:00 corex: handle return code from core functions for uac forwarding --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f409ffa05fcefc11dbfaef0cfedcc7c… Patch: https://github.com/kamailio/kamailio/commit/f409ffa05fcefc11dbfaef0cfedcc7c… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 585b65b0836..021ed586253 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -279,7 +279,13 @@ static void mod_destroy(void) */ static int ki_forward_uac(sip_msg_t *msg, str *vuri) { - return forward_uac_uri(msg, NULL); + int ret; + + ret = forward_uac_uri(msg, NULL); + if(ret >= 0) { + return 1; + } + return -1; } /** @@ -287,7 +293,13 @@ static int ki_forward_uac(sip_msg_t *msg, str *vuri) */ static int ki_forward_uac_uri(sip_msg_t *msg, str *vuri) { - return forward_uac_uri(msg, vuri); + int ret; + + ret = forward_uac_uri(msg, vuri); + if(ret >= 0) { + return 1; + } + return -1; } /** @@ -295,7 +307,13 @@ static int ki_forward_uac_uri(sip_msg_t *msg, str *vuri) */ static int w_forward_uac(sip_msg_t *msg, char *p1, char *p2) { - return forward_uac_uri(msg, NULL); + int ret; + + ret = forward_uac_uri(msg, NULL); + if(ret >= 0) { + return 1; + } + return -1; } /** @@ -303,6 +321,7 @@ static int w_forward_uac(sip_msg_t *msg, char *p1, char *p2) */ static int w_forward_uac_uri(sip_msg_t *msg, char *puri, char *p2) { + int ret; str vuri = STR_NULL; if(fixup_get_svalue(msg, (gparam_t *)puri, &vuri)) { @@ -310,7 +329,11 @@ static int w_forward_uac_uri(sip_msg_t *msg, char *puri, char *p2) return -1; } - return forward_uac_uri(msg, &vuri); + ret = forward_uac_uri(msg, &vuri); + if(ret >= 0) { + return 1; + } + return -1; } /**

1 0

git:master:31c77b2f: core: propagate return code for forward uac helpers
by Daniel-Constantin Mierla 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: 31c77b2f81e23666fbd8d6d249d6b8ddce06483a URL: https://github.com/kamailio/kamailio/commit/31c77b2f81e23666fbd8d6d249d6b8d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:38:25+02:00 core: propagate return code for forward uac helpers --- Modified: src/core/forward.c --- Diff: https://github.com/kamailio/kamailio/commit/31c77b2f81e23666fbd8d6d249d6b8d… Patch: https://github.com/kamailio/kamailio/commit/31c77b2f81e23666fbd8d6d249d6b8d… --- diff --git a/src/core/forward.c b/src/core/forward.c index 97953ee7b85..ff73d957642 100644 --- a/src/core/forward.c +++ b/src/core/forward.c @@ -688,6 +688,9 @@ int forward_request_mode(struct sip_msg *msg, str *dst, unsigned short port, } +/** + * forward request in stateless mode + */ int forward_request(struct sip_msg *msg, str *dst, unsigned short port, struct dest_info *send_info) { @@ -695,6 +698,9 @@ int forward_request(struct sip_msg *msg, str *dst, unsigned short port, } +/** + * forward request like initial uac sender, with only one via + */ int forward_request_uac(struct sip_msg *msg, str *dst, unsigned short port, struct dest_info *send_info) { @@ -723,11 +729,8 @@ int forward_request_uac(struct sip_msg *msg, str *dst, unsigned short port, msg->msg_flags |= FL_VIA_NORECEIVED; ret = forward_request_mode(msg, dst, port, send_info, BUILD_NO_VIA1_UPDATE); msg->msg_flags = msg_flags_bk; - if(ret >= 0) { - return 1; - } - return -1; + return ret; } /** @@ -787,11 +790,8 @@ int forward_uac_uri(sip_msg_t *msg, str *vuri) ret = forward_request_mode( msg, &u->host, u->port_no, &dst, BUILD_NO_VIA1_UPDATE); msg->msg_flags = msg_flags_bk; - if(ret >= 0) { - return 1; - } - return -1; + return ret; } int update_sock_struct_from_via(

1 0

git:master:efcb697e: corex: export to kemi the forward uac functions
by Daniel-Constantin Mierla 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: efcb697e34f767ccb243c181c9d557d136eada2e URL: https://github.com/kamailio/kamailio/commit/efcb697e34f767ccb243c181c9d557d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:38:25+02:00 corex: export to kemi the forward uac functions --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/efcb697e34f767ccb243c181c9d557d… Patch: https://github.com/kamailio/kamailio/commit/efcb697e34f767ccb243c181c9d557d… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index a5d05dbaea2..585b65b0836 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -274,6 +274,14 @@ static void mod_destroy(void) { } +/** + * forward request like initial uac sender, with only one via + */ +static int ki_forward_uac(sip_msg_t *msg, str *vuri) +{ + return forward_uac_uri(msg, NULL); +} + /** * forward request like initial uac sender, with only one via */ @@ -1528,6 +1536,16 @@ static sr_kemi_t sr_kemi_corex_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("corex"), str_init("forward_uac"), + SR_KEMIP_INT, ki_forward_uac, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("corex"), str_init("forward_uac_uri"), + SR_KEMIP_INT, ki_forward_uac_uri, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:69b43802: tm: new headers_mode flag 2
by Daniel-Constantin Mierla 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: 69b4380222121321412afc70dfafe39961551f41 URL: https://github.com/kamailio/kamailio/commit/69b4380222121321412afc70dfafe39… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:38:25+02:00 tm: new headers_mode flag 2 - statelss uac-style forwarding of CANCEL --- Modified: src/modules/tm/t_fwd.c Modified: src/modules/tm/t_msgbuilder.c Modified: src/modules/tm/t_msgbuilder.h --- Diff: https://github.com/kamailio/kamailio/commit/69b4380222121321412afc70dfafe39… Patch: https://github.com/kamailio/kamailio/commit/69b4380222121321412afc70dfafe39… --- diff --git a/src/modules/tm/t_fwd.c b/src/modules/tm/t_fwd.c index cf30afedfa7..9568b6adb1b 100644 --- a/src/modules/tm/t_fwd.c +++ b/src/modules/tm/t_fwd.c @@ -61,6 +61,7 @@ extern int tm_failure_exec_mode; extern int tm_dns_reuse_rcv_socket; +extern int tm_headers_mode; static int goto_on_branch = 0, branch_route = 0; /* E2E_CANCEL_HOP_BY_HOP - cancel hop by hop */ @@ -1902,7 +1903,11 @@ int t_forward_cancel(struct sip_msg *p_msg, struct proxy_l *proxy, int proto, #endif /* dst->send_sock not set, but forward_request * will take care of it */ - ret = forward_request(p_msg, &host, port, &dst); + if(tm_headers_mode & TM_CANCEL_FORWARD_UAC) { + ret = forward_request_uac(p_msg, &host, port, &dst); + } else { + ret = forward_request(p_msg, &host, port, &dst); + } goto end; } else { init_dest_info(&dst); @@ -1910,7 +1915,11 @@ int t_forward_cancel(struct sip_msg *p_msg, struct proxy_l *proxy, int proto, proxy2su(&dst.to, proxy); /* dst->send_sock not set, but forward_request * will take care of it */ - ret = forward_request(p_msg, 0, 0, &dst); + if(tm_headers_mode & TM_CANCEL_FORWARD_UAC) { + ret = forward_request_uac(p_msg, &host, port, &dst); + } else { + ret = forward_request(p_msg, 0, 0, &dst); + } goto end; } } diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index 49c801d2e8f..9adc4613421 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -70,7 +70,6 @@ (_d) += (_len); \ } while(0) -#define TM_CANCEL_HEADERS_COPY 1 extern int tm_headers_mode; /* Build a local request based on a previous request; main diff --git a/src/modules/tm/t_msgbuilder.h b/src/modules/tm/t_msgbuilder.h index c06d1e6adf6..f6ad810d377 100644 --- a/src/modules/tm/t_msgbuilder.h +++ b/src/modules/tm/t_msgbuilder.h @@ -28,6 +28,9 @@ #include "h_table.h" #include "t_reply.h" +#define TM_CANCEL_HEADERS_COPY (1) +#define TM_CANCEL_FORWARD_UAC (1 << 1) + char *build_local(struct cell *Trans, unsigned int branch, unsigned int *len, char *method, int method_len, str *to, sip_msg_t *imsg, struct cancel_reason *reason);

1 0

git:master:233dda7b: core: helper function to forward uac style with dst attributes
by Daniel-Constantin Mierla 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: 233dda7b9a1ca6954c35f2f0b271cb9bc4c813d9 URL: https://github.com/kamailio/kamailio/commit/233dda7b9a1ca6954c35f2f0b271cb9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:38:25+02:00 core: helper function to forward uac style with dst attributes --- Modified: src/core/forward.c Modified: src/core/forward.h --- Diff: https://github.com/kamailio/kamailio/commit/233dda7b9a1ca6954c35f2f0b271cb9… Patch: https://github.com/kamailio/kamailio/commit/233dda7b9a1ca6954c35f2f0b271cb9… --- diff --git a/src/core/forward.c b/src/core/forward.c index 3d2e743cdbd..97953ee7b85 100644 --- a/src/core/forward.c +++ b/src/core/forward.c @@ -695,6 +695,41 @@ int forward_request(struct sip_msg *msg, str *dst, unsigned short port, } +int forward_request_uac(struct sip_msg *msg, str *dst, unsigned short port, + struct dest_info *send_info) +{ + int ret; + sr_lump_t *anchor; + hdr_field_t *hf; + msg_flags_t msg_flags_bk; + + if(parse_headers(msg, HDR_EOH_F, 0) == -1) { + LM_ERR("error while parsing message\n"); + return -1; + } + /* remove incoming Via headers */ + for(hf = msg->headers; hf; hf = hf->next) { + if(hf->type != HDR_VIA_T) { + continue; + } + anchor = del_lump(msg, hf->name.s - msg->buf, hf->len, 0); + if(anchor == 0) { + LM_ERR("cannot remove Via header\n"); + return -1; + } + } + + msg_flags_bk = msg->msg_flags; + msg->msg_flags |= FL_VIA_NORECEIVED; + ret = forward_request_mode(msg, dst, port, send_info, BUILD_NO_VIA1_UPDATE); + msg->msg_flags = msg_flags_bk; + if(ret >= 0) { + return 1; + } + + return -1; +} + /** * forward request like initial uac sender, with only one via */ diff --git a/src/core/forward.h b/src/core/forward.h index 5b414a7a64b..31086c6512b 100644 --- a/src/core/forward.h +++ b/src/core/forward.h @@ -82,6 +82,8 @@ int forward_request(struct sip_msg *msg, str *dst, unsigned short port, struct dest_info *send_info); int forward_request_mode(struct sip_msg *msg, str *dst, unsigned short port, struct dest_info *send_info, unsigned int mbmode); +int forward_request_uac(struct sip_msg *msg, str *dst, unsigned short port, + struct dest_info *send_info); int forward_uac_uri(sip_msg_t *msg, str *vuri); int update_sock_struct_from_via( union sockaddr_union *to, struct sip_msg *msg, struct via_body *via);

1 0

git:master:f58c1a0b: corex: updates to forward-uac functions after code relocation
by Daniel-Constantin Mierla 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: f58c1a0b74cce2f3abca540d0d6cb826d3d7b637 URL: https://github.com/kamailio/kamailio/commit/f58c1a0b74cce2f3abca540d0d6cb82… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:38:25+02:00 corex: updates to forward-uac functions after code relocation --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f58c1a0b74cce2f3abca540d0d6cb82… Patch: https://github.com/kamailio/kamailio/commit/f58c1a0b74cce2f3abca540d0d6cb82… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index c6852759114..a5d05dbaea2 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -279,63 +279,7 @@ static void mod_destroy(void) */ static int ki_forward_uac_uri(sip_msg_t *msg, str *vuri) { - int ret; - dest_info_t dst; - sip_uri_t *u; - sip_uri_t next_hop; - sr_lump_t *anchor; - hdr_field_t *hf; - msg_flags_t msg_flags_bk; - - if(msg == NULL) { - LM_WARN("invalid msg parameter\n"); - return -1; - } - - if(parse_headers(msg, HDR_EOH_F, 0) == -1) { - LM_ERR("error while parsing message\n"); - return -1; - } - /* remove incoming Via headers */ - for(hf = msg->headers; hf; hf = hf->next) { - if(hf->type != HDR_VIA_T) { - continue; - } - anchor = del_lump(msg, hf->name.s - msg->buf, hf->len, 0); - if(anchor == 0) { - LM_ERR("cannot remove Via header\n"); - return -1; - } - } - - init_dest_info(&dst); - if(vuri == NULL || vuri->s == NULL || vuri->len <= 0) { - if(msg->dst_uri.len) { - ret = parse_uri(msg->dst_uri.s, msg->dst_uri.len, &next_hop); - u = &next_hop; - } else { - ret = parse_sip_msg_uri(msg); - u = &msg->parsed_uri; - } - } else { - ret = parse_uri(vuri->s, vuri->len, &next_hop); - u = &next_hop; - } - if(ret < 0) { - LM_ERR("forward - bad uri dropping packet\n"); - return -1; - } - dst.proto = u->proto; - msg_flags_bk = msg->msg_flags; - msg->msg_flags |= FL_VIA_NORECEIVED; - ret = forward_request_mode( - msg, &u->host, u->port_no, &dst, BUILD_NO_VIA1_UPDATE); - msg->msg_flags = msg_flags_bk; - if(ret >= 0) { - return 1; - } - - return -1; + return forward_uac_uri(msg, vuri); } /** @@ -343,7 +287,7 @@ static int ki_forward_uac_uri(sip_msg_t *msg, str *vuri) */ static int w_forward_uac(sip_msg_t *msg, char *p1, char *p2) { - return ki_forward_uac_uri(msg, NULL); + return forward_uac_uri(msg, NULL); } /** @@ -358,7 +302,7 @@ static int w_forward_uac_uri(sip_msg_t *msg, char *puri, char *p2) return -1; } - return ki_forward_uac_uri(msg, &vuri); + return forward_uac_uri(msg, &vuri); } /**

1 0

git:master:a8162b51: core: relocated function for stateless forwarding uac style
by Daniel-Constantin Mierla 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: a8162b513443fd688ab66e470748cc948c811a6a URL: https://github.com/kamailio/kamailio/commit/a8162b513443fd688ab66e470748cc9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:38:25+02:00 core: relocated function for stateless forwarding uac style --- Modified: src/core/forward.c Modified: src/core/forward.h --- Diff: https://github.com/kamailio/kamailio/commit/a8162b513443fd688ab66e470748cc9… Patch: https://github.com/kamailio/kamailio/commit/a8162b513443fd688ab66e470748cc9… --- diff --git a/src/core/forward.c b/src/core/forward.c index 1d2b1d5d650..3d2e743cdbd 100644 --- a/src/core/forward.c +++ b/src/core/forward.c @@ -40,6 +40,7 @@ #include "hash_func.h" #include "config.h" #include "parser/msg_parser.h" +#include "parser/parse_uri.h" #include "char_msg_val.h" #include "route.h" #include "events.h" @@ -694,6 +695,70 @@ int forward_request(struct sip_msg *msg, str *dst, unsigned short port, } +/** + * forward request like initial uac sender, with only one via + */ +int forward_uac_uri(sip_msg_t *msg, str *vuri) +{ + int ret; + dest_info_t dst; + sip_uri_t *u; + sip_uri_t next_hop; + sr_lump_t *anchor; + hdr_field_t *hf; + msg_flags_t msg_flags_bk; + + if(msg == NULL) { + LM_WARN("invalid msg parameter\n"); + return -1; + } + + if(parse_headers(msg, HDR_EOH_F, 0) == -1) { + LM_ERR("error while parsing message\n"); + return -1; + } + /* remove incoming Via headers */ + for(hf = msg->headers; hf; hf = hf->next) { + if(hf->type != HDR_VIA_T) { + continue; + } + anchor = del_lump(msg, hf->name.s - msg->buf, hf->len, 0); + if(anchor == 0) { + LM_ERR("cannot remove Via header\n"); + return -1; + } + } + + init_dest_info(&dst); + if(vuri == NULL || vuri->s == NULL || vuri->len <= 0) { + if(msg->dst_uri.len) { + ret = parse_uri(msg->dst_uri.s, msg->dst_uri.len, &next_hop); + u = &next_hop; + } else { + ret = parse_sip_msg_uri(msg); + u = &msg->parsed_uri; + } + } else { + ret = parse_uri(vuri->s, vuri->len, &next_hop); + u = &next_hop; + } + if(ret < 0) { + LM_ERR("forward - bad uri dropping packet\n"); + return -1; + } + dst.proto = u->proto; + msg_flags_bk = msg->msg_flags; + msg->msg_flags |= FL_VIA_NORECEIVED; + ret = forward_request_mode( + msg, &u->host, u->port_no, &dst, BUILD_NO_VIA1_UPDATE); + msg->msg_flags = msg_flags_bk; + if(ret >= 0) { + return 1; + } + + return -1; +} + int update_sock_struct_from_via( union sockaddr_union *to, struct sip_msg *msg, struct via_body *via) { diff --git a/src/core/forward.h b/src/core/forward.h index a90ce3446ce..5b414a7a64b 100644 --- a/src/core/forward.h +++ b/src/core/forward.h @@ -82,6 +82,7 @@ int forward_request(struct sip_msg *msg, str *dst, unsigned short port, struct dest_info *send_info); int forward_request_mode(struct sip_msg *msg, str *dst, unsigned short port, struct dest_info *send_info, unsigned int mbmode); +int forward_uac_uri(sip_msg_t *msg, str *vuri); int update_sock_struct_from_via( union sockaddr_union *to, struct sip_msg *msg, struct via_body *via);

1 0

git:master:bf9dec59: tm: implement headers_mode option for build_local()
by Daniel-Constantin Mierla 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: bf9dec59480cb8bed1deaa7670454b57045b8b90 URL: https://github.com/kamailio/kamailio/commit/bf9dec59480cb8bed1deaa7670454b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:38:25+02:00 tm: implement headers_mode option for build_local() --- Modified: src/modules/tm/t_msgbuilder.c --- Diff: https://github.com/kamailio/kamailio/commit/bf9dec59480cb8bed1deaa7670454b5… Patch: https://github.com/kamailio/kamailio/commit/bf9dec59480cb8bed1deaa7670454b5… --- diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index c195193d6e6..49c801d2e8f 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -187,6 +187,28 @@ char *build_local(struct cell *Trans, unsigned int branch, unsigned int *len, LM_BUG("unhandled reason cause %d\n", reason->cause); } *len += reason_len; + if(imsg != NULL && (tm_headers_mode & TM_CANCEL_HEADERS_COPY)) { + for(hdr = imsg->headers; hdr; hdr = hdr->next) { + switch(hdr->type) { + case HDR_CALLID_T: + case HDR_CSEQ_T: + case HDR_VIA_T: + case HDR_TO_T: + case HDR_FROM_T: + case HDR_ROUTE_T: + case HDR_MAXFORWARDS_T: + case HDR_REQUIRE_T: + case HDR_PROXYREQUIRE_T: + case HDR_CONTENTLENGTH_T: + case HDR_REASON_T: + case HDR_EOH_T: + /* skip these headers - they were added already */ + break; + default: + *len += hdr->len; + } + } + } *len += CRLF_LEN; /* end of msg. */ cancel_buf = shm_malloc(*len + 1); @@ -258,6 +280,29 @@ char *build_local(struct cell *Trans, unsigned int branch, unsigned int *len, } } } + if(imsg != NULL && (tm_headers_mode & TM_CANCEL_HEADERS_COPY)) { + for(hdr = imsg->headers; hdr; hdr = hdr->next) { + switch(hdr->type) { + case HDR_CALLID_T: + case HDR_CSEQ_T: + case HDR_VIA_T: + case HDR_TO_T: + case HDR_FROM_T: + case HDR_ROUTE_T: + case HDR_MAXFORWARDS_T: + case HDR_REQUIRE_T: + case HDR_PROXYREQUIRE_T: + case HDR_CONTENTLENGTH_T: + case HDR_REASON_T: + case HDR_EOH_T: + /* skip these headers - they were added already */ + break; + default: + append_str(p, hdr->name.s, hdr->len); + } + } + } + append_str(p, CRLF, CRLF_LEN); /* msg. end */ *p = 0;

1 0

git:master:aba3c191: corex: backup and restor internal flags for forward uac mode
by Daniel-Constantin Mierla 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: aba3c191e4d00666cb4a9e0c646057df4976d133 URL: https://github.com/kamailio/kamailio/commit/aba3c191e4d00666cb4a9e0c646057d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-27T12:38:25+02:00 corex: backup and restor internal flags for forward uac mode --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/aba3c191e4d00666cb4a9e0c646057d… Patch: https://github.com/kamailio/kamailio/commit/aba3c191e4d00666cb4a9e0c646057d… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 7e121f8bb61..c6852759114 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -285,6 +285,7 @@ static int ki_forward_uac_uri(sip_msg_t *msg, str *vuri) sip_uri_t next_hop; sr_lump_t *anchor; hdr_field_t *hf; + msg_flags_t msg_flags_bk; if(msg == NULL) { LM_WARN("invalid msg parameter\n"); @@ -325,9 +326,11 @@ static int ki_forward_uac_uri(sip_msg_t *msg, str *vuri) return -1; } dst.proto = u->proto; + msg_flags_bk = msg->msg_flags; msg->msg_flags |= FL_VIA_NORECEIVED; ret = forward_request_mode( msg, &u->host, u->port_no, &dst, BUILD_NO_VIA1_UPDATE); + msg->msg_flags = msg_flags_bk; if(ret >= 0) { return 1; }

1 0

git:master:a30839fc: modules: readme files regenerated - pua_dialoginfo ... [skip ci]
by Kamailio Dev 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: a30839fceabbab3be18e01ec6f39c9e0d542f6b6 URL: https://github.com/kamailio/kamailio/commit/a30839fceabbab3be18e01ec6f39c9e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-08-27T10:16:10+02:00 modules: readme files regenerated - pua_dialoginfo ... [skip ci] --- Modified: src/modules/pua_dialoginfo/README --- Diff: https://github.com/kamailio/kamailio/commit/a30839fceabbab3be18e01ec6f39c9e… Patch: https://github.com/kamailio/kamailio/commit/a30839fceabbab3be18e01ec6f39c9e…

1 0

[kamailio/kamailio] pua and pua_dialoginfo improvements (PR #3955)
by Victor Seva 27 Aug '24

27 Aug '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) - [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 #### Description We are seeing a lot of error messages like: > ERROR: <null> pua [pua_db.c:895]: get_record_puadb(): Too many rows found (2) After some investigation I come up with a couple of fixes: * pua: improve the query to support caller|callee with same pres_id (same dialog) * pua_dialoginfo: support uuid to generate pres_id to improve randomness You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3955 -- Commit Summary -- * pua: get_record_puadb() add pres_uri to the query * pua_dialoginfo: use_uuid parameter * pua_dialoginfo: document use_uuid parameter -- File Changes -- M src/modules/pua/pua_db.c (18) M src/modules/pua/pua_db.h (5) M src/modules/pua/send_publish.c (5) M src/modules/pua_dialoginfo/doc/pua_dialoginfo.xml (11) M src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml (25) M src/modules/pua_dialoginfo/pua_dialoginfo.c (15) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3955.patch https://github.com/kamailio/kamailio/pull/3955.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3955 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3955(a)github.com>

1 2

git:master:c06ed186: pua_dialoginfo: document use_uuid parameter
by Victor Seva 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: c06ed1864f37e5574345601489427a8623d24e34 URL: https://github.com/kamailio/kamailio/commit/c06ed1864f37e5574345601489427a8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-27T10:12:58+02:00 pua_dialoginfo: document use_uuid parameter --- Modified: src/modules/pua_dialoginfo/doc/pua_dialoginfo.xml Modified: src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c06ed1864f37e5574345601489427a8… Patch: https://github.com/kamailio/kamailio/commit/c06ed1864f37e5574345601489427a8… --- diff --git a/src/modules/pua_dialoginfo/doc/pua_dialoginfo.xml b/src/modules/pua_dialoginfo/doc/pua_dialoginfo.xml index 17ae58a27fa..d1eda128f23 100644 --- a/src/modules/pua_dialoginfo/doc/pua_dialoginfo.xml +++ b/src/modules/pua_dialoginfo/doc/pua_dialoginfo.xml @@ -50,6 +50,11 @@ <surname>Gaisnon</surname> <email>frederic.gaisnon(a)gmail.com</email> </editor> + <editor> + <firstname>Victor</firstname> + <surname>Seva</surname> + <email>vseva(a)sipwise.com</email> + </editor> </authorgroup> <copyright> <year>2006</year> @@ -63,6 +68,10 @@ <year>2021</year> <holder>MomentTech</holder> </copyright> + <copyright> + <year>2024</year> + <holder>Sipwise</holder> + </copyright> </bookinfo> <toc></toc> @@ -70,5 +79,3 @@ </book> - - diff --git a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml index cad923058ac..6093c3516b6 100644 --- a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml +++ b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml @@ -211,6 +211,11 @@ <emphasis>pua</emphasis>. </para> </listitem> + <listitem> + <para> + <emphasis>uuid</emphasis> if <varname>use_uuid</varname> is enabled. + </para> + </listitem> </itemizedlist> </para> </section> @@ -233,6 +238,25 @@ <section> <title>Parameters</title> + <section id="pua_dialoginfo.p.use_uuid"> + <title><varname>use_uuid</varname> (int)</title> + <para> + If this parameter is set, the pres_id will be generated using libuuid via uuid module. + uuid module has to be loaded before pua_dialoginfo in this case. + </para> + <para> + <emphasis>Default value is <quote>0</quote>.</emphasis> + </para> + <example> + <title>Set <varname>use_uuid</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("pua_dialoginfo", "use_uuid", 1) +... +</programlisting> + </example> + </section> + <section id="pua_dialoginfo.p.include_callid"> <title><varname>include_callid</varname> (int)</title> <para>

1 0

git:master:6ba2fba3: pua_dialoginfo: use_uuid parameter
by Victor Seva 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: 6ba2fba382704b0c693a1ca5745db6203c12f2a0 URL: https://github.com/kamailio/kamailio/commit/6ba2fba382704b0c693a1ca5745db62… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-27T10:12:58+02:00 pua_dialoginfo: use_uuid parameter generate pres_id using libuuid via uuid module --- Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/6ba2fba382704b0c693a1ca5745db62… Patch: https://github.com/kamailio/kamailio/commit/6ba2fba382704b0c693a1ca5745db62… --- diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c index d1782380b07..35757128ff7 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -51,6 +51,7 @@ MODULE_VERSION /* Default module parameter values */ +#define DEF_USE_UUID 0 #define DEF_INCLUDE_CALLID 1 #define DEF_INCLUDE_LOCALREMOTE 1 #define DEF_INCLUDE_TAGS 1 @@ -91,6 +92,7 @@ static str callee_entity_when_publish_disabled = {0, 0}; /* pubruri_callee */ static str local_identity_dlg_var = STR_NULL; /* Module parameter variables */ +int use_uuid = DEF_USE_UUID; int include_callid = DEF_INCLUDE_CALLID; int include_localremote = DEF_INCLUDE_LOCALREMOTE; int include_tags = DEF_INCLUDE_TAGS; @@ -123,6 +125,7 @@ static cmd_export_t cmds[] = { }; static param_export_t params[] = { + {"use_uuid", INT_PARAM, &use_uuid}, {"include_callid", INT_PARAM, &include_callid}, {"include_localremote", INT_PARAM, &include_localremote}, {"include_tags", INT_PARAM, &include_tags}, @@ -733,8 +736,16 @@ struct dlginfo_cell *get_dialog_data(struct dlg_cell *dlg, int type, int len; // generate new random uuid - if(sruid_next_safe(&_puadi_sruid) < 0) { - return NULL; + if(use_uuid) { + _puadi_sruid.uid.len = SRUID_SIZE; + if(sruid_uuid_generate(_puadi_sruid.uid.s, &_puadi_sruid.uid.len) < 0) { + LM_ERR("uuid not generated\n"); + return NULL; + } + } else { + if(sruid_next_safe(&_puadi_sruid) < 0) { + return NULL; + } } LM_DBG("uuid generated: '%.*s'\n", _puadi_sruid.uid.len, _puadi_sruid.uid.s);

1 0

git:master:bbb86944: pua: get_record_puadb() add pres_uri to the query
by Victor Seva 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: bbb869441feb141d6732926973a6a95224d70a17 URL: https://github.com/kamailio/kamailio/commit/bbb869441feb141d6732926973a6a95… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-27T10:12:58+02:00 pua: get_record_puadb() add pres_uri to the query if pres_uri is present, added to the query to avoid this kind of errors: > pua [pua_db.c:895]: get_record_puadb(): Too many rows found (2) Since there's always in our case two records with the same pres_id (callee|caller): | 27 | sip:testgroup1010@invite-group-parallel.scenarios-pbx.test | DIALOG_PUBLISH.padi-66c6f28a-108ad-4 | 32 | 1724318050 | 1724338210 | 1024 | a.1724314250.67760.9.0 | | 29 | sip:testuser1003@invite-group-parallel.scenarios-pbx.test | DIALOG_PUBLISH.padi-66c6f28a-108ad-4 | 32 | 1724318050 | 1724338210 | 1024 | a.1724314250.67757.8.0 | --- Modified: src/modules/pua/pua_db.c Modified: src/modules/pua/pua_db.h Modified: src/modules/pua/send_publish.c --- Diff: https://github.com/kamailio/kamailio/commit/bbb869441feb141d6732926973a6a95… Patch: https://github.com/kamailio/kamailio/commit/bbb869441feb141d6732926973a6a95… --- diff --git a/src/modules/pua/pua_db.c b/src/modules/pua/pua_db.c index f66c3b210f7..67f02736836 100644 --- a/src/modules/pua/pua_db.c +++ b/src/modules/pua/pua_db.c @@ -2,6 +2,7 @@ * pua db - presence user agent database support * * Copyright (C) 2011 Crocodile RCS Ltd + * Copyright (C) 2024 Victor Seva (Sipwise) * * This file is part of Kamailio, a free SIP server. * @@ -790,17 +791,26 @@ int insert_record_puadb(ua_pres_t *pres) /******************************************************************************/ -ua_pres_t *get_record_puadb( - str pres_id, str *etag, ua_pres_t *result, db1_res_t **dbres) +ua_pres_t *get_record_puadb(str *pres_uri, str pres_id, str *etag, + ua_pres_t *result, db1_res_t **dbres) { - db_key_t q_cols[2]; - db_val_t q_vals[2], *values; + db_key_t q_cols[3]; + db_val_t q_vals[3], *values; db_row_t *rows; db1_res_t *res; int n_query_cols = 0, nr_rows; db_query_f query_fn = pua_dbf.query_lock ? pua_dbf.query_lock : pua_dbf.query; + if(pres_uri != NULL) { + q_cols[n_query_cols] = &str_pres_uri_col; + q_vals[n_query_cols].type = DB1_STR; + q_vals[n_query_cols].nul = 0; + q_vals[n_query_cols].val.str_val.s = pres_uri->s; + q_vals[n_query_cols].val.str_val.len = pres_uri->len; + n_query_cols++; + } + q_cols[n_query_cols] = &str_pres_id_col; q_vals[n_query_cols].type = DB1_STR; q_vals[n_query_cols].nul = 0; diff --git a/src/modules/pua/pua_db.h b/src/modules/pua/pua_db.h index 788d1656207..cd448b0467d 100644 --- a/src/modules/pua/pua_db.h +++ b/src/modules/pua/pua_db.h @@ -2,6 +2,7 @@ * pua_db headers - presence user agent db headers * * Copyright (C) 2011 Crocodile RCS Ltd + * Copyright (C) 2024 Victor Seva (Sipwise) * * This file is part of Kamailio, a free SIP server. * @@ -58,8 +59,8 @@ int update_dialog_puadb(ua_pres_t *pres, int expires, str *contact); list_entry_t *get_subs_list_puadb(str *did); int insert_record_puadb(ua_pres_t *pres); -ua_pres_t *get_record_puadb( - str pres_id, str *etag, ua_pres_t *result, db1_res_t **res); +ua_pres_t *get_record_puadb(str *pres_uri, str pres_id, str *etag, + ua_pres_t *result, db1_res_t **res); int delete_record_puadb(ua_pres_t *pres); int update_record_puadb(ua_pres_t *pres, int expires, str *contact); int update_version_puadb(ua_pres_t *pres); diff --git a/src/modules/pua/send_publish.c b/src/modules/pua/send_publish.c index 53644265633..4a06870f7a5 100644 --- a/src/modules/pua/send_publish.c +++ b/src/modules/pua/send_publish.c @@ -309,7 +309,7 @@ void publ_cback_func(struct cell *t, int type, struct tmcb_params *ps) if(pua_dbf.affected_rows != NULL || dbmode != PUA_DB_ONLY) { if(find_and_update_record(hentity, hash_code, lexpire, &etag) > 0) goto done; - } else if((db_presentity = get_record_puadb( + } else if((db_presentity = get_record_puadb(hentity->pres_uri, hentity->id, &hentity->etag, &dbpres, &res)) != NULL) { update_record_puadb(hentity, lexpire, &etag); @@ -468,7 +468,8 @@ int send_publish(publ_info_t *publ) dbpres.pres_uri = &pres_uri; dbpres.watcher_uri = &watcher_uri; dbpres.extra_headers = &extra_headers; - presentity = get_record_puadb(publ->id, publ->etag, &dbpres, &res); + presentity = get_record_puadb( + publ->pres_uri, publ->id, publ->etag, &dbpres, &res); } else { ua_pres_t pres;

1 0

git:master:30d9ef64: pkg/kamailio/deb: add Ubuntu 24.04 (Noble Numbat) support [skip ci]
by Victor Seva 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: 30d9ef64d7162d53290c1f18d0b89a33010084a1 URL: https://github.com/kamailio/kamailio/commit/30d9ef64d7162d53290c1f18d0b89a3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-27T10:02:33+02:00 pkg/kamailio/deb: add Ubuntu 24.04 (Noble Numbat) support [skip ci] --- Added: pkg/kamailio/deb/debian/backports/noble Added: pkg/kamailio/deb/noble/changelog Added: pkg/kamailio/deb/noble/compat Added: pkg/kamailio/deb/noble/control Added: pkg/kamailio/deb/noble/copyright Added: pkg/kamailio/deb/noble/kamailio-autheph-modules.lintian-overrides Added: pkg/kamailio/deb/noble/kamailio-berkeley-bin.dirs Added: pkg/kamailio/deb/noble/kamailio-dnssec-modules.lintian-overrides Added: pkg/kamailio/deb/noble/kamailio-outbound-modules.lintian-overrides Added: pkg/kamailio/deb/noble/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/noble/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/noble/kamailio-tls-modules.lintian-overrides Added: pkg/kamailio/deb/noble/kamailio-websocket-modules.lintian-overrides Added: pkg/kamailio/deb/noble/kamailio.README.Debian Added: pkg/kamailio/deb/noble/kamailio.default Added: pkg/kamailio/deb/noble/kamailio.examples Added: pkg/kamailio/deb/noble/kamailio.init Added: pkg/kamailio/deb/noble/kamailio.lintian-overrides Added: pkg/kamailio/deb/noble/kamailio.postinst Added: pkg/kamailio/deb/noble/kamailio.service Added: pkg/kamailio/deb/noble/kamailio@.service Added: pkg/kamailio/deb/noble/rules Added: pkg/kamailio/deb/noble/source.lintian-overrides Added: pkg/kamailio/deb/noble/source/format Added: pkg/kamailio/deb/noble/watch --- Diff: https://github.com/kamailio/kamailio/commit/30d9ef64d7162d53290c1f18d0b89a3… Patch: https://github.com/kamailio/kamailio/commit/30d9ef64d7162d53290c1f18d0b89a3…

1 0

git:master:2581d7aa: modules: readme files regenerated - sca ... [skip ci]
by Kamailio Dev 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: 2581d7aa2fd9c14c76b75274ea42fb94a87c4684 URL: https://github.com/kamailio/kamailio/commit/2581d7aa2fd9c14c76b75274ea42fb9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-08-27T09:46:09+02:00 modules: readme files regenerated - sca ... [skip ci] --- Modified: src/modules/sca/README --- Diff: https://github.com/kamailio/kamailio/commit/2581d7aa2fd9c14c76b75274ea42fb9… Patch: https://github.com/kamailio/kamailio/commit/2581d7aa2fd9c14c76b75274ea42fb9…

1 0

[kamailio/kamailio] sca: add support custom [to|from]_uri (PR #3930)
by Victor Seva 27 Aug '24

27 Aug '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 - [ ] 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 #### Description This is the first step to merge the functionality that is already used in Sipwise kamailio flavor * module parameters [from|to]_uri_avp to store * sca_handle_subscribe() support [from|to_uri] parameters Add the possibility of define what is the URI value for To and/or From instead of the values from the SIP message You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3930 -- Commit Summary -- * sca: add support custom [to|from]_uri -- File Changes -- M src/modules/sca/doc/sca.xml (58) M src/modules/sca/doc/sca_admin.xml (52) M src/modules/sca/sca.c (115) M src/modules/sca/sca.h (5) M src/modules/sca/sca_call_info.c (190) M src/modules/sca/sca_subscribe.c (96) M src/modules/sca/sca_subscribe.h (5) M src/modules/sca/sca_util.c (184) M src/modules/sca/sca_util.h (19) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3930.patch https://github.com/kamailio/kamailio/pull/3930.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3930 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3930(a)github.com>

1 1

git:master:c9a9fcd4: sca: add support custom [to|from]_uri
by Victor Seva 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: c9a9fcd4429de8c7da7cb3ab9cebe077edea91bf URL: https://github.com/kamailio/kamailio/commit/c9a9fcd4429de8c7da7cb3ab9cebe07… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-27T09:37:56+02:00 sca: add support custom [to|from]_uri * module parameters [from|to]_uri_avp to store * sca_handle_subscribe() support [from|to_uri] parameters Add the possibility of define what is the URI value for To and/or From instead of the values from the SIP message --- Modified: src/modules/sca/doc/sca.xml Modified: src/modules/sca/doc/sca_admin.xml Modified: src/modules/sca/sca.c Modified: src/modules/sca/sca.h Modified: src/modules/sca/sca_call_info.c Modified: src/modules/sca/sca_subscribe.c Modified: src/modules/sca/sca_subscribe.h Modified: src/modules/sca/sca_util.c Modified: src/modules/sca/sca_util.h --- Diff: https://github.com/kamailio/kamailio/commit/c9a9fcd4429de8c7da7cb3ab9cebe07… Patch: https://github.com/kamailio/kamailio/commit/c9a9fcd4429de8c7da7cb3ab9cebe07…

1 0

[kamailio/kamailio] fix(pua_reginfo): free pkg memory after getting the XML attribute (PR #3953)
by Andrew Pogrebennyk 27 Aug '24

27 Aug '24

fix(pua_reginfo): free pkg memory after getting the XML attribute - free the memory from the state XML attribute that was returned and immediately used in another function call without freeing leaving one small mem leak; - add comments but keep the dead code regarding parsed but unused attrs.   #### 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) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3953 -- Commit Summary -- * fix(pua_reginfo): free pkg memory after getting the content of each XML attribute -- File Changes -- M src/modules/pua_reginfo/notify.c (86) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3953.patch https://github.com/kamailio/kamailio/pull/3953.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3953 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3953(a)github.com>

2 14

git:master:ed6730aa: pua_reginfo: free pkg memory after getting the content of each XML attribute
by Victor Seva 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: ed6730aa64e0e7c1580584d6f808e76a665e5882 URL: https://github.com/kamailio/kamailio/commit/ed6730aa64e0e7c1580584d6f808e76… Author: Andrii Pogrebennyk <andrii(a)ng-voice.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-27T09:35:47+02:00 pua_reginfo: free pkg memory after getting the content of each XML attribute - free the memory from the state XML attribute that was returned and immediately used in another function call without freeing leaving one small mem leak; - add comments but keep the dead code regarding parsed but unused attrs. --- Modified: src/modules/pua_reginfo/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/ed6730aa64e0e7c1580584d6f808e76… Patch: https://github.com/kamailio/kamailio/commit/ed6730aa64e0e7c1580584d6f808e76…

1 0

[kamailio/kamailio] github: [skip ci]: bump tj-actions/changed-files from 44 to 45 (PR #3957)
by dependabot[bot] 27 Aug '24

27 Aug '24

Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 44 to 45. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/tj-actions/changed-files/releases">tj… releases</a>.</em></p> <blockquote> <h2>v45</h2> <h1>Changes in v45.0.0</h1> <h2>🔥🔥 BREAKING CHANGE 🔥🔥</h2> <ul> <li>With changes detected using GitHub's API setting <code>output_renamed_files_as_deleted_and_added</code> to <code>true</code>, would now include the previous file name in the list of deleted files instead of the current file name.</li> </ul> <h2>What's Changed</h2> <ul> <li>chore(deps): update dependency <code>@types/node</code> to v22.0.1 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2219&q… <li>Upgraded to v44.5.7 by <a href="https://github.com/tj-actions-bot"><code>@tj-acti… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2218&q… <li>chore(deps): update dependency ts-jest to v29.2.4 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2221&q… <li>chore(deps): update dependency <code>@types/node</code> to v22.0.3 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2222&q… <li>chore(deps): update dependency <code>@types/node</code> to v22.1.0 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2223&q… <li>chore(deps): update dependency eslint-plugin-jest to v28.7.0 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2224&q… <li>chore(deps): update dependency eslint-plugin-jest to v28.8.0 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2227&q… <li>chore(deps): update dependency <code>@types/node</code> to v22.2.0 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2229&q… <li>chore(deps): update dependency <code>@types/node</code> to v22.3.0 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2230&q… <li>chore(deps): update dependency <code>@types/node</code> to v22.4.0 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2231&q… <li>fix(deps): update dependency <code>@octokit/rest</code> to v21.0.2 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2232&q… <li>chore(deps): lock file maintenance by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2226&q… <li>chore(deps): update dependency <code>@types/node</code> to v22.4.1 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2233&q… <li>chore(deps): update dependency <code>@types/node</code> to v22.4.2 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2237&q… <li>fix: remove unsupported input by <a href="https://github.com/jackton1"><code>@jackton1</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2238&q… <li>chore: conditionally skip certain test for foked prs by <a href="https://github.com/jackton1"><code>@jackton1</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2240&q… <li>chore: debug env vars by <a href="https://github.com/jackton1"><code>@jackton1</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2241&q… <li>fix: update test skip logic to use custom env by <a href="https://github.com/jackton1"><code>@jackton1</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2242&q… <li>Renamed Files decomposed into Deleted: previous_filename and Added:filename by <a href="https://github.com/Whadup"><code>@Whadup</code… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2236&q… <li>docs: add Whadup as a contributor for code by <a href="https://github.com/allcontributors"><code>@allcon… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2239&q… <li>Updated README.md by <a href="https://github.com/tj-actions-bot"><code>@tj-acti… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2243&q… </ul> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/Whadup"><code>@Whadup</code… made their first contribution in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2236&q… </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/tj-actions/changed-files/compare/v44...v45.0.… <hr /> <h2>v45.0.0</h2> <h2>🔥🔥 BREAKING CHANGE 🔥🔥</h2> <ul> <li>With changes detected using GitHub's API setting <code>output_renamed_files_as_deleted_and_added</code> to <code>true</code>, would now include the previous file name in the list of deleted files.</li> </ul> <h2>What's Changed</h2> <ul> <li>chore(deps): update dependency <code>@types/node</code> to v22.0.1 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2219&q… <li>Upgraded to v44.5.7 by <a href="https://github.com/tj-actions-bot"><code>@tj-acti… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2218&q… <li>chore(deps): update dependency ts-jest to v29.2.4 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2221&q… <li>chore(deps): update dependency <code>@types/node</code> to v22.0.3 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2222&q… <li>chore(deps): update dependency <code>@types/node</code> to v22.1.0 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2223&q… <li>chore(deps): update dependency eslint-plugin-jest to v28.7.0 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2224&q… <li>chore(deps): update dependency eslint-plugin-jest to v28.8.0 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2227&q… <li>chore(deps): update dependency <code>@types/node</code> to v22.2.0 by <a href="https://github.com/renovate"><code>@renovate</… in <a href="https://redirect.github.com/tj-actions/changed-files/pull/2229&q… </ul>  </blockquote> <p>... (truncated)</p> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/tj-actions/changed-files/blob/main/HISTORY.md… changelog</a>.</em></p> <blockquote> <h1>Changelog</h1> <h1><a href="https://github.com/tj-actions/changed-files/compare/v44.5.7...v4… - (2024-08-21)</h1> <h2>🐛 Bug Fixes</h2> <ul> <li>Update test skip logic to use custom env (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2242…) (<a href="https://github.com/tj-actions/changed-files/commit/b4c09741612c0…) - (Tonye Jack)</li> <li>Remove unsupported input (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2238…) (<a href="https://github.com/tj-actions/changed-files/commit/525aabbe28ff9…) - (Tonye Jack)</li> <li><strong>deps:</strong> Update dependency <code>@octokit/rest</code> to v21.0.2 (<a href="https://github.com/tj-actions/changed-files/commit/3ea85a1c0dd32…) - (renovate[bot])</li> </ul> <h2>➕ Add</h2> <ul> <li>Added missing changes and modified dist assets. (<a href="https://github.com/tj-actions/changed-files/commit/598b7212f2ea6…) - (GitHub Action)</li> </ul> <h2>📝 Rename</h2> <ul> <li>Renamed Files decomposed into Deleted: previous_filename and Added:filename (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2236… </ul> <p>Co-authored-by: Tonye Jack <a href="mailto:jtonye@ymail.com">jtonye@ymail.com</a> (<a href="https://github.com/tj-actions/changed-files/commit/f8034fbb842b9…) - (Lukas Pfahler)</p> <h2>🔄 Update</h2> <ul> <li>Updated README.md (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2243… </ul> <p>Co-authored-by: jackton1 <a href="mailto:17484350+jackton1@users.noreply.github.com">17484350+jackton1@users.noreply.github.com</a> Co-authored-by: GitHub Action <a href="mailto:action@github.com">action@github.com</a> (<a href="https://github.com/tj-actions/changed-files/commit/40853de9f8ce2…) - (tj-actions[bot])</p> <ul> <li>Update tsconfig.json (<a href="https://github.com/tj-actions/changed-files/commit/88201be733611…) - (Tonye Jack)</li> </ul> <h2>📚 Documentation</h2> <ul> <li>Add Whadup as a contributor for code (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2239…) (<a href="https://github.com/tj-actions/changed-files/commit/94b94fea13561…) - (allcontributors[bot])</li> </ul> <h2>⚙️ Miscellaneous Tasks</h2> <ul> <li>Debug env vars (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2241…) (<a href="https://github.com/tj-actions/changed-files/commit/246859db916b5…) - (Tonye Jack)</li> <li>Conditionally skip certain test for foked prs (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2240…) (<a href="https://github.com/tj-actions/changed-files/commit/46a4c027a6ca4…) - (Tonye Jack)</li> <li><strong>deps:</strong> Update dependency <code>@types/node</code> to v22.4.2 (<a href="https://github.com/tj-actions/changed-files/commit/25b256207da93…) - (renovate[bot])</li> <li><strong>deps:</strong> Update dependency <code>@types/node</code> to v22.4.1 (<a href="https://github.com/tj-actions/changed-files/commit/257f12c17b624…) - (renovate[bot])</li> <li><strong>deps:</strong> Lock file maintenance (<a href="https://github.com/tj-actions/changed-files/commit/9b7ba7b107e24…) - (renovate[bot])</li> <li><strong>deps:</strong> Update dependency <code>@types/node</code> to v22.4.0 (<a href="https://github.com/tj-actions/changed-files/commit/50693d8df5efe…) - (renovate[bot])</li> <li><strong>deps:</strong> Update dependency <code>@types/node</code> to v22.3.0 (<a href="https://github.com/tj-actions/changed-files/commit/87d8f9488bd23…) - (renovate[bot])</li> <li><strong>deps:</strong> Update dependency <code>@types/node</code> to v22.2.0 (<a href="https://github.com/tj-actions/changed-files/commit/950331d47c80d…) - (renovate[bot])</li> <li><strong>deps:</strong> Update dependency eslint-plugin-jest to v28.8.0 (<a href="https://github.com/tj-actions/changed-files/commit/ed00b69562f42…) - (renovate[bot])</li> <li><strong>deps:</strong> Update dependency eslint-plugin-jest to v28.7.0 (<a href="https://github.com/tj-actions/changed-files/commit/9d768c3d4e4de…) - (renovate[bot])</li> <li><strong>deps:</strong> Update dependency <code>@types/node</code> to v22.1.0 (<a href="https://github.com/tj-actions/changed-files/commit/6b79c79980934…) - (renovate[bot])</li> <li><strong>deps:</strong> Update dependency <code>@types/node</code> to v22.0.3 (<a href="https://github.com/tj-actions/changed-files/commit/99b60a2a91bd1…) - (renovate[bot])</li> <li><strong>deps:</strong> Update dependency ts-jest to v29.2.4 (<a href="https://github.com/tj-actions/changed-files/commit/8ae850f052514…) - (renovate[bot])</li> <li><strong>deps:</strong> Update dependency <code>@types/node</code> to v22.0.1 (<a href="https://github.com/tj-actions/changed-files/commit/03d95b07db4ba…) - (renovate[bot])</li> </ul>  </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/tj-actions/changed-files/commit/40853de9f8ce2… Updated README.md (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2243… <li><a href="https://github.com/tj-actions/changed-files/commit/94b94fea13561… docs: add Whadup as a contributor for code (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2239… <li><a href="https://github.com/tj-actions/changed-files/commit/f8034fbb842b9… Renamed Files decomposed into Deleted: previous_filename and Added:filename (...</li> <li><a href="https://github.com/tj-actions/changed-files/commit/b4c09741612c0… fix: update test skip logic to use custom env (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2242… <li><a href="https://github.com/tj-actions/changed-files/commit/246859db916b5… chore: debug env vars (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2241… <li><a href="https://github.com/tj-actions/changed-files/commit/46a4c027a6ca4… chore: conditionally skip certain test for foked prs (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2240… <li><a href="https://github.com/tj-actions/changed-files/commit/525aabbe28ff9… fix: remove unsupported input (<a href="https://redirect.github.com/tj-actions/changed-files/issues/2238… <li><a href="https://github.com/tj-actions/changed-files/commit/25b256207da93… chore(deps): update dependency <code>@types/node</code> to v22.4.2</li> <li><a href="https://github.com/tj-actions/changed-files/commit/257f12c17b624… chore(deps): update dependency <code>@types/node</code> to v22.4.1</li> <li><a href="https://github.com/tj-actions/changed-files/commit/598b7212f2ea6… Added missing changes and modified dist assets.</li> <li>Additional commits viewable in <a href="https://github.com/tj-actions/changed-files/compare/v44...v45&qu… view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?d… Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3957 -- Commit Summary -- * github: [skip ci]: bump tj-actions/changed-files from 44 to 45 -- File Changes -- M .github/workflows/devcontainer.yaml (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3957.patch https://github.com/kamailio/kamailio/pull/3957.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3957 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3957(a)github.com>

2 1

git:master:1c5983c8: github: [skip ci]: bump tj-actions/changed-files from 44 to 45
by Victor Seva 27 Aug '24

27 Aug '24

Module: kamailio Branch: master Commit: 1c5983c8f7ab7a93b5c96efeaa9600b6f2246d13 URL: https://github.com/kamailio/kamailio/commit/1c5983c8f7ab7a93b5c96efeaa9600b… Author: dependabot[bot] <49699333+dependabot[bot](a)users.noreply.github.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-27T09:14:23+02:00 github: [skip ci]: bump tj-actions/changed-files from 44 to 45 Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 44 to 45. - [Release notes](https://github.com/tj-actions/changed-files/releases) - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md) - [Commits](https://github.com/tj-actions/changed-files/compare/v44...v45) --- updated-dependencies: - dependency-name: tj-actions/changed-files dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support(a)github.com> --- Modified: .github/workflows/devcontainer.yaml --- Diff: https://github.com/kamailio/kamailio/commit/1c5983c8f7ab7a93b5c96efeaa9600b… Patch: https://github.com/kamailio/kamailio/commit/1c5983c8f7ab7a93b5c96efeaa9600b… --- diff --git a/.github/workflows/devcontainer.yaml b/.github/workflows/devcontainer.yaml index e70f646891c..3acd963b2df 100644 --- a/.github/workflows/devcontainer.yaml +++ b/.github/workflows/devcontainer.yaml @@ -33,14 +33,14 @@ jobs: - name: Get changed files if: ${{ ! inputs.force }} id: changed-files - uses: tj-actions/changed-files@v44 + uses: tj-actions/changed-files@v45 with: since_last_remote_commit: true - name: changes in relevant files if: ${{ ! inputs.force }} id: changed-files-builder - uses: tj-actions/changed-files@v44 + uses: tj-actions/changed-files@v45 with: files: | .devcontainer/**

1 0

git:master:9743c122: corex: set internal flag FL_VIA_NORECEIVED for forward_uac() variants
by Daniel-Constantin Mierla 26 Aug '24

26 Aug '24

Module: kamailio Branch: master Commit: 9743c1226e95e9a9f890d6c22ad1da7b9f9cc543 URL: https://github.com/kamailio/kamailio/commit/9743c1226e95e9a9f890d6c22ad1da7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-26T18:07:47+02:00 corex: set internal flag FL_VIA_NORECEIVED for forward_uac() variants --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9743c1226e95e9a9f890d6c22ad1da7… Patch: https://github.com/kamailio/kamailio/commit/9743c1226e95e9a9f890d6c22ad1da7… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index cf663158fa0..7e121f8bb61 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -325,6 +325,7 @@ static int ki_forward_uac_uri(sip_msg_t *msg, str *vuri) return -1; } dst.proto = u->proto; + msg->msg_flags |= FL_VIA_NORECEIVED; ret = forward_request_mode( msg, &u->host, u->port_no, &dst, BUILD_NO_VIA1_UPDATE); if(ret >= 0) {

1 0

git:master:3acf1296: modules: readme files regenerated - siputils ... [skip ci]
by Kamailio Dev 26 Aug '24

26 Aug '24

Module: kamailio Branch: master Commit: 3acf129660be4e2d9f4dfa68ad3ec6d25c43fbf1 URL: https://github.com/kamailio/kamailio/commit/3acf129660be4e2d9f4dfa68ad3ec6d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-08-26T15:46:11+02:00 modules: readme files regenerated - siputils ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/3acf129660be4e2d9f4dfa68ad3ec6d… Patch: https://github.com/kamailio/kamailio/commit/3acf129660be4e2d9f4dfa68ad3ec6d… --- diff --git a/src/modules/siputils/README b/src/modules/siputils/README index d3eda806d4d..f66c7391747 100644 --- a/src/modules/siputils/README +++ b/src/modules/siputils/README @@ -107,6 +107,7 @@ Gabriel Vasile 4.41. contact_param_rm(pname) 4.42. contact_param_check(pname) 4.43. hdr_date_check(tdiff) + 4.44. sip_parse_headers() 5. Exported pseudo-variables @@ -170,6 +171,7 @@ Gabriel Vasile 1.50. contact_param_rm usage 1.51. contact_param_check usage 1.52. hdr_date_check usage + 1.53. sip_parse_headers usage Chapter 1. Admin Guide @@ -238,6 +240,7 @@ Chapter 1. Admin Guide 4.41. contact_param_rm(pname) 4.42. contact_param_check(pname) 4.43. hdr_date_check(tdiff) + 4.44. sip_parse_headers() 5. Exported pseudo-variables @@ -455,6 +458,7 @@ modparam("siputils", "e164_max_len", 20) 4.41. contact_param_rm(pname) 4.42. contact_param_check(pname) 4.43. hdr_date_check(tdiff) + 4.44. sip_parse_headers() 4.1. options_reply() @@ -1203,6 +1207,19 @@ if (!hdr_date_check("10")) { } ... +4.44. sip_parse_headers() + + Return true if parsing (fast mode) all SIP headers is successful. + + This function can be used from ANY_ROUTE. + + Example 1.53. sip_parse_headers usage +... +if (sip_parse_headers()) { + ... +} +... + 5. Exported pseudo-variables 5.1. $pcv(all)

1 0

git:master:52036e27: siputils: docs for sip_parse_headers() function
by Daniel-Constantin Mierla 26 Aug '24

26 Aug '24

Module: kamailio Branch: master Commit: 52036e2772821459daea6d5ac98a3710d9daec13 URL: https://github.com/kamailio/kamailio/commit/52036e2772821459daea6d5ac98a371… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-26T15:39:20+02:00 siputils: docs for sip_parse_headers() function --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/52036e2772821459daea6d5ac98a371… Patch: https://github.com/kamailio/kamailio/commit/52036e2772821459daea6d5ac98a371… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index cf08771326c..6850f53e9bf 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -1474,6 +1474,27 @@ if (!hdr_date_check("10")) { exit; } ... +</programlisting> + </example> + </section> + <section id="siputils.f.sip_parse_headers"> + <title> + <function moreinfo="none">sip_parse_headers()</function> + </title> + <para> + Return true if parsing (fast mode) all SIP headers is successful. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>sip_parse_headers</function> usage</title> + <programlisting format="linespecific"> +... +if (sip_parse_headers()) { + ... +} +... </programlisting> </example> </section>

1 0

git:master:c04e2367: siputils: added function to parse headers
by Daniel-Constantin Mierla 26 Aug '24

26 Aug '24

Module: kamailio Branch: master Commit: c04e236721f9572a2655e39b8c5136bd23f95dd3 URL: https://github.com/kamailio/kamailio/commit/c04e236721f9572a2655e39b8c5136b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-26T15:00:07+02:00 siputils: added function to parse headers - could be useful after applying changes or replacing message buffer content --- Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/c04e236721f9572a2655e39b8c5136b… Patch: https://github.com/kamailio/kamailio/commit/c04e236721f9572a2655e39b8c5136b… --- diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index 372da25b041..ffbeacd00a5 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -111,6 +111,8 @@ static int w_contact_param_check(sip_msg_t *msg, char *pnparam, char *p2); static int w_hdr_date_check(sip_msg_t *msg, char *ptdiff, char *p2); +static int w_sip_parse_headers(sip_msg_t *msg, char *p1, char *p2); + /* Fixup functions to be defined later */ static int fixup_set_uri(void **param, int param_no); static int fixup_free_set_uri(void **param, int param_no); @@ -208,6 +210,7 @@ static cmd_export_t cmds[] = { fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"hdr_date_check", (cmd_function)w_hdr_date_check, 1, fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + {"sip_parse_headers", (cmd_function)w_sip_parse_headers, 0, 0, 0, ANY_ROUTE}, {"bind_siputils", (cmd_function)bind_siputils, 1, 0, 0, 0}, @@ -605,6 +608,17 @@ static int w_hdr_date_check(sip_msg_t *msg, char *ptdiff, char *p2) return ki_hdr_date_check(msg, tdiff); } +/** + * + */ +static int w_sip_parse_headers(sip_msg_t *msg, char *p1, char *p2) +{ + if(parse_headers(msg, HDR_EOH_F, 0) < 0) { + return -1; + } + return 1; +} + /** * */

1 0

[kamailio/kamailio] During de-registration procedure, clean-up is not happening if contact has * value (Issue #3848)
by deepak-git-account 24 Aug '24

24 Aug '24

### Description If Deregistration contains * in a contact field as described in RFC-3261, then the Kamailio is not cleaning the in-memory and database record. And the next iteration is not working correctly. Use of the "*" Contact header field value allows a registering UA to remove all bindings associated with an address-of-record without knowing their precise values.  Step:1 REGISTER USER UE-A Step:2: Wait for the certain duration Step:3: De-REGISTER USER UE-A (Contact header is using *) Step:4: Repeat from the step-1 After step:3, clean-up is not happening. Record can be seen in SQL. Note: If de-register contains specific CONTACT header, then cleanup is happening. ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: DEBUG: <script>: Contact headervalue: * May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/usr/local/etc/kamailio/pcscf/route/register.cfg] l=25 a=63 n=assign May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/usr/local/etc/kamailio/pcscf/route/register.cfg] l=26 a=26 n=xlog May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: DEBUG: <script>: Full URI from sip:49404965200004@open-ims.test: sip:49404965200004@open-ims.test May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/usr/local/etc/kamailio/pcscf/route/register.cfg] l=33 a=63 n=assign May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/usr/local/etc/kamailio/pcscf/route/register.cfg] l=34 a=63 n=assign May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/usr/local/etc/kamailio/pcscf/route/register.cfg] l=36 a=63 n=assign May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/usr/local/etc/kamailio/pcscf/route/register.cfg] l=37 a=26 n=xlog May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/usr/local/etc/kamailio/pcscf/route/register.cfg] l=38 a=63 n=assign May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/usr/local/etc/kamailio/pcscf/route/register.cfg] l=39 a=26 n=xlog May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/usr/local/etc/kamailio/pcscf/route/register.cfg] l=46 a=16 n=if May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/usr/local/etc/kamailio/pcscf/route/register.cfg] l=43 a=26 n=xlog May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/usr/local/etc/kamailio/pcscf/route/register.cfg] l=54 a=16 n=if May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/usr/local/etc/kamailio/pcscf/route/register.cfg] l=46 a=25 n=is_present_hf May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/usr/local/etc/kamailio/pcscf/route/register.cfg] l=47 a=26 n=xlog May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/usr/local/etc/kamailio/pcscf/route/register.cfg] l=50 a=25 n=append_hf May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/usr/local/etc/kamailio/pcscf/route/register.cfg] l=54 a=26 n=xlog May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/usr/local/etc/kamailio/pcscf/route/register.cfg] l=55 a=25 n=pcscf_save_pending May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: ERROR: ims_registrar_pcscf [save.c:318]: save_pending(): No contact headers May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: DEBUG: ims_registrar_pcscf [save.c:492]: save_pending(): Error saving pending contact May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/usr/local/etc/kamailio/pcscf/route/register.cfg] l=67 a=16 n=if May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/usr/local/etc/kamailio/pcscf/route/register.cfg] l=65 a=63 n=assign May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[] c=[] l=0 a=12 n=seturi May 13 19:47:22 openims-tvmcfg-node-focal pcscf/pcscf[35816]: ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/usr/local/etc/kamailio/pcscf/route/register.cfg] l=71 a=26 n=xlog ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio -v version: kamailio 5.7.5 (x86_64/linux) 58499a-dirty flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 58499a -dirty compiled on 11:23:55 May 8 2024 with gcc 9.4.0 ``` * **Operating System**:  ``` lsb_release -a No LSB modules are available. Distributor ID: Ubuntu Description: Ubuntu 20.04.6 LTS Release: 20.04 Codename: focal ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3848 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3848(a)github.com>

5 9

Re: [kamailio/kamailio] core: main - safety check for invalid syntax in listen parameter (9783c27)
by Henning Westerholt 23 Aug '24

23 Aug '24

Right now it will just ignore the additional slash and cut the string there: henning@app01:~/repositories/kamailio/src$ killall kamailio; ./kamailio -l udp:127.0.0.1:5060//te/st -f ../etc/test.cfg -Y /tmp/ -E -L modules Listening on udp: 127.0.0.1:5060 name te Aliases: udp: localhost:5060 I think the logic could be extended easily to allow e.g. a fourth field for the listen, when we need it. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/9783c270eae580b22e73349ac72afd8… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/9783c270eae580b22e73349ac72afd864b1de592/145744930(a)github.com>

1 0

Re: [kamailio/kamailio] core: main - safety check for invalid syntax in listen parameter (9783c27)
by Daniel-Constantin Mierla 23 Aug '24

23 Aug '24

Maybe a check should be added that there is no `/` is in the last field now/socket name, so in the future `/` can be used as separator for new fields. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/9783c270eae580b22e73349ac72afd8… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/9783c270eae580b22e73349ac72afd864b1de592/145744612(a)github.com>

1 0

git:master:fad4fbc3: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 23 Aug '24

23 Aug '24

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

1 0

git:master:f2c31f59: tm: docs for headers_mode parameter
by Daniel-Constantin Mierla 23 Aug '24

23 Aug '24

Module: kamailio Branch: master Commit: f2c31f5948cc8f6df652d193372973b1da748d51 URL: https://github.com/kamailio/kamailio/commit/f2c31f5948cc8f6df652d193372973b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-23T12:18:13+02:00 tm: docs for headers_mode parameter --- Modified: src/modules/tm/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/f2c31f5948cc8f6df652d193372973b… Patch: https://github.com/kamailio/kamailio/commit/f2c31f5948cc8f6df652d193372973b… --- diff --git a/src/modules/tm/doc/params.xml b/src/modules/tm/doc/params.xml index 2c42e2cea5e..ffef9a4eec3 100644 --- a/src/modules/tm/doc/params.xml +++ b/src/modules/tm/doc/params.xml @@ -1355,13 +1355,14 @@ modparam("tm", "e2e_cancel_reason", 0) </programlisting> </example> </section> + <section id="e2e_cancel_hop_by_hop"> <title><varname>e2e_cancel_hop_by_hop</varname> (int)</title> <para> Enable/disable sending CANCEL in hop-by-hop mode. </para> <para> - Default value: 1 ( hop-by-hop mode). + Default value: 1 (hop-by-hop mode). </para> <example> <title>Set <varname>e2e_cancel_hop_by_hop</varname> parameter</title> @@ -1373,6 +1374,25 @@ modparam("tm", "e2e_cancel_hop_by_hop", 0) </example> </section> + <section id="headers_mode"> + <title><varname>headers_mode</varname> (int)</title> + <para> + Control if headers from incoming CANCEL should be propagated to + hop-by-hop generated CANCEL. + </para> + <para> + Default value: 0 (do not propagate). + </para> + <example> + <title>Set <varname>headers_mode</varname> parameter</title> + <programlisting> +... +modparam("tm", "headers_mode", 1) +... + </programlisting> + </example> + </section> + <section id="remap_503_500"> <title><varname>remap_503_500</varname> (boolean)</title> <para>

1 0

git:master:e84ef549: tm: new parameter headers_mode
by Daniel-Constantin Mierla 23 Aug '24

23 Aug '24

Module: kamailio Branch: master Commit: e84ef54979dd05e92c65f96c7b1336aefd28faa2 URL: https://github.com/kamailio/kamailio/commit/e84ef54979dd05e92c65f96c7b1336a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-23T12:18:13+02:00 tm: new parameter headers_mode - control if headers from incoming CANCEL should be propagated to hop-by-hop generated CANCEL - default 0, do not propagate (exiting behaviour) --- Modified: src/modules/tm/t_cancel.c Modified: src/modules/tm/t_cancel.h Modified: src/modules/tm/t_fwd.c Modified: src/modules/tm/t_msgbuilder.c Modified: src/modules/tm/t_msgbuilder.h Modified: src/modules/tm/t_reply.c Modified: src/modules/tm/timer.c Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/e84ef54979dd05e92c65f96c7b1336a… Patch: https://github.com/kamailio/kamailio/commit/e84ef54979dd05e92c65f96c7b1336a…

1 0

git:master:9783c270: core: main - safety check for invalid syntax in listen parameter
by Henning Westerholt 23 Aug '24

23 Aug '24

Module: kamailio Branch: master Commit: 9783c270eae580b22e73349ac72afd864b1de592 URL: https://github.com/kamailio/kamailio/commit/9783c270eae580b22e73349ac72afd8… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-08-23T10:17:02Z core: main - safety check for invalid syntax in listen parameter --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/9783c270eae580b22e73349ac72afd8… Patch: https://github.com/kamailio/kamailio/commit/9783c270eae580b22e73349ac72afd8… --- diff --git a/src/main.c b/src/main.c index cbe67350004..993181c7326 100644 --- a/src/main.c +++ b/src/main.c @@ -2765,7 +2765,7 @@ int main(int argc, char **argv) fprintf(stderr, "error during processing -l parameter\n"); } tbuf_tmp = tbuf; - while ((p = strsep(&tbuf, "/")) != NULL) { + while ((p = strsep(&tbuf, "/")) != NULL && listen_field_count < 3) { listen_fields[listen_field_count++] = p; } /* empty advertise only allowed with a name field */

1 0

[kamailio/kamailio] main: Add support for naming socket in cli (PR #3954)
by Xenofon Karamanos 23 Aug '24

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

2 7

git:master:d44b13cd: core: main - add support for socket names as command line parameters
by Henning Westerholt 23 Aug '24

23 Aug '24

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

1 0

git:master:57144a26: core: add new function pkg_char_dup, similar as shm_char_dup but for PKG memory
by Henning Westerholt 23 Aug '24

23 Aug '24

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

1 0

git:master:e839563d: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 22 Aug '24

22 Aug '24

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

1 0

git:master:c622429b: tm: align comments
by Daniel-Constantin Mierla 22 Aug '24

22 Aug '24

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

1 0

git:master:2d2daa0e: tm: docs for e2e_cancel_hop_by_hop parameter
by Daniel-Constantin Mierla 22 Aug '24

22 Aug '24

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

1 0

git:master:13895810: tm: compile define E2E_CANCEL_HOP_BY_HOP turned into modparam
by Daniel-Constantin Mierla 22 Aug '24

22 Aug '24

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

1 0

git:master:82abbf4c: modules: readme files regenerated - presence_conference ... [skip ci]
by Kamailio Dev 22 Aug '24

22 Aug '24

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

1 0

git:master:20f7aa0d: presence_conference: add a note about deactivated MI cmds to docs [skip ci]
by Victor Seva 22 Aug '24

22 Aug '24

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

1 0

git:master:59862ba2: presence_conference: add section ID's to documentation [skip ci]
by Victor Seva 22 Aug '24

22 Aug '24

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

1 0

git:master:748da567: pua_dialoginfo: reformat exported structures more human friendly
by Victor Seva 22 Aug '24

22 Aug '24

Module: kamailio Branch: master Commit: 748da56717800c36c43bb6fe3739011f3d3105e0 URL: https://github.com/kamailio/kamailio/commit/748da56717800c36c43bb6fe3739011… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-22T11:23:08+02:00 pua_dialoginfo: reformat exported structures more human friendly --- Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/748da56717800c36c43bb6fe3739011… Patch: https://github.com/kamailio/kamailio/commit/748da56717800c36c43bb6fe3739011…

1 0

git:master:aba56a5a: pua_dialoginfo: add section ID's to documentation
by Victor Seva 22 Aug '24

22 Aug '24

Module: kamailio Branch: master Commit: aba56a5aa3b8fa4f07d0c52cd7fd2d56103ca56c URL: https://github.com/kamailio/kamailio/commit/aba56a5aa3b8fa4f07d0c52cd7fd2d5… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-22T11:07:43+02:00 pua_dialoginfo: add section ID's to documentation --- Modified: src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/aba56a5aa3b8fa4f07d0c52cd7fd2d5… Patch: https://github.com/kamailio/kamailio/commit/aba56a5aa3b8fa4f07d0c52cd7fd2d5…

1 0

git:master:3c6bc5db: modules: readme files regenerated - corex ... [skip ci]
by Kamailio Dev 22 Aug '24

22 Aug '24

Module: kamailio Branch: master Commit: 3c6bc5db3e2651784d95ef80d6de24973ffc963c URL: https://github.com/kamailio/kamailio/commit/3c6bc5db3e2651784d95ef80d6de249… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-08-22T10:46:10+02:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/3c6bc5db3e2651784d95ef80d6de249… Patch: https://github.com/kamailio/kamailio/commit/3c6bc5db3e2651784d95ef80d6de249… --- diff --git a/src/modules/corex/README b/src/modules/corex/README index fa4a34ce706..5b867a911b6 100644 --- a/src/modules/corex/README +++ b/src/modules/corex/README @@ -65,7 +65,8 @@ Muhammad Shahzad Shafi 4.24. is_faked_msg() 4.25. is_socket_name(sockname) 4.26. forward_uac() - 4.27. forward_reply() + 4.27. forward_uac_uri(vuri) + 4.28. forward_reply() 5. RPC Commands @@ -122,9 +123,10 @@ Muhammad Shahzad Shafi 1.31. is_faked_msg usage 1.32. is_socket_name usage 1.33. forward_uac usage - 1.34. forward_reply usage - 1.35. event_route[network:msg] use cases - 1.36. Sample PERL code for do_compress and do_uncompress + 1.34. forward_uac usage + 1.35. forward_reply usage + 1.36. event_route[network:msg] use cases + 1.37. Sample PERL code for do_compress and do_uncompress Chapter 1. Admin Guide @@ -174,7 +176,8 @@ Chapter 1. Admin Guide 4.24. is_faked_msg() 4.25. is_socket_name(sockname) 4.26. forward_uac() - 4.27. forward_reply() + 4.27. forward_uac_uri(vuri) + 4.28. forward_reply() 5. RPC Commands @@ -394,7 +397,8 @@ modparam("corex", "nio_msg_avp", "$avp(msg)") 4.24. is_faked_msg() 4.25. is_socket_name(sockname) 4.26. forward_uac() - 4.27. forward_reply() + 4.27. forward_uac_uri(vuri) + 4.28. forward_reply() 4.1. append_branch([ uri, [ q ] ]) @@ -834,13 +838,31 @@ request_route { } ... -4.27. forward_reply() +4.27. forward_uac_uri(vuri) + + Similar to forward_uac() with the posibility to provide the target + address as a SIP URI via the parameter vuri. The parameter vuri can + contain variables. + + This function can be used in REQUEST_ROUTE. + + Example 1.34. forward_uac usage +... +request_route { + ... + sl_send_reply("200", "OK"); + forward_uac_uri("sip:mirror.com:5080"); + ... +} +... + +4.28. forward_reply() Forward received reply on demand. This function can be used in CORE_ONREPLY_ROUTE. - Example 1.34. forward_reply usage + Example 1.35. forward_reply usage ... route[reply] { forward_reply(); @@ -1023,7 +1045,7 @@ route[reply] { Next is a basic usage example where encoding and decoding is done using PERL. - Example 1.35. event_route[network:msg] use cases + Example 1.36. event_route[network:msg] use cases ... loadmodule "app_perl.so" loadmodule "corex.so" @@ -1054,7 +1076,7 @@ event_route[network:msg] { } ... - Example 1.36. Sample PERL code for do_compress and do_uncompress + Example 1.37. Sample PERL code for do_compress and do_uncompress ... use strict; use warnings;

1 0

git:master:6c106dec: corex: docs for forward_uac_uri(...)
by Daniel-Constantin Mierla 22 Aug '24

22 Aug '24

Module: kamailio Branch: master Commit: 6c106dec657a7f2a0a6f56ab24a7a715ec5d40b0 URL: https://github.com/kamailio/kamailio/commit/6c106dec657a7f2a0a6f56ab24a7a71… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-22T10:33:08+02:00 corex: docs for forward_uac_uri(...) --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6c106dec657a7f2a0a6f56ab24a7a71… Patch: https://github.com/kamailio/kamailio/commit/6c106dec657a7f2a0a6f56ab24a7a71… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index 61529f94335..b3eb90f6d3c 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -1005,6 +1005,32 @@ request_route { ... } ... +</programlisting> + </example> + </section> + <section id="corex.f.forward_uac_uri"> + <title> + <function moreinfo="none">forward_uac_uri(vuri)</function> + </title> + <para> + Similar to forward_uac() with the posibility to provide the target + address as a SIP URI via the parameter vuri. The parameter vuri can + contain variables. + </para> + <para> + This function can be used in REQUEST_ROUTE. + </para> + <example> + <title><function>forward_uac</function> usage</title> + <programlisting format="linespecific"> +... +request_route { + ... + sl_send_reply("200", "OK"); + forward_uac_uri("sip:mirror.com:5080"); + ... +} +... </programlisting> </example> </section>

1 0

git:master:a651349d: corex: added forward_uac_uri(vuri) function
by Daniel-Constantin Mierla 22 Aug '24

22 Aug '24

Module: kamailio Branch: master Commit: a651349dec416ba649fda4e0665e23c980dce42b URL: https://github.com/kamailio/kamailio/commit/a651349dec416ba649fda4e0665e23c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-22T10:24:03+02:00 corex: added forward_uac_uri(vuri) function - target address can be provided via parameter --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a651349dec416ba649fda4e0665e23c… Patch: https://github.com/kamailio/kamailio/commit/a651349dec416ba649fda4e0665e23c… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 2b06231f734..cf663158fa0 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -51,6 +51,7 @@ MODULE_VERSION static int nio_intercept = 0; static int w_forward_uac(sip_msg_t *msg, char *p1, char *p2); +static int w_forward_uac_uri(sip_msg_t *msg, char *puri, char *p2); static int w_forward_reply(sip_msg_t *msg, char *p1, char *p2); static int w_append_branch(sip_msg_t *msg, char *su, char *sq); static int w_send_udp(sip_msg_t *msg, char *su, char *sq); @@ -117,6 +118,8 @@ static tr_export_t mod_trans[] = { static cmd_export_t cmds[] = { {"forward_uac", (cmd_function)w_forward_uac, 0, 0, 0, REQUEST_ROUTE}, + {"forward_uac_uri", (cmd_function)w_forward_uac_uri, 1, + fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE}, {"forward_reply", (cmd_function)w_forward_reply, 0, 0, 0, CORE_ONREPLY_ROUTE}, {"append_branch", (cmd_function)w_append_branch, 0, @@ -274,7 +277,7 @@ static void mod_destroy(void) /** * forward request like initial uac sender, with only one via */ -static int w_forward_uac(sip_msg_t *msg, char *p1, char *p2) +static int ki_forward_uac_uri(sip_msg_t *msg, str *vuri) { int ret; dest_info_t dst; @@ -305,12 +308,17 @@ static int w_forward_uac(sip_msg_t *msg, char *p1, char *p2) } init_dest_info(&dst); - if(msg->dst_uri.len) { - ret = parse_uri(msg->dst_uri.s, msg->dst_uri.len, &next_hop); - u = &next_hop; + if(vuri == NULL || vuri->s == NULL || vuri->len <= 0) { + if(msg->dst_uri.len) { + ret = parse_uri(msg->dst_uri.s, msg->dst_uri.len, &next_hop); + u = &next_hop; + } else { + ret = parse_sip_msg_uri(msg); + u = &msg->parsed_uri; + } } else { - ret = parse_sip_msg_uri(msg); - u = &msg->parsed_uri; + ret = parse_uri(vuri->s, vuri->len, &next_hop); + u = &next_hop; } if(ret < 0) { LM_ERR("forward - bad uri dropping packet\n"); @@ -326,6 +334,29 @@ static int w_forward_uac(sip_msg_t *msg, char *p1, char *p2) return -1; } +/** + * forward request like initial uac sender, with only one via + */ +static int w_forward_uac(sip_msg_t *msg, char *p1, char *p2) +{ + return ki_forward_uac_uri(msg, NULL); +} + +/** + * forward request to uri like initial uac sender, with only one via + */ +static int w_forward_uac_uri(sip_msg_t *msg, char *puri, char *p2) +{ + str vuri = STR_NULL; + + if(fixup_get_svalue(msg, (gparam_t *)puri, &vuri)) { + LM_ERR("cannot get the destination parameter\n"); + return -1; + } + + return ki_forward_uac_uri(msg, &vuri); +} + /** * forward reply based on via */

1 0

Seeking Suggestions for Kamailio Integration with Dovecot
by iamolivasmith＠gmail.com 21 Aug '24

21 Aug '24

Hi everyone, I hope you're all doing well! I'm currently working on a project where I'm integrating Kamailio with Dovecot, and I'm looking for some advice or best practices from those who have experience with this setup. Specifically, I'm interested in how best to configure Kamailio to work seamlessly with Dovecot for handling email traffic. Any tips on optimizing performance, potential pitfalls to avoid, or resources that could guide me through the integration would be greatly appreciated. Also, if there are any particular modules or configurations you’ve found useful, I'd love to hear about them! https://www.igmguru.com/blog/how-to-pass-ccsp-certification-exam Thanks in advance for your help! Best Regards

2 1

[kamailio/kamailio] ims_qos_npn: fixed issues in 3GPP-User-Location-Information decoding to P-Access-Network-Info header value (PR #3936)
by Dragos Vingarzan 21 Aug '24

21 Aug '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:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3936 -- Commit Summary -- * ims_qos_npn: fixed issues in 3GPP-User-Location-Information decoding to P-Access-Network-Info header value -- File Changes -- M src/modules/ims_qos_npn/rx_avp.c (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3936.patch https://github.com/kamailio/kamailio/pull/3936.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3936 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3936(a)github.com>

1 1

git:master:7bba70f8: ims_qos_npn: fixed issues in 3GPP-User-Location-Information decoding to P-Access-Network-Info header value
by Dragos Vingarzan 21 Aug '24

21 Aug '24

Module: kamailio Branch: master Commit: 7bba70f82f9b9928d24e2312025d48aa0ed6a441 URL: https://github.com/kamailio/kamailio/commit/7bba70f82f9b9928d24e2312025d48a… Author: Dragos Vingarzan <vingarzan(a)gmail.com> Committer: Dragos Vingarzan <dragos(a)neatpath.net> Date: 2024-08-21T13:14:43+02:00 ims_qos_npn: fixed issues in 3GPP-User-Location-Information decoding to P-Access-Network-Info header value --- Modified: src/modules/ims_qos_npn/rx_avp.c --- Diff: https://github.com/kamailio/kamailio/commit/7bba70f82f9b9928d24e2312025d48a… Patch: https://github.com/kamailio/kamailio/commit/7bba70f82f9b9928d24e2312025d48a… --- diff --git a/src/modules/ims_qos_npn/rx_avp.c b/src/modules/ims_qos_npn/rx_avp.c index a2fd3188efe..ca553852648 100644 --- a/src/modules/ims_qos_npn/rx_avp.c +++ b/src/modules/ims_qos_npn/rx_avp.c @@ -1592,6 +1592,8 @@ char *rx_avp_get_access_class(int32_t ip_can_type, int32_t rat_type) return "3GPP-NR-OTHERSAT"; case 1039: return "3GPP-NR-REDCAP"; + case 1040: + return "3GPP-NR-EREDCAP"; case 2000: return "3GPP2-1X"; case 2001: @@ -1605,7 +1607,7 @@ char *rx_avp_get_access_class(int32_t ip_can_type, int32_t rat_type) switch(ip_can_type) { case -1: default: - snprintf(unknown, 64, "UNKNOWN-IP-CAN-Type-%d/RAT-Type-%d", + snprintf(unknown, 64, "UNKNOWN-IP-CAN-Type-%d-RAT-Type-%d", ip_can_type, rat_type); return unknown; case 1: @@ -2026,6 +2028,9 @@ int rx_avp_process_3gpp_user_location_information(AAAMessage *rar, str *dst) // Fallback to IP-CAN-Type and RAT-Type dst->len += snprintf(dst->s + dst->len, MAX_PANI_LEN - dst->len, "%s;network-provided", c_access_class); + } else { + dst->len += snprintf(dst->s + dst->len, MAX_PANI_LEN - dst->len, + ";network-provided"); } LOG(L_INFO, "P-Access-Network-Info from Diameter is [%.*s]\n", dst->len,

1 0

git:master:a5f4feae: modules: readme files regenerated - corex ... [skip ci]
by Kamailio Dev 21 Aug '24

21 Aug '24

Module: kamailio Branch: master Commit: a5f4feaec7f61d9c8ce54bdd42634220d116f116 URL: https://github.com/kamailio/kamailio/commit/a5f4feaec7f61d9c8ce54bdd4263422… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-08-21T09:46:11+02:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/a5f4feaec7f61d9c8ce54bdd4263422… Patch: https://github.com/kamailio/kamailio/commit/a5f4feaec7f61d9c8ce54bdd4263422… --- diff --git a/src/modules/corex/README b/src/modules/corex/README index 8986ee4df23..fa4a34ce706 100644 --- a/src/modules/corex/README +++ b/src/modules/corex/README @@ -64,7 +64,8 @@ Muhammad Shahzad Shafi 4.23. via_reply_add_xavp_params(flags) 4.24. is_faked_msg() 4.25. is_socket_name(sockname) - 4.26. forward_reply() + 4.26. forward_uac() + 4.27. forward_reply() 5. RPC Commands @@ -120,9 +121,10 @@ Muhammad Shahzad Shafi 1.30. via_reply_add_xavp_params usage 1.31. is_faked_msg usage 1.32. is_socket_name usage - 1.33. forward_reply usage - 1.34. event_route[network:msg] use cases - 1.35. Sample PERL code for do_compress and do_uncompress + 1.33. forward_uac usage + 1.34. forward_reply usage + 1.35. event_route[network:msg] use cases + 1.36. Sample PERL code for do_compress and do_uncompress Chapter 1. Admin Guide @@ -171,7 +173,8 @@ Chapter 1. Admin Guide 4.23. via_reply_add_xavp_params(flags) 4.24. is_faked_msg() 4.25. is_socket_name(sockname) - 4.26. forward_reply() + 4.26. forward_uac() + 4.27. forward_reply() 5. RPC Commands @@ -390,7 +393,8 @@ modparam("corex", "nio_msg_avp", "$avp(msg)") 4.23. via_reply_add_xavp_params(flags) 4.24. is_faked_msg() 4.25. is_socket_name(sockname) - 4.26. forward_reply() + 4.26. forward_uac() + 4.27. forward_reply() 4.1. append_branch([ uri, [ q ] ]) @@ -810,13 +814,33 @@ event_route[dispatcher:dst-down] { } ... -4.26. forward_reply() +4.26. forward_uac() + + Forward received request with a single Via header, the one added by + Kamailio, the other ones being removed. Useful in cases when its reply + should not be sent back (e.g., the reply was already sent out from + Kamailio). + + This function can be used in REQUEST_ROUTE. + + Example 1.33. forward_uac usage +... +request_route { + ... + sl_send_reply("200", "OK"); + $du = "sip:mirror.com:5080"; + forward_uac(); + ... +} +... + +4.27. forward_reply() Forward received reply on demand. This function can be used in CORE_ONREPLY_ROUTE. - Example 1.33. forward_reply usage + Example 1.34. forward_reply usage ... route[reply] { forward_reply(); @@ -999,7 +1023,7 @@ route[reply] { Next is a basic usage example where encoding and decoding is done using PERL. - Example 1.34. event_route[network:msg] use cases + Example 1.35. event_route[network:msg] use cases ... loadmodule "app_perl.so" loadmodule "corex.so" @@ -1030,7 +1054,7 @@ event_route[network:msg] { } ... - Example 1.35. Sample PERL code for do_compress and do_uncompress + Example 1.36. Sample PERL code for do_compress and do_uncompress ... use strict; use warnings;

1 0

git:master:3debbb5a: corex: docs for forward_uac() function
by Daniel-Constantin Mierla 21 Aug '24

21 Aug '24

Module: kamailio Branch: master Commit: 3debbb5a608c135c628799546ee95c96abe18824 URL: https://github.com/kamailio/kamailio/commit/3debbb5a608c135c628799546ee95c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-21T09:30:50+02:00 corex: docs for forward_uac() function --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3debbb5a608c135c628799546ee95c9… Patch: https://github.com/kamailio/kamailio/commit/3debbb5a608c135c628799546ee95c9… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index 3d6ff893808..61529f94335 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -977,6 +977,34 @@ event_route[dispatcher:dst-down] { xinfo("matched local socket name\n"); } ... +</programlisting> + </example> + </section> + <section id="corex.f.forward_uac"> + <title> + <function moreinfo="none">forward_uac()</function> + </title> + <para> + Forward received request with a single Via header, the one added + by &kamailio;, the other ones being removed. Useful in cases when + its reply should not be sent back (e.g., the reply was already sent + out from &kamailio;). + </para> + <para> + This function can be used in REQUEST_ROUTE. + </para> + <example> + <title><function>forward_uac</function> usage</title> + <programlisting format="linespecific"> +... +request_route { + ... + sl_send_reply("200", "OK"); + $du = "sip:mirror.com:5080"; + forward_uac(); + ... +} +... </programlisting> </example> </section>

1 0

git:master:ed8486de: corex: new function forward_uac()
by Daniel-Constantin Mierla 21 Aug '24

21 Aug '24

Module: kamailio Branch: master Commit: ed8486de52c29996f64496dcce0f44941cff49d3 URL: https://github.com/kamailio/kamailio/commit/ed8486de52c29996f64496dcce0f449… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-21T09:23:14+02:00 corex: new function forward_uac() - send out with only one Via, the one added by Kamailio, simulating a request sent by the initial UAC - useful when the reply is not wanted to be sent back (e.g., it was sent back from Kamailio) --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ed8486de52c29996f64496dcce0f449… Patch: https://github.com/kamailio/kamailio/commit/ed8486de52c29996f64496dcce0f449… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index de2fb03b5fd..2b06231f734 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -37,6 +37,7 @@ #include "../../core/onsend.h" #include "../../core/forward.h" #include "../../core/dns_cache.h" +#include "../../core/data_lump.h" #include "../../core/parser/parse_uri.h" #include "../../core/parser/parse_param.h" @@ -49,6 +50,7 @@ MODULE_VERSION static int nio_intercept = 0; +static int w_forward_uac(sip_msg_t *msg, char *p1, char *p2); static int w_forward_reply(sip_msg_t *msg, char *p1, char *p2); static int w_append_branch(sip_msg_t *msg, char *su, char *sq); static int w_send_udp(sip_msg_t *msg, char *su, char *sq); @@ -113,6 +115,8 @@ static tr_export_t mod_trans[] = { }; static cmd_export_t cmds[] = { + {"forward_uac", (cmd_function)w_forward_uac, 0, + 0, 0, REQUEST_ROUTE}, {"forward_reply", (cmd_function)w_forward_reply, 0, 0, 0, CORE_ONREPLY_ROUTE}, {"append_branch", (cmd_function)w_append_branch, 0, @@ -267,6 +271,61 @@ static void mod_destroy(void) { } +/** + * forward request like initial uac sender, with only one via + */ +static int w_forward_uac(sip_msg_t *msg, char *p1, char *p2) +{ + int ret; + dest_info_t dst; + sip_uri_t *u; + sip_uri_t next_hop; + sr_lump_t *anchor; + hdr_field_t *hf; + + if(msg == NULL) { + LM_WARN("invalid msg parameter\n"); + return -1; + } + + if(parse_headers(msg, HDR_EOH_F, 0) == -1) { + LM_ERR("error while parsing message\n"); + return -1; + } + /* remove incoming Via headers */ + for(hf = msg->headers; hf; hf = hf->next) { + if(hf->type != HDR_VIA_T) { + continue; + } + anchor = del_lump(msg, hf->name.s - msg->buf, hf->len, 0); + if(anchor == 0) { + LM_ERR("cannot remove Via header\n"); + return -1; + } + } + + init_dest_info(&dst); + if(msg->dst_uri.len) { + ret = parse_uri(msg->dst_uri.s, msg->dst_uri.len, &next_hop); + u = &next_hop; + } else { + ret = parse_sip_msg_uri(msg); + u = &msg->parsed_uri; + } + if(ret < 0) { + LM_ERR("forward - bad uri dropping packet\n"); + return -1; + } + dst.proto = u->proto; + ret = forward_request_mode( + msg, &u->host, u->port_no, &dst, BUILD_NO_VIA1_UPDATE); + if(ret >= 0) { + return 1; + } + + return -1; +} + /** * forward reply based on via */

1 0

git:master:f41b8ee9: core: helper function to forward request specifying message build mode
by Daniel-Constantin Mierla 21 Aug '24

21 Aug '24

Module: kamailio Branch: master Commit: f41b8ee9990aaee7423505b6216e46b574825c83 URL: https://github.com/kamailio/kamailio/commit/f41b8ee9990aaee7423505b6216e46b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-20T14:22:56+02:00 core: helper function to forward request specifying message build mode --- Modified: src/core/forward.c Modified: src/core/forward.h --- Diff: https://github.com/kamailio/kamailio/commit/f41b8ee9990aaee7423505b6216e46b… Patch: https://github.com/kamailio/kamailio/commit/f41b8ee9990aaee7423505b6216e46b… --- diff --git a/src/core/forward.c b/src/core/forward.c index 0276f8a5a2e..1d2b1d5d650 100644 --- a/src/core/forward.c +++ b/src/core/forward.c @@ -482,14 +482,15 @@ int check_self_port(unsigned short port, unsigned short proto) * - send_info->send_flags is filled from the message * - if the send_socket member is null, a send_socket will be * chosen automatically + * mbmode - message build mode (for build_req_buf_from_sip_req()) * WARNING: don't forget to zero-fill all the unused members (a non-zero * random id along with proto==PROTO_TCP can have bad consequences, same for * a bogus send_socket value) * * return: 0 (E_OK) on success; negative (E_*) on failure */ -int forward_request(struct sip_msg *msg, str *dst, unsigned short port, - struct dest_info *send_info) +int forward_request_mode(struct sip_msg *msg, str *dst, unsigned short port, + struct dest_info *send_info, unsigned int mbmode) { unsigned int len; char *buf; @@ -582,7 +583,7 @@ int forward_request(struct sip_msg *msg, str *dst, unsigned short port, if(buf) pkg_free(buf); send_info->proto = proto; - buf = build_req_buf_from_sip_req(msg, &len, send_info, 0); + buf = build_req_buf_from_sip_req(msg, &len, send_info, mbmode); if(!buf) { LM_ERR("building failed\n"); ret = E_OUT_OF_MEM; /* most probable */ @@ -686,6 +687,13 @@ int forward_request(struct sip_msg *msg, str *dst, unsigned short port, } +int forward_request(struct sip_msg *msg, str *dst, unsigned short port, + struct dest_info *send_info) +{ + return forward_request_mode(msg, dst, port, send_info, 0); +} + + int update_sock_struct_from_via( union sockaddr_union *to, struct sip_msg *msg, struct via_body *via) { diff --git a/src/core/forward.h b/src/core/forward.h index 7b51e1a5559..a90ce3446ce 100644 --- a/src/core/forward.h +++ b/src/core/forward.h @@ -80,6 +80,8 @@ int check_self(str *host, unsigned short port, unsigned short proto); int check_self_port(unsigned short port, unsigned short proto); int forward_request(struct sip_msg *msg, str *dst, unsigned short port, struct dest_info *send_info); +int forward_request_mode(struct sip_msg *msg, str *dst, unsigned short port, + struct dest_info *send_info, unsigned int mbmode); int update_sock_struct_from_via( union sockaddr_union *to, struct sip_msg *msg, struct via_body *via);

1 0

git:master:e0f10477: core: explicit unsigned long long for internal flag constants
by Daniel-Constantin Mierla 20 Aug '24

20 Aug '24

Module: kamailio Branch: master Commit: e0f10477728922cefbbff9d23d846cd5912eb148 URL: https://github.com/kamailio/kamailio/commit/e0f10477728922cefbbff9d23d846cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-20T13:05:42+02:00 core: explicit unsigned long long for internal flag constants --- Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/e0f10477728922cefbbff9d23d846cd… Patch: https://github.com/kamailio/kamailio/commit/e0f10477728922cefbbff9d23d846cd…

1 0

git:master:9ff1080c: core: new internal flags to skip adding received/rport in incoming via
by Daniel-Constantin Mierla 20 Aug '24

20 Aug '24

Module: kamailio Branch: master Commit: 9ff1080cc6452343e6bc2de00350b2f7bcecf6d2 URL: https://github.com/kamailio/kamailio/commit/9ff1080cc6452343e6bc2de00350b2f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-20T12:26:10+02:00 core: new internal flags to skip adding received/rport in incoming via --- Modified: src/core/msg_translator.c Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/9ff1080cc6452343e6bc2de00350b2f… Patch: https://github.com/kamailio/kamailio/commit/9ff1080cc6452343e6bc2de00350b2f… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index f26abd2e79d..5028accb1fb 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -212,6 +212,24 @@ static int check_via_address( return -1; } +/* check if rport has to be added or updated in Via + * - return 1 on true; 0 on false */ +int rport_test(struct sip_msg *msg) +{ + if(msg->msg_flags & FL_VIA_NORECEIVED) { + return 0; + } + /* check if rport needs to be updated: + * - if FL_FORCE_RPORT is set add it (and del. any previous version) + * - if via already contains an rport add it and overwrite the previous + * rport value if present (if you don't want to overwrite the previous + * version remove the comments) */ + if(((msg->msg_flags | global_req_flags) & FL_FORCE_RPORT) + || (msg->via1->rport /*&& msg->via1->rport->value.s==0*/)) { + return 1; + } + return 0; +} /* check if IP address in Via != source IP address of signaling, * or the sender requires adding rport or received values */ @@ -219,6 +237,9 @@ int received_test(struct sip_msg *msg) { int rcvd; + if(msg->msg_flags & FL_VIA_NORECEIVED) { + return 0; + } rcvd = msg->via1->received || msg->via1->rport || check_via_address(&msg->rcv.src_ip, &msg->via1->host, msg->via1->port, received_dns); @@ -230,6 +251,9 @@ int received_via_test(struct sip_msg *msg) { int rcvd; + if(msg->msg_flags & FL_VIA_NORECEIVED) { + return 0; + } rcvd = (check_via_address(&msg->rcv.src_ip, &msg->via1->host, msg->via1->port, received_dns) != 0); @@ -2039,7 +2063,7 @@ char *build_req_buf_from_sip_req(struct sip_msg *msg, struct lump *path_anchor; struct lump *path_lump; str branch; - unsigned int flags; + msg_flags_t flags; unsigned int udp_mtu; struct dest_info di; int ret; @@ -2108,13 +2132,8 @@ char *build_req_buf_from_sip_req(struct sip_msg *msg, } } - /* check if rport needs to be updated: - * - if FL_FORCE_RPORT is set add it (and del. any previous version) - * - if via already contains an rport add it and overwrite the previous - * rport value if present (if you don't want to overwrite the previous - * version remove the comments) */ - if((flags & FL_FORCE_RPORT) - || (msg->via1->rport /*&& msg->via1->rport->value.s==0*/)) { + /* check if rport needs to be updated */ + if(rport_test(msg)) { if((rport_buf = rport_builder(msg, &rport_len)) == 0) { LM_ERR("rport_builder failed\n"); goto error00; /* free everything */ @@ -2518,8 +2537,7 @@ char *build_res_buf_from_sip_req(unsigned int code, str *text, str *new_tag, } } /* check if rport needs to be updated */ - if(((msg->msg_flags | global_req_flags) & FL_FORCE_RPORT) - || (msg->via1->rport /*&& msg->via1->rport->value.s==0*/)) { + if(rport_test(msg)) { if((rport_buf = rport_builder(msg, &rport_len)) == 0) { LM_ERR("rport_builder failed\n"); goto error01; /* free everything */ diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index 45e7eb1a714..0627754446a 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -133,8 +133,9 @@ typedef enum request_method /* WARNING: Value (1 << 31) is reserved for use in kamailio * nat_traversal module (flag FL_DO_KEEPALIVE)! */ -#define FL_FINAL_REPLY (1ULL << 32) /* local final reply sent */ -#define FL_DELAYED_REPLY (1ULL << 33) /* local reply sending delayed */ +#define FL_FINAL_REPLY (1ULL << 32) /* local final reply sent */ +#define FL_DELAYED_REPLY (1ULL << 33) /* local reply sending delayed */ +#define FL_VIA_NORECEIVED (1ULL << 34) /* no received test for incoming Via */ #define FL_MTU_FB_MASK (FL_MTU_TCP_FB | FL_MTU_TLS_FB | FL_MTU_SCTP_FB)

1 0

Re: [kamailio/kamailio] rtpengine: export API for other modules (GH #3949) (3d002d5)
by Henning Westerholt 19 Aug '24

19 Aug '24

Yes, I commented it in the other issue. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/3d002d561e82b8bb71b225da708bdfd… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/3d002d561e82b8bb71b225da708bdfd9ce504335/145517761(a)github.com>

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev