sr-dev November 2023

sr-dev@lists.kamailio.org

15 participants
385 discussions

git:master:3b2bffc9: ims_usrloc_scscf: improve contact lookup for an IMPU

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3b2bffc92ab0f684f8731c02f080d8df4392de5d URL: https://github.com/kamailio/kamailio/commit/3b2bffc92ab0f684f8731c02f080d8d… Author: Supreeth Herle <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-30T10:18:47+01:00 ims_usrloc_scscf: improve contact lookup for an IMPU - --- Modified: src/modules/ims_usrloc_scscf/contact_dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/3b2bffc92ab0f684f8731c02f080d8d… Patch: https://github.com/kamailio/kamailio/commit/3b2bffc92ab0f684f8731c02f080d8d… --- diff --git a/src/modules/ims_usrloc_scscf/contact_dlg_handlers.c b/src/modules/ims_usrloc_scscf/contact_dlg_handlers.c index ad166ea6557..c872fbef4dc 100644 --- a/src/modules/ims_usrloc_scscf/contact_dlg_handlers.c +++ b/src/modules/ims_usrloc_scscf/contact_dlg_handlers.c @@ -54,8 +54,10 @@ static inline int find_contact_from_impu( impurecord_t *impu, str *search_aor, ucontact_t **scontact) { impu_contact_t *impucontact; - short i_searchlen; + short i_searchlen, c_searchlen, alias_searchlen; char *s_term; + char *c_term; + char *alias_term; if(!search_aor) return 1; @@ -63,29 +65,57 @@ static inline int find_contact_from_impu( LM_DBG("Looking for contact [%.*s] for IMPU [%.*s]\n", search_aor->len, search_aor->s, impu->public_identity.len, impu->public_identity.s); - s_term = memchr(search_aor->s, '@', search_aor->len); + + /* Filter out sip: and anything before @ from search URI */ + s_term = strstr(search_aor->s, "@"); if(!s_term) { - LM_DBG("Malformed contact...bailing search\n"); - return 1; + s_term = strstr(search_aor->s, ":"); + } + s_term += 1; + if(s_term - search_aor->s >= search_aor->len) { + goto error; + } + i_searchlen = search_aor->len - (s_term - search_aor->s); + + /* Compare the entire contact including alias, if not until alias IP */ + alias_term = strstr(s_term, "~"); + if(!alias_term) { + alias_searchlen = i_searchlen; + } else { + alias_term += 1; + alias_searchlen = alias_term - s_term; } - i_searchlen = s_term - search_aor->s; impucontact = impu->linked_contacts.head; while(impucontact) { - if(impucontact->contact - && impucontact->contact->aor.s[i_searchlen] == '@' - && (memcmp(impucontact->contact->aor.s, search_aor->s, - i_searchlen) - == 0)) { - *scontact = impucontact->contact; - return 0; + if(impucontact->contact) { + + c_term = strstr(impucontact->contact->c.s, "@"); + if(!c_term) { + c_term = strstr(impucontact->contact->c.s, ":"); + } + c_term += 1; + c_searchlen = impucontact->contact->c.len + - (c_term - impucontact->contact->c.s); + + LM_DBG("Comparing [%.*s] and [%.*s]\n", i_searchlen, s_term, + c_searchlen, c_term); + LM_DBG("Comparing [%.*s] and [%.*s]\n", alias_searchlen, s_term, + c_searchlen, c_term); + if((strncmp(c_term, s_term, i_searchlen) == 0) + || (strncmp(c_term, s_term, alias_searchlen) == 0)) { + *scontact = impucontact->contact; + return 0; + } } if(impucontact->contact) - LM_DBG("Skipping %.*s\n", impucontact->contact->aor.len, - impucontact->contact->aor.s); + LM_DBG("Skipping %.*s\n", impucontact->contact->c.len, + impucontact->contact->c.s); impucontact = impucontact->next; } +error: + LM_INFO("malformed contact, bailing search\n"); return 1; }

5 months, 3 weeks

git:master:bc3e758f: ims_registrar_pcscf: option to delay record expiration instead of immediate delete

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: bc3e758fb32285ba8d0f9f9e1a1489dd1894468d URL: https://github.com/kamailio/kamailio/commit/bc3e758fb32285ba8d0f9f9e1a1489d… Author: Supreeth Herle <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-30T10:18:47+01:00 ims_registrar_pcscf: option to delay record expiration instead of immediate delete - new parameter delete_delay --- Modified: src/modules/ims_registrar_pcscf/ims_registrar_pcscf_mod.c Modified: src/modules/ims_registrar_pcscf/ims_registrar_pcscf_mod.h Modified: src/modules/ims_registrar_pcscf/notify.c Modified: src/modules/ims_registrar_pcscf/save.c --- Diff: https://github.com/kamailio/kamailio/commit/bc3e758fb32285ba8d0f9f9e1a1489d… Patch: https://github.com/kamailio/kamailio/commit/bc3e758fb32285ba8d0f9f9e1a1489d…

5 months, 3 weeks

git:master:e49469c0: kamctl: mysql/ims_usrloc_scscf-create.sql - support for larger record_route values

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e49469c0ce534879a7d366c71374356e7883c6f2 URL: https://github.com/kamailio/kamailio/commit/e49469c0ce534879a7d366c71374356… Author: Supreeth Herle <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-30T10:18:47+01:00 kamctl: mysql/ims_usrloc_scscf-create.sql - support for larger record_route values --- Modified: utils/kamctl/mysql/ims_usrloc_scscf-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/e49469c0ce534879a7d366c71374356… Patch: https://github.com/kamailio/kamailio/commit/e49469c0ce534879a7d366c71374356… --- diff --git a/utils/kamctl/mysql/ims_usrloc_scscf-create.sql b/utils/kamctl/mysql/ims_usrloc_scscf-create.sql index ae7bd93a545..21c816c34e9 100644 --- a/utils/kamctl/mysql/ims_usrloc_scscf-create.sql +++ b/utils/kamctl/mysql/ims_usrloc_scscf-create.sql @@ -49,7 +49,7 @@ CREATE TABLE `subscriber` ( `call_id` varchar(50) NOT NULL, `from_tag` varchar(50) NOT NULL, `to_tag` varchar(50) NOT NULL, - `record_route` varchar(50) NOT NULL, + `record_route` TEXT NOT NULL, `sockinfo_str` varchar(50) NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `watcher_uri` (`event`,`watcher_contact`,`presentity_uri`)

5 months, 3 weeks

[kamailio/kamailio] nathelper: Add Max-Forwards to keep-alive (PR #3657)

by Kristian Høgh

#### 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 - [x] 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/3657 -- Commit Summary -- * nathelper: Add Max-Forwards to keep-alive -- File Changes -- M src/modules/nathelper/sip_pinger.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3657.patch https://github.com/kamailio/kamailio/pull/3657.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3657 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3657(a)github.com>

5 months, 3 weeks

git:master:e1d9bec0: nathelper: add Max-Forwards headers which is mandatory for OPTIONS according to RFC 3261 (GH 3657)

by Henning Westerholt

Module: kamailio Branch: master Commit: e1d9bec0e16727325330c822c21ae29237c7812a URL: https://github.com/kamailio/kamailio/commit/e1d9bec0e16727325330c822c21ae29… Author: Kristian Hogh <kfh(a)uni-tel.dk> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-11-30T06:21:25Z nathelper: add Max-Forwards headers which is mandatory for OPTIONS according to RFC 3261 (GH 3657) - add Max-Forwards headers which is mandatory for OPTIONS according to RFC 3261 - similar patch is used from several large customer installations since many years - GH #3657 with small formatting change --- Modified: src/modules/nathelper/sip_pinger.h --- Diff: https://github.com/kamailio/kamailio/commit/e1d9bec0e16727325330c822c21ae29… Patch: https://github.com/kamailio/kamailio/commit/e1d9bec0e16727325330c822c21ae29… --- diff --git a/src/modules/nathelper/sip_pinger.h b/src/modules/nathelper/sip_pinger.h index 733e38f21c3..b3ee4d39f3d 100644 --- a/src/modules/nathelper/sip_pinger.h +++ b/src/modules/nathelper/sip_pinger.h @@ -151,7 +151,7 @@ static inline char *build_sipping(str *curi, struct socket_info *s, str *path, + ruid->len + 1 + 8 + 1 + 8 + s_len(CRLF "To: ") + curi->len + s_len(CRLF "Call-ID: ") + sipping_callid.len + 1 + 8 + 1 + 8 + 1 + s->address_str.len + s_len(CRLF "CSeq: 1 ") - + sipping_method.len + + sipping_method.len + s_len(CRLF "Max-Forwards: 70") + s_len(CRLF "Content-Length: 0" CRLF CRLF) > MAX_SIPPING_SIZE) { LM_ERR("len exceeds %d\n", MAX_SIPPING_SIZE); @@ -205,6 +205,7 @@ static inline char *build_sipping(str *curi, struct socket_info *s, str *path, append_str(p, s->address_str.s, s->address_str.len); append_fix(p, CRLF "CSeq: 1 "); append_str(p, sipping_method.s, sipping_method.len); + append_fix(p, CRLF "Max-Forwards: 70"); append_fix(p, CRLF "Content-Length: 0" CRLF CRLF); *len_p = p - buf;

5 months, 3 weeks

Jenkins build became unstable: kamailiodev-nightly-binaries » amd64,stretch #2536

by kamailio＠sipwise.com

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

5 months, 3 weeks

Jenkins build became unstable: kamailio57-nightly-binaries » amd64,stretch #36

by kamailio＠sipwise.com

See <https://kamailio.sipwise.com/job/kamailio57-nightly-binaries/architecture=a…>

5 months, 3 weeks

[kamailio/kamailio] group include ktls no longer works after 7f07a6ef9ae90baee4281394d0dcf505b30c8fcb (Issue #3660)

by Anthony Messina

After 7f07a6ef9ae90baee4281394d0dcf505b30c8fcb, building the ktls group doesn't work as it's not included in the #else statement. I don't have a need for ktlsa at this point. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3660 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3660(a)github.com>

5 months, 3 weeks

git:5.7:b29d5808: Makefile.groups: fix ktls when KTLS_INCLUDE_TLSA is not set

by Victor Seva

Module: kamailio Branch: 5.7 Commit: b29d5808505aa072fd23b59adf7943fb13ea98a2 URL: https://github.com/kamailio/kamailio/commit/b29d5808505aa072fd23b59adf7943f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-11-29T17:25:05+01:00 Makefile.groups: fix ktls when KTLS_INCLUDE_TLSA is not set fix #3660 (cherry picked from commit aef29af56cabaf626e2ae552ae69c3cd2f692a27) --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/b29d5808505aa072fd23b59adf7943f… Patch: https://github.com/kamailio/kamailio/commit/b29d5808505aa072fd23b59adf7943f… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 028c34da711..ee4ec90e83f 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -407,6 +407,9 @@ ifeq ($(KTLS_INCLUDE_TLSA),yes) # pkg tls module with curl module_group_ktls=$(mod_list_tlsdeps) $(mod_list_tlsdeps_curl) $(mod_list_tlsa) else +# pkg tls module with curl +module_group_ktls=$(mod_list_tlsdeps) $(mod_list_tlsdeps_curl) + # pkg tlsa module module_group_ktlsa=$(mod_list_tlsa) endif @@ -540,4 +543,3 @@ module_group_krtp_media_server=$(mod_list_rtp_media_server) # list of static modules # static_modules:= -

5 months, 3 weeks

git:master:aef29af5: Makefile.groups: fix ktls when KTLS_INCLUDE_TLSA is not set

by Victor Seva

Module: kamailio Branch: master Commit: aef29af56cabaf626e2ae552ae69c3cd2f692a27 URL: https://github.com/kamailio/kamailio/commit/aef29af56cabaf626e2ae552ae69c3c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-11-29T17:21:59+01:00 Makefile.groups: fix ktls when KTLS_INCLUDE_TLSA is not set fix #3660 --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/aef29af56cabaf626e2ae552ae69c3c… Patch: https://github.com/kamailio/kamailio/commit/aef29af56cabaf626e2ae552ae69c3c… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index b428394d31d..48e06e0646c 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -411,6 +411,9 @@ ifeq ($(KTLS_INCLUDE_TLSA),yes) # pkg tls module with curl module_group_ktls=$(mod_list_tlsdeps) $(mod_list_tlsdeps_curl) $(mod_list_tlsa) else +# pkg tls module with curl +module_group_ktls=$(mod_list_tlsdeps) $(mod_list_tlsdeps_curl) + # pkg tlsa module module_group_ktlsa=$(mod_list_tlsa) endif @@ -547,4 +550,3 @@ module_group_krtp_media_server=$(mod_list_rtp_media_server) # list of static modules # static_modules:= -

5 months, 3 weeks

← Newer
1
...
4
5
6
7
8
9
10
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2023