sr-dev

sr-dev@lists.kamailio.org

20 participants
45160 discussions

git:master:9b8a4fd1: lost: URI list support in LoST response (filter for sip/sips scheme)
by Wolfgang Kampichler 28 May '22

28 May '22

Module: kamailio Branch: master Commit: 9b8a4fd17e8819395043f54d43dab07a226d8490 URL: https://github.com/kamailio/kamailio/commit/9b8a4fd17e8819395043f54d43dab07… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2022-05-28T22:42:02+02:00 lost: URI list support in LoST response (filter for sip/sips scheme) --- Modified: src/modules/lost/functions.c Modified: src/modules/lost/response.c Modified: src/modules/lost/response.h --- Diff: https://github.com/kamailio/kamailio/commit/9b8a4fd17e8819395043f54d43dab07… Patch: https://github.com/kamailio/kamailio/commit/9b8a4fd17e8819395043f54d43dab07… --- diff --git a/src/modules/lost/functions.c b/src/modules/lost/functions.c index 711c3732bf..bc6dbd936c 100644 --- a/src/modules/lost/functions.c +++ b/src/modules/lost/functions.c @@ -1,7 +1,7 @@ /* * lost module functions * - * Copyright (C) 2021 Wolfgang Kampichler + * Copyright (C) 2022 Wolfgang Kampichler * DEC112, FREQUENTIS AG * * This file is part of Kamailio, a free SIP server. @@ -1123,16 +1123,24 @@ int lost_function(struct sip_msg *_m, char *_con, char *_uri, char *_name, switch(fsrdata->category) { case RESPONSE: if(fsrdata->uri != NULL) { - /* get the first uri element */ - if((tmp.s = fsrdata->uri->value) != NULL) { - tmp.len = strlen(fsrdata->uri->value); - if(pkg_str_dup(&uri, &tmp) < 0) { - LM_ERR("could not copy: [%.*s]\n", tmp.len, tmp.s); - goto err; - } + /* get the first sips uri element ... */ + if(lost_search_response_list(&fsrdata->uri, &tmp.s, SIPS_S) > 0) { + tmp.len = strlen(tmp.s); + /* or the first sip uri element ... */ + } else if(lost_search_response_list(&fsrdata->uri, &tmp.s, SIP_S) > 0) { + tmp.len = strlen(tmp.s); + /* or return error if nothing found */ + } else { + LM_ERR("sip/sips uri not found: [%.*s]\n", ret.len, ret.s); + goto err; + } + /* copy uri string */ + if(pkg_str_dup(&uri, &tmp) < 0) { + LM_ERR("could not copy: [%.*s]\n", tmp.len, tmp.s); + goto err; } } else { - LM_ERR("uri not found: [%.*s]\n", ret.len, ret.s); + LM_ERR("uri element not found: [%.*s]\n", ret.len, ret.s); goto err; } if(fsrdata->mapping != NULL) { diff --git a/src/modules/lost/response.c b/src/modules/lost/response.c index cc6d65ad2a..dcd6dc5363 100644 --- a/src/modules/lost/response.c +++ b/src/modules/lost/response.c @@ -1,7 +1,7 @@ /* * lost module LoST response parsing functions * - * Copyright (C) 2021 Wolfgang Kampichler + * Copyright (C) 2022 Wolfgang Kampichler * DEC112, FREQUENTIS AG * * This file is part of Kamailio, a free SIP server. @@ -353,6 +353,40 @@ void lost_reverse_response_list(p_lost_list_t *head) *head = prev; } +/* + * lost_search_response_list(list, value, search) + * looks for search string in list object and returns pointer if found + */ +int lost_search_response_list(p_lost_list_t *list, char **val, const char *str) +{ + p_lost_list_t cur; + p_lost_list_t next; + + if(*list == NULL) + return 0; + + if(str == NULL) + return 0; + + LM_DBG("### list data search [%s]\n", str); + + next = *list; + while((cur = next) != NULL) { + next = cur->next; + if(cur->value != NULL) { + if(strncasecmp(cur->value, str, strlen(str)) == 0) { + *val = cur->value; + + LM_DBG("###\t[%s] found\n", cur->value); + + return 1; + } + } + } + + return 0; +} + /* * lost_delete_response_list(list) * removes response list from private memory diff --git a/src/modules/lost/response.h b/src/modules/lost/response.h index 991f82ac6e..9c1fcbcb23 100644 --- a/src/modules/lost/response.h +++ b/src/modules/lost/response.h @@ -1,7 +1,7 @@ /* * lost module LoST response parsing functions * - * Copyright (C) 2021 Wolfgang Kampichler + * Copyright (C) 2022 Wolfgang Kampichler * DEC112, FREQUENTIS AG * * This file is part of Kamailio, a free SIP server. @@ -56,6 +56,9 @@ #define ERRORS_NODE (const char *)"errors" +#define SIP_S (const char *)"sip:" +#define SIPS_S (const char *)"sips:" + #define HELD_RESPONSE_REFERENCE 1 #define HELD_RESPONSE_VALUE 2 @@ -133,4 +136,7 @@ int is_cid_laquot(char *); int is_http_laquot(char *); int is_https_laquot(char *); +/* list search */ +int lost_search_response_list(p_lost_list_t *, char **, const char *); + #endif

1 0

git:master:de70fdc5: dialog: dlg_get_var assure return null on error
by Victor Seva 27 May '22

27 May '22

Module: kamailio Branch: master Commit: de70fdc58a011bb8189f83bad99e064a8a0111da URL: https://github.com/kamailio/kamailio/commit/de70fdc58a011bb8189f83bad99e064… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-05-27T16:58:28+02:00 dialog: dlg_get_var assure return null on error --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/de70fdc58a011bb8189f83bad99e064… Patch: https://github.com/kamailio/kamailio/commit/de70fdc58a011bb8189f83bad99e064… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 6668712dc3..767e6efa54 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -1570,53 +1570,62 @@ static int w_dlg_get_var(struct sip_msg *msg, char *ci, char *ft, char *tt, char str k = STR_NULL; str *val = NULL; pv_value_t dst_val; - pv_spec_t* dst_pv; + pv_spec_t* dst_pv = (pv_spec_t *)pv; if(ci==0 || ft==0 || tt==0) { LM_ERR("invalid parameters\n"); - return -1; + goto error; } if(fixup_get_svalue(msg, (gparam_p)ci, &sc)!=0) { LM_ERR("unable to get Call-ID\n"); - return -1; + goto error; } if(fixup_get_svalue(msg, (gparam_p)ft, &sf)!=0) { LM_ERR("unable to get From tag\n"); - return -1; + goto error; } if(fixup_get_svalue(msg, (gparam_p)tt, &st)!=0) { LM_ERR("unable to get To Tag\n"); - return -1; + goto error; } if(st.s==NULL || st.len == 0) { LM_ERR("invalid To tag parameter\n"); - return -1; + goto error; } if(fixup_get_svalue(msg, (gparam_p)key, &k)!=0) { LM_ERR("unable to get key name\n"); - return -1; + goto error; } - dst_pv = (pv_spec_t *)pv; - val = ki_dlg_get_var_helper(msg, &sc, &sf, &st, &k); + val = ki_dlg_get_var(msg, &sc, &sf, &st, &k); if(val) { memset(&dst_val, 0, sizeof(pv_value_t)); dst_val.flags |= PV_VAL_STR; dst_val.rs.s = val->s; dst_val.rs.len = val->len; - if(pv_set_spec_value(msg, dst_pv, 0, &dst_val) != 0) return -1; } else { - if(pv_get_null(msg, NULL, &dst_val) != 0) return -1; + pv_get_null(msg, NULL, &dst_val); + } + if(pv_set_spec_value(msg, dst_pv, 0, &dst_val) != 0) { + LM_ERR("unable to set value to dst_pv\n"); + if(val) goto error; else return -1; } return 1; + +error: + pv_get_null(msg, NULL, &dst_val); + if(pv_set_spec_value(msg, dst_pv, 0, &dst_val) != 0) { + LM_ERR("unable to set null value to dst_pv\n"); + } + return -1; } static int fixup_dlg_get_var(void** param, int param_no)

1 0

git:master:a0d89214: dialog: w_dlg_get_var, fix incompatible pointer
by Victor Seva 27 May '22

27 May '22

Module: kamailio Branch: master Commit: a0d89214cf8296d30bacdf10a8732bc8826b2418 URL: https://github.com/kamailio/kamailio/commit/a0d89214cf8296d30bacdf10a8732bc… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-05-27T17:18:01+02:00 dialog: w_dlg_get_var, fix incompatible pointer > CC (gcc) [M dialog.so] dialog.o > dialog.c: In function 'w_dlg_get_var': dialog.c:1608:6: warning: assignment to 'str *' {aka 'struct _str *'} from incompatible pointer type 'sr_kemi_xval_t *' {aka 'struct sr_kemi_xval *'} [-Wincompatible-pointer-types] > 1608 | val = ki_dlg_get_var(msg, &sc, &sf, &st, &k); > | ^ --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/a0d89214cf8296d30bacdf10a8732bc… Patch: https://github.com/kamailio/kamailio/commit/a0d89214cf8296d30bacdf10a8732bc… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 767e6efa54..2082a41e19 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -1568,7 +1568,7 @@ static int w_dlg_get_var(struct sip_msg *msg, char *ci, char *ft, char *tt, char str sf = STR_NULL; str st = STR_NULL; str k = STR_NULL; - str *val = NULL; + sr_kemi_xval_t *val = NULL; pv_value_t dst_val; pv_spec_t* dst_pv = (pv_spec_t *)pv; @@ -1606,11 +1606,11 @@ static int w_dlg_get_var(struct sip_msg *msg, char *ci, char *ft, char *tt, char goto error; } val = ki_dlg_get_var(msg, &sc, &sf, &st, &k); - if(val) { + if(val && val->vtype == SR_KEMIP_STR) { memset(&dst_val, 0, sizeof(pv_value_t)); dst_val.flags |= PV_VAL_STR; - dst_val.rs.s = val->s; - dst_val.rs.len = val->len; + dst_val.rs.s = val->v.s.s; + dst_val.rs.len = val->v.s.len; } else { pv_get_null(msg, NULL, &dst_val); }

1 0

git:master:0d9380c8: modules: readme files regenerated - auth_identity ... [skip ci]
by Kamailio Dev 24 May '22

24 May '22

Module: kamailio Branch: master Commit: 0d9380c8812d4e57b0c92f5f68b6c20001b28819 URL: https://github.com/kamailio/kamailio/commit/0d9380c8812d4e57b0c92f5f68b6c20… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-05-24T12:31:17+02:00 modules: readme files regenerated - auth_identity ... [skip ci] --- Modified: src/modules/auth_identity/README --- Diff: https://github.com/kamailio/kamailio/commit/0d9380c8812d4e57b0c92f5f68b6c20… Patch: https://github.com/kamailio/kamailio/commit/0d9380c8812d4e57b0c92f5f68b6c20… --- diff --git a/src/modules/auth_identity/README b/src/modules/auth_identity/README index 5ffdd5d9b1..acbac172dd 100644 --- a/src/modules/auth_identity/README +++ b/src/modules/auth_identity/README @@ -25,7 +25,7 @@ Gergely Kovacs 5.6. callid_cache_limit (integer) 5.7. certificate_cache_limit (integer) 5.8. cainfo_path (string) - 5.9. accept_pem_certs ([0|1]) + 5.9. accept_pem_certs (int) 6. Functions @@ -91,7 +91,7 @@ Chapter 1. Admin Guide 5.6. callid_cache_limit (integer) 5.7. certificate_cache_limit (integer) 5.8. cainfo_path (string) - 5.9. accept_pem_certs ([0|1]) + 5.9. accept_pem_certs (int) 6. Functions @@ -174,7 +174,7 @@ Chapter 1. Admin Guide 5.6. callid_cache_limit (integer) 5.7. certificate_cache_limit (integer) 5.8. cainfo_path (string) - 5.9. accept_pem_certs ([0|1]) + 5.9. accept_pem_certs (int) 5.1. privatekey_path (string) @@ -296,11 +296,12 @@ modparam("auth_identity","certificate_cache_limit",4096) modparam("auth_identity","cainfo_path","/etc/ssl/certs/ca-certificates.crt") ... -5.9. accept_pem_certs ([0|1]) +5.9. accept_pem_certs (int) Note: this parameter is for verifier service. Enables the acquired certificate processing if it is in PEM format. + Value can be 0 or 1. This parameter is optional. The default value is "0".

1 0

git:master:9155a53b: auth_identity: removed auth_identity.xml from source folder
by Daniel-Constantin Mierla 24 May '22

24 May '22

Module: kamailio Branch: master Commit: 9155a53bccd090e51b274802d140f363aca6d4b7 URL: https://github.com/kamailio/kamailio/commit/9155a53bccd090e51b274802d140f36… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-24T12:19:38+02:00 auth_identity: removed auth_identity.xml from source folder - there is one in doc/ subfolder --- Removed: src/modules/auth_identity/auth_identity.xml --- Diff: https://github.com/kamailio/kamailio/commit/9155a53bccd090e51b274802d140f36… Patch: https://github.com/kamailio/kamailio/commit/9155a53bccd090e51b274802d140f36…

1 0

git:master:6e7b6cfa: auth_identity: docs - type for accept_pem_certs param
by Daniel-Constantin Mierla 24 May '22

24 May '22

Module: kamailio Branch: master Commit: 6e7b6cfabba6774627f942d7f02e1adf62bf7797 URL: https://github.com/kamailio/kamailio/commit/6e7b6cfabba6774627f942d7f02e1ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-24T12:21:53+02:00 auth_identity: docs - type for accept_pem_certs param --- Modified: src/modules/auth_identity/doc/auth_identity_params.xml --- Diff: https://github.com/kamailio/kamailio/commit/6e7b6cfabba6774627f942d7f02e1ad… Patch: https://github.com/kamailio/kamailio/commit/6e7b6cfabba6774627f942d7f02e1ad… --- diff --git a/src/modules/auth_identity/doc/auth_identity_params.xml b/src/modules/auth_identity/doc/auth_identity_params.xml index a252bbed6b..aefb49cdd0 100644 --- a/src/modules/auth_identity/doc/auth_identity_params.xml +++ b/src/modules/auth_identity/doc/auth_identity_params.xml @@ -190,11 +190,11 @@ modparam("auth_identity","cainfo_path","/etc/ssl/certs/ca-certificates.crt") </section> <section id="accept_pem_certs"> - <title><varname>accept_pem_certs</varname> ([0|1])</title> + <title><varname>accept_pem_certs</varname> (int)</title> <para>Note: this parameter is for verifier service.</para> <para> Enables the acquired certificate processing if it is in PEM - format. + format. Value can be 0 or 1. </para> <para> This parameter is optional. The default value is "0".

1 0

git:master:d001dc00: modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci]
by Kamailio Dev 24 May '22

24 May '22

Module: kamailio Branch: master Commit: d001dc00e4f5cc5925727757e3517eebc164c7f8 URL: https://github.com/kamailio/kamailio/commit/d001dc00e4f5cc5925727757e3517ee… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-05-24T10:46:28+02:00 modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci] --- Modified: src/modules/ims_ipsec_pcscf/README --- Diff: https://github.com/kamailio/kamailio/commit/d001dc00e4f5cc5925727757e3517ee… Patch: https://github.com/kamailio/kamailio/commit/d001dc00e4f5cc5925727757e3517ee…

1 0

[kamailio/kamailio] IMS, P-CSCF: fix issues with UEs and ipsec tunnel (PR #3094)
by Kristiyan Peychev 24 May '22

24 May '22

#### 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  Implement reuse of IPSec tunnels when UEs are re-registering or de-registering, optimizing tunnel creations and key exchanges, and (hopefully) performance. This is a refactored version of PR #3029. I hope that all the issues @alexyosifov found have been fixed. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3094 -- Commit Summary -- * ims_ipsec_pcscf: fix issues with UEs and ipsec tunnel -- File Changes -- M src/modules/ims_ipsec_pcscf/cmd.c (151) M src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c (12) M src/modules/ims_ipsec_pcscf/ipsec.c (29) D src/modules/ims_ipsec_pcscf/port_gen.c (227) D src/modules/ims_ipsec_pcscf/port_gen.h (41) M src/modules/ims_ipsec_pcscf/sec_agree.c (33) M src/modules/ims_ipsec_pcscf/spi_gen.c (112) M src/modules/ims_ipsec_pcscf/spi_gen.h (6) M src/modules/ims_ipsec_pcscf/spi_list.c (62) M src/modules/ims_ipsec_pcscf/spi_list.h (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3094.patch https://github.com/kamailio/kamailio/pull/3094.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3094 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3094(a)github.com>

3 6

git:master:59fd5cd7: IMS, P-CSCF: fix issues with UEs and ipsec tunnel (#3094)
by GitHub 24 May '22

24 May '22

Module: kamailio Branch: master Commit: 59fd5cd7053df2941aa6df7270ed7a021ce1f62d URL: https://github.com/kamailio/kamailio/commit/59fd5cd7053df2941aa6df7270ed7a0… Author: Kristiyan Peychev <97663519+kristiyan-peychev-flolive(a)users.noreply.github.com> Committer: GitHub <noreply(a)github.com> Date: 2022-05-24T10:39:47+02:00 IMS, P-CSCF: fix issues with UEs and ipsec tunnel (#3094) * ims_ipsec_pcscf: fix issues with UEs and ipsec tunnel UEs were not sending certain replies through the ipsec tunnel * ims_ipsec_pcscf: fix issues pointed out in code review Remove error logs which were not errors at all. Fix issue in clean_spi_list where the free SPI list would get completely wiped. * ims_ipsec_pcscf: lower log severity from error to info Co-authored-by: Teodor Mihov <teodor.mihov(a)flolive.net> --- Modified: src/modules/ims_ipsec_pcscf/cmd.c Modified: src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml Modified: src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c Modified: src/modules/ims_ipsec_pcscf/ipsec.c Modified: src/modules/ims_ipsec_pcscf/sec_agree.c Modified: src/modules/ims_ipsec_pcscf/spi_gen.c Modified: src/modules/ims_ipsec_pcscf/spi_gen.h Modified: src/modules/ims_ipsec_pcscf/spi_list.c Modified: src/modules/ims_ipsec_pcscf/spi_list.h Removed: src/modules/ims_ipsec_pcscf/port_gen.c Removed: src/modules/ims_ipsec_pcscf/port_gen.h --- Diff: https://github.com/kamailio/kamailio/commit/59fd5cd7053df2941aa6df7270ed7a0… Patch: https://github.com/kamailio/kamailio/commit/59fd5cd7053df2941aa6df7270ed7a0…

1 0

Kamailio v5.6.0 Released - new major version is out
by Daniel-Constantin Mierla 23 May '22

23 May '22

Kamailio v5.6.0 is out – it comes with 7 new modules and a considerable set of improvements touching again more than 90 existing modules. You can read detailed release notes at: * https://www.kamailio.org/w/kamailio-v5-6-0-release-notes/ Many thanks to all developers and community members that made possible this release. v5.6.0 brings more flexibility and optimizations across many components, plenty of new variables and transformations, load balancer enhancements, generic iterators for SIP headers and body lines, alternative http client, NATS PubSub connector, improvements to STIR/SHAKEN, IMS/VoLTE, rtpengine and tls as well as more functions exported to KEMI interface ... just to list only a few here. Enjoy Kamailio v5.5.0! Thank you for flying Kamailio! Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online: June 20-23, 2022 * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev