[sr-dev] Re: [kamailio/kamailio] ims_registrar_scscf: cannot build on Fedora 40 (Issue #3855)
This change allows build module ```diff diff --git a/src/modules/ims_registrar_scscf/userdata_parser.c b/src/modules/ims_registrar_scscf/userdata_parser.c index 984395f886..df629548c6 100644 --- a/src/modules/ims_registrar_scscf/userdata_parser.c +++ b/src/modules/ims_registrar_scscf/userdata_parser.c @@ -40,6 +40,7 @@ * */ +#include #include "../../core/parser/parse_uri.h" #include "userdata_parser.h" #include "../../core/parser/parse_hname2.h" ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3855#issuecomment-2116121589 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] [kamailio/kamailio] ims_registrar_scscf: cannot build on Fedora 40 (Issue #3855)
### Description
"ims_registrar_scscf" cannot be compiled on Fedora 40 dist.
```
CC (gcc) [M ims_registrar_scscf.so] reply.o
CC (gcc) [M ims_registrar_scscf.so] rerrno.o
CC (gcc) [M ims_registrar_scscf.so] save.o
CC (gcc) [M ims_registrar_scscf.so] server_assignment.o
CC (gcc) [M ims_registrar_scscf.so] sip_msg.o
CC (gcc) [M ims_registrar_scscf.so] stats.o
CC (gcc) [M ims_registrar_scscf.so] userdata_parser.o
userdata_parser.c: In function ‘ifc_tDefaultHandling2char’:
userdata_parser.c:126:13: error: implicit declaration of function ‘strtol’; did
you mean ‘strtok’? [-Wimplicit-function-declaration]
126 | r = strtol((char *)x, (char **)NULL, 10);
| ^~
| strtok
userdata_parser.c: In function ‘parse_spt_extension’:
userdata_parser.c:411:32: error: implicit declaration of function ‘atoi’
[-Wimplicit-function-declaration]
411 | switch(atoi((char *)x)) {
|^~~~
make[2]: *** [../../Makefile.rules:100: userdata_parser.o] Error 1
make[1]: *** [Makefile:508: modules] Error 1
make[1]: Leaving directory '/root/rpmbuild/BUILD/kamailio-5.8.1/src'
make: *** [Makefile:34: every-module] Error 2
error: Bad exit status from /var/tmp/rpm-tmp.tyeQgK (%build)
RPM build errors:
Bad exit status from /var/tmp/rpm-tmp.tyeQgK (%build)
```
### Additional Information
* **Kamailio Version** - output of `kamailio -v`
```
used modified 5.8.1 version
```
* **Operating System**:
```
[root@sbc-stage-a0 SPECS]# cat /etc/os-release
NAME="Fedora Linux"
VERSION="40 (Container Image)"
ID=fedora
VERSION_ID=40
VERSION_CODENAME=""
PLATFORM_ID="platform:f40"
PRETTY_NAME="Fedora Linux 40 (Container Image)"
ANSI_COLOR="0;38;2;60;110;180"
LOGO=fedora-logo-icon
CPE_NAME="cpe:/o:fedoraproject:fedora:40"
DEFAULT_HOSTNAME="fedora"
HOME_URL="https://fedoraproject.org/;
DOCUMENTATION_URL="https://docs.fedoraproject.org/en-US/fedora/f40/system-administrators-guide/;
SUPPORT_URL="https://ask.fedoraproject.org/;
BUG_REPORT_URL="https://bugzilla.redhat.com/;
REDHAT_BUGZILLA_PRODUCT="Fedora"
REDHAT_BUGZILLA_PRODUCT_VERSION=40
REDHAT_SUPPORT_PRODUCT="Fedora"
REDHAT_SUPPORT_PRODUCT_VERSION=40
SUPPORT_END=2025-05-13
VARIANT="Container Image"
VARIANT_ID=container
```
--
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/issues/3855
You are receiving this because you are subscribed to this thread.
Message ID: ___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:e738bd08: pv: added $ctu - return contact header uri
Module: kamailio
Branch: master
Commit: e738bd08b14bfc765a8317267d738a8b1b574c64
URL:
https://github.com/kamailio/kamailio/commit/e738bd08b14bfc765a8317267d738a8b1b574c64
Author: Daniel-Constantin Mierla
Committer: Daniel-Constantin Mierla
Date: 2024-05-16T21:24:24+02:00
pv: added $ctu - return contact header uri
---
Modified: src/modules/pv/pv.c
Modified: src/modules/pv/pv_core.c
Modified: src/modules/pv/pv_core.h
---
Diff:
https://github.com/kamailio/kamailio/commit/e738bd08b14bfc765a8317267d738a8b1b574c64.diff
Patch:
https://github.com/kamailio/kamailio/commit/e738bd08b14bfc765a8317267d738a8b1b574c64.patch
---
diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c
index 5e9da2703e0..3226c773a2e 100644
--- a/src/modules/pv/pv.c
+++ b/src/modules/pv/pv.c
@@ -163,6 +163,8 @@ static pv_export_t mod_pvs[] = {
PVT_OTHER, pv_get_cseq_body, 0, 0, 0, 0, 0},
{{"ct", (sizeof("ct") - 1)}, /* */
PVT_OTHER, pv_get_contact, 0, 0, 0, 0, 0},
+ {{"ctu", (sizeof("ctu") - 1)}, /* */
+ PVT_OTHER, pv_get_contact_uri, 0, 0, 0, 0, 0},
{{"cT", (sizeof("cT") - 1)}, /* */
PVT_OTHER, pv_get_content_type, 0, 0, 0, 0, 0},
{{"dd", (sizeof("dd") - 1)}, /* */
diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c
index b10b7513a6f..8eed3c2e019 100644
--- a/src/modules/pv/pv_core.c
+++ b/src/modules/pv/pv_core.c
@@ -381,6 +381,29 @@ int pv_get_contact(struct sip_msg *msg, pv_param_t *param,
pv_value_t *res)
return pv_get_strval(msg, param, res, >contact->body);
}
+int pv_get_contact_uri(struct sip_msg *msg, pv_param_t *param, pv_value_t *res)
+{
+ contact_body_t *cb = NULL;
+
+ if(msg == NULL)
+ return -1;
+
+ if(msg->contact == NULL && parse_headers(msg, HDR_CONTACT_F, 0) == -1) {
+ LM_DBG("no contact header\n");
+ return pv_get_null(msg, param, res);
+ }
+ if(parse_contact_headers(msg) < 0) {
+ return pv_get_null(msg, param, res);
+ }
+
+ cb = (contact_body_t *)msg->contact->parsed;
+ if(cb->star == 1 || cb->contacts == NULL) {
+ return pv_get_null(msg, param, res);
+ }
+
+ return pv_get_strval(msg, param, res, >contacts->uri);
+}
+
int pv_get_xto_attr(struct sip_msg *msg, pv_param_t *param, pv_value_t *res,
struct to_body *xto, int type)
{
diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h
index caaa12e54d1..7d4681dab96 100644
--- a/src/modules/pv/pv_core.h
+++ b/src/modules/pv/pv_core.h
@@ -65,6 +65,8 @@ int pv_get_errinfo_attr(
int pv_get_contact(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);
+int pv_get_contact_uri(struct sip_msg *msg, pv_param_t *param, pv_value_t
*res);
+
int pv_get_xto_attr(struct sip_msg *msg, pv_param_t *param, pv_value_t *res,
struct to_body *xto, int type);
___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] extented haproxy protocol support (PR #3731)
Yes, we prefer to merge this. @ivanuschak continues to work on this to allow dynamic memory allocation, but this has not been implemented. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3731#issuecomment-2115536160 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] usrloc: delete location_attrs in db_only mode on delete_urecord (PR #3827)
Thank you, merged -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3827#issuecomment-2115226477 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] usrloc: delete location_attrs in db_only mode on delete_urecord (PR #3827)
Merged #3827 into master. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3827#event-12833708801 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:6b8f6d3b: usrloc: delete location_attrs in db_only mode on delete_urecord
Module: kamailio
Branch: master
Commit: 6b8f6d3b5d563d91234b8d4b7e155b7e74b9d313
URL:
https://github.com/kamailio/kamailio/commit/6b8f6d3b5d563d91234b8d4b7e155b7e74b9d313
Author: Rick Barenthin
Committer: Henning Westerholt
Date: 2024-05-16T15:18:54+02:00
usrloc: delete location_attrs in db_only mode on delete_urecord
When calling delete_urecord in DB_ONLY mode the location_attrs are not deleted.
This fix makes sure to delete location_attrs when calling db_delete_urecord is
called.
---
Modified: src/modules/usrloc/ucontact.c
Modified: src/modules/usrloc/urecord.c
---
Diff:
https://github.com/kamailio/kamailio/commit/6b8f6d3b5d563d91234b8d4b7e155b7e74b9d313.diff
Patch:
https://github.com/kamailio/kamailio/commit/6b8f6d3b5d563d91234b8d4b7e155b7e74b9d313.patch
---
diff --git a/src/modules/usrloc/ucontact.c b/src/modules/usrloc/ucontact.c
index f95fe987d75..8a8c1ea7895 100644
--- a/src/modules/usrloc/ucontact.c
+++ b/src/modules/usrloc/ucontact.c
@@ -1784,9 +1784,11 @@ int uldb_delete_attrs(str *_dname, str *_user, str
*_domain, str *_ruid)
str tname;
db_key_t keys[3];
db_val_t vals[3];
+ int n = 0;
- if(ul_db_ops_ruid == 1)
+ if(ul_db_ops_ruid == 1 && _ruid) {
return uldb_delete_attrs_ruid(_dname, _ruid);
+ }
LM_DBG("trying to delete location attributes\n");
@@ -1805,22 +1807,26 @@ int uldb_delete_attrs(str *_dname, str *_user, str
*_domain, str *_ruid)
tname.s = tname_buf;
tname.len = _dname->len + 6;
- keys[0] = _user_col;
- keys[1] = _ruid_col;
- keys[2] = _domain_col;
-
- vals[0].type = DB1_STR;
- vals[0].nul = 0;
- vals[0].val.str_val = *_user;
+ keys[n] = _user_col;
+ vals[n].type = DB1_STR;
+ vals[n].nul = 0;
+ vals[n].val.str_val = *_user;
+ n++;
- vals[1].type = DB1_STR;
- vals[1].nul = 0;
- vals[1].val.str_val = *_ruid;
+ if(_ruid) {
+ keys[n] = _ruid_col;
+ vals[n].type = DB1_STR;
+ vals[n].nul = 0;
+ vals[n].val.str_val = *_ruid;
+ n++;
+ }
if(ul_use_domain) {
- vals[2].type = DB1_STR;
- vals[2].nul = 0;
- vals[2].val.str_val = *_domain;
+ keys[n] = _domain_col;
+ vals[n].type = DB1_STR;
+ vals[n].nul = 0;
+ vals[n].val.str_val = *_domain;
+ n++;
}
if(ul_dbf.use_table(ul_dbh, ) < 0) {
@@ -1828,7 +1834,7 @@ int uldb_delete_attrs(str *_dname, str *_user, str
*_domain, str *_ruid)
return -1;
}
- if(ul_dbf.delete(ul_dbh, keys, 0, vals, (ul_use_domain) ? (3) : (2)) <
0) {
+ if(ul_dbf.delete(ul_dbh, keys, 0, vals, n) < 0) {
LM_ERR("deleting from database failed\n");
return -1;
}
diff --git a/src/modules/usrloc/urecord.c b/src/modules/usrloc/urecord.c
index 3c394a24a10..d47167c0f4b 100644
--- a/src/modules/usrloc/urecord.c
+++ b/src/modules/usrloc/urecord.c
@@ -502,6 +502,10 @@ int db_delete_urecord(urecord_t *_r)
vals[1].val.str_val.s = dom + 1;
vals[1].val.str_val.len = _r->aor.s + _r->aor.len - dom
- 1;
}
+ uldb_delete_attrs(
+ _r->domain, [0].val.str_val,
[1].val.str_val, NULL);
+ } else {
+ uldb_delete_attrs(_r->domain, [0].val.str_val, NULL, NULL);
}
if(ul_dbf.use_table(ul_dbh, _r->domain) < 0) {
___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] [FEATURE] mid-call self-redirect call to new nexthop (Issue #3773)
Maybe you can try to start a discussion about that on the users lists, to see if there is some interest about it. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3773#issuecomment-2115211397 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] extented haproxy protocol support (PR #3731)
Reopened #3731. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3731#event-12833617033 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] extented haproxy protocol support (PR #3731)
@sergey-safarov do you like to continue to work on this? I think there have been already several discussions about the PR. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3731#issuecomment-2115214324 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] Wrong Route header order in called party re-INVITE when using topos (Issue #3778)
Reopened #3778. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3778#event-12833629926 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:25e409cf: pkg/kamailio/deb: version set to 6.0.0~dev2 [skip ci]
Module: kamailio Branch: master Commit: 25e409cf60a80e4e0af09bb84234af51c33755c4 URL: https://github.com/kamailio/kamailio/commit/25e409cf60a80e4e0af09bb84234af51c33755c4 Author: Victor Seva Committer: Victor Seva Date: 2024-05-16T09:46:51+02:00 pkg/kamailio/deb: version set to 6.0.0~dev2 [skip ci] --- 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/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/25e409cf60a80e4e0af09bb84234af51c33755c4.diff Patch: https://github.com/kamailio/kamailio/commit/25e409cf60a80e4e0af09bb84234af51c33755c4.patch ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:2e2b22a0: Makefile.defs: version set to 6.0.0-dev2
Module: kamailio Branch: master Commit: 2e2b22a097139239b8493bfdd777530a9795ad66 URL: https://github.com/kamailio/kamailio/commit/2e2b22a097139239b8493bfdd777530a9795ad66 Author: Daniel-Constantin Mierla Committer: Daniel-Constantin Mierla Date: 2024-05-16T09:25:33+02:00 Makefile.defs: version set to 6.0.0-dev2 - next major release series is going to be 6.0.x --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/2e2b22a097139239b8493bfdd777530a9795ad66.diff Patch: https://github.com/kamailio/kamailio/commit/2e2b22a097139239b8493bfdd777530a9795ad66.patch --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 9feece65535..99157d2c017 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -104,10 +104,10 @@ endif INSTALL_FLAVOUR=$(FLAVOUR) # version number -VERSION = 5 -PATCHLEVEL = 9 +VERSION = 6 +PATCHLEVEL = 0 SUBLEVEL = 0 -EXTRAVERSION = -dev1 +EXTRAVERSION = -dev2 # memory manager switcher # 0 - f_malloc (fast malloc) ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] pdb: make 'timeout' runtime configurable (PR #3850)
Hi, thanks for the feedback. I've updated the PR accordingly. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3850#issuecomment-2114247068 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] p_usrloc: use a global p_usrloc_columns variable in db_load* functions (PR #3845)
Hi @henningw, Will make a similar PR for usrloc. Thank you -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3845#issuecomment-2114142321 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
