sr-dev August 2022

sr-dev@lists.kamailio.org

16 participants
279 discussions

git:master:399b34c6: tm: backup and restore X/AVP values from initial transaction in DNS failover processing

by Henning Westerholt

Module: kamailio Branch: master Commit: 399b34c6bd4e5cbfcf4dcb699755c393229fcb99 URL: https://github.com/kamailio/kamailio/commit/399b34c6bd4e5cbfcf4dcb699755c39… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-08-19T13:17:46Z tm: backup and restore X/AVP values from initial transaction in DNS failover processing - restore X/AVP values from initial transaction in DNS failover processing - the X/AVP context gets lost, so we need to re-create it from the transaction - otherwise modules that depends on the X/AVPs, e.g. topology hiding will not work - tested with one load-balancer and two proxy servers - previous fix d6b1c20d3ad94 was reverted, we now properly backup and restore --- Modified: src/modules/tm/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/399b34c6bd4e5cbfcf4dcb699755c39… Patch: https://github.com/kamailio/kamailio/commit/399b34c6bd4e5cbfcf4dcb699755c39… --- diff --git a/src/modules/tm/timer.c b/src/modules/tm/timer.c index a662920cab..4c821ba871 100644 --- a/src/modules/tm/timer.c +++ b/src/modules/tm/timer.c @@ -360,6 +360,7 @@ inline static void final_response_handler( int branch_ret; int prev_branch; ticks_t now; + tm_xlinks_t backup_xd; #endif #ifdef EXTRA_DEBUG @@ -450,11 +451,15 @@ inline static void final_response_handler( branch_ret = add_uac_dns_fallback( t, t->uas.request, &t->uac[r_buf->branch], 0); prev_branch = -1; + /* restore X/AVP values from initial transaction */ + tm_xdata_swap(t, &backup_xd, 0); while((branch_ret >= 0) && (branch_ret != prev_branch)) { prev_branch = branch_ret; branch_ret = t_send_branch(t, branch_ret, t->uas.request, 0, 0); } + /* restore X/AVP values from backup data */ + tm_xdata_swap(t, &backup_xd, 1); } } #endif

2 years, 3 months

git:master:9ceeabc2: Revert "tm: restore X/AVP values from initial transaction in DNS failover processing"

by Henning Westerholt

Module: kamailio Branch: master Commit: 9ceeabc299e08c944014c16ef54cd159b063be2e URL: https://github.com/kamailio/kamailio/commit/9ceeabc299e08c944014c16ef54cd15… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-08-19T13:15:53Z Revert "tm: restore X/AVP values from initial transaction in DNS failover processing" This reverts commit d6b1c20d3ad94d9136cf247e67b7fc0d32b18d3b. --- Modified: src/modules/tm/t_fwd.c --- Diff: https://github.com/kamailio/kamailio/commit/9ceeabc299e08c944014c16ef54cd15… Patch: https://github.com/kamailio/kamailio/commit/9ceeabc299e08c944014c16ef54cd15… --- diff --git a/src/modules/tm/t_fwd.c b/src/modules/tm/t_fwd.c index 6b26f28f6a..fbcf1b3e02 100644 --- a/src/modules/tm/t_fwd.c +++ b/src/modules/tm/t_fwd.c @@ -1042,8 +1042,6 @@ int add_uac_dns_fallback(struct cell *t, struct sip_msg* msg, t->uac[t->nr_of_outgoings].on_branch_failure = old_uac->on_branch_failure; /* copy branch flags */ t->uac[t->nr_of_outgoings].branch_flags = old_uac->branch_flags; - /* restore X/AVP values from initial transaction */ - tm_xdata_swap(t, 0, 0); if (cfg_get(tm, tm_cfg, reparse_on_dns_failover)){ /* Reuse the old buffer and only replace the via header.

2 years, 3 months

git:master:3b0b03c9: tls: exclude TLSv1.3 from OpenSSL > 1.1.0 < 1.1.1 for Debian stretch

by Henning Westerholt

Module: kamailio Branch: master Commit: 3b0b03c921945000b2c0f97810061fee58faf77d URL: https://github.com/kamailio/kamailio/commit/3b0b03c921945000b2c0f97810061fe… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-08-19T07:10:45Z tls: exclude TLSv1.3 from OpenSSL > 1.1.0 < 1.1.1 for Debian stretch --- Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/3b0b03c921945000b2c0f97810061fe… Patch: https://github.com/kamailio/kamailio/commit/3b0b03c921945000b2c0f97810061fe… --- diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index 9bbd0acb83..e6d0060d41 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -463,6 +463,7 @@ static void init_ssl_methods(void) sr_tls_methods[TLS_USE_TLSv1_2 - 1].TLSMethodMin = TLS1_2_VERSION; sr_tls_methods[TLS_USE_TLSv1_2 - 1].TLSMethodMax = TLS1_2_VERSION; +#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(LIBRESSL_VERSION_NUMBER) sr_tls_methods[TLS_USE_TLSv1_3_cli - 1].TLSMethod = TLS_client_method(); sr_tls_methods[TLS_USE_TLSv1_3_cli - 1].TLSMethodMin = TLS1_3_VERSION; sr_tls_methods[TLS_USE_TLSv1_3_cli - 1].TLSMethodMax = TLS1_3_VERSION; @@ -472,6 +473,7 @@ static void init_ssl_methods(void) sr_tls_methods[TLS_USE_TLSv1_3 - 1].TLSMethod = TLS_method(); sr_tls_methods[TLS_USE_TLSv1_3 - 1].TLSMethodMin = TLS1_3_VERSION; sr_tls_methods[TLS_USE_TLSv1_3 - 1].TLSMethodMax = TLS1_3_VERSION; +#endif /* ranges of TLS versions (require a minimum TLS version) */ sr_tls_methods[TLS_USE_TLSv1_PLUS - 1].TLSMethod = TLS_method(); @@ -483,8 +485,10 @@ static void init_ssl_methods(void) sr_tls_methods[TLS_USE_TLSv1_2_PLUS - 1].TLSMethod = TLS_method(); sr_tls_methods[TLS_USE_TLSv1_2_PLUS - 1].TLSMethodMin = TLS1_2_VERSION; +#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(LIBRESSL_VERSION_NUMBER) sr_tls_methods[TLS_USE_TLSv1_3_PLUS - 1].TLSMethod = TLS_method(); sr_tls_methods[TLS_USE_TLSv1_3_PLUS - 1].TLSMethodMin = TLS1_3_VERSION; +#endif #endif }

2 years, 3 months

git:master:60f25fc4: tls: remove wrong TLSv1.3 statements from #ifdef block for openssl < 1.1.0

by Henning Westerholt

Module: kamailio Branch: master Commit: 60f25fc4b47222bac0eb09fbed93a1b63dcc54a4 URL: https://github.com/kamailio/kamailio/commit/60f25fc4b47222bac0eb09fbed93a1b… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-08-18T10:32:47Z tls: remove wrong TLSv1.3 statements from #ifdef block for openssl < 1.1.0 --- Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/60f25fc4b47222bac0eb09fbed93a1b… Patch: https://github.com/kamailio/kamailio/commit/60f25fc4b47222bac0eb09fbed93a1b… --- diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index 1b88aa03bc..9bbd0acb83 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -401,12 +401,6 @@ static void init_ssl_methods(void) ssl_methods[TLS_USE_TLSv1_2 - 1] = TLSv1_2_method(); #endif -#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(LIBRESSL_VERSION_NUMBER) - ssl_methods[TLS_USE_TLSv1_3_cli - 1] = TLSv1_3_client_method(); - ssl_methods[TLS_USE_TLSv1_3_srv - 1] = TLSv1_3_server_method(); - ssl_methods[TLS_USE_TLSv1_3 - 1] = TLSv1_3_method(); -#endif - /* ranges of TLS versions (require a minimum TLS version) */ ssl_methods[TLS_USE_TLSv1_PLUS - 1] = (void*)TLS_OP_TLSv1_PLUS; @@ -418,9 +412,6 @@ static void init_ssl_methods(void) ssl_methods[TLS_USE_TLSv1_2_PLUS - 1] = (void*)TLS_OP_TLSv1_2_PLUS; #endif -#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(LIBRESSL_VERSION_NUMBER) - ssl_methods[TLS_USE_TLSv1_3_PLUS - 1] = (void*)TLS_OP_TLSv1_3_PLUS; -#endif #else /* openssl 1.1.0+ */ memset(sr_tls_methods, 0, sizeof(sr_tls_methods));

2 years, 3 months

git:master:a88f8052: registrar: print number of contacts and max limit in logs and formatting updates

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a88f805236ef0549ce8a8079142b202d569bf3f1 URL: https://github.com/kamailio/kamailio/commit/a88f805236ef0549ce8a8079142b202… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-18T11:34:44+02:00 registrar: print number of contacts and max limit in logs and formatting updates --- Modified: src/modules/registrar/save.c --- Diff: https://github.com/kamailio/kamailio/commit/a88f805236ef0549ce8a8079142b202… Patch: https://github.com/kamailio/kamailio/commit/a88f805236ef0549ce8a8079142b202… --- diff --git a/src/modules/registrar/save.c b/src/modules/registrar/save.c index e90ae82bb78..5356f74c547 100644 --- a/src/modules/registrar/save.c +++ b/src/modules/registrar/save.c @@ -323,7 +323,8 @@ static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, ci.instance = _c->instance->body; LM_DBG("set instance[%.*s]\n", ci.instance.len, ci.instance.s); } - if(_use_regid && _c->instance!=NULL && _c->reg_id!=NULL && _c->reg_id->body.len>0) { + if(_use_regid && _c->instance!=NULL && _c->reg_id!=NULL + && _c->reg_id->body.len>0) { if(str2int(&_c->reg_id->body, &ci.reg_id)<0 || ci.reg_id==0) { LM_ERR("invalid reg-id value\n"); @@ -459,7 +460,8 @@ int reg_get_crt_max_contacts(void) * and insert all contacts from the message that have expires * > 0 */ -static inline int insert_contacts(struct sip_msg* _m, udomain_t* _d, str* _a, int _use_regid, int novariation) +static inline int insert_contacts(struct sip_msg* _m, udomain_t* _d, str* _a, + int _use_regid, int novariation) { ucontact_info_t* ci; urecord_t* r = NULL; @@ -551,7 +553,8 @@ static inline int insert_contacts(struct sip_msg* _m, udomain_t* _d, str* _a, in if (parse_uri( _c->uri.s, _c->uri.len, &uri)<0) { LM_ERR("failed to parse contact <%.*s>\n", _c->uri.len, _c->uri.s); - } else if (uri.proto==PROTO_TCP || uri.proto==PROTO_TLS || uri.proto==PROTO_WS || uri.proto==PROTO_WSS) { + } else if (uri.proto==PROTO_TCP || uri.proto==PROTO_TLS + || uri.proto==PROTO_WS || uri.proto==PROTO_WSS) { if (e_max) { LM_WARN("multiple TCP contacts on single REGISTER\n"); if (expires>e_max) e_max = expires; @@ -604,7 +607,7 @@ static int test_max_contacts(struct sip_msg* _m, urecord_t* _r, contact_t* _c, } ptr = ptr->next; } - LM_DBG("%d valid contacts\n", num); + LM_DBG("%d valid contacts before update\n", num); for( ; _c ; _c = get_next_contact(_c) ) { /* calculate expires */ @@ -626,12 +629,13 @@ static int test_max_contacts(struct sip_msg* _m, urecord_t* _r, contact_t* _c, } } - LM_DBG("%d contacts after commit\n", num); if (num > mc) { - LM_INFO("too many contacts for AOR <%.*s>\n", _r->aor.len, _r->aor.s); + LM_INFO("too many contacts for AOR <%.*s> (n:%d max:%d)\n", + _r->aor.len, _r->aor.s, num, mc); rerrno = R_TOO_MANY; return -1; } + LM_DBG("%d contacts when update is done (max: %d)\n", num, mc); return 0; } @@ -648,7 +652,8 @@ static int test_max_contacts(struct sip_msg* _m, urecord_t* _r, contact_t* _c, * 3) If contact in usrloc exists and expires * == 0, delete contact */ -static inline int update_contacts(struct sip_msg* _m, urecord_t* _r, int _mode, int _use_regid, int novariation) +static inline int update_contacts(struct sip_msg* _m, urecord_t* _r, int _mode, + int _use_regid, int novariation) { ucontact_info_t *ci; ucontact_t *c, *ptr, *ptr0; @@ -683,7 +688,8 @@ static inline int update_contacts(struct sip_msg* _m, urecord_t* _r, int _mode, #ifdef USE_TCP if ( (_m->flags&tcp_persistent_flag) && - (_m->rcv.proto==PROTO_TCP||_m->rcv.proto==PROTO_TLS||_m->rcv.proto==PROTO_WS||_m->rcv.proto==PROTO_WSS)) { + (_m->rcv.proto==PROTO_TCP||_m->rcv.proto==PROTO_TLS + ||_m->rcv.proto==PROTO_WS||_m->rcv.proto==PROTO_WSS)) { e_max = -1; tcp_check = 1; } else { @@ -805,7 +811,8 @@ static inline int update_contacts(struct sip_msg* _m, urecord_t* _r, int _mode, if (parse_uri( _c->uri.s, _c->uri.len, &uri)<0) { LM_ERR("failed to parse contact <%.*s>\n", _c->uri.len, _c->uri.s); - } else if (uri.proto==PROTO_TCP || uri.proto==PROTO_TLS || uri.proto==PROTO_WS || uri.proto==PROTO_WSS) { + } else if (uri.proto==PROTO_TCP || uri.proto==PROTO_TLS + || uri.proto==PROTO_WS || uri.proto==PROTO_WSS) { if (e_max>0) { LM_WARN("multiple TCP contacts on single REGISTER\n"); }

2 years, 3 months

git:master:5f229a79: registrar: use macro to init str value and more debug messages

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5f229a799b251e82431b4642e9bd8aa76c405d13 URL: https://github.com/kamailio/kamailio/commit/5f229a799b251e82431b4642e9bd8aa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-18T11:52:51+02:00 registrar: use macro to init str value and more debug messages --- Modified: src/modules/registrar/save.c --- Diff: https://github.com/kamailio/kamailio/commit/5f229a799b251e82431b4642e9bd8aa… Patch: https://github.com/kamailio/kamailio/commit/5f229a799b251e82431b4642e9bd8aa… --- diff --git a/src/modules/registrar/save.c b/src/modules/registrar/save.c index 5356f74c54..07f6e7ff6f 100644 --- a/src/modules/registrar/save.c +++ b/src/modules/registrar/save.c @@ -432,12 +432,14 @@ int reg_get_crt_max_contacts(void) { int n; sr_xavp_t *vavp=NULL; - str vname = {"max_contacts", 12}; + str vname = str_init("max_contacts"); n = 0; if(reg_xavp_cfg.s!=NULL) { + LM_DBG("looking up $xavp(%.*s=>%.*s) for max contacts limit\n", + reg_xavp_cfg.len, reg_xavp_cfg.s, vname.len, vname.s); vavp = xavp_get_child_with_ival(&reg_xavp_cfg, &vname); if(vavp!=NULL) { @@ -506,8 +508,8 @@ static inline int insert_contacts(struct sip_msg* _m, udomain_t* _d, str* _a, if (maxc > 0 && num >= maxc) { - LM_INFO("too many contacts (%d) for AOR <%.*s>\n", - num, _a->len, _a->s); + LM_INFO("too many contacts (n:%d max:%d) for AOR <%.*s>\n", + num, maxc, _a->len, _a->s); rerrno = R_TOO_MANY; goto error; } @@ -573,7 +575,7 @@ static inline int insert_contacts(struct sip_msg* _m, udomain_t* _d, str* _a, } else { /* No contacts found */ build_contact(_m, NULL, &u->host); } - + #ifdef USE_TCP if ( tcp_check && e_max>0 ) { e_max -= act_time;

2 years, 3 months

git:master:c73a4127: tls: add parser logic for previous commits related to TLSv1.3

by Henning Westerholt

Module: kamailio Branch: master Commit: c73a4127dfab65f2c17ea9bf21c94b102f4ec1ea URL: https://github.com/kamailio/kamailio/commit/c73a4127dfab65f2c17ea9bf21c94b1… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-08-17T16:07:58Z tls: add parser logic for previous commits related to TLSv1.3 --- Modified: src/modules/tls/tls_config.c --- Diff: https://github.com/kamailio/kamailio/commit/c73a4127dfab65f2c17ea9bf21c94b1… Patch: https://github.com/kamailio/kamailio/commit/c73a4127dfab65f2c17ea9bf21c94b1… --- diff --git a/src/modules/tls/tls_config.c b/src/modules/tls/tls_config.c index 4134aeb7a4..4cec01b0b6 100644 --- a/src/modules/tls/tls_config.c +++ b/src/modules/tls/tls_config.c @@ -125,6 +125,8 @@ static cfg_option_t methods[] = { {"TLSv1.1+", .val = TLS_USE_TLSv1_1_PLUS}, {"TLSv1.2", .val = TLS_USE_TLSv1_2}, {"TLSv1.2+", .val = TLS_USE_TLSv1_2_PLUS}, + {"TLSv1.3", .val = TLS_USE_TLSv1_3}, + {"TLSv1.3+", .val = TLS_USE_TLSv1_3_PLUS}, {0} }; @@ -528,6 +530,13 @@ int tls_parse_method(str* method) return -1; } #endif +#if OPENSSL_VERSION_NUMBER < 0x1010100fL + if(opt->val == TLS_USE_TLSv1_3 || opt->val == TLS_USE_TLSv1_3_PLUS) { + LM_ERR("tls v1.3 not supported by this libssl version: %ld\n", + (long)OPENSSL_VERSION_NUMBER); + return -1; + } +#endif return opt->val; }

2 years, 3 months

git:master:105600b3: tls: add support for configuration option TLSv1.3 and TLSv1.3+

by Henning Westerholt

Module: kamailio Branch: master Commit: 105600b3b3385787e448955df49135c038095730 URL: https://github.com/kamailio/kamailio/commit/105600b3b3385787e448955df49135c… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-08-17T13:56:43Z tls: add support for configuration option TLSv1.3 and TLSv1.3+ --- Modified: src/modules/tls/doc/params.xml Modified: src/modules/tls/tls_cfg.c Modified: src/modules/tls/tls_domain.h Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/105600b3b3385787e448955df49135c… Patch: https://github.com/kamailio/kamailio/commit/105600b3b3385787e448955df49135c…

2 years, 3 months

[kamailio/kamailio] usrloc keepalive does not work for TLS connections (Issue #3178)

by abrezinsky

### Description The keepalive (ka*) features of usrloc does not work for TLS connections (and probably TCP). If a TLS connection is registered, the keepalive code attempts to send OPTIONS packets to the endpoint using UDP. Additionally, a TCP/TLS connection is not re-used and the code attempts to create a new one each request. ### Troubleshooting #### Reproduction Enable keepalive and register a phone using TLS #### Log Messages Kamailio Host: 10.15.5.116 Phone: 10.15.5.117 Phone is registered and seen in the registry ``` kamctl ul show { "jsonrpc": "2.0", "result": { "Domains": [{ "Domain": { "Domain": "location", "Size": 1024, "AoRs": [{ "Info": { "AoR": "anonymous", "HashID": 3819435025, "Contacts": [{ "Contact": { "Address": "sips:anonymous@10.15.5.117:5061", "Expires": 3531, "Q": -1, "Call-ID": "d06e987694afb559", "CSeq": 521595368, "User-Agent": "testclient/1.0", "Received": "[not set]", "Path": "[not set]", "State": "CS_NEW", "Flags": 0, "CFlags": 0, "Socket": "tls:10.15.5.116:5061", "Methods": 7903, "Ruid": "uloc-62c87f5c-1b6b-2", "Instance": "<urn:uuid:00000000-0000-1000-8000-0010492e1879>", "Reg-Id": 0, "Server-Id": 0, "Tcpconn-Id": 17, "Keepalive": 0, "Last-Keepalive": 1657310753, "KA-Roundtrip": 0, "Last-Modified": 1657310753 } }] } } ], "Stats": { "Records": 1, "Max-Slots": 1 } } }] }, "id": 14871 ``` When the keepalive code runs it shows the following: ``` Jul 8 14:27:52 localhost kamailio[6976]: 33(7012) DEBUG: usrloc [ul_keepalive.c:112]: ul_ka_urecord(): keepalive for aor: anonymous Jul 8 14:27:52 localhost kamailio[6976]: 33(7012) DEBUG: usrloc [ul_keepalive.c:235]: ul_ka_urecord(): keepalive request (len: 295) [[ Jul 8 14:27:52 localhost kamailio[6976]: OPTIONS sips:anonymous@10.15.5.117:5061 SIP/2.0 Jul 8 14:27:52 localhost kamailio[6976]: Via: SIP/2.0/UDP 10.15.5.116:5061;branch=z9hG4bKx.20.1.0 Jul 8 14:27:52 localhost kamailio[6976]: From: <sips:10.15.5.116:5061>;tag=uloc-62c87f5c-1b71-1-e3a7f411-62c88538-cc68d-14.1 Jul 8 14:27:52 localhost kamailio[6976]: To: <sip:anonymous@kamailio.org> Jul 8 14:27:52 localhost kamailio[6976]: Call-ID: ksrulka-20.1 Jul 8 14:27:52 localhost kamailio[6976]: CSeq: 80 OPTIONS Jul 8 14:27:52 localhost kamailio[6976]: Content-Length: 0 Jul 8 14:27:52 localhost kamailio[6976]: #015 Jul 8 14:27:52 localhost kamailio[6976]: ]] Jul 8 14:27:52 localhost kamailio[6976]: 33(7012) ERROR: <core> [core/udp_server.c:597]: udp_send(): sendto(sock, buf: 0x7fffe728ece0, len: 295, 0, dst: (10.15.5.117:5061), tolen: 16) - err: Bad file descriptor (9) ``` ### Possible Solutions There are 2 problems here. First, the address record does not have a transport defined. https://github.com/kamailio/kamailio/blob/a466d0b73a66b18419555eca437136f1b… at this point, `sdst.s` is "sips:anonymous@10.15.5.117:5061" so parse_uri returns a proto of `UDP`. If you override the value to "sips:anonymous@10.15.5.117:5061;transport=tls" then the code works as expected. The protocol is detected as TLS and the OPTIONS message generated later has the correct `Via` header. I'm not sure if the problem is that the address record is missing the transport, or if we need to infer the transport from the socket connection. The second issue is that the keepalive code doesn't re-use TCP/TLS connections. In the ul_ka_send() function ) all of the socket IDs hardcoded to '0' https://github.com/kamailio/kamailio/blob/a466d0b73a66b18419555eca437136f1b… This is easily fixable by adding in ``` if(uc->tcpconn_id) { idst.id = uc->tcpconn_id; } ``` to `ul_ka_urecord()` and removing all of the `kadst->id=0;` lines from the `ul_ka_send()` function. This works for in-memory during testing. I believe the tcpconn_id field needs to be set in ul_ka_db_records if you're returning it from the DB. I don't have an environment setup to test that. With those two changes made (hardcoding the transport and fixing the connection id) the keepalives are sent and work as expected: ``` 33(19413) DEBUG: usrloc [ul_keepalive.c:112]: ul_ka_urecord(): keepalive for aor: anonymous 33(19413) DEBUG: usrloc [ul_keepalive.c:169]: ul_ka_urecord(): MANUALLY OVERRIDING SDST: sips:anonymous@10.15.5.117:5061;transport=tls 33(19413) DEBUG: usrloc [ul_keepalive.c:247]: ul_ka_urecord(): keepalive request (len: 288) [[ OPTIONS sips:anonymous@10.15.5.117:5061 SIP/2.0 Via: SIP/2.0/TLS 10.15.5.116:5061;branch=z9hG4bKx.33.1.0 From: <sips:10.15.5.116:5061>;tag=uloc-62c8af83-4bd9-1-e3a7f411-62c8b37f-f2a22-21.1 To: <sip:anonymous@kamailio.org> Call-ID: ksrulka-33.1 CSeq: 80 OPTIONS Content-Length: 0 ]] 33(19413) DEBUG: <core> [core/tcp_main.c:1644]: _tcpconn_find(): found connection by id: 1 33(19413) DEBUG: <core> [core/tcp_main.c:2539]: tcpconn_send_put(): found fd in cache (4, 0x7fbaef193db8, 1) 33(19413) DEBUG: <core> [core/tcp_main.c:2761]: tcpconn_do_send(): sending... 33(19413) DEBUG: <core> [core/tcp_main.c:2794]: tcpconn_do_send(): after real write: c= 0x7fbaef193db8 n=317 fd=4 ``` I assume that we'd want to re-use a TCP/TLS connection but maybe that needs to be an option (ka_reuse_tcp) if other people are expecting the current behavior of creating a new connection for each new keepalive request. ### Additional Information ``` version: kamailio 5.7.0-dev0 (x86_64/linux) a466d0 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, 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: a466d0 compiled on 11:27:35 Jul 8 2022 with gcc 8.3.0 ``` * **Operating System**: Debian Buster -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3178 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3178(a)github.com>

2 years, 3 months

git:master:988b999c: modules: readme files regenerated - tls ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 988b999cbdf20a1c2056035cd4240d6147bf76a4 URL: https://github.com/kamailio/kamailio/commit/988b999cbdf20a1c2056035cd4240d6… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-08-17T16:01:35+02:00 modules: readme files regenerated - tls ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/988b999cbdf20a1c2056035cd4240d6… Patch: https://github.com/kamailio/kamailio/commit/988b999cbdf20a1c2056035cd4240d6… --- diff --git a/src/modules/tls/README b/src/modules/tls/README index c9bed56ec5..632b8e32d1 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -632,6 +632,10 @@ Place holder 10.1. tls_method (string) Sets the TLS protocol method. Possible values are: + * TLSv1.3+ - TLSv1.3 or newer (TLSv1.3, ...) connections are accepted + (available starting with openssl/libssl v1.1.1) + * TLSv1.3 - only TLSv1.3 connections are accepted (available starting + with openssl/libssl v1.1.1) * TLSv1.2+ - TLSv1.2 or newer (TLSv1.3, ...) connections are accepted (available starting with openssl/libssl v1.1.1) * TLSv1.2 - only TLSv1.2 connections are accepted (available starting

2 years, 3 months

← Newer
1
...
16
17
18
19
20
21
22
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2022