sr-dev May 2024

sr-dev@lists.kamailio.org

15 participants
163 discussions

Re: [kamailio/kamailio] tm: add mandatory Max-Forwards header to local AC (3a34b46)

by Victor Seva

@juha-h please use ``cherry-pick -x <SHA>`` when back-porting -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/3a34b468ad93904c507bd0fc7ef592b… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/3a34b468ad93904c507bd0fc7ef592b25321807f/142208292(a)github.com>

4 months

[kamailio/kamailio] Add mandatory Max-Forwards header to local ACK (PR #3856)

by juha-h

#### Type Of Change - [ x] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [x ] PR should be backported to stable branches - [ x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Add mandatory Max-Forwards header to local ACK You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3856 -- Commit Summary -- * Add mandatory Max-Forwards header to local AC -- File Changes -- M src/modules/tm/t_msgbuilder.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3856.patch https://github.com/kamailio/kamailio/pull/3856.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3856 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3856(a)github.com>

4 months

git:5.8:3a34b468: tm: add mandatory Max-Forwards header to local AC

by Juha Heinanen

Module: kamailio Branch: 5.8 Commit: 3a34b468ad93904c507bd0fc7ef592b25321807f URL: https://github.com/kamailio/kamailio/commit/3a34b468ad93904c507bd0fc7ef592b… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2024-05-20T19:54:45+03:00 tm: add mandatory Max-Forwards header to local AC --- Modified: src/modules/tm/t_msgbuilder.c --- Diff: https://github.com/kamailio/kamailio/commit/3a34b468ad93904c507bd0fc7ef592b… Patch: https://github.com/kamailio/kamailio/commit/3a34b468ad93904c507bd0fc7ef592b… --- diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index 362ff6c5eb5..1aa680aa9a4 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -1246,7 +1246,8 @@ char *build_dlg_ack(struct sip_msg *rpl, struct cell *Trans, /* headers */ *len += Trans->from_hdr.len + Trans->callid_hdr.len + to->len - + Trans->cseq_hdr_n.len + 1 + ACK_LEN + CRLF_LEN; + + Trans->cseq_hdr_n.len + 1 + ACK_LEN + +MAXFWD_HEADER_LEN + + CRLF_LEN; /* copy'n'paste Route headers */ @@ -1291,6 +1292,8 @@ char *build_dlg_ack(struct sip_msg *rpl, struct cell *Trans, append_str(p, Trans->callid_hdr.s, Trans->callid_hdr.len); append_str(p, to->s, to->len); + append_str(p, MAXFWD_HEADER, MAXFWD_HEADER_LEN); + append_str(p, Trans->cseq_hdr_n.s, Trans->cseq_hdr_n.len); append_str(p, " ", 1); append_str(p, ACK, ACK_LEN);

4 months

git:master:d4629be2: tm: add mandatory Max-Forwards header to local AC

by Victor Seva

Module: kamailio Branch: master Commit: d4629be286fc6d3cf61574e34ee877b2c5e9ee4a URL: https://github.com/kamailio/kamailio/commit/d4629be286fc6d3cf61574e34ee877b… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-05-20T12:18:38+02:00 tm: add mandatory Max-Forwards header to local AC --- Modified: src/modules/tm/t_msgbuilder.c --- Diff: https://github.com/kamailio/kamailio/commit/d4629be286fc6d3cf61574e34ee877b… Patch: https://github.com/kamailio/kamailio/commit/d4629be286fc6d3cf61574e34ee877b… --- diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index 362ff6c5eb5..1aa680aa9a4 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -1246,7 +1246,8 @@ char *build_dlg_ack(struct sip_msg *rpl, struct cell *Trans, /* headers */ *len += Trans->from_hdr.len + Trans->callid_hdr.len + to->len - + Trans->cseq_hdr_n.len + 1 + ACK_LEN + CRLF_LEN; + + Trans->cseq_hdr_n.len + 1 + ACK_LEN + +MAXFWD_HEADER_LEN + + CRLF_LEN; /* copy'n'paste Route headers */ @@ -1291,6 +1292,8 @@ char *build_dlg_ack(struct sip_msg *rpl, struct cell *Trans, append_str(p, Trans->callid_hdr.s, Trans->callid_hdr.len); append_str(p, to->s, to->len); + append_str(p, MAXFWD_HEADER, MAXFWD_HEADER_LEN); + append_str(p, Trans->cseq_hdr_n.s, Trans->cseq_hdr_n.len); append_str(p, " ", 1); append_str(p, ACK, ACK_LEN);

4 months

git:master:4eb39425: pv: added $cts - contact header star status

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4eb39425e2bb9322e0cc4f0c013aaeab1fcfb9dd URL: https://github.com/kamailio/kamailio/commit/4eb39425e2bb9322e0cc4f0c013aaea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-17T10:40:54+02:00 pv: added $cts - contact header star status - 1 if it is *, 0 otherwise --- 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/4eb39425e2bb9322e0cc4f0c013aaea… Patch: https://github.com/kamailio/kamailio/commit/4eb39425e2bb9322e0cc4f0c013aaea… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 3226c773a2e..ec6488d1f04 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}, + {{"cts", (sizeof("cts") - 1)}, /* */ + PVT_OTHER, pv_get_contact_star, 0, 0, 0, 0, 0}, {{"ctu", (sizeof("ctu") - 1)}, /* */ PVT_OTHER, pv_get_contact_uri, 0, 0, 0, 0, 0}, {{"cT", (sizeof("cT") - 1)}, /* */ diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 8eed3c2e019..87345490af1 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -404,6 +404,29 @@ int pv_get_contact_uri(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) return pv_get_strval(msg, param, res, &cb->contacts->uri); } +int pv_get_contact_star(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) { + return pv_get_uintval(msg, param, res, 1); + } + return pv_get_uintval(msg, param, res, 0); +} + 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 7d4681dab96..53951340db1 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -67,6 +67,9 @@ 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_contact_star( + 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);

4 months

git:master:e738bd08: pv: added $ctu - return contact header uri

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e738bd08b14bfc765a8317267d738a8b1b574c64 URL: https://github.com/kamailio/kamailio/commit/e738bd08b14bfc765a8317267d738a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> 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/e738bd08b14bfc765a8317267d738a8… Patch: https://github.com/kamailio/kamailio/commit/e738bd08b14bfc765a8317267d738a8… --- 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, &msg->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, &cb->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);

4 months

[kamailio/kamailio] usrloc: delete location_attrs in db_only mode on delete_urecord (PR #3827)

by Rick Barenthin

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  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. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3827 -- Commit Summary -- * usrloc: delete location_attrs in db_only mode on delete_urecord -- File Changes -- M src/modules/usrloc/ucontact.c (36) M src/modules/usrloc/urecord.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3827.patch https://github.com/kamailio/kamailio/pull/3827.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3827 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3827(a)github.com>

4 months

git:master:6b8f6d3b: usrloc: delete location_attrs in db_only mode on delete_urecord

by Henning Westerholt

Module: kamailio Branch: master Commit: 6b8f6d3b5d563d91234b8d4b7e155b7e74b9d313 URL: https://github.com/kamailio/kamailio/commit/6b8f6d3b5d563d91234b8d4b7e155b7… Author: Rick Barenthin <rick(a)ng-voice.com> Committer: Henning Westerholt <hw(a)gilawa.com> 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/6b8f6d3b5d563d91234b8d4b7e155b7… Patch: https://github.com/kamailio/kamailio/commit/6b8f6d3b5d563d91234b8d4b7e155b7… --- 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] = &ulattrs_user_col; - keys[1] = &ulattrs_ruid_col; - keys[2] = &ulattrs_domain_col; - - vals[0].type = DB1_STR; - vals[0].nul = 0; - vals[0].val.str_val = *_user; + keys[n] = &ulattrs_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] = &ulattrs_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] = &ulattrs_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, &tname) < 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, &vals[0].val.str_val, &vals[1].val.str_val, NULL); + } else { + uldb_delete_attrs(_r->domain, &vals[0].val.str_val, NULL, NULL); } if(ul_dbf.use_table(ul_dbh, _r->domain) < 0) {

4 months

[kamailio/kamailio] [FEATURE] mid-call self-redirect call to new nexthop (Issue #3773)

by Jakihiko

These below is sample diagram, where kamailio/rtpengine act as an SBC <img width="1604" alt="image" src="https://github.com/kamailio/kamailio/assets/143789335/b9540fb3-c1bf-4a78-b1…"> * There is an active call carrier, kamailio/rtpngine and Asterisk1 * Asterisk1 went down (power shortage, or network ..) * What I want is kamailio self-redirect the call to Asterisk2 **Describe the solution you'd like** Ideally, kamailio provide the command line to tell which call will be self-redirect to the new destination, eg: `kamcmd -x sefl_redirect_callid <call-id> <destionation-ip>` Noted: I read the https://blog.opensips.org/2021/06/09/media-re-anchoring-using-opensips-3-2/ but re-INVITE to carrier seem not appropriate in my case due to call rate limit. I'm looking for a new solution where I don't need to use re-INVITE when Asterisk down. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3773 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3773(a)github.com>

4 months

git:master:25e409cf: pkg/kamailio/deb: version set to 6.0.0~dev2 [skip ci]

by Victor Seva

Module: kamailio Branch: master Commit: 25e409cf60a80e4e0af09bb84234af51c33755c4 URL: https://github.com/kamailio/kamailio/commit/25e409cf60a80e4e0af09bb84234af5… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> 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/25e409cf60a80e4e0af09bb84234af5… Patch: https://github.com/kamailio/kamailio/commit/25e409cf60a80e4e0af09bb84234af5…

4 months

← Newer
1
...
5
6
7
8
9
10
11
...
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2024