sr-dev September 2024

sr-dev@lists.kamailio.org

15 participants
170 discussions

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

← Newer
1
2
3
4
5
6
7
8
9
...
17
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2024