[sr-dev] git:master:17ef6f22: src/Makefile: deb-stable is bullseye nowadays

2022-10-12 Thread Victor Seva
Module: kamailio
Branch: master
Commit: 17ef6f22f24a77fba64d8076c8be771fac2ab00a
URL: 
https://github.com/kamailio/kamailio/commit/17ef6f22f24a77fba64d8076c8be771fac2ab00a

Author: Victor Seva 
Committer: Victor Seva 
Date: 2022-10-12T09:48:38+02:00

src/Makefile: deb-stable is bullseye nowadays

https://github.com/kamailio/pkg-kamailio-docker/issues/3

---

Modified: src/Makefile

---

Diff:  
https://github.com/kamailio/kamailio/commit/17ef6f22f24a77fba64d8076c8be771fac2ab00a.diff
Patch: 
https://github.com/kamailio/kamailio/commit/17ef6f22f24a77fba64d8076c8be771fac2ab00a.patch

---

diff --git a/src/Makefile b/src/Makefile
index a6380c2283..8fc3f57aaa 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -626,7 +626,7 @@ deb-stable:
dpkg-buildpackage -rfakeroot -tc -uc -us; \
rm debian; \
else \
-   ln -s pkg/$(MAIN_NAME)/deb/buster debian; \
+   ln -s pkg/$(MAIN_NAME)/deb/bullseye debian; \
dpkg-buildpackage -rfakeroot -tc -uc -us; \
rm debian; \
fi)


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev


Re: [sr-dev] [kamailio/kamailio] htable: bogus error while trying to iterate over an empty htable (Issue #3260)

2022-10-12 Thread Daniel-Constantin Mierla
Actually that log message should be printed if the iterator is not found (like 
in: not defined) or there is no space for a new iterator (there is a limited 
number of iterators that can be created). Also, I think it can happen if the 
htable is not defined at all.

And the log message should contain iterator name, not the htable name.

-- 
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/issues/3260#issuecomment-1275840499
You are receiving this because you are subscribed to this thread.

Message ID: ___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev


Re: [sr-dev] [kamailio/kamailio] Kamailio 5.4.7 crash related to tls (Issue #3052)

2022-10-12 Thread Ihor Olkhovskyi
Just to add, it's more often case now (due to increase number of TLS clients)
```
2022-10-12T12:46:52.905533+02:00 mycompanyphone-0058-fe-1.mycompany.domain 
/usr/local/sbin/kamailio[53316]: CRITICAL:  [core/mem/q_malloc.c:521]: 
qm_free(): BUG: freeing already freed pointer (0x7f51947f3470), called from 
tls: tls_init.c: ser_free(316), first free tls: tls_init.c: ser_free(316) - 
ignoring
2022-10-12T12:46:52.905969+02:00 mycompanyphone-0058-fe-1.mycompany.domain 
/usr/local/sbin/kamailio[53316]: CRITICAL:  [core/mem/q_malloc.c:521]: 
qm_free(): BUG: freeing already freed pointer (0x7f51947fba20), called from 
tls: tls_init.c: ser_free(316), first free tls: tls_init.c: ser_malloc(282) - 
ignoring
```
Centos 7,
```
openssl version
OpenSSL 1.0.2k-fips  26 Jan 2017
```

-- 
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/issues/3052#issuecomment-1275976256
You are receiving this because you are subscribed to this thread.

Message ID: ___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev


[sr-dev] git:master:279de091: topoh: modparam to control header masking

2022-10-12 Thread Daniel-Constantin Mierla
Module: kamailio
Branch: master
Commit: 279de09111c0884f01fa002fabc8a200fcc26846
URL: 
https://github.com/kamailio/kamailio/commit/279de09111c0884f01fa002fabc8a200fcc26846

Author: Daniel-Constantin Mierla 
Committer: Daniel-Constantin Mierla 
Date: 2022-10-12T13:20:19+02:00

topoh: modparam to control header masking

- mask_mode - a new parameter
- if bit 1 is set, the masking of contact header in 3xx replies is
  skipped
- GH #3256

---

Modified: src/modules/topoh/topoh_mod.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/279de09111c0884f01fa002fabc8a200fcc26846.diff
Patch: 
https://github.com/kamailio/kamailio/commit/279de09111c0884f01fa002fabc8a200fcc26846.patch

---

diff --git a/src/modules/topoh/topoh_mod.c b/src/modules/topoh/topoh_mod.c
index b8f7e3a852c..55bb18145b0 100644
--- a/src/modules/topoh/topoh_mod.c
+++ b/src/modules/topoh/topoh_mod.c
@@ -60,6 +60,8 @@
 MODULE_VERSION
 
 
+#define TH_MASKMODE_SLIP3XXCONTACT 1
+
 /** module parameters */
 str _th_key = str_init("aL9.n8~Hm]Z");
 str th_cookie_name = str_init("TH"); /* lost parameter? */
@@ -75,6 +77,7 @@ str th_via_prefix = {0, 0};
 str th_uri_prefix = {0, 0};
 
 int th_param_mask_callid = 0;
+int th_param_mask_mode = 0;
 
 int th_sanity_checks = 0;
 int th_uri_prefix_checks = 0;
@@ -103,6 +106,7 @@ static param_export_t params[]={
{"mask_key",PARAM_STR, &_th_key},
{"mask_ip", PARAM_STR, &th_ip},
{"mask_callid", PARAM_INT, &th_param_mask_callid},
+   {"mask_mode",   PARAM_INT, &th_param_mask_mode},
{"uparam_name", PARAM_STR, &th_uparam_name},
{"uparam_prefix",   PARAM_STR, &th_uparam_prefix},
{"vparam_name", PARAM_STR, &th_vparam_name},
@@ -515,7 +519,11 @@ int th_msg_sent(sr_event_param_t *evp)
}
} else {
th_flip_record_route(&msg, 1);
-   th_mask_contact(&msg);
+   if(!(th_param_mask_mode & TH_MASKMODE_SLIP3XXCONTACT)
+   || msg.first_line.u.reply.statuscode < 
300
+   || msg.first_line.u.reply.statuscode > 
399) {
+   th_mask_contact(&msg);
+   }
if(th_cookie_value.s[0]=='d') {
th_mask_callid(&msg);
}


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev


[sr-dev] git:master:dc46d8eb: topoh: docs for mask_mode parameter

2022-10-12 Thread Daniel-Constantin Mierla
Module: kamailio
Branch: master
Commit: dc46d8eb102d4390a5cb257ee1ac9a0cc7528551
URL: 
https://github.com/kamailio/kamailio/commit/dc46d8eb102d4390a5cb257ee1ac9a0cc7528551

Author: Daniel-Constantin Mierla 
Committer: Daniel-Constantin Mierla 
Date: 2022-10-12T13:36:53+02:00

topoh: docs for mask_mode parameter

---

Modified: src/modules/topoh/doc/topoh_admin.xml

---

Diff:  
https://github.com/kamailio/kamailio/commit/dc46d8eb102d4390a5cb257ee1ac9a0cc7528551.diff
Patch: 
https://github.com/kamailio/kamailio/commit/dc46d8eb102d4390a5cb257ee1ac9a0cc7528551.patch

---

diff --git a/src/modules/topoh/doc/topoh_admin.xml 
b/src/modules/topoh/doc/topoh_admin.xml
index ff98338f027..c8718b81a79 100644
--- a/src/modules/topoh/doc/topoh_admin.xml
+++ b/src/modules/topoh/doc/topoh_admin.xml
@@ -133,6 +133,29 @@ modparam("topoh", "mask_ip", "192.168.0.1")
 ...
 modparam("topoh", "mask_callid", 1)
 ...
+
+   
+   
+   
+   mask_mode (integer)
+   
+   Control when and what parts of SIP message are masked.
+   
+   
+   It works as a bitmask value. The following options are 
available:
+   (1) - skip masking Contact headers in 3XX (redirect) 
replies.
+   
+   
+   
+   Default value is 0.
+   
+   
+   
+   Set mask_mode parameter
+   
+...
+modparam("topoh", "mask_mode", 1)
+...
 




___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev


Re: [sr-dev] [kamailio/kamailio] Retaining Contact Header for 301, 302 requests when using Topoh module (Issue #3256)

2022-10-12 Thread Daniel-Constantin Mierla
Closed #3256 as completed.

-- 
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/issues/3256#event-7572341618
You are receiving this because you are subscribed to this thread.

Message ID: ___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev


Re: [sr-dev] [kamailio/kamailio] Retaining Contact Header for 301, 302 requests when using Topoh module (Issue #3256)

2022-10-12 Thread Daniel-Constantin Mierla
topoh was designed for interconnect, where redirects are usually not allowed. 
Propagation of contact header can disclose the topology on redirect, usually 
being a telephone number @ the domain/IP of the server hosting the target user.

Anyhow, I see potential usefulness in specific cases if that is fine from 
privacy point of view for whoever runs the service, so I added the option to 
turn on propagation of contacts in the 3xx replies. See the commit referenced 
above, mask_mode param has to be set to 1.

This is a new feature and is not going to be backported. If it is not working, 
open a new issue providing relevant data using the latest master branch.

-- 
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/issues/3256#issuecomment-1276254389
You are receiving this because you are subscribed to this thread.

Message ID: ___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev


[sr-dev] git:master:6081ae45: modules: readme files regenerated - topoh ... [skip ci]

2022-10-12 Thread Kamailio Dev
Module: kamailio
Branch: master
Commit: 6081ae45c21a50036d9b773d11b5c692767d6d1f
URL: 
https://github.com/kamailio/kamailio/commit/6081ae45c21a50036d9b773d11b5c692767d6d1f

Author: Kamailio Dev 
Committer: Kamailio Dev 
Date: 2022-10-12T16:16:30+02:00

modules: readme files regenerated - topoh ... [skip ci]

---

Modified: src/modules/topoh/README

---

Diff:  
https://github.com/kamailio/kamailio/commit/6081ae45c21a50036d9b773d11b5c692767d6d1f.diff
Patch: 
https://github.com/kamailio/kamailio/commit/6081ae45c21a50036d9b773d11b5c692767d6d1f.patch


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev


Re: [sr-dev] [kamailio/kamailio] htable: bogus error while trying to iterate over an empty htable (Issue #3260)

2022-10-12 Thread Ovidiu Sas
My bad: I was calling sht_iterator_end() and passing the htable name as an 
argument instead of the actual iterator.
This didn't raise any error logs in previous versions of kamailio and the error 
popped up during an upgrade.
Closing as invalid ...

-- 
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/issues/3260#issuecomment-1276387168
You are receiving this because you are subscribed to this thread.

Message ID: ___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev


Re: [sr-dev] [kamailio/kamailio] htable: bogus error while trying to iterate over an empty htable (Issue #3260)

2022-10-12 Thread Ovidiu Sas
Closed #3260 as completed.

-- 
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/issues/3260#event-7573147922
You are receiving this because you are subscribed to this thread.

Message ID: ___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev


[sr-dev] [kamailio/kamailio] mqtt: Add tls_alpn module option (PR #3261)

2022-10-12 Thread Andreas Granig
This is used when a service (like AWS IoT Core) uses one TLS port for multiple 
services (like https and mqtt), so you have to set the ALPN to 'mqtt' 
to be able to connect kamailio.





 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 # (replace  with an open issue number)

 Description


Some services use ALPN to have one single TLS port serving multiple protocols, 
in order to avoid additional round-trips for negotiating TLS connections. 
https://en.wikipedia.org/wiki/Application-Layer_Protocol_Negotiation has the 
details.

One of those services using ALPN is AWS IoT Core, which allows components to 
send messages both via HTTP and MQTT to AWS for further processing (e.g. 
logging, analysis, storage to db etc). This patch enables kamailio to 
communicate with this service by allowing the kamailio admin to set the mqtt.so 
module mod-param *tls_alpn*  to *mqtt*.
You can view, comment on, or merge this pull request online at:

  https://github.com/kamailio/kamailio/pull/3261

-- Commit Summary --

  * mqtt: Add tls_alpn module option

-- File Changes --

M src/modules/mqtt/doc/mqtt_admin.xml (21)
M src/modules/mqtt/mqtt_dispatch.c (13)
M src/modules/mqtt/mqtt_dispatch.h (3)
M src/modules/mqtt/mqtt_mod.c (5)

-- Patch Links --

https://github.com/kamailio/kamailio/pull/3261.patch
https://github.com/kamailio/kamailio/pull/3261.diff

-- 
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/3261
You are receiving this because you are subscribed to this thread.

Message ID: 
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev


Re: [sr-dev] [kamailio/kamailio] mqtt: Add tls_alpn module option (PR #3261)

2022-10-12 Thread Olle E. Johansson
@oej commented on this pull request.



> @@ -224,6 +224,17 @@ int mqtt_run_dispatcher(mqtt_dispatcher_cfg_t* cfg)
LM_ERR("mosquitto_tls_set() failed: %d %s\n",errno, 
strerror(errno));
return -1;
}
+if (cfg->tls_alpn != NULL) {
+#if LIBMOSQUITTO_VERSION_NUMBER >= 1006000
+res = mosquitto_string_option(_mosquitto, MOSQ_OPT_TLS_ALPN, 
cfg->tls_alpn);
+if (res != MOSQ_ERR_SUCCESS) {
+LM_ERR("mosquitto_string_option() failedi setting tls alpn: %d 
%s\n",errno, strerror(errno));

"failedi" ?

-- 
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/3261#pullrequestreview-1140169130
You are receiving this because you are subscribed to this thread.

Message ID: ___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev


Re: [sr-dev] [kamailio/kamailio] mqtt: Add tls_alpn module option (PR #3261)

2022-10-12 Thread Olle E. Johansson
@oej commented on this pull request.



> @@ -224,6 +224,17 @@ int mqtt_run_dispatcher(mqtt_dispatcher_cfg_t* cfg)
LM_ERR("mosquitto_tls_set() failed: %d %s\n",errno, 
strerror(errno));
return -1;
}
+if (cfg->tls_alpn != NULL) {
+#if LIBMOSQUITTO_VERSION_NUMBER >= 1006000
+res = mosquitto_string_option(_mosquitto, MOSQ_OPT_TLS_ALPN, 
cfg->tls_alpn);
+if (res != MOSQ_ERR_SUCCESS) {
+LM_ERR("mosquitto_string_option() failedi setting tls alpn: %d 
%s\n",errno, strerror(errno));

TLS upper case

-- 
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/3261#discussion_r994226551
You are receiving this because you are subscribed to this thread.

Message ID: ___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev


Re: [sr-dev] [kamailio/kamailio] mqtt: Add tls_alpn module option (PR #3261)

2022-10-12 Thread Olle E. Johansson
@oej commented on this pull request.



> @@ -324,6 +324,27 @@ modparam("mqtt", "ca_path", "/etc/ssl/certs")

 ...
 modparam("mqtt", "tls_method", "tlsv1.3")
+...
+   
+   
+   
+   
+   tls_alpn (str)
+   
+Used to set the TLS ALPN option for cases where one TLS port is used 
to share multiple services. Prominent
+example is AWS IoT, where you have to set the 
tls_alpn to "mqtt" to be able to connect
+via MQTT.
+   
+   
+   
+   Default value is NULL, where no ALPN is set on the TLS 
connection.

You can't set NULL in a mod-param. I would say that "Default value is empty 
string, which means that no TLS ALPN is used.

-- 
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/3261#pullrequestreview-1140170312
You are receiving this because you are subscribed to this thread.

Message ID: ___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev


Re: [sr-dev] [kamailio/kamailio] mqtt: Add tls_alpn module option (PR #3261)

2022-10-12 Thread Andreas Granig
@agranig commented on this pull request.



> @@ -324,6 +324,27 @@ modparam("mqtt", "ca_path", "/etc/ssl/certs")

 ...
 modparam("mqtt", "tls_method", "tlsv1.3")
+...
+   
+   
+   
+   
+   tls_alpn (str)
+   
+Used to set the TLS ALPN option for cases where one TLS port is used 
to share multiple services. Prominent
+example is AWS IoT, where you have to set the 
tls_alpn to "mqtt" to be able to connect
+via MQTT.
+   
+   
+   
+   Default value is NULL, where no ALPN is set on the TLS 
connection.

Ok. The wording is taken from other params in this module (see 
https://www.kamailio.org/docs/modules/devel/modules/mqtt.html#mqtt.p.id). So we 
could say "The default is that his modparam is not set, which means that no TLS 
ALPN is used"?



-- 
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/3261#discussion_r994231540
You are receiving this because you are subscribed to this thread.

Message ID: ___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev