sr-dev May 2019

sr-dev@lists.kamailio.org

29 participants
306 discussions

git:5.2:1d064994: tls: register SNI callback for server default profile

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: 1d06499462e1e893e5965d2cc9553cbdd5bd347d URL: https://github.com/kamailio/kamailio/commit/1d06499462e1e893e5965d2cc9553cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-21T13:20:23+02:00 tls: register SNI callback for server default profile - make SNI work for other profile when the default one does not have server_name - GH #1938 (cherry picked from commit 08d22b7bd95828554e30f4c23e906cd9d234e1cd) --- Modified: src/modules/tls/tls_domain.c --- Diff: https://github.com/kamailio/kamailio/commit/1d06499462e1e893e5965d2cc9553cb… Patch: https://github.com/kamailio/kamailio/commit/1d06499462e1e893e5965d2cc9553cb… --- diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index f22b8e8049..fff4603eba 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -1061,17 +1061,20 @@ static int ksr_tls_fix_domain(tls_domain_t* d, tls_domain_t* def) * check server domains for server_name extension and register * callback function */ - if ((d->type & TLS_DOMAIN_SRV) && d->server_name.len>0) { + if ((d->type & TLS_DOMAIN_SRV) + && (d->server_name.len>0 || (d->type & TLS_DOMAIN_DEF))) { if (!SSL_CTX_set_tlsext_servername_callback(d->ctx[i], tls_server_name_cb)) { LM_ERR("register server_name callback handler for socket " "[%s:%d], server_name='%s' failed for proc %d\n", - ip_addr2a(&d->ip), d->port, d->server_name.s, i); + ip_addr2a(&d->ip), d->port, + (d->server_name.s)?d->server_name.s:"<default>", i); return -1; } if (!SSL_CTX_set_tlsext_servername_arg(d->ctx[i], d)) { LM_ERR("register server_name callback handler data for socket " "[%s:%d], server_name='%s' failed for proc %d\n", - ip_addr2a(&d->ip), d->port, d->server_name.s, i); + ip_addr2a(&d->ip), d->port, + (d->server_name.s)?d->server_name.s:"<default>", i); return -1; } } @@ -1079,10 +1082,11 @@ static int ksr_tls_fix_domain(tls_domain_t* d, tls_domain_t* def) } #ifndef OPENSSL_NO_TLSEXT - if ((d->type & TLS_DOMAIN_SRV) && d->server_name.len>0) { + if ((d->type & TLS_DOMAIN_SRV) + && (d->server_name.len>0 || (d->type & TLS_DOMAIN_DEF))) { LM_NOTICE("registered server_name callback handler for socket " "[%s:%d], server_name='%s' ...\n", ip_addr2a(&d->ip), d->port, - d->server_name.s); + (d->server_name.s)?d->server_name.s:"<default>"); } #endif

5 years, 7 months

git:5.2:a67274df: core: kemi - typedefs for functions with 5 parameters

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: a67274df404107a729890b5d4936928f8cdde379 URL: https://github.com/kamailio/kamailio/commit/a67274df404107a729890b5d4936928… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-21T13:19:19+02:00 core: kemi - typedefs for functions with 5 parameters (cherry picked from commit e184648a9cf9b7be2cc12ef64bbb978926384e2b) --- Modified: src/core/kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/a67274df404107a729890b5d4936928… Patch: https://github.com/kamailio/kamailio/commit/a67274df404107a729890b5d4936928… --- diff --git a/src/core/kemi.h b/src/core/kemi.h index 5d3c84ebb7..26e56e3087 100644 --- a/src/core/kemi.h +++ b/src/core/kemi.h @@ -108,7 +108,37 @@ typedef int (*sr_kemi_fmssss_f)(sip_msg_t*, str*, str*, str*, str*); /* sip_msg_t and five int|str params */ typedef int (*sr_kemi_fmsssss_f)(sip_msg_t*, str*, str*, str*, str*, str*); +typedef int (*sr_kemi_fmssssn_f)(sip_msg_t*, str*, str*, str*, str*, int); +typedef int (*sr_kemi_fmsssns_f)(sip_msg_t*, str*, str*, str*, int, str*); +typedef int (*sr_kemi_fmsssnn_f)(sip_msg_t*, str*, str*, str*, int, int); +typedef int (*sr_kemi_fmssnss_f)(sip_msg_t*, str*, str*, int, str*, str*); +typedef int (*sr_kemi_fmssnsn_f)(sip_msg_t*, str*, str*, int, str*, int); typedef int (*sr_kemi_fmssnns_f)(sip_msg_t*, str*, str*, int, int, str*); +typedef int (*sr_kemi_fmssnnn_f)(sip_msg_t*, str*, str*, int, int, int); +typedef int (*sr_kemi_fmsnsss_f)(sip_msg_t*, str*, int, str*, str*, str*); +typedef int (*sr_kemi_fmsnssn_f)(sip_msg_t*, str*, int, str*, str*, int); +typedef int (*sr_kemi_fmsnsns_f)(sip_msg_t*, str*, int, str*, int, str*); +typedef int (*sr_kemi_fmsnsnn_f)(sip_msg_t*, str*, int, str*, int, int); +typedef int (*sr_kemi_fmsnnss_f)(sip_msg_t*, str*, int, int, str*, str*); +typedef int (*sr_kemi_fmsnnsn_f)(sip_msg_t*, str*, int, int, str*, int); +typedef int (*sr_kemi_fmsnnns_f)(sip_msg_t*, str*, int, int, int, str*); +typedef int (*sr_kemi_fmsnnnn_f)(sip_msg_t*, str*, int, int, int, int); +typedef int (*sr_kemi_fmnssss_f)(sip_msg_t*, int, str*, str*, str*, str*); +typedef int (*sr_kemi_fmnsssn_f)(sip_msg_t*, int, str*, str*, str*, int); +typedef int (*sr_kemi_fmnssns_f)(sip_msg_t*, int, str*, str*, int, str*); +typedef int (*sr_kemi_fmnssnn_f)(sip_msg_t*, int, str*, str*, int, int); +typedef int (*sr_kemi_fmnsnss_f)(sip_msg_t*, int, str*, int, str*, str*); +typedef int (*sr_kemi_fmnsnsn_f)(sip_msg_t*, int, str*, int, str*, int); +typedef int (*sr_kemi_fmnsnns_f)(sip_msg_t*, int, str*, int, int, str*); +typedef int (*sr_kemi_fmnsnnn_f)(sip_msg_t*, int, str*, int, int, int); +typedef int (*sr_kemi_fmnnsss_f)(sip_msg_t*, int, int, str*, str*, str*); +typedef int (*sr_kemi_fmnnssn_f)(sip_msg_t*, int, int, str*, str*, int); +typedef int (*sr_kemi_fmnnsns_f)(sip_msg_t*, int, int, str*, int, str*); +typedef int (*sr_kemi_fmnnsnn_f)(sip_msg_t*, int, int, str*, int, int); +typedef int (*sr_kemi_fmnnnss_f)(sip_msg_t*, int, int, int, str*, str*); +typedef int (*sr_kemi_fmnnnsn_f)(sip_msg_t*, int, int, int, str*, int); +typedef int (*sr_kemi_fmnnnns_f)(sip_msg_t*, int, int, int, int, str*); +typedef int (*sr_kemi_fmnnnnn_f)(sip_msg_t*, int, int, int, int, int); /* sip_msg_t and six int|str params */ typedef int (*sr_kemi_fmssssss_f)(sip_msg_t*, str*, str*, str*, str*, str*, str*);

5 years, 7 months

git:5.2:110de278: core: pv - define the string printed for null value

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: 110de27806d7703939b3123cff7a8fe423028d0a URL: https://github.com/kamailio/kamailio/commit/110de27806d7703939b3123cff7a8fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-21T13:18:16+02:00 core: pv - define the string printed for null value - added function to return the str null value (cherry picked from commit c84a89a3ab5b3f3174203753e51926143b0309f8) --- Modified: src/core/pvapi.c Modified: src/core/pvar.h --- Diff: https://github.com/kamailio/kamailio/commit/110de27806d7703939b3123cff7a8fe… Patch: https://github.com/kamailio/kamailio/commit/110de27806d7703939b3123cff7a8fe… --- diff --git a/src/core/pvapi.c b/src/core/pvapi.c index 878ae30f8e..9b5234f1be 100644 --- a/src/core/pvapi.c +++ b/src/core/pvapi.c @@ -674,7 +674,8 @@ static char pv_str_empty_buf[2]; static char pv_str_null_buf[8]; static str pv_str_empty = { "", 0 }; -static str pv_str_null = { "<null>", 6 }; +#define PV_STR_NULL_VAL "<null>" +static str pv_str_null = { PV_STR_NULL_VAL, sizeof(PV_STR_NULL_VAL)-1 }; int pv_get_null(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { if(res==NULL) @@ -686,6 +687,14 @@ int pv_get_null(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) return 0; } +/** + * + */ +str *pv_get_null_str(void) +{ + return &pv_str_null; +} + /** * */ @@ -2003,7 +2012,7 @@ int pv_init_api(void) pv_str_empty_buf[0] = '\0'; pv_str_empty_buf[1] = '\0'; pv_str_empty.s = pv_str_empty_buf; - strcpy(pv_str_null_buf, "<null>"); + strcpy(pv_str_null_buf, PV_STR_NULL_VAL); pv_str_null.s = pv_str_null_buf; if(register_pvars_mod("core", _core_pvs)<0) diff --git a/src/core/pvar.h b/src/core/pvar.h index 3e838e20f8..564bc03d90 100644 --- a/src/core/pvar.h +++ b/src/core/pvar.h @@ -209,6 +209,7 @@ int pv_free_extra_list(void); int pv_locate_name(str *in); pv_spec_t* pv_cache_get(str *name); str* pv_cache_get_name(pv_spec_t *spec); +str *pv_get_null_str(void); /*! \brief PV helper functions */ int pv_get_null(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);

5 years, 7 months

[kamailio/kamailio] In-place string transform having occasionally corrupted results (#1937)

by andycwlai

If I do a substring operation where I extract the middle of a string, I occasionally get results that are not correct. Example code: $var(x) = $(var(y){s.substr,1,5}); This seems to be the same issue as: http://sip-router.1086192.n5.nabble.com/PATCH-Memory-corruption-using-s-sub… This issue had a fix which added "tr_string_clone_result" in numerous exit points in pv_trans.c: https://github.com/kamailio/kamailio/commit/fe7e4a5152674aa9c81c09dd2fc9938… It seemed to be missing at the exit path for the substring operation which may explain my observation. See: https://github.com/kamailio/kamailio/blob/master/src/modules/pv/pv_trans.c#… I also notice that this is not used in some other string operations which leads me to wonder if this problem is more prevalent (likely, since I've heard reports of similar symptoms with the replace). Suggestion: Investigate if we can have this "tr_string_clone_result" called here and remove all other occurrences in the switch clause. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1937

5 years, 7 months

git:5.1:5534c048: pv: clone string in all substr operations, related to GH #1937

by Henning Westerholt

Module: kamailio Branch: 5.1 Commit: 5534c048648d99424c5a5e1d67a510d96da52ff1 URL: https://github.com/kamailio/kamailio/commit/5534c048648d99424c5a5e1d67a510d… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-05-20T21:00:40+02:00 pv: clone string in all substr operations, related to GH #1937 (cherry picked from commit 280eabf16a45f522655f8b49677e46c75d34024f) --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/5534c048648d99424c5a5e1d67a510d… Patch: https://github.com/kamailio/kamailio/commit/5534c048648d99424c5a5e1d67a510d… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index e7c07a0054..8b894689e8 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -614,6 +614,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, } val->rs.s += i; val->rs.len = j; + tr_string_clone_result; break; } i = -i;

5 years, 7 months

git:master:8ee81c12: modules: readme files regenerated - dispatcher ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 8ee81c12b60c2de74dc604f16369e5fbd38922b7 URL: https://github.com/kamailio/kamailio/commit/8ee81c12b60c2de74dc604f16369e5f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-05-20T17:16:42+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/8ee81c12b60c2de74dc604f16369e5f… Patch: https://github.com/kamailio/kamailio/commit/8ee81c12b60c2de74dc604f16369e5f… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index eb63603d8f..21a1c0249b 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -951,7 +951,7 @@ modparam("dispatcher", "ds_db_extra_attrs", "socket=socket;pref=prefix") If set to 0, no rate limit is configured. Note carefully: use this configuration only in tests environments because executing many RPC - reload commandss at the same time can cause unexpected behavior. + reload commands at the same time can cause unexpected behavior. Default value is “5”.

5 years, 7 months

git:master:dc6901ea: dispatcher: docs - fixed typo in description for reload_delta

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: dc6901eaa1024431c86c4e13a65b37194ec9fbe9 URL: https://github.com/kamailio/kamailio/commit/dc6901eaa1024431c86c4e13a65b371… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-20T17:11:21+02:00 dispatcher: docs - fixed typo in description for reload_delta --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/dc6901eaa1024431c86c4e13a65b371… Patch: https://github.com/kamailio/kamailio/commit/dc6901eaa1024431c86c4e13a65b371… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index a797c0b6ac..9754e3f320 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1019,7 +1019,7 @@ modparam("dispatcher", "ds_db_extra_attrs", "socket=socket;pref=prefix") <para> If set to 0, no rate limit is configured. Note carefully: use this configuration only in tests environments because executing many RPC - reload commandss at the same time can cause unexpected behavior. + reload commands at the same time can cause unexpected behavior. </para> <para> <emphasis>

5 years, 7 months

git:5.2:4676d3d2: pv: clone string in all substr operations, related to GH #1937

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: 4676d3d2c1267761ac6405464459b49c809afcbf URL: https://github.com/kamailio/kamailio/commit/4676d3d2c1267761ac6405464459b49… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-20T14:23:55+02:00 pv: clone string in all substr operations, related to GH #1937 (cherry picked from commit 280eabf16a45f522655f8b49677e46c75d34024f) --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/4676d3d2c1267761ac6405464459b49… Patch: https://github.com/kamailio/kamailio/commit/4676d3d2c1267761ac6405464459b49… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index efbf8e8cf2..17c6a3e204 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -614,6 +614,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, } val->rs.s += i; val->rs.len = j; + tr_string_clone_result; break; } i = -i;

5 years, 7 months

Configuration for dummies

by jespinosa

Hello, My name is Javier Espinosa and I am trying to connect a Kamailio IMS Core with my LTE EPC that I already have working. To make it faster I had downloaded the VM that Franz Edler post here: https://www.kamailio.org/w/2016/02/kamailio-ims-getting-started-box/ but I can't find the properly way to connect it with my EPC that is a real EPC so, I have IMSI codes for each user and I don't know how to register them in the HSS of the IMS and I also have one HSS in my EPC so I am a little bit lost. If anyone can help me with this I will be very grateful. Thank you so much, Javier Espinosa.

5 years, 7 months

git:master:2921bb2d: modules: readme files regenerated - dispatcher ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 2921bb2da7e257ea5ff6fac76e35d08be26e6008 URL: https://github.com/kamailio/kamailio/commit/2921bb2da7e257ea5ff6fac76e35d08… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-05-20T11:46:45+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/2921bb2da7e257ea5ff6fac76e35d08… Patch: https://github.com/kamailio/kamailio/commit/2921bb2da7e257ea5ff6fac76e35d08…

5 years, 7 months

← Newer
1
...
13
14
15
16
17
18
19
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2019