date:20250129

[sr-dev] Kamailio v6.0.0 Released - new major version is out

2025-01-29 Thread Daniel-Constantin Mierla via sr-dev

Kamailio v6.0.0 is out – it comes with 5 new modules and important
updates to the core components and existing modules.

The increment of the first version number reflects several important
updates, among them: multi-threaded option for UDP receiving, option for
specifying a range of ports to listen to, support for expressions with
variables for most of the module functions parameters, internal
libraries are directly inked to the core, support to use cmake to
compile and install Kamailio.

You can read a bit more detailed release notes at:

   * https://www.kamailio.org/w/kamailio-v6.0-0-release-notes/

Many thanks to all developers and community members that made possible
this release.

v6.0.0 brings more flexibility and optimizations across many existing
components and modules, new parameters, functions, variables and
transformations.

Enjoy Kamailio v6.0.0!

Thank you for flying Kamailio!
Daniel

-- 
Daniel-Constantin Mierla (@ asipto.com)
twitter.com/miconda -- linkedin.com/in/miconda
Kamailio Consultancy, Training and Development Services -- asipto.com
Kamailio World Conference, May 12-13, 2025, Berlin -- kamailioworld.com

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] Re: [kamailio/kamailio] multiple Makefiles: evaluate LIBS variable imediately in Makefile (PR #4085)

2025-01-29 Thread sergey-safarov via sr-dev

Thanks @xkaraman, the build is now completed without errors. Making final tests.

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

Message ID: ___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] git:6.0:af3d036f: main: Print open file limits

2025-01-29 Thread Daniel-Constantin Mierla via sr-dev

Module: kamailio
Branch: 6.0
Commit: af3d036fbc6ca41be61b79bb6e22ac72266234ea
URL: 
https://github.com/kamailio/kamailio/commit/af3d036fbc6ca41be61b79bb6e22ac72266234ea

Author: Xenofon Karamanos 
Committer: Daniel-Constantin Mierla 
Date: 2025-01-29T10:31:42+01:00

main: Print open file limits

(cherry picked from commit 4a335848f1b2b1e685891258803d1acd5540710d)

---

Modified: src/main.c

---

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

---

diff --git a/src/main.c b/src/main.c
index 9e315285998..a29857757bc 100644
--- a/src/main.c
+++ b/src/main.c
@@ -59,6 +59,7 @@
 #include 
 #include 
 #include 
+#include  /* getrlimit */
 #include 
 #include 
 #include 
@@ -2209,6 +2210,7 @@ int main(int argc, char **argv)
char *tbuf_tmp;
struct stat st = {0};
long l1 = 0;
+   struct rlimit lim;
 
int option_index = 0;
 
@@ -3310,7 +3312,16 @@ int main(int argc, char **argv)
fprintf(stderr, "ERROR: error could not increase file 
limits\n");
goto error;
}
+   } else {
+   if(getrlimit(RLIMIT_NOFILE, &lim) < 0) {
+   LM_CRIT("cannot get the maximum number of file 
descriptors: %s\n",
+   strerror(errno));
+   goto error;
+   }
+   LM_INFO("current open file limits [soft/hard]: [%lu/%lu]\n",
+   (unsigned long)lim.rlim_cur, (unsigned 
long)lim.rlim_max);
}
+
if(mlock_pages)
mem_lock_pages();
 

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] git:6.0:e4e66928: cmake: Fix naming to be clear we want the CLIENT version

2025-01-29 Thread Xenofon Karamanos via sr-dev

Module: kamailio
Branch: 6.0
Commit: e4e669286264cc7e7ce6aab92c68a486311de708
URL: 
https://github.com/kamailio/kamailio/commit/e4e669286264cc7e7ce6aab92c68a486311de708

Author: Xenofon Karamanos 
Committer: Xenofon Karamanos <22965395+xkara...@users.noreply.github.com>
Date: 2025-01-29T10:21:04Z

cmake: Fix naming to be clear we want the CLIENT version

(cherry picked from commit 640bd4fb7529ad8b0a9415775679dca5e64c52be)

---

Added: cmake/modules/FindLibfreeradiusClient.cmake
Modified: cmake/modules/FindRadius.cmake
Removed: cmake/modules/FindLibfreeradius.cmake

---

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

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] Re: [kamailio/kamailio] multiple Makefiles: evaluate LIBS variable imediately in Makefile (PR #4085)

2025-01-29 Thread Xenofon Karamanos via sr-dev

The target `dbschema` is only available when the `xsltproc` exe can be found. 
Can you verify that is installed?

You should have seen something like this in your cmake config phase if it's not 
found:  `message(STATUS "xsltproc is not found. Skip dbschema target.")`


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

Message ID: ___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] git:master:389ef7a6: modules: readme files regenerated - ims_qos_npn ... [skip ci]

2025-01-29 Thread Kamailio Dev via sr-dev

Module: kamailio
Branch: master
Commit: 389ef7a67fc7860dc5ac7fe01810b17b5374818c
URL: 
https://github.com/kamailio/kamailio/commit/389ef7a67fc7860dc5ac7fe01810b17b5374818c

Author: Kamailio Dev 
Committer: Kamailio Dev 
Date: 2025-01-29T11:46:10+01:00

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

---

Modified: src/modules/ims_qos_npn/README

---

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

---

diff --git a/src/modules/ims_qos_npn/README b/src/modules/ims_qos_npn/README
index 3a85244f6bd..fd4aaec3823 100644
--- a/src/modules/ims_qos_npn/README
+++ b/src/modules/ims_qos_npn/README
@@ -1,4 +1,4 @@
-The IMS QoS Module - Neat Path Networks "branch"
+The IMS QoS NPN Module
 
 Dragos Vingarzan
 
@@ -192,7 +192,7 @@ Chapter 1. Admin Guide
control functions performed by an Application Function (e.g. P-CSCF)
over the Rx interface. This module is dependent on the CDP (C Diameter
Peer) modules for communicating with PCRF as specified in 3GPP
-   specification TS 29.214.
+   specification TS 29.214. It is an enhaced variant of ims_qos.
 
 2. Dependencies
 

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] git:6.0:1953e241: modules: readme files regenerated - modules ... [skip ci]

2025-01-29 Thread Kamailio Dev via sr-dev

Module: kamailio
Branch: 6.0
Commit: 1953e241862466120b8ca98319f3d24be5c42c5c
URL: 
https://github.com/kamailio/kamailio/commit/1953e241862466120b8ca98319f3d24be5c42c5c

Author: Kamailio Dev 
Committer: Kamailio Dev 
Date: 2025-01-29T11:46:20+01:00

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

---

Modified: src/modules/ims_qos_npn/README

---

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

---

diff --git a/src/modules/ims_qos_npn/README b/src/modules/ims_qos_npn/README
index 3a85244f6bd..fd4aaec3823 100644
--- a/src/modules/ims_qos_npn/README
+++ b/src/modules/ims_qos_npn/README
@@ -1,4 +1,4 @@
-The IMS QoS Module - Neat Path Networks "branch"
+The IMS QoS NPN Module
 
 Dragos Vingarzan
 
@@ -192,7 +192,7 @@ Chapter 1. Admin Guide
control functions performed by an Application Function (e.g. P-CSCF)
over the Rx interface. This module is dependent on the CDP (C Diameter
Peer) modules for communicating with PCRF as specified in 3GPP
-   specification TS 29.214.
+   specification TS 29.214. It is an enhaced variant of ims_qos.
 
 2. Dependencies
 

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] Re: [kamailio/kamailio] multiple Makefiles: evaluate LIBS variable imediately in Makefile (PR #4085)

2025-01-29 Thread Xenofon Karamanos via sr-dev

> @xkaraman could you help me force disable VERBOSE logs for cmake. RHEL by 
> default enables verbose logs using `cmake build` command with `--verbose`. 
> Can I add other options to revert this options like?
> 
> ```
> cmake --build . --verbose --something_new.
> ```

What do you mean? Can;t you not provide the `--verbose` flag? 

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

Message ID: ___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] Re: [kamailio/kamailio] multiple Makefiles: evaluate LIBS variable imediately in Makefile (PR #4085)

2025-01-29 Thread sergey-safarov via sr-dev

@xkaraman could you help me force disable VERBOSE logs for cmake.
RHEL by default enables verbose logs using `cmake build` command with 
`--verbose`. Can I add other options to revert this options like?
```
cmake --build . --verbose --something_new.
```

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

Message ID: ___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] git:6.0:77330f92: Makefile.defs: version set to 6.0.0

2025-01-29 Thread Daniel-Constantin Mierla via sr-dev

Module: kamailio
Branch: 6.0
Commit: 77330f92899cf11878a20ea0d0cd80c90ebd8f5b
URL: 
https://github.com/kamailio/kamailio/commit/77330f92899cf11878a20ea0d0cd80c90ebd8f5b

Author: Daniel-Constantin Mierla 
Committer: Daniel-Constantin Mierla 
Date: 2025-01-29T12:05:25+01:00

Makefile.defs: version set to 6.0.0

---

Modified: src/Makefile.defs

---

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

---

diff --git a/src/Makefile.defs b/src/Makefile.defs
index 5946eb600fa..8c35d66c5dc 100644
--- a/src/Makefile.defs
+++ b/src/Makefile.defs
@@ -106,8 +106,8 @@ INSTALL_FLAVOUR=$(FLAVOUR)
 # version number
 VERSION = 6
 PATCHLEVEL = 0
-SUBLEVEL =  0
-EXTRAVERSION = -rc0
+SUBLEVEL = 0
+EXTRAVERSION =
 
 # memory manager switcher
 # 0 - f_malloc (fast malloc)

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] git:6.0:17aa4df3: pkg/kamailio: version set 6.0.0 for rpms and alpine

2025-01-29 Thread Daniel-Constantin Mierla via sr-dev

Module: kamailio
Branch: 6.0
Commit: 17aa4df3a0ffd10405d74b864665d383ba43eeca
URL: 
https://github.com/kamailio/kamailio/commit/17aa4df3a0ffd10405d74b864665d383ba43eeca

Author: Daniel-Constantin Mierla 
Committer: Daniel-Constantin Mierla 
Date: 2025-01-29T12:05:25+01:00

pkg/kamailio: version set 6.0.0 for rpms and alpine

---

Modified: pkg/kamailio/alpine/APKBUILD
Modified: pkg/kamailio/obs/kamailio.spec

---

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

---

diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD
index 585705a7fd9..0516493d47b 100644
--- a/pkg/kamailio/alpine/APKBUILD
+++ b/pkg/kamailio/alpine/APKBUILD
@@ -4,7 +4,7 @@
 # Maintainer: Nathan Angelacos 
 
 pkgname=kamailio
-pkgver=5.1.0
+pkgver=6.0.0
 pkgrel=0
 
 # If building from a git snapshot, specify the gitcommit
diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec
index de909ffd85b..7c27f98a0b6 100644
--- a/pkg/kamailio/obs/kamailio.spec
+++ b/pkg/kamailio/obs/kamailio.spec
@@ -1,5 +1,5 @@
 %define namekamailio
-%define ver 5.4.0
+%define ver 6.0.0
 %define rel dev1.0%{dist}
 
 %if 0%{?fedora}

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] git:6.0:94a546d5: ChangeLog: content updated for v6.0.0

2025-01-29 Thread Daniel-Constantin Mierla via sr-dev

Module: kamailio
Branch: 6.0
Commit: 94a546d5e68a484daf64373c047ff5f3c8a927b7
URL: 
https://github.com/kamailio/kamailio/commit/94a546d5e68a484daf64373c047ff5f3c8a927b7

Author: Daniel-Constantin Mierla 
Committer: Daniel-Constantin Mierla 
Date: 2025-01-29T12:05:25+01:00

ChangeLog: content updated for v6.0.0

---

Modified: ChangeLog

---

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

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] Re: [kamailio/kamailio] Suggestions on changing behavior of '--loadmodule' and '--modparam' command line options (Issue #4126)

2025-01-29 Thread Daniel-Constantin Mierla via sr-dev

These cli parameters were designed indeed to be used before loading the config, 
one of the aims was that the loaded modules could be useful for processing the 
input for config file.

When a module is loaded, a define is set for it, like `MOD_corex`, I haven't 
checked the code if it also done for the cli option, but you can try to add to 
your config:

```
#!ifndef MOD_corex
loadmodule "corex.so"
#!endif
```

You can leverage further `-A ...` to control what modparams are set in config.

For future, a variant would be to extend load module with a new option like `o` 
to skip loading if the module was already loaded.

  * https://www.kamailio.org/wikidocs/cookbooks/devel/core/#loadmodule

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

Message ID: ___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] git:6.0:225f23a0: ims_registrar_scscf: send NOTIFY in case of subsequent SUBSCRIBE as per RFC 3265

2025-01-29 Thread Daniel-Constantin Mierla via sr-dev

Module: kamailio
Branch: 6.0
Commit: 225f23a03a2941d44cbb1b56d0d95adcc3f78004
URL: 
https://github.com/kamailio/kamailio/commit/225f23a03a2941d44cbb1b56d0d95adcc3f78004

Author: herlesupreeth 
Committer: Daniel-Constantin Mierla 
Date: 2025-01-29T10:31:27+01:00

ims_registrar_scscf: send NOTIFY in case of subsequent SUBSCRIBE as per RFC 3265

(cherry picked from commit 7de4f84f08e4ce910c007aad3fa2cadbe4b11dd2)

---

Modified: src/modules/ims_registrar_scscf/registrar_notify.c

---

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

---

diff --git a/src/modules/ims_registrar_scscf/registrar_notify.c 
b/src/modules/ims_registrar_scscf/registrar_notify.c
index aade763a09a..bcddbf17cc2 100644
--- a/src/modules/ims_registrar_scscf/registrar_notify.c
+++ b/src/modules/ims_registrar_scscf/registrar_notify.c
@@ -497,13 +497,15 @@ int event_reg(udomain_t *_d, impurecord_t *r_passed, 
ucontact_t *c_passed,
case IMS_REGISTRAR_NONE:
return 0;
case IMS_REGISTRAR_SUBSCRIBE:
+   case IMS_REGISTRAR_SUBSEQUENT_SUBSCRIBE:
if(r_passed || !presentity_uri || !watcher_contact || 
!_d) {
LM_ERR("this is a subscribe called from cfg 
file: r_passed be "
   "zero and presentity_uri, 
watcher_contact and _d should "
   "be valid for a subscribe");
return 0;
}
-   LM_DBG("Event type is IMS REGISTRAR SUBSCRIBE about to 
get "
+   LM_DBG("Event type is IMS REGISTRAR 
SUBSCRIBE/RE-SUBSCRIBE about "
+  "to get "
   "reginfo_full\n");
//lets get IMPU list for presentity as well as register 
for callbacks (IFF it is a new SUBSCRIBE)
 
@@ -1376,8 +1378,8 @@ int subscribe_to_reg(struct sip_msg *msg, char *_t, char 
*str2)
subscribe_reply(
msg, 200, MSG_REG_SUBSCRIBE_OK, &expires, 
&scscf_name_str);
 
-   if(event_type == IMS_REGISTRAR_SUBSCRIBE) {
-   //do reg event only for the initial subscribe
+   if(event_type == IMS_REGISTRAR_SUBSCRIBE
+   || event_type == 
IMS_REGISTRAR_SUBSEQUENT_SUBSCRIBE) {
if(event_reg(domain, 0, 0, event_type, &presentity_uri,
   &watcher_contact, 0, 0, 0)
!= 0) {
@@ -1723,7 +1725,8 @@ void create_notifications(udomain_t *_t, impurecord_t 
*r_passed,
}
 
//This is a fix to ensure that when a user subscribes a full 
reg info is only sent to that UE
-   if(event_type == IMS_REGISTRAR_SUBSCRIBE) {
+   if(event_type == IMS_REGISTRAR_SUBSCRIBE
+   || event_type == 
IMS_REGISTRAR_SUBSEQUENT_SUBSCRIBE) {
if(contact_match(watcher_contact, &s->watcher_contact)
&& (presentity_uri->len == 
s->presentity_uri.len)
&& (memcmp(s->presentity_uri.s, 
presentity_uri->s,

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] git:6.0:620eb2f0: kamctl: regenerated db creation files

2025-01-29 Thread Daniel-Constantin Mierla via sr-dev

Module: kamailio
Branch: 6.0
Commit: 620eb2f029c74006200d19dae1450e7735e3ec2e
URL: 
https://github.com/kamailio/kamailio/commit/620eb2f029c74006200d19dae1450e7735e3ec2e

Author: Daniel-Constantin Mierla 
Committer: Daniel-Constantin Mierla 
Date: 2025-01-29T10:34:25+01:00

kamctl: regenerated db creation files

---

Modified: utils/kamctl/db_berkeley/kamailio/contact
Modified: utils/kamctl/db_berkeley/kamailio/impu
Modified: utils/kamctl/db_berkeley/kamailio/impu_contact
Modified: utils/kamctl/db_berkeley/kamailio/impu_subscriber
Modified: utils/kamctl/db_berkeley/kamailio/ro_session
Modified: utils/kamctl/db_berkeley/kamailio/subscriber_scscf
Modified: utils/kamctl/db_berkeley/kamailio/version
Modified: utils/kamctl/db_sqlite/ims_charging-create.sql
Modified: utils/kamctl/db_sqlite/ims_usrloc_scscf-create.sql
Modified: utils/kamctl/dbtext/kamailio/contact
Modified: utils/kamctl/dbtext/kamailio/impu
Modified: utils/kamctl/dbtext/kamailio/impu_contact
Modified: utils/kamctl/dbtext/kamailio/impu_subscriber
Modified: utils/kamctl/dbtext/kamailio/pcscf_location
Modified: utils/kamctl/dbtext/kamailio/ro_session
Modified: utils/kamctl/dbtext/kamailio/subscriber_scscf
Modified: utils/kamctl/dbtext/kamailio/version
Modified: utils/kamctl/mongodb/kamailio/contact.json
Modified: utils/kamctl/mongodb/kamailio/impu.json
Modified: utils/kamctl/mongodb/kamailio/impu_contact.json
Modified: utils/kamctl/mongodb/kamailio/impu_subscriber.json
Modified: utils/kamctl/mongodb/kamailio/ro_session.json
Modified: utils/kamctl/mongodb/kamailio/subscriber_scscf.json
Modified: utils/kamctl/mongodb/kamailio/version-create.mongo
Modified: utils/kamctl/mysql/ims_charging-create.sql
Modified: utils/kamctl/mysql/ims_usrloc_scscf-create.sql
Modified: utils/kamctl/oracle/ims_charging-create.sql
Modified: utils/kamctl/oracle/ims_usrloc_scscf-create.sql
Modified: utils/kamctl/postgres/ims_charging-create.sql
Modified: utils/kamctl/postgres/ims_usrloc_scscf-create.sql

---

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

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] git:6.0:60c9bafc: outbound: encode bind address into flow token as destination

2025-01-29 Thread Daniel-Constantin Mierla via sr-dev

Module: kamailio
Branch: 6.0
Commit: 60c9bafc287bfabe7860b389197e8801e26a6bfb
URL: 
https://github.com/kamailio/kamailio/commit/60c9bafc287bfabe7860b389197e8801e26a6bfb

Author: Alexander Bakker 
Committer: Daniel-Constantin Mierla 
Date: 2025-01-29T10:31:48+01:00

outbound: encode bind address into flow token as destination

This is an attempt to fix the combination of the outbound/rr modules and
``tcp_accept_haproxy=yes``. This combination is currently broken, as
previously reported on the mailing list:
https://www.mail-archive.com/sr-users@lists.kamailio.org/msg21854.html

The issue is that the destination address/port combo of the haproxy side is
encoded into the flow token. When the rr module decodes the flow token and tries
to look up the listening socket using ``find_si``, it cannot be found, because
it is given the destination address/port combo of the connection of the haproxy
side, not the address/port combo that Kamailio is actually listening on.

This patch fixes the issue by encoding the ``bind_address`` of the socket the
connection was received on into the flow token as the destination address. The
source address remains unchanged, as it *can* be used to look up the TCP
connection (with a minor patch to ``_tcpconn_find`` in ``tcp_main.c``)

(cherry picked from commit b918e09e9c3e06bddfd7a205f64abb603d589f1c)

---

Modified: src/modules/outbound/outbound_mod.c

---

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

---

diff --git a/src/modules/outbound/outbound_mod.c 
b/src/modules/outbound/outbound_mod.c
index f2e0c7dbc3d..a5f17e4ef99 100644
--- a/src/modules/outbound/outbound_mod.c
+++ b/src/modules/outbound/outbound_mod.c
@@ -180,15 +180,25 @@ int encode_flow_token(str *flow_token, struct 
receive_info *rcv)
return -1;
}
 
+   /* By encoding the bind address into the flow token as the destination
+  address, we make sure that we'll still be able to find the socket 
when
+  decoding it even if there's an haproxy in front */
+   struct ip_addr dst_ip = rcv->dst_ip;
+   unsigned short dst_port = rcv->dst_port;
+   if(rcv->bind_address) {
+   dst_ip = rcv->bind_address->address;
+   dst_port = rcv->bind_address->port_no;
+   }
+
/* Encode protocol information */
unenc_flow_token[pos++] =
-   (rcv->dst_ip.af == AF_INET6 ? 0x80 : 0x00) | rcv->proto;
+   (dst_ip.af == AF_INET6 ? 0x80 : 0x00) | rcv->proto;
 
/* Encode destination address */
-   for(i = 0; i < (rcv->dst_ip.af == AF_INET6 ? 16 : 4); i++)
-   unenc_flow_token[pos++] = rcv->dst_ip.u.addr[i];
-   unenc_flow_token[pos++] = (rcv->dst_port >> 8) & 0xff;
-   unenc_flow_token[pos++] = rcv->dst_port & 0xff;
+   for(i = 0; i < (dst_ip.af == AF_INET6 ? 16 : 4); i++)
+   unenc_flow_token[pos++] = dst_ip.u.addr[i];
+   unenc_flow_token[pos++] = (dst_port >> 8) & 0xff;
+   unenc_flow_token[pos++] = dst_port & 0xff;
 
/* Encode source address */
for(i = 0; i < (rcv->src_ip.af == AF_INET6 ? 16 : 4); i++)

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] git:6.0:5f2c7c7a: ims_registrar_scscf: set contact to presentity URI in 200OK for SUBSCRIBE to reg events

2025-01-29 Thread Daniel-Constantin Mierla via sr-dev

Module: kamailio
Branch: 6.0
Commit: 5f2c7c7a958d010afd303a4feb95241aefd31dca
URL: 
https://github.com/kamailio/kamailio/commit/5f2c7c7a958d010afd303a4feb95241aefd31dca

Author: herlesupreeth 
Committer: Daniel-Constantin Mierla 
Date: 2025-01-29T10:31:33+01:00

ims_registrar_scscf: set contact to presentity URI in 200OK for SUBSCRIBE to 
reg events

(cherry picked from commit 75af5c3d8b14a0b17d34c416f2dfc0df6c3ff6f8)

---

Modified: src/modules/ims_registrar_scscf/registrar_notify.c

---

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

---

diff --git a/src/modules/ims_registrar_scscf/registrar_notify.c 
b/src/modules/ims_registrar_scscf/registrar_notify.c
index bcddbf17cc2..b1af5189a8d 100644
--- a/src/modules/ims_registrar_scscf/registrar_notify.c
+++ b/src/modules/ims_registrar_scscf/registrar_notify.c
@@ -1376,7 +1376,7 @@ int subscribe_to_reg(struct sip_msg *msg, char *_t, char 
*str2)
ret = CSCF_RETURN_TRUE;
LM_DBG("Sending 200 OK to subscribing user\n");
subscribe_reply(
-   msg, 200, MSG_REG_SUBSCRIBE_OK, &expires, 
&scscf_name_str);
+   msg, 200, MSG_REG_SUBSCRIBE_OK, &expires, 
&presentity_uri);
 
if(event_type == IMS_REGISTRAR_SUBSCRIBE
|| event_type == 
IMS_REGISTRAR_SUBSEQUENT_SUBSCRIBE) {
@@ -1427,7 +1427,7 @@ int subscribe_to_reg(struct sip_msg *msg, char *_t, char 
*str2)
ret = CSCF_RETURN_TRUE;
LM_DBG("Sending 200 OK to subscribing user\n");
subscribe_reply(
-   msg, 200, MSG_REG_UNSUBSCRIBE_OK, &expires, 
&scscf_name_str);
+   msg, 200, MSG_REG_UNSUBSCRIBE_OK, &expires, 
&presentity_uri);
}
 
 doneorerror:

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] git:6.0:01429a85: core: tcp_main - include local dst port in conn lookup when using haproxy

2025-01-29 Thread Daniel-Constantin Mierla via sr-dev

Module: kamailio
Branch: 6.0
Commit: 01429a85381a1d9ad96ce678285358b0ecfe48a1
URL: 
https://github.com/kamailio/kamailio/commit/01429a85381a1d9ad96ce678285358b0ecfe48a1

Author: Alexander Bakker 
Committer: Daniel-Constantin Mierla 
Date: 2025-01-29T10:31:54+01:00

core: tcp_main - include local dst port in conn lookup when using haproxy

(cherry picked from commit 9c109f3a371445e03defde279912fbb4179244bd)

---

Modified: src/core/tcp_main.c

---

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

---

diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c
index e0238fe090b..391255cab9d 100644
--- a/src/core/tcp_main.c
+++ b/src/core/tcp_main.c
@@ -1745,7 +1745,8 @@ struct tcp_connection *_tcpconn_find(int id, struct 
ip_addr *ip, int port,
print_ip("ip=", &a->parent->rcv.src_ip, "\n");
 #endif
if((a->parent->state != S_CONN_BAD) && (port == a->port)
-   && ((l_port == 0) || (l_port == 
a->parent->rcv.dst_port))
+   && ((l_port == 0) || (l_port == 
a->parent->rcv.dst_port)
+   || (l_port == 
a->parent->cinfo.dst_port))
&& (ip_addr_cmp(ip, 
&a->parent->rcv.src_ip))
&& (is_local_ip_any
|| ip_addr_cmp(l_ip, 
&a->parent->rcv.dst_ip)

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] git:6.0:1e362f2b: tcp: fix for local TCP/TLS socket matching with 'tcp_reuse_port' enabled

2025-01-29 Thread Daniel-Constantin Mierla via sr-dev

Module: kamailio
Branch: 6.0
Commit: 1e362f2ba51c6ee9a9e005675a30202e42ceb3a7
URL: 
https://github.com/kamailio/kamailio/commit/1e362f2ba51c6ee9a9e005675a30202e42ceb3a7

Author: pinacolada1610 
Committer: Daniel-Constantin Mierla 
Date: 2025-01-29T10:31:19+01:00

tcp: fix for local TCP/TLS socket matching with 'tcp_reuse_port' enabled

- Changed the logic for matching a listening TCP/TLS-socket in tcp_reuse_port 
scenario, now it considers local port as well.
With 'tcp_reuse_port' option enabled, the local port is meaningful and helps to 
differenciate between sockets on the same IP but different ports.

(cherry picked from commit 0cb6e35d581398d2c5a7086a0d98b113fbb16138)

---

Modified: src/core/tcp_main.c

---

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

---

diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c
index bc1327204e8..e0238fe090b 100644
--- a/src/core/tcp_main.c
+++ b/src/core/tcp_main.c
@@ -1332,6 +1332,7 @@ inline static int tcp_do_connect(union sockaddr_union 
*server,
union sockaddr_union my_name;
socklen_t my_name_len;
struct ip_addr ip;
+   unsigned short port;
 #ifdef TCP_ASYNC
int n;
 #endif /* TCP_ASYNC */
@@ -1437,14 +1438,19 @@ inline static int tcp_do_connect(union sockaddr_union 
*server,
from = &my_name; /* update from with the real "from" address */
su2ip_addr(&ip, &my_name);
 find_socket:
+#ifdef SO_REUSEPORT
+   port = cfg_get(tcp, tcp_cfg, reuse_port) ? su_getport(from) : 0;
+#else
+   port = 0;
+#endif
 #ifdef USE_TLS
if(unlikely(type == PROTO_TLS)) {
-   *res_si = find_si(&ip, 0, PROTO_TLS);
+   *res_si = find_si(&ip, port, PROTO_TLS);
} else {
-   *res_si = find_si(&ip, 0, PROTO_TCP);
+   *res_si = find_si(&ip, port, PROTO_TCP);
}
 #else
-   *res_si = find_si(&ip, 0, PROTO_TCP);
+   *res_si = find_si(&ip, port, PROTO_TCP);
 #endif
 
if(unlikely(*res_si == 0)) {

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] git:6.0:ddd98b09: janssonrpcc: fixed warning var may be used uninitialized

2025-01-29 Thread Daniel-Constantin Mierla via sr-dev

Module: kamailio
Branch: 6.0
Commit: ddd98b09c80dc0d15af080e37961b59ecde17689
URL: 
https://github.com/kamailio/kamailio/commit/ddd98b09c80dc0d15af080e37961b59ecde17689

Author: Sergey Safarov 
Committer: Daniel-Constantin Mierla 
Date: 2025-01-29T10:32:01+01:00

janssonrpcc: fixed warning var may be used uninitialized

(cherry picked from commit 3039c02404e05da05a031f6ccf68913a8c1c80eb)

---

Modified: src/modules/janssonrpcc/janssonrpc_server.c

---

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

---

diff --git a/src/modules/janssonrpcc/janssonrpc_server.c 
b/src/modules/janssonrpcc/janssonrpc_server.c
index 3fb4d7c624f..5a98a6fc1f9 100644
--- a/src/modules/janssonrpcc/janssonrpc_server.c
+++ b/src/modules/janssonrpcc/janssonrpc_server.c
@@ -130,6 +130,7 @@ int jsonrpc_parse_server(char *server_s, 
jsonrpc_server_group_t **group_ptr)
param_t *pit = NULL;
param_t *freeme = NULL;
str conn;
+   conn.s = NULL;
str addr;
addr.s = NULL;
str srv;

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] git:6.0:5ce31280: cmake: Fix typo

2025-01-29 Thread Xenofon Karamanos via sr-dev

Module: kamailio
Branch: 6.0
Commit: 5ce31280e1c4988408b4b77833947ae0cece4c83
URL: 
https://github.com/kamailio/kamailio/commit/5ce31280e1c4988408b4b77833947ae0cece4c83

Author: Xenofon Karamanos 
Committer: Xenofon Karamanos <22965395+xkara...@users.noreply.github.com>
Date: 2025-01-29T10:20:56Z

cmake: Fix typo

(cherry picked from commit 8d1b60bc7f21fe9d0fadd1df926fee931966f34e)

---

Modified: utils/kamctl/CMakeLists.txt

---

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

---

diff --git a/utils/kamctl/CMakeLists.txt b/utils/kamctl/CMakeLists.txt
index 10ef2cf9db8..ca8a4f20660 100644
--- a/utils/kamctl/CMakeLists.txt
+++ b/utils/kamctl/CMakeLists.txt
@@ -264,7 +264,7 @@ else()
   dbschema_${db_name}
   COMMAND ${CMAKE_COMMAND} -E make_directory "${db_name_folder}"
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-  COMMENT "Creating scehmas for ${db_name}")
+  COMMENT "Creating schemas for ${db_name}")
 
 # Loop through each table and add a command for xsltproc
 foreach(table ${EXTRACTED_TABLES})

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] git:6.0:f08adc56: cmake/json: Use CONFIG mode

2025-01-29 Thread Xenofon Karamanos via sr-dev

Module: kamailio
Branch: 6.0
Commit: f08adc567b19721b1bf515a2b1595fed28152177
URL: 
https://github.com/kamailio/kamailio/commit/f08adc567b19721b1bf515a2b1595fed28152177

Author: Xenofon Karamanos 
Committer: Xenofon Karamanos <22965395+xkara...@users.noreply.github.com>
Date: 2025-01-29T10:27:05Z

cmake/json: Use CONFIG mode

(cherry picked from commit 532744eebf1014939c4ccd9a6aa4e7d6fbb454ac)

---

Modified: src/modules/json/CMakeLists.txt

---

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

---

diff --git a/src/modules/json/CMakeLists.txt b/src/modules/json/CMakeLists.txt
index c4cbf81440c..72df4d390f5 100644
--- a/src/modules/json/CMakeLists.txt
+++ b/src/modules/json/CMakeLists.txt
@@ -2,7 +2,8 @@ file(GLOB MODULE_SOURCES "*.c")
 
 add_library(${module_name} SHARED ${MODULE_SOURCES})
 
-find_package(json-c QUIET)
+find_package(json-c CONFIG)
+
 if(NOT json-c_FOUND)
   message(STATUS "json-c not found. looking with pkg-config")
   find_package(PkgConfig REQUIRED)

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] git:6.0:aef5f6c4: cmake: Link with correct Erlang target

2025-01-29 Thread Xenofon Karamanos via sr-dev

Module: kamailio
Branch: 6.0
Commit: aef5f6c422981a36a1eac3d93079d8aa930c3810
URL: 
https://github.com/kamailio/kamailio/commit/aef5f6c422981a36a1eac3d93079d8aa930c3810

Author: Xenofon Karamanos 
Committer: Xenofon Karamanos <22965395+xkara...@users.noreply.github.com>
Date: 2025-01-29T10:20:12Z

cmake: Link with correct Erlang target

(cherry picked from commit 2dbd3d47cdbd55365fcb37b48a30c3224b8af810)

---

Modified: src/modules/erlang/CMakeLists.txt

---

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

---

diff --git a/src/modules/erlang/CMakeLists.txt 
b/src/modules/erlang/CMakeLists.txt
index 16c4be64bfd..db92655b497 100644
--- a/src/modules/erlang/CMakeLists.txt
+++ b/src/modules/erlang/CMakeLists.txt
@@ -5,4 +5,6 @@ add_library(${module_name} SHARED ${MODULE_SOURCES})
 # erlang-dev
 find_package(Erlang REQUIRED)
 
-target_link_libraries(${module_name} PRIVATE Erlang::EI)
+target_link_libraries(${module_name} PRIVATE Erlang::Erlang)
+target_include_directories(${module_name} PRIVATE ${Erlang_INCLUDE_DIRS})
+target_compile_definitions(${module_name} PRIVATE _REENTRANT)

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] git:master:dcdcee0d: ims_qos_npn: small docs updates

2025-01-29 Thread Daniel-Constantin Mierla via sr-dev

Module: kamailio
Branch: master
Commit: dcdcee0d9f2326e079f905632af9db3b898330ab
URL: 
https://github.com/kamailio/kamailio/commit/dcdcee0d9f2326e079f905632af9db3b898330ab

Author: Daniel-Constantin Mierla 
Committer: Daniel-Constantin Mierla 
Date: 2025-01-29T11:34:01+01:00

ims_qos_npn: small docs updates

---

Modified: src/modules/ims_qos_npn/doc/ims_qos_npn.xml
Modified: src/modules/ims_qos_npn/doc/ims_qos_npn_admin.xml

---

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

---

diff --git a/src/modules/ims_qos_npn/doc/ims_qos_npn.xml 
b/src/modules/ims_qos_npn/doc/ims_qos_npn.xml
index 0cd99dcd0c7..fa9d03eb003 100644
--- a/src/modules/ims_qos_npn/doc/ims_qos_npn.xml
+++ b/src/modules/ims_qos_npn/doc/ims_qos_npn.xml
@@ -7,7 +7,7 @@
 ]>
 
   
-The IMS QoS Module - Neat Path Networks "branch"
+The IMS QoS NPN Module
 
 
   
diff --git a/src/modules/ims_qos_npn/doc/ims_qos_npn_admin.xml 
b/src/modules/ims_qos_npn/doc/ims_qos_npn_admin.xml
index dfb6ea9ed15..70459b65801 100644
--- a/src/modules/ims_qos_npn/doc/ims_qos_npn_admin.xml
+++ b/src/modules/ims_qos_npn/doc/ims_qos_npn_admin.xml
@@ -16,7 +16,7 @@
 charging control functions performed by an Application Function (e.g.
 P-CSCF) over the Rx interface. This module is dependent on the CDP (C
 Diameter Peer) modules for communicating with PCRF as specified in 3GPP
-specification TS 29.214.
+specification TS 29.214. It is an enhaced variant of ims_qos.
   
 
   
@@ -548,7 +548,7 @@ modparam("ims_qos", "dialog_direction", 1)
 If set to 1 it will trust the bottom Via as the UE IP/port/transport 
when doing client identification.
   
   
-Normally, the UE identification should be done on IPsec SPIs and 
source IP/port of the packets. 
+Normally, the UE identification should be done on IPsec SPIs and 
source IP/port of the packets.
 In some cases the ims_* modules trust the top Via on requests and the 
bottom Via on responses. In some (better)
 cases this trusts the received-from IP (or the alias in the Contact 
header).
   
@@ -707,7 +707,7 @@ modparam("ims_qos", "af_signaling_port_ps", "5063")
   Note: this is executed asynchronously. See 
example on how to
   retrieve return value
 
-  Note: this authorization session triggers 
+  Note: this authorization session triggers
   event_route[qos:asr_registration], event_route[qos:rar_access_network] 
and event_route[qos:terminate_dialog].
 
   
@@ -785,7 +785,7 @@ route[REGISTER_AAR_REPLY]
   Note: this is executed asynchronously. See 
example on how to
   retrieve return value
 
-  Note: this authorization session triggers 
+  Note: this authorization session triggers
   event_route[qos:asr_call], event_route[qos:rar_access_network] and 
event_route[qos:terminate_dialog].
 
 

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] git:6.0:ff20204c: cmake/sctp: Search for libsctp and error if not found

2025-01-29 Thread Xenofon Karamanos via sr-dev

Module: kamailio
Branch: 6.0
Commit: ff20204c0163d56964036bdfba5d9325cd74c90e
URL: 
https://github.com/kamailio/kamailio/commit/ff20204c0163d56964036bdfba5d9325cd74c90e

Author: Xenofon Karamanos 
Committer: Xenofon Karamanos <22965395+xkara...@users.noreply.github.com>
Date: 2025-01-29T10:20:22Z

cmake/sctp: Search for libsctp and error if not found

(cherry picked from commit 9b7719a61ab02c93939e3681cb90e9fa04f3ac5d)

---

Modified: src/modules/sctp/CMakeLists.txt

---

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

---

diff --git a/src/modules/sctp/CMakeLists.txt b/src/modules/sctp/CMakeLists.txt
index 5d8cb523a49..22e51fd7c08 100644
--- a/src/modules/sctp/CMakeLists.txt
+++ b/src/modules/sctp/CMakeLists.txt
@@ -2,6 +2,23 @@ file(GLOB MODULE_SOURCES "*.c")
 
 add_library(${module_name} SHARED ${MODULE_SOURCES})
 
+# TODO: find include file required
+find_path(
+  SCTP_INCLUDE_DIR
+  NAMES sctp.h
+  PATHS /usr/include /usr/local/include /usr/include/netinet)
+
+if(NOT SCTP_INCLUDE_DIR)
+  message(FATAL_ERROR "sctp.h not found. maybe missing libsctp-dev?")
+endif()
+
+target_include_directories(${module_name} PRIVATE ${SCTP_INCLUDE_DIR})
+
+find_library(
+  SCTP_LIBRARY
+  NAMES sctp
+  PATHS /usr/lib /usr/local/lib)
+
 if(UNIX)
-  target_link_libraries(${module_name} PRIVATE -lsctp)
+  target_link_libraries(${module_name} PRIVATE ${SCTP_LIBRARY})
 endif()

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] git:6.0:fa54a06f: cmake/Radius: Add libfreeradius support

2025-01-29 Thread Xenofon Karamanos via sr-dev

Module: kamailio
Branch: 6.0
Commit: fa54a06f165f7d6a0c49a8653f2ed71fe775dbc4
URL: 
https://github.com/kamailio/kamailio/commit/fa54a06f165f7d6a0c49a8653f2ed71fe775dbc4

Author: Xenofon Karamanos 
Committer: Xenofon Karamanos <22965395+xkara...@users.noreply.github.com>
Date: 2025-01-29T10:19:58Z

cmake/Radius: Add libfreeradius support

- Add libfreeradius.cmake to search for libfreeradius-client
- Link modules with correct libraries paths
- Fix description

(cherry picked from commit 53bd567dd7444a8145aa876d82db2c6b579a7e19)

---

Added: cmake/modules/FindLibfreeradius.cmake
Modified: cmake/modules/FindRadius.cmake
Modified: src/modules/acc_radius/CMakeLists.txt
Modified: src/modules/auth_radius/CMakeLists.txt
Modified: src/modules/misc_radius/CMakeLists.txt
Modified: src/modules/peering/CMakeLists.txt

---

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

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] git:6.0:3adaab6c: cmake: Install snmpstats files

2025-01-29 Thread Xenofon Karamanos via sr-dev

Module: kamailio
Branch: 6.0
Commit: 3adaab6c56657bc73cd83e0b7bbcd158efb070c1
URL: 
https://github.com/kamailio/kamailio/commit/3adaab6c56657bc73cd83e0b7bbcd158efb070c1

Author: Xenofon Karamanos 
Committer: Xenofon Karamanos <22965395+xkara...@users.noreply.github.com>
Date: 2025-01-29T10:21:15Z

cmake: Install snmpstats files

(cherry picked from commit f69b22ce3cdc2c06739c11f19c9ebeb5eb1727f3)

---

Modified: src/modules/snmpstats/CMakeLists.txt

---

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

---

diff --git a/src/modules/snmpstats/CMakeLists.txt 
b/src/modules/snmpstats/CMakeLists.txt
index fa3980030db..ac416979da7 100644
--- a/src/modules/snmpstats/CMakeLists.txt
+++ b/src/modules/snmpstats/CMakeLists.txt
@@ -7,3 +7,8 @@ find_package(NETSNMP REQUIRED)
 
 # TODO: Compiles fine but need to do some more verifcation
 target_link_libraries(${module_name} PRIVATE NETSNMP::NETSNMP)
+
+install(
+  DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/mibs
+  DESTINATION ${CMAKE_INSTALL_DATADIR}/snmp/
+  OPTIONAL)

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] git:6.0:5da84593: cmake: fix CPL definition

2025-01-29 Thread Xenofon Karamanos via sr-dev

Module: kamailio
Branch: 6.0
Commit: 5da8459301f0a9d74b9c9b0f8e6e5890c194a8c2
URL: 
https://github.com/kamailio/kamailio/commit/5da8459301f0a9d74b9c9b0f8e6e5890c194a8c2

Author: Victor Seva 
Committer: Xenofon Karamanos <22965395+xkara...@users.noreply.github.com>
Date: 2025-01-29T10:21:36Z

cmake: fix CPL definition

(cherry picked from commit feb371852ea9b53a1dd95fec0db0943c5fb160ad)

---

Modified: cmake/groups.cmake

---

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

---

diff --git a/cmake/groups.cmake b/cmake/groups.cmake
index 9cd7ddf77dc..73ef6d632dd 100644
--- a/cmake/groups.cmake
+++ b/cmake/groups.cmake
@@ -167,7 +167,7 @@ set(MOD_LIST_POSTGRES db_postgres)
 set(MOD_LIST_UNIXODBC db_unixodbc)
 
 # * modules depending on xml2 library
-set(MOD_LIST_CPLC cplc)
+set(MOD_LIST_CPL cplc)
 
 # * modules depending on xml2 library
 set(MOD_LIST_XMLDEPS xhttp_pi xmlrpc xmlops)
@@ -385,7 +385,7 @@ set(MOD_LIST_ALL
 ${MOD_LIST_UNIXODBC}
 ${MOD_LIST_XMLDEPS}
 ${MOD_LIST_PERLDEPS}
-${MOD_LIST_CPLC}
+${MOD_LIST_CPL}
 ${MOD_LIST_XMPP}
 ${MOD_LIST_BERKELEY}
 ${MOD_LIST_UTILS}

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] git:6.0:1efa1332: cmake: Use pkg-config instead for json-c dev package.

2025-01-29 Thread Xenofon Karamanos via sr-dev

Module: kamailio
Branch: 6.0
Commit: 1efa133244bbca0c9c35b76f936cce2b0a5864d3
URL: 
https://github.com/kamailio/kamailio/commit/1efa133244bbca0c9c35b76f936cce2b0a5864d3

Author: Xenofon Karamanos 
Committer: Xenofon Karamanos <22965395+xkara...@users.noreply.github.com>
Date: 2025-01-29T10:28:40Z

cmake: Use pkg-config instead for json-c dev package.

(cherry picked from commit 8ebae54cff261b95fcece3be3719da511cc35084)

---

Modified: src/modules/nsq/CMakeLists.txt

---

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

---

diff --git a/src/modules/nsq/CMakeLists.txt b/src/modules/nsq/CMakeLists.txt
index b4a482c2a47..e6acfa9a2f7 100644
--- a/src/modules/nsq/CMakeLists.txt
+++ b/src/modules/nsq/CMakeLists.txt
@@ -4,13 +4,19 @@ add_library(${module_name} SHARED ${MODULE_SOURCES})
 
 find_package(Libev REQUIRED)
 
-find_package(json-c QUIET)
-if(NOT json-c_FOUND)
-  message(STATUS "json-c not found. looking with pkg-config")
-  find_package(PkgConfig REQUIRED)
-  pkg_check_modules(json-c REQUIRED IMPORTED_TARGET json-c)
-  add_library(json-c::json-c ALIAS PkgConfig::json-c)
-endif()
+# TODO: When we have a proper cmake config file for json-c for most OS, we can
+# use that instead of pkg-config.
+# json-c v 0.14 and 0.15 have wrong include directories in their cmake config
+# files. uncomment the following line when we have a proper cmake config file
+# for json-c for most OS.
+# find_package(json-c 0.16 CONFIG)
+
+# if(NOT json-c_FOUND)
+# message(STATUS "json-c not found. looking with pkg-config")
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(json-c REQUIRED IMPORTED_TARGET json-c)
+add_library(json-c::json-c ALIAS PkgConfig::json-c)
+# endif()
 
 find_package(CURL REQUIRED)
 

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] git:6.0:7a174649: cmake/perl: Install files / Add perl user link and def options

2025-01-29 Thread Xenofon Karamanos via sr-dev

Module: kamailio
Branch: 6.0
Commit: 7a17464946f8027e9d66497a44357d7f0eac64a2
URL: 
https://github.com/kamailio/kamailio/commit/7a17464946f8027e9d66497a44357d7f0eac64a2

Author: Xenofon Karamanos 
Committer: Xenofon Karamanos <22965395+xkara...@users.noreply.github.com>
Date: 2025-01-29T10:21:26Z

cmake/perl: Install files / Add perl user link and def options

- Fix perl extra_c_flags parsing by using SHELL:
- Add user option PERL_LDOPTS to define extra ldopts
- Add user option PERL_CCOPTS to define extra defs
- Add new generated file to compilation
- Add new target for sgml docs
- Add install directives for perl libraries

(cherry picked from commit f4d7e298bb351be5f12652083bd5e37109748169)

---

Modified: src/modules/app_perl/CMakeLists.txt
Modified: src/modules/db_perlvdb/CMakeLists.txt

---

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

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] git:6.0:d0360fbb: cmake/json: Remove find_package call. Use pkg-config instead.

2025-01-29 Thread Xenofon Karamanos via sr-dev

Module: kamailio
Branch: 6.0
Commit: d0360fbb8e622c786f3d8791b67f06d1eb6e0ae4
URL: 
https://github.com/kamailio/kamailio/commit/d0360fbb8e622c786f3d8791b67f06d1eb6e0ae4

Author: Xenofon Karamanos 
Committer: Xenofon Karamanos <22965395+xkara...@users.noreply.github.com>
Date: 2025-01-29T10:28:03Z

cmake/json: Remove find_package call. Use pkg-config instead.

(cherry picked from commit 99d36df0a15bbb960b2d7ee5916d65a55b9b26cd)

---

Modified: src/modules/json/CMakeLists.txt

---

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

---

diff --git a/src/modules/json/CMakeLists.txt b/src/modules/json/CMakeLists.txt
index 72df4d390f5..5d791dbd03d 100644
--- a/src/modules/json/CMakeLists.txt
+++ b/src/modules/json/CMakeLists.txt
@@ -2,13 +2,18 @@ file(GLOB MODULE_SOURCES "*.c")
 
 add_library(${module_name} SHARED ${MODULE_SOURCES})
 
-find_package(json-c CONFIG)
-
-if(NOT json-c_FOUND)
-  message(STATUS "json-c not found. looking with pkg-config")
-  find_package(PkgConfig REQUIRED)
-  pkg_check_modules(json-c REQUIRED IMPORTED_TARGET json-c)
-  add_library(json-c::json-c ALIAS PkgConfig::json-c)
-endif()
+# TODO: When we have a proper cmake config file for json-c for most OS, we can
+# use that instead of pkg-config.
+# json-c v 0.14 and 0.15 have wrong include directories in their cmake config
+# files. uncomment the following line when we have a proper cmake config file
+# for json-c for most OS.
+# find_package(json-c 0.16 CONFIG)
+
+# if(NOT json-c_FOUND)
+message(STATUS "json-c not found. looking with pkg-config")
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(json-c REQUIRED IMPORTED_TARGET json-c)
+add_library(json-c::json-c ALIAS PkgConfig::json-c)
+# endif()
 
 target_link_libraries(${module_name} PRIVATE json-c::json-c)

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] git:6.0:2496ccd1: cmake: Use pkg-config instead for json-c dev package.

2025-01-29 Thread Xenofon Karamanos via sr-dev

Module: kamailio
Branch: 6.0
Commit: 2496ccd1d1878e275a8797a286de6edc4aff4805
URL: 
https://github.com/kamailio/kamailio/commit/2496ccd1d1878e275a8797a286de6edc4aff4805

Author: Xenofon Karamanos 
Committer: Xenofon Karamanos <22965395+xkara...@users.noreply.github.com>
Date: 2025-01-29T10:28:26Z

cmake: Use pkg-config instead for json-c dev package.

(cherry picked from commit e7f9531adc6f319b6889d5644eb55a9cccfdd27d)

---

Modified: src/modules/json/CMakeLists.txt
Modified: src/modules/jsonrpcc/CMakeLists.txt
Modified: src/modules/kazoo/CMakeLists.txt
Modified: src/modules/pua_json/CMakeLists.txt

---

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

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] git:master:e7f9531a: cmake: Use pkg-config instead for json-c dev package.

2025-01-29 Thread Xenofon Karamanos via sr-dev

Module: kamailio
Branch: master
Commit: e7f9531adc6f319b6889d5644eb55a9cccfdd27d
URL: 
https://github.com/kamailio/kamailio/commit/e7f9531adc6f319b6889d5644eb55a9cccfdd27d

Author: Xenofon Karamanos 
Committer: Xenofon Karamanos 
Date: 2025-01-29T10:03:55Z

cmake: Use pkg-config instead for json-c dev package.

---

Modified: src/modules/json/CMakeLists.txt
Modified: src/modules/jsonrpcc/CMakeLists.txt
Modified: src/modules/kazoo/CMakeLists.txt
Modified: src/modules/pua_json/CMakeLists.txt

---

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

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] Re: [kamailio/kamailio] multiple Makefiles: evaluate LIBS variable imediately in Makefile (PR #4085)

2025-01-29 Thread Xenofon Karamanos via sr-dev

@sergey-safarov  Done.

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

Message ID: ___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] Re: [kamailio/kamailio] multiple Makefiles: evaluate LIBS variable imediately in Makefile (PR #4085)

2025-01-29 Thread sergey-safarov via sr-dev

yes, json error fixed now.
Could you also check
```
 /usr/bin/cmake --build redhat-linux-build -j8 --verbose --target dbschema
gmake: *** No rule to make target 'dbschema'.  Stop.
error: Bad exit status from /var/tmp/rpm-tmp.jUvIRf (%build)
```
This error is not present on RHEL 10 and Fedora but exist on CentOS 9.

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

Message ID: ___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] git:6.0:f540d97e: ims_qos_npn: small docs updates

2025-01-29 Thread Daniel-Constantin Mierla via sr-dev

Module: kamailio
Branch: 6.0
Commit: f540d97e3f0be21cb6abc61ac701c8fd437b4371
URL: 
https://github.com/kamailio/kamailio/commit/f540d97e3f0be21cb6abc61ac701c8fd437b4371

Author: Daniel-Constantin Mierla 
Committer: Daniel-Constantin Mierla 
Date: 2025-01-29T11:34:17+01:00

ims_qos_npn: small docs updates

(cherry picked from commit dcdcee0d9f2326e079f905632af9db3b898330ab)

---

Modified: src/modules/ims_qos_npn/doc/ims_qos_npn.xml
Modified: src/modules/ims_qos_npn/doc/ims_qos_npn_admin.xml

---

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

---

diff --git a/src/modules/ims_qos_npn/doc/ims_qos_npn.xml 
b/src/modules/ims_qos_npn/doc/ims_qos_npn.xml
index 0cd99dcd0c7..fa9d03eb003 100644
--- a/src/modules/ims_qos_npn/doc/ims_qos_npn.xml
+++ b/src/modules/ims_qos_npn/doc/ims_qos_npn.xml
@@ -7,7 +7,7 @@
 ]>
 
   
-The IMS QoS Module - Neat Path Networks "branch"
+The IMS QoS NPN Module
 
 
   
diff --git a/src/modules/ims_qos_npn/doc/ims_qos_npn_admin.xml 
b/src/modules/ims_qos_npn/doc/ims_qos_npn_admin.xml
index dfb6ea9ed15..70459b65801 100644
--- a/src/modules/ims_qos_npn/doc/ims_qos_npn_admin.xml
+++ b/src/modules/ims_qos_npn/doc/ims_qos_npn_admin.xml
@@ -16,7 +16,7 @@
 charging control functions performed by an Application Function (e.g.
 P-CSCF) over the Rx interface. This module is dependent on the CDP (C
 Diameter Peer) modules for communicating with PCRF as specified in 3GPP
-specification TS 29.214.
+specification TS 29.214. It is an enhaced variant of ims_qos.
   
 
   
@@ -548,7 +548,7 @@ modparam("ims_qos", "dialog_direction", 1)
 If set to 1 it will trust the bottom Via as the UE IP/port/transport 
when doing client identification.
   
   
-Normally, the UE identification should be done on IPsec SPIs and 
source IP/port of the packets. 
+Normally, the UE identification should be done on IPsec SPIs and 
source IP/port of the packets.
 In some cases the ims_* modules trust the top Via on requests and the 
bottom Via on responses. In some (better)
 cases this trusts the received-from IP (or the alias in the Contact 
header).
   
@@ -707,7 +707,7 @@ modparam("ims_qos", "af_signaling_port_ps", "5063")
   Note: this is executed asynchronously. See 
example on how to
   retrieve return value
 
-  Note: this authorization session triggers 
+  Note: this authorization session triggers
   event_route[qos:asr_registration], event_route[qos:rar_access_network] 
and event_route[qos:terminate_dialog].
 
   
@@ -785,7 +785,7 @@ route[REGISTER_AAR_REPLY]
   Note: this is executed asynchronously. See 
example on how to
   retrieve return value
 
-  Note: this authorization session triggers 
+  Note: this authorization session triggers
   event_route[qos:asr_call], event_route[qos:rar_access_network] and 
event_route[qos:terminate_dialog].
 
 

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] git:6.0:8d482b1a: pua: added breaks to event type matching switch

2025-01-29 Thread Daniel-Constantin Mierla via sr-dev

Module: kamailio
Branch: 6.0
Commit: 8d482b1a4a01dca834928795b0e789ae135b8224
URL: 
https://github.com/kamailio/kamailio/commit/8d482b1a4a01dca834928795b0e789ae135b8224

Author: Daniel-Constantin Mierla 
Committer: Daniel-Constantin Mierla 
Date: 2025-01-29T11:43:53+01:00

pua: added breaks to event type matching switch

(cherry picked from commit a2ae4fe607125a05debeb40c0ecf1ce05d69ff5f)

---

Modified: src/modules/pua/hash.h

---

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

---

diff --git a/src/modules/pua/hash.h b/src/modules/pua/hash.h
index 36f0335cc79..ae19357fe17 100644
--- a/src/modules/pua/hash.h
+++ b/src/modules/pua/hash.h
@@ -178,9 +178,11 @@ static inline int get_event_flag(str *event)
case 15:
if(strncmp(event->s, "message-summary", 15) == 0)
return MSGSUM_EVENT;
+   break;
case 16:
if(strncmp(event->s, "as-feature-event", 16) == 0)
return DFKS_EVENT;
+   break;
}
 
LM_ERR("Unknown event string\n");

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] git:master:a2ae4fe6: pua: added breaks to event type matching switch

2025-01-29 Thread Daniel-Constantin Mierla via sr-dev

Module: kamailio
Branch: master
Commit: a2ae4fe607125a05debeb40c0ecf1ce05d69ff5f
URL: 
https://github.com/kamailio/kamailio/commit/a2ae4fe607125a05debeb40c0ecf1ce05d69ff5f

Author: Daniel-Constantin Mierla 
Committer: Daniel-Constantin Mierla 
Date: 2025-01-29T11:42:49+01:00

pua: added breaks to event type matching switch

---

Modified: src/modules/pua/hash.h

---

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

---

diff --git a/src/modules/pua/hash.h b/src/modules/pua/hash.h
index 36f0335cc79..ae19357fe17 100644
--- a/src/modules/pua/hash.h
+++ b/src/modules/pua/hash.h
@@ -178,9 +178,11 @@ static inline int get_event_flag(str *event)
case 15:
if(strncmp(event->s, "message-summary", 15) == 0)
return MSGSUM_EVENT;
+   break;
case 16:
if(strncmp(event->s, "as-feature-event", 16) == 0)
return DFKS_EVENT;
+   break;
}
 
LM_ERR("Unknown event string\n");

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] Re: [SR-Users] Kamailio v6.0.0 Released - new major version is out

2025-01-29 Thread Daniel-Constantin Mierla via sr-dev

Hello,

some cmake-related tutorials are available at:

  - https://www.kamailio.org/wikidocs/tutorials/cmake/

A couple of corresponding commands between old-makefiles and cmake variants:

  - https://www.kamailio.org/wikidocs/tutorials/cmake/commands/

Cheers,
Daniel

On 29.01.25 14:55, VoIP wrote:
> Great news!!!
>
> One question. Using cmake how can I add or remove modules from
> compilation?
>
> Thank you
>
> Regards
>
> El 29/01/2025 a las 7:10 a. m., Daniel-Constantin Mierla via sr-users
> escribió:
>> Kamailio v6.0.0 is out – it comes with 5 new modules and important
>> updates to the core components and existing modules.
>>
>> The increment of the first version number reflects several important
>> updates, among them: multi-threaded option for UDP receiving, option for
>> specifying a range of ports to listen to, support for expressions with
>> variables for most of the module functions parameters, internal
>> libraries are directly inked to the core, support to use cmake to
>> compile and install Kamailio.
>>
>> You can read a bit more detailed release notes at:
>>
>>     * https://www.kamailio.org/w/kamailio-v6.0-0-release-notes/
>>
>> Many thanks to all developers and community members that made possible
>> this release.
>>
>> v6.0.0 brings more flexibility and optimizations across many existing
>> components and modules, new parameters, functions, variables and
>> transformations.
>>
>> Enjoy Kamailio v6.0.0!
>>
>> Thank you for flying Kamailio!
>> Daniel
>>
-- 
Daniel-Constantin Mierla (@ asipto.com)
twitter.com/miconda -- linkedin.com/in/miconda
Kamailio Consultancy, Training and Development Services -- asipto.com
Kamailio World Conference, May 12-13, 2025, Berlin -- kamailioworld.com

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] Re: [kamailio/kamailio] outbound: encode bind address into flow token as destination (PR #4105)

2025-01-29 Thread Henning Westerholt via sr-dev

Just to add a bit of context, the TCP connection match was changed globally to 
include the local destination port, its not conditional to the 
tcp_accept_haproxy=yes.

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

Message ID: ___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] git:6.0:d407132a: lib/srdb1/schema: ims_usrloc_scscf definitions

2025-01-29 Thread Victor Seva via sr-dev

Module: kamailio
Branch: 6.0
Commit: d407132aa0accd93f58b7da1b6fdc2cf91b340db
URL: 
https://github.com/kamailio/kamailio/commit/d407132aa0accd93f58b7da1b6fdc2cf91b340db

Author: Victor Seva 
Committer: Victor Seva 
Date: 2025-01-29T09:00:53+01:00

lib/srdb1/schema: ims_usrloc_scscf definitions

related #4100

(cherry picked from commit 283a77887c88c38a240567a7b165478775662d81)

---

Added: src/lib/srdb1/schema/contact.xml
Added: src/lib/srdb1/schema/impu.xml
Added: src/lib/srdb1/schema/impu_contact.xml
Added: src/lib/srdb1/schema/impu_subscriber.xml
Added: src/lib/srdb1/schema/kamailio-ims_usrloc_scscf.xml
Added: src/lib/srdb1/schema/subscriber_scscf.xml

---

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

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] git:6.0:ce5cbf12: kamctl: regenerated db creation files

2025-01-29 Thread Victor Seva via sr-dev

Module: kamailio
Branch: 6.0
Commit: ce5cbf1263e38e51973d2515b047f2213a8f6039
URL: 
https://github.com/kamailio/kamailio/commit/ce5cbf1263e38e51973d2515b047f2213a8f6039

Author: Victor Seva 
Committer: Victor Seva 
Date: 2025-01-29T09:01:46+01:00

kamctl: regenerated db creation files

---

Added: utils/kamctl/db_berkeley/kamailio/contact
Added: utils/kamctl/db_berkeley/kamailio/impu
Added: utils/kamctl/db_berkeley/kamailio/impu_contact
Added: utils/kamctl/db_berkeley/kamailio/impu_subscriber
Added: utils/kamctl/db_berkeley/kamailio/ro_session
Added: utils/kamctl/db_berkeley/kamailio/subscriber_scscf
Added: utils/kamctl/db_redis/kamailio/contact
Added: utils/kamctl/db_redis/kamailio/impu
Added: utils/kamctl/db_redis/kamailio/impu_contact
Added: utils/kamctl/db_redis/kamailio/impu_subscriber
Added: utils/kamctl/db_redis/kamailio/ro_session
Added: utils/kamctl/db_redis/kamailio/subscriber_scscf
Added: utils/kamctl/db_sqlite/ims_charging-create.sql
Added: utils/kamctl/db_sqlite/ims_usrloc_scscf-create.sql
Added: utils/kamctl/dbtext/kamailio/contact
Added: utils/kamctl/dbtext/kamailio/impu
Added: utils/kamctl/dbtext/kamailio/impu_contact
Added: utils/kamctl/dbtext/kamailio/impu_subscriber
Added: utils/kamctl/dbtext/kamailio/ro_session
Added: utils/kamctl/dbtext/kamailio/subscriber_scscf
Added: utils/kamctl/mongodb/kamailio/contact.json
Added: utils/kamctl/mongodb/kamailio/impu.json
Added: utils/kamctl/mongodb/kamailio/impu_contact.json
Added: utils/kamctl/mongodb/kamailio/impu_subscriber.json
Added: utils/kamctl/mongodb/kamailio/ro_session.json
Added: utils/kamctl/mongodb/kamailio/subscriber_scscf.json
Added: utils/kamctl/oracle/ims_charging-create.sql
Added: utils/kamctl/oracle/ims_usrloc_scscf-create.sql
Added: utils/kamctl/postgres/ims_charging-create.sql
Added: utils/kamctl/postgres/ims_usrloc_scscf-create.sql
Added: utils/kamctl/xhttp_pi/ims_charging-mod
Added: utils/kamctl/xhttp_pi/ims_charging-table
Added: utils/kamctl/xhttp_pi/ims_usrloc_scscf-mod
Added: utils/kamctl/xhttp_pi/ims_usrloc_scscf-table
Modified: utils/kamctl/db_berkeley/kamailio/pcscf_location
Modified: utils/kamctl/db_berkeley/kamailio/version
Modified: utils/kamctl/dbtext/kamailio/pcscf_location
Modified: utils/kamctl/dbtext/kamailio/version
Modified: utils/kamctl/mongodb/kamailio/version-create.mongo
Modified: utils/kamctl/mysql/ims_charging-create.sql
Modified: utils/kamctl/mysql/ims_usrloc_scscf-create.sql
Modified: utils/kamctl/xhttp_pi/pi_framework.xml

---

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

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] Releasing v6.0.0

2025-01-29 Thread Daniel-Constantin Mierla via sr-dev

Hello,

short note that Kamailio v6.0.0 is going to be released today, therefore
any commit to branch 6.0 after 11:00am UTC+1 (Berlin timezone) has to be
announced on sr-dev mailing list and wait for the ack before pushing it
in order to avoid conflicts with release building processes. Once the
release announcement is out, commits can be pushed to branch 6.0 as usual.

Cheers,
Daniel

-- 
Daniel-Constantin Mierla (@ asipto.com)
twitter.com/miconda -- linkedin.com/in/miconda
Kamailio Consultancy, Training and Development Services -- asipto.com
Kamailio World Conference, May 12-13, 2025, Berlin -- kamailioworld.com

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] Re: [kamailio/kamailio] UB: Kamailio 5.8.2 - Transformations + Psuedo Variables + Topos (Issue #4127)

2025-01-29 Thread Daniel-Constantin Mierla via sr-dev

The `$hdr(...)` is a variable for getting values based on generic header 
structure `Name: value`, it does not uderstand the specifics of each header and 
what could be as `value`.

For you case, you should use `$hfl(...)`:

  - 
https://www.kamailio.org/wikidocs/cookbooks/5.8.x/pseudovariables/#hflname-header-field-with-list-of-bodies

If not getting what you need, probably the best is to discuss on mailing list 
to see what options are to resolve your needs.

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

Message ID: ___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] Re: [kamailio/kamailio] UB: Kamailio 5.8.2 - Transformations + Psuedo Variables + Topos (Issue #4127)

2025-01-29 Thread Daniel-Constantin Mierla via sr-dev

Closed #4127 as completed.

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

Message ID: ___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] Re: [kamailio/kamailio] janssonrpcc: fixed warning var may be used uninitialized (PR #4129)

2025-01-29 Thread Daniel-Constantin Mierla via sr-dev

Merged #4129 into master.

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

Message ID: ___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] Re: Branching 6.0 series

2025-01-29 Thread Henning Westerholt via sr-dev

Hello Daniel,

I will look with Xenofon this morning into it and backport the cmake fixes from 
the last days to 6.0 branch.

Cheers,

Henning

From: Daniel-Constantin Mierla via sr-dev 
Sent: Dienstag, 28. Januar 2025 17:16
To: Kamailio (SER) - Development Mailing List 
Cc: Xenofon Karamanos ; Daniel-Constantin Mierla 

Subject: [sr-dev] Re: Branching 6.0 series

Hello,

can you backport the cmake-related commits to branch 6.0 that you consider to 
be ready for it? It should be from last week, since the branch 6.0 was created. 
I was not sure what is ready or not, so I haven't gone through them. Being 
related to build tools, future cmake-related commits can also be backported to 
branch 6.0 if they apply for this release series.

Cheers,
Daniel

On 28.01.25 11:18, Xenofon Karamanos via sr-dev wrote:
Hey all,

Yeah we can keep for now the Makefiles until CMake is fully ready for used also 
in packaging.

As Henning said, RHEL and Fedora package seems to be working by Sergey apart 
from some minor json-c stuff currently.

There is still some work to be done for Debian-based and the modular packaging 
for the various groups to be used by Victor but hopefully soon it will be 
implemented.

Thanks,
Xenofon

From: Henning Westerholt via sr-dev 

Sent: Tuesday, January 28, 2025 10:44
To: Kamailio (SER) - Development Mailing List 
; Kamailio (SER) - 
Users Mailing List 

Cc: Henning Westerholt 
Subject: [sr-dev] Re: Branching 6.0 series

Hi Daniel,

releasing 6.0 tomorrow sounds good to me.

Regarding the package building with the cmake infrastructure: I think for RPM 
based distributions we are probably close, for Debian based distributions there 
seems to be more work open as discussed in the different GitHub issues.

Packages for 6.0 could be created with the old Makefile system, sure.

But we should remove the Makefiles in git master for release 6.1 then 
completely, just to finish the migration. The really old releases (Ubuntu 
16.04) with a too old cmake will be in 2026 then also end of life, so it should 
be fine.

Cheers,

Henning

> -Original Message-
> From: Daniel-Constantin Mierla via sr-dev 
> 
> Sent: Montag, 27. Januar 2025 18:38
> To: Kamailio (SER) - Development Mailing List 
> ;
> Kamailio (SER) - Users Mailing List 
> 
> Cc: Daniel-Constantin Mierla 
> Subject: [sr-dev] Re: Branching 6.0 series
>
> Hello,
>
> On 20.01.25 08:25, Daniel-Constantin Mierla via sr-dev wrote:
> > Hello,
> >
> > I think we should branch it on Wednesday, Jan 22, 2025, no matter on
> > what stage we are with cmake support. The old-Makefiles should be kept
> > anyhow (as they are or in a special folder with an easy way to recover
> > them), because there are many bits and pieces that can be discovered
> > later when more users.
> >
> > Because there were no many bugs reported to the C code specific to
> > 6.0, we can aim releasing on January 29, 2025, with old-Makefile still
> > to be used for tasks that are not yet covered by cmake.
>
> shall we still aim for releasing v6.0.0 on this upcoming Wednesday, January
> 29, 2025?
>
> We the old-Makefiles kept, it is doable, the wiki pages needs to be created 
> for
> this release series, which I can do tomorrow, as I waited to see if how it 
> should
> be the recommended method for compilation/installation.
>
> If the feeling is that we should wait, then probably the target date has to be
> shifted somewhere in the week starting on February 10, 2025, because
> Fosdem follows this weekend and then some countries have a week holiday
> break.
>
> If no other opinions and change of decision, the release will be done on
> Wednesday, with content using the old-Makefiles (to reuse existing
> tutorials) and reference to cmake variant when it is the case.
>
> Cheers,
> Daniel
>
> --
> Daniel-Constantin Mierla (@ asipto.com)
> twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy,
> Training and Development Services -- asipto.com Kamailio World Conference,
> May 12-13, 2025, Berlin -- kamailioworld.com
>
> ___
> Kamailio - Development Mailing List -- 
> sr-dev@lists.kamailio.org To
> unsubscribe send an email to 
> sr-dev-le...@lists.kamailio.org
> Important: keep the mailing list in the recipients, do not reply only to the
> sender!
___
Kamailio - Development Mailing List -- 
sr-dev@lists.kamailio.org
To unsubscribe send an email to 
sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the

[sr-dev] git:master:3039c024: janssonrpcc: fixed warning var may be used uninitialized

2025-01-29 Thread Daniel-Constantin Mierla via sr-dev

Module: kamailio
Branch: master
Commit: 3039c02404e05da05a031f6ccf68913a8c1c80eb
URL: 
https://github.com/kamailio/kamailio/commit/3039c02404e05da05a031f6ccf68913a8c1c80eb

Author: Sergey Safarov 
Committer: Daniel-Constantin Mierla 
Date: 2025-01-29T09:15:04+01:00

janssonrpcc: fixed warning var may be used uninitialized

---

Modified: src/modules/janssonrpcc/janssonrpc_server.c

---

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

---

diff --git a/src/modules/janssonrpcc/janssonrpc_server.c 
b/src/modules/janssonrpcc/janssonrpc_server.c
index 3fb4d7c624f..5a98a6fc1f9 100644
--- a/src/modules/janssonrpcc/janssonrpc_server.c
+++ b/src/modules/janssonrpcc/janssonrpc_server.c
@@ -130,6 +130,7 @@ int jsonrpc_parse_server(char *server_s, 
jsonrpc_server_group_t **group_ptr)
param_t *pit = NULL;
param_t *freeme = NULL;
str conn;
+   conn.s = NULL;
str addr;
addr.s = NULL;
str srv;

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] git:6.0:0fbaf456: lib/srdb1/schema: ims_charging definitions

2025-01-29 Thread Victor Seva via sr-dev

Module: kamailio
Branch: 6.0
Commit: 0fbaf4567973f84721b7e25074b61374e657b34a
URL: 
https://github.com/kamailio/kamailio/commit/0fbaf4567973f84721b7e25074b61374e657b34a

Author: Victor Seva 
Committer: Victor Seva 
Date: 2025-01-29T09:00:53+01:00

lib/srdb1/schema: ims_charging definitions

related #4100

(cherry picked from commit 48683f3798683a508fc456bcde11a8e59a8a64de)

---

Added: src/lib/srdb1/schema/kamailio-ims_charging.xml
Added: src/lib/srdb1/schema/ro_session.xml

---

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

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] git:6.0:489b46bd: pkg/kamailio/deb: version set 6.0.0

2025-01-29 Thread Victor Seva via sr-dev

Module: kamailio
Branch: 6.0
Commit: 489b46bd9ffaa8a9e6fed5281f7df250cf1ad777
URL: 
https://github.com/kamailio/kamailio/commit/489b46bd9ffaa8a9e6fed5281f7df250cf1ad777

Author: Victor Seva 
Committer: Victor Seva 
Date: 2025-01-29T09:07:06+01:00

pkg/kamailio/deb: version set 6.0.0

---

Modified: pkg/kamailio/deb/bionic/changelog
Modified: pkg/kamailio/deb/bookworm/changelog
Modified: pkg/kamailio/deb/bullseye/changelog
Modified: pkg/kamailio/deb/buster/changelog
Modified: pkg/kamailio/deb/debian/changelog
Modified: pkg/kamailio/deb/focal/changelog
Modified: pkg/kamailio/deb/jammy/changelog
Modified: pkg/kamailio/deb/jessie/changelog
Modified: pkg/kamailio/deb/noble/changelog
Modified: pkg/kamailio/deb/precise/changelog
Modified: pkg/kamailio/deb/sid/changelog
Modified: pkg/kamailio/deb/stretch/changelog
Modified: pkg/kamailio/deb/trusty/changelog
Modified: pkg/kamailio/deb/wheezy/changelog
Modified: pkg/kamailio/deb/xenial/changelog

---

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

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] Re: [kamailio/kamailio] outbound: encode bind address into flow token as destination (PR #4105)

2025-01-29 Thread Daniel-Constantin Mierla via sr-dev

Indeed, but the tcp struct field `cinfo.dst_port` is only set in such cases, 
otherwise, for normal tcp, is 0.

I let this PR in background for a while to think if other option would be 
better, but ultimately adding more conditions would add complexity without 
benefits, because for normal TCP connections `cinfo.dst_port` is 0 and the 
`(l_port == 0)` was already there and it will match before comparing ` (l_port 
== a->parent->cinfo.dst_port)`.

```
&& ((l_port == 0) || (l_port == 
a->parent->rcv.dst_port)
|| (l_port == 
a->parent->cinfo.dst_port))
```

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

Message ID: ___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] Re: [kamailio/kamailio] outbound: encode bind address into flow token as destination (PR #4105)

2025-01-29 Thread Henning Westerholt via sr-dev

I agree that adding more conditions does not make this code path easier to 
understand. I don't expect any regressions, just wanted to add a bit more info 
if something is discovered later anyway.

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

Message ID: ___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] git:5.8:95feca55: outbound: reformat exported structures

2025-01-29 Thread Xenofon Karamanos via sr-dev

Module: kamailio
Branch: 5.8
Commit: 95feca55b38991e045d57ab8cdb9b75bcdb7070e
URL: 
https://github.com/kamailio/kamailio/commit/95feca55b38991e045d57ab8cdb9b75bcdb7070e

Author: Victor Seva 
Committer: Xenofon Karamanos <22965395+xkara...@users.noreply.github.com>
Date: 2025-01-29T11:48:18Z

outbound: reformat exported structures

(cherry picked from commit 793a494f5b23f2ef5e82664924c3bed3893105bb)

---

Modified: src/modules/outbound/outbound_mod.c

---

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

---

diff --git a/src/modules/outbound/outbound_mod.c 
b/src/modules/outbound/outbound_mod.c
index e5ed1712607..687fc5480d7 100644
--- a/src/modules/outbound/outbound_mod.c
+++ b/src/modules/outbound/outbound_mod.c
@@ -59,25 +59,32 @@ static unsigned int ob_force_no_flag = (unsigned int)-1;
 static str ob_key = {0, 0};
 static str flow_token_secret = {0, 0};
 
+/* clang-format off */
 static cmd_export_t cmds[] = {
-   {"bind_ob", (cmd_function)bind_ob, 1, 0, 0, 0}, {0, 0, 0, 0, 0, 
0}};
+   {"bind_ob", (cmd_function)bind_ob, 1, 0, 0, 0},
+   {0, 0, 0, 0, 0, 0}
+};
 
 static param_export_t params[] = {
-   {"force_outbound_flag", PARAM_INT, &ob_force_flag},
-   {"force_no_outbound_flag", PARAM_INT, &ob_force_no_flag},
-   {"flow_token_secret", PARAM_STRING, &flow_token_secret}, {0, 0, 
0}};
+   {"force_outbound_flag", PARAM_INT, &ob_force_flag},
+   {"force_no_outbound_flag", PARAM_INT, &ob_force_no_flag},
+   {"flow_token_secret", PARAM_STRING, &flow_token_secret},
+   {0, 0, 0}
+};
 
 struct module_exports exports = {
-   "outbound", DEFAULT_DLFLAGS, /* dlopen flags */
-   cmds,/* exported 
functions */
-   params,  /* exported 
parameters */
-   0,   /* 
exported??RPC??methods */
-   0,   /* 
exported pseudo-variables */
-   0,   /* 
response??function */
-   mod_init,/* module 
initialization function */
-   0,   /* 
per-child initialization function */
-   destroy  /* destroy 
function */
+   "outbound",
+   DEFAULT_DLFLAGS,/* dlopen flags */
+   cmds,   /* exported functions */
+   params, /* exported parameters */
+   0,  /* RPC method exports */
+   0,  /* exported pseudo-variables */
+   0,  /* response handling function */
+   mod_init,   /* module initialization function */
+   0,  /* per-child init function */
+   destroy /* module destroy function */
 };
+/* clang-format on */
 
 static void mod_init_openssl(void)
 {

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] Re: Branching 6.0 series

2025-01-29 Thread Xenofon Karamanos via sr-dev

Hey Daniel,

I went through the commits and cherry-picked them to branch 6.0.

If there are some more commits coming later, they can still be backported right?

Cheers,
Xenofon

From: Henning Westerholt 
Sent: Wednesday, January 29, 2025 10:15
To: Kamailio (SER) - Development Mailing List 
Cc: mico...@gmail.com ; Xenofon Karamanos 
Subject: RE: [sr-dev] Re: Branching 6.0 series

Hello Daniel,

I will look with Xenofon this morning into it and backport the cmake fixes from 
the last days to 6.0 branch.

Cheers,

Henning

From: Daniel-Constantin Mierla via sr-dev 
Sent: Dienstag, 28. Januar 2025 17:16
To: Kamailio (SER) - Development Mailing List 
Cc: Xenofon Karamanos ; Daniel-Constantin Mierla 

Subject: [sr-dev] Re: Branching 6.0 series

Hello,

can you backport the cmake-related commits to branch 6.0 that you consider to 
be ready for it? It should be from last week, since the branch 6.0 was created. 
I was not sure what is ready or not, so I haven't gone through them. Being 
related to build tools, future cmake-related commits can also be backported to 
branch 6.0 if they apply for this release series.

Cheers,
Daniel

On 28.01.25 11:18, Xenofon Karamanos via sr-dev wrote:

Hey all,

Yeah we can keep for now the Makefiles until CMake is fully ready for used also 
in packaging.

As Henning said, RHEL and Fedora package seems to be working by Sergey apart 
from some minor json-c stuff currently.

There is still some work to be done for Debian-based and the modular packaging 
for the various groups to be used by Victor but hopefully soon it will be 
implemented.

Thanks,

Xenofon

From: Henning Westerholt via sr-dev 

Sent: Tuesday, January 28, 2025 10:44
To: Kamailio (SER) - Development Mailing List 
; Kamailio (SER) - 
Users Mailing List 

Cc: Henning Westerholt 
Subject: [sr-dev] Re: Branching 6.0 series

Hi Daniel,

releasing 6.0 tomorrow sounds good to me.

Regarding the package building with the cmake infrastructure: I think for RPM 
based distributions we are probably close, for Debian based distributions there 
seems to be more work open as discussed in the different GitHub issues.

Packages for 6.0 could be created with the old Makefile system, sure.

But we should remove the Makefiles in git master for release 6.1 then 
completely, just to finish the migration. The really old releases (Ubuntu 
16.04) with a too old cmake will be in 2026 then also end of life, so it should 
be fine.

Cheers,

Henning

> -Original Message-
> From: Daniel-Constantin Mierla via sr-dev 
> 
> Sent: Montag, 27. Januar 2025 18:38
> To: Kamailio (SER) - Development Mailing List 
> ;
> Kamailio (SER) - Users Mailing List 
> 
> Cc: Daniel-Constantin Mierla 
> Subject: [sr-dev] Re: Branching 6.0 series
>
> Hello,
>
> On 20.01.25 08:25, Daniel-Constantin Mierla via sr-dev wrote:
> > Hello,
> >
> > I think we should branch it on Wednesday, Jan 22, 2025, no matter on
> > what stage we are with cmake support. The old-Makefiles should be kept
> > anyhow (as they are or in a special folder with an easy way to recover
> > them), because there are many bits and pieces that can be discovered
> > later when more users.
> >
> > Because there were no many bugs reported to the C code specific to
> > 6.0, we can aim releasing on January 29, 2025, with old-Makefile still
> > to be used for tasks that are not yet covered by cmake.
>
> shall we still aim for releasing v6.0.0 on this upcoming Wednesday, January
> 29, 2025?
>
> We the old-Makefiles kept, it is doable, the wiki pages needs to be created 
> for
> this release series, which I can do tomorrow, as I waited to see if how it 
> should
> be the recommended method for compilation/installation.
>
> If the feeling is that we should wait, then probably the target date has to be
> shifted somewhere in the week starting on February 10, 2025, because
> Fosdem follows this weekend and then some countries have a week holiday
> break.
>
> If no other opinions and change of decision, the release will be done on
> Wednesday, with content using the old-Makefiles (to reuse existing
> tutorials) and reference to cmake variant when it is the case.
>
> Cheers,
> Daniel
>
> --
> Daniel-Constantin Mierla (@ asipto.com)
> twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy,
> Training and Development Services -- asipto.com Kamailio World Conference,
> May 12-13, 2025, Berlin -- kamailioworld.com
>
> ___
> Kamailio - Development Mailing List -- 
> sr-dev@lists.kamailio.org To
> unsubscribe send an email to 
> sr-dev-le...@lists.kamailio.org

[sr-dev] Re: [SR-Users] Kamailio v6.0.0 Released - new major version is out

2025-01-29 Thread VoIP via sr-dev


Great news!!!

One question. Using cmake how can I add or remove modules from compilation?

Thank you

Regards

El 29/01/2025 a las 7:10 a. m., Daniel-Constantin Mierla via sr-users 
escribió:

Kamailio v6.0.0 is out – it comes with 5 new modules and important
updates to the core components and existing modules.

The increment of the first version number reflects several important
updates, among them: multi-threaded option for UDP receiving, option for
specifying a range of ports to listen to, support for expressions with
variables for most of the module functions parameters, internal
libraries are directly inked to the core, support to use cmake to
compile and install Kamailio.

You can read a bit more detailed release notes at:

    * https://www.kamailio.org/w/kamailio-v6.0-0-release-notes/

Many thanks to all developers and community members that made possible
this release.

v6.0.0 brings more flexibility and optimizations across many existing
components and modules, new parameters, functions, variables and
transformations.

Enjoy Kamailio v6.0.0!

Thank you for flying Kamailio!
Daniel


___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] Jenkins build is back to normal : kamailiodev-nightly-binaries » amd64,bookworm #2918

2025-01-29 Thread kamailio--- via sr-dev

See 


___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] git:5.7:95465330: outbound: reformat exported structures

2025-01-29 Thread Xenofon Karamanos via sr-dev

Module: kamailio
Branch: 5.7
Commit: 95465330fbc8916e3798122083cb895030171e00
URL: 
https://github.com/kamailio/kamailio/commit/95465330fbc8916e3798122083cb895030171e00

Author: Victor Seva 
Committer: Xenofon Karamanos <22965395+xkara...@users.noreply.github.com>
Date: 2025-01-29T11:53:16Z

outbound: reformat exported structures

(cherry picked from commit 793a494f5b23f2ef5e82664924c3bed3893105bb)

---

Modified: src/modules/outbound/outbound_mod.c

---

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

---

diff --git a/src/modules/outbound/outbound_mod.c 
b/src/modules/outbound/outbound_mod.c
index e5ed1712607..687fc5480d7 100644
--- a/src/modules/outbound/outbound_mod.c
+++ b/src/modules/outbound/outbound_mod.c
@@ -59,25 +59,32 @@ static unsigned int ob_force_no_flag = (unsigned int)-1;
 static str ob_key = {0, 0};
 static str flow_token_secret = {0, 0};
 
+/* clang-format off */
 static cmd_export_t cmds[] = {
-   {"bind_ob", (cmd_function)bind_ob, 1, 0, 0, 0}, {0, 0, 0, 0, 0, 
0}};
+   {"bind_ob", (cmd_function)bind_ob, 1, 0, 0, 0},
+   {0, 0, 0, 0, 0, 0}
+};
 
 static param_export_t params[] = {
-   {"force_outbound_flag", PARAM_INT, &ob_force_flag},
-   {"force_no_outbound_flag", PARAM_INT, &ob_force_no_flag},
-   {"flow_token_secret", PARAM_STRING, &flow_token_secret}, {0, 0, 
0}};
+   {"force_outbound_flag", PARAM_INT, &ob_force_flag},
+   {"force_no_outbound_flag", PARAM_INT, &ob_force_no_flag},
+   {"flow_token_secret", PARAM_STRING, &flow_token_secret},
+   {0, 0, 0}
+};
 
 struct module_exports exports = {
-   "outbound", DEFAULT_DLFLAGS, /* dlopen flags */
-   cmds,/* exported 
functions */
-   params,  /* exported 
parameters */
-   0,   /* 
exported??RPC??methods */
-   0,   /* 
exported pseudo-variables */
-   0,   /* 
response??function */
-   mod_init,/* module 
initialization function */
-   0,   /* 
per-child initialization function */
-   destroy  /* destroy 
function */
+   "outbound",
+   DEFAULT_DLFLAGS,/* dlopen flags */
+   cmds,   /* exported functions */
+   params, /* exported parameters */
+   0,  /* RPC method exports */
+   0,  /* exported pseudo-variables */
+   0,  /* response handling function */
+   mod_init,   /* module initialization function */
+   0,  /* per-child init function */
+   destroy /* module destroy function */
 };
+/* clang-format on */
 
 static void mod_init_openssl(void)
 {

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] git:5.7:634aa6f2: outbound: Fix flow_token_secret bug

2025-01-29 Thread Xenofon Karamanos via sr-dev

Module: kamailio
Branch: 5.7
Commit: 634aa6f2843b468a69ba63fe312a068c6562db2c
URL: 
https://github.com/kamailio/kamailio/commit/634aa6f2843b468a69ba63fe312a068c6562db2c

Author: Xenofon Karamanos 
Committer: Xenofon Karamanos <22965395+xkara...@users.noreply.github.com>
Date: 2025-01-29T11:53:20Z

outbound: Fix flow_token_secret bug

- flow_token_secret is of type str and not char*
- check the length of the string instead of memory for initialization

(cherry picked from commit 046ba41e431fec7fad0c82a9091ea9e27d9f677d)

---

Modified: src/modules/outbound/outbound_mod.c

---

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

---

diff --git a/src/modules/outbound/outbound_mod.c 
b/src/modules/outbound/outbound_mod.c
index 687fc5480d7..2e1251e3ad1 100644
--- a/src/modules/outbound/outbound_mod.c
+++ b/src/modules/outbound/outbound_mod.c
@@ -68,7 +68,7 @@ static cmd_export_t cmds[] = {
 static param_export_t params[] = {
{"force_outbound_flag", PARAM_INT, &ob_force_flag},
{"force_no_outbound_flag", PARAM_INT, &ob_force_no_flag},
-   {"flow_token_secret", PARAM_STRING, &flow_token_secret},
+   {"flow_token_secret", PARAM_STR, &flow_token_secret},
{0, 0, 0}
 };
 
@@ -88,7 +88,7 @@ struct module_exports exports = {
 
 static void mod_init_openssl(void)
 {
-   if(flow_token_secret.s) {
+   if(flow_token_secret.s && flow_token_secret.len > 0) {
assert(ob_key.len == SHA_DIGEST_LENGTH);
LM_DBG("flow_token_secret mod param set. use persistent 
ob_key");
 #if OPENSSL_VERSION_NUMBER < 0x03000L

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] git:5.8:fddfbdcc: outbound: Fix flow_token_secret bug

2025-01-29 Thread Xenofon Karamanos via sr-dev

Module: kamailio
Branch: 5.8
Commit: fddfbdcce2587e9b40f6c2fe77334d3b3b1dbb6c
URL: 
https://github.com/kamailio/kamailio/commit/fddfbdcce2587e9b40f6c2fe77334d3b3b1dbb6c

Author: Xenofon Karamanos 
Committer: Xenofon Karamanos <22965395+xkara...@users.noreply.github.com>
Date: 2025-01-29T11:48:26Z

outbound: Fix flow_token_secret bug

- flow_token_secret is of type str and not char*
- check the length of the string instead of memory for initialization

(cherry picked from commit 046ba41e431fec7fad0c82a9091ea9e27d9f677d)

---

Modified: src/modules/outbound/outbound_mod.c

---

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

---

diff --git a/src/modules/outbound/outbound_mod.c 
b/src/modules/outbound/outbound_mod.c
index 687fc5480d7..2e1251e3ad1 100644
--- a/src/modules/outbound/outbound_mod.c
+++ b/src/modules/outbound/outbound_mod.c
@@ -68,7 +68,7 @@ static cmd_export_t cmds[] = {
 static param_export_t params[] = {
{"force_outbound_flag", PARAM_INT, &ob_force_flag},
{"force_no_outbound_flag", PARAM_INT, &ob_force_no_flag},
-   {"flow_token_secret", PARAM_STRING, &flow_token_secret},
+   {"flow_token_secret", PARAM_STR, &flow_token_secret},
{0, 0, 0}
 };
 
@@ -88,7 +88,7 @@ struct module_exports exports = {
 
 static void mod_init_openssl(void)
 {
-   if(flow_token_secret.s) {
+   if(flow_token_secret.s && flow_token_secret.len > 0) {
assert(ob_key.len == SHA_DIGEST_LENGTH);
LM_DBG("flow_token_secret mod param set. use persistent 
ob_key");
 #if OPENSSL_VERSION_NUMBER < 0x03000L

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] git:6.0:dec19b9d: github: set 6.0 for devcontainer [skip ci]

2025-01-29 Thread Victor Seva via sr-dev

Module: kamailio
Branch: 6.0
Commit: dec19b9d4a2f4cedf31b0f8661add77761d85036
URL: 
https://github.com/kamailio/kamailio/commit/dec19b9d4a2f4cedf31b0f8661add77761d85036

Author: Victor Seva 
Committer: Victor Seva 
Date: 2025-01-29T10:14:52+01:00

github: set 6.0 for devcontainer [skip ci]

---

Modified: .devcontainer/devcontainer.json

---

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

---

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 2a307c79e3e..947a7ec9a5e 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -4,7 +4,7 @@
*/
   "name": "Debian",
   "build": {
-"cacheFrom": "ghcr.io/kamailio/kamailio-master-devcontainer",
+"cacheFrom": "ghcr.io/kamailio/kamailio-6.0-devcontainer",
 "context": "../pkg/kamailio/deb",
 "dockerfile": "Dockerfile"
   },

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] git:master:8ebae54c: cmake: Use pkg-config instead for json-c dev package.

2025-01-29 Thread Xenofon Karamanos via sr-dev

Module: kamailio
Branch: master
Commit: 8ebae54cff261b95fcece3be3719da511cc35084
URL: 
https://github.com/kamailio/kamailio/commit/8ebae54cff261b95fcece3be3719da511cc35084

Author: Xenofon Karamanos 
Committer: Xenofon Karamanos 
Date: 2025-01-29T10:07:24Z

cmake: Use pkg-config instead for json-c dev package.

---

Modified: src/modules/nsq/CMakeLists.txt

---

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

---

diff --git a/src/modules/nsq/CMakeLists.txt b/src/modules/nsq/CMakeLists.txt
index b4a482c2a47..e6acfa9a2f7 100644
--- a/src/modules/nsq/CMakeLists.txt
+++ b/src/modules/nsq/CMakeLists.txt
@@ -4,13 +4,19 @@ add_library(${module_name} SHARED ${MODULE_SOURCES})
 
 find_package(Libev REQUIRED)
 
-find_package(json-c QUIET)
-if(NOT json-c_FOUND)
-  message(STATUS "json-c not found. looking with pkg-config")
-  find_package(PkgConfig REQUIRED)
-  pkg_check_modules(json-c REQUIRED IMPORTED_TARGET json-c)
-  add_library(json-c::json-c ALIAS PkgConfig::json-c)
-endif()
+# TODO: When we have a proper cmake config file for json-c for most OS, we can
+# use that instead of pkg-config.
+# json-c v 0.14 and 0.15 have wrong include directories in their cmake config
+# files. uncomment the following line when we have a proper cmake config file
+# for json-c for most OS.
+# find_package(json-c 0.16 CONFIG)
+
+# if(NOT json-c_FOUND)
+# message(STATUS "json-c not found. looking with pkg-config")
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(json-c REQUIRED IMPORTED_TARGET json-c)
+add_library(json-c::json-c ALIAS PkgConfig::json-c)
+# endif()
 
 find_package(CURL REQUIRED)
 

___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] Re: [kamailio/kamailio] multiple Makefiles: evaluate LIBS variable imediately in Makefile (PR #4085)

2025-01-29 Thread sergey-safarov via sr-dev

I have managed this, please ignore the comment above.
Could you check why
```
/usr/share/kamailio/mongodb/kamailio/version-create.mongo
```
file installed on `CentOS 8` and not installed on `CentOS 9`.

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

Message ID: ___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

[sr-dev] Re: [kamailio/kamailio] Segfault when using kamailio 5.8.4 as a presence proxy (Issue #4102)

2025-01-29 Thread Joe Mordica via sr-dev

Hey there just checking on this one.

Thanks!

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

Message ID: ___
Kamailio - Development Mailing List -- sr-dev@lists.kamailio.org
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
Important: keep the mailing list in the recipients, do not reply only to the 
sender!

63 matches

Mail list logo