sr-dev August 2024

sr-dev@lists.kamailio.org

10 participants
156 discussions

git:master:d90101e1: lib/srdb1: add uint support for db->pv conversions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d90101e1a50ef0c958e8e8a2f361198a28ea336a URL: https://github.com/kamailio/kamailio/commit/d90101e1a50ef0c958e8e8a2f361198… Author: Tyler Moore <tmoore(a)goflyball.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-01T08:02:09+02:00 lib/srdb1: add uint support for db->pv conversions - add support for converting unsigned integers into PVs. --- Modified: src/lib/srdb1/db_ut.c --- Diff: https://github.com/kamailio/kamailio/commit/d90101e1a50ef0c958e8e8a2f361198… Patch: https://github.com/kamailio/kamailio/commit/d90101e1a50ef0c958e8e8a2f361198… --- diff --git a/src/lib/srdb1/db_ut.c b/src/lib/srdb1/db_ut.c index 9975672aeea..76210d5691e 100644 --- a/src/lib/srdb1/db_ut.c +++ b/src/lib/srdb1/db_ut.c @@ -596,6 +596,10 @@ int db_val2pv_spec(struct sip_msg *msg, db_val_t *dbval, pv_spec_t *pvs) pv.flags = PV_VAL_INT | PV_TYPE_INT; pv.ri = (long)dbval->val.int_val; break; + case DB1_UINT: + pv.flags = PV_VAL_INT | PV_TYPE_INT; + pv.ri = (long)dbval->val.uint_val; + break; case DB1_DATETIME: pv.flags = PV_VAL_INT | PV_TYPE_INT; pv.ri = (long)dbval->val.time_val;

1 month, 2 weeks

git:master:772f261f: htable: add uint support when packing an htable

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 772f261f91685583af3db7cee2c227336eef7c42 URL: https://github.com/kamailio/kamailio/commit/772f261f91685583af3db7cee2c2273… Author: Tyler Moore <tmoore(a)goflyball.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-01T08:02:09+02:00 htable: add uint support when packing an htable - add support for packing unsigned integer values from DB, into hash tables. --- Modified: src/modules/htable/ht_db.c --- Diff: https://github.com/kamailio/kamailio/commit/772f261f91685583af3db7cee2c2273… Patch: https://github.com/kamailio/kamailio/commit/772f261f91685583af3db7cee2c2273… --- diff --git a/src/modules/htable/ht_db.c b/src/modules/htable/ht_db.c index 7a22ff6c484..8b0c667411d 100644 --- a/src/modules/htable/ht_db.c +++ b/src/modules/htable/ht_db.c @@ -132,6 +132,8 @@ static int ht_pack_values( len += RES_ROWS(db_res)[row].values[c].val.blob_val.len; } else if(RES_ROWS(db_res)[row].values[c].type == DB1_INT) { len += 12; + } else if(RES_ROWS(db_res)[row].values[c].type == DB1_UINT) { + len += 12; } else { LM_ERR("unsupported data type for column %d\n", c); return -1; @@ -165,6 +167,11 @@ static int ht_pack_values( RES_ROWS(db_res)[row].values[c].val.int_val, &iv.len); strncpy(p, iv.s, iv.len); p += iv.len; + } else if(RES_ROWS(db_res)[row].values[c].type == DB1_UINT) { + iv.s = int2str( + RES_ROWS(db_res)[row].values[c].val.uint_val, &iv.len); + strncpy(p, iv.s, iv.len); + p += iv.len; } if(c + 1 < cols) { *p = ht->pack[1];

1 month, 2 weeks

git:master:5f4f1f02: permissions: fixup uint support in address table reload

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5f4f1f027132a1e4cdc2528a0d65e777a0a01da7 URL: https://github.com/kamailio/kamailio/commit/5f4f1f027132a1e4cdc2528a0d65e77… Author: Tyler Moore <tmoore(a)goflyball.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-01T08:02:09+02:00 permissions: fixup uint support in address table reload - add support for converting unsigned integer values directly, in address table rpc reload. --- Modified: src/modules/permissions/address.c --- Diff: https://github.com/kamailio/kamailio/commit/5f4f1f027132a1e4cdc2528a0d65e77… Patch: https://github.com/kamailio/kamailio/commit/5f4f1f027132a1e4cdc2528a0d65e77… --- diff --git a/src/modules/permissions/address.c b/src/modules/permissions/address.c index c05811f73f9..3f825fba010 100644 --- a/src/modules/permissions/address.c +++ b/src/modules/permissions/address.c @@ -192,41 +192,49 @@ int reload_address_db_table(address_tables_group_t *atg) ROW_N(row + i)); goto dberror; } - if((VAL_TYPE(val) != DB1_INT) || VAL_NULL(val) || (VAL_INT(val) <= 0)) { + if((VAL_TYPE(val) != DB1_INT && VAL_TYPE(val) != DB1_UINT) + || VAL_NULL(val) || (VAL_INT(val) <= 0)) { LM_DBG("failure during checks of database value 1 (group) in " "address table\n"); goto dberror; } - if((VAL_TYPE(val + 1) != DB1_STRING) - && (VAL_TYPE(val + 1) != DB1_STR)) { + if((VAL_TYPE(val + 1) != DB1_STRING && VAL_TYPE(val + 1) != DB1_STR) + || VAL_NULL(val + 1)) { LM_DBG("failure during checks of database value 2 (IP address) in " - "address table - not a string value\n"); - goto dberror; - } - if(VAL_NULL(val + 1)) { - LM_DBG("failure during checks of database value 2 (IP address) in " - "address table - NULL value not permitted\n"); + "address table\n"); goto dberror; } - if((VAL_TYPE(val + 2) != DB1_INT) || VAL_NULL(val + 2)) { + if((VAL_TYPE(val + 2) != DB1_INT && VAL_TYPE(val + 2) != DB1_UINT) + || VAL_NULL(val + 2)) { LM_DBG("failure during checks of database value 3 (subnet " "size/CIDR) in address table\n"); goto dberror; } - if((VAL_TYPE(val + 3) != DB1_INT) || VAL_NULL(val + 3)) { + if((VAL_TYPE(val + 3) != DB1_INT && VAL_TYPE(val + 3) != DB1_UINT) + || VAL_NULL(val + 3)) { LM_DBG("failure during checks of database value 4 (port) in " "address table\n"); goto dberror; } + if(VAL_TYPE(val + 4) != DB1_STRING && VAL_TYPE(val + 4) != DB1_STR) { + LM_DBG("failure during checks of database value 5 (tag) in address " + "table\n"); + goto dberror; + } + gid = VAL_UINT(val); ips.s = (char *)VAL_STRING(val + 1); ips.len = strlen(ips.s); mask = VAL_UINT(val + 2); port = VAL_UINT(val + 3); - tagv.s = VAL_NULL(val + 4) ? NULL : (char *)VAL_STRING(val + 4); - if(tagv.s != NULL) { + if(VAL_NULL(val + 4)) { + tagv.s = NULL; + tagv.len = 0; + } else { + tagv.s = (char *)VAL_STRING(val + 4); tagv.len = strlen(tagv.s); } + if(reload_address_insert(atg, gid, &ips, mask, port, &tagv) < 0) { goto dberror; }

1 month, 2 weeks

git:master:e273fc10: modules: readme files regenerated - msrp ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: e273fc10d65b41a407797fef0f9953c1615a88a2 URL: https://github.com/kamailio/kamailio/commit/e273fc10d65b41a407797fef0f9953c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-08-01T07:31:11+02:00 modules: readme files regenerated - msrp ... [skip ci] --- Modified: src/modules/msrp/README --- Diff: https://github.com/kamailio/kamailio/commit/e273fc10d65b41a407797fef0f9953c… Patch: https://github.com/kamailio/kamailio/commit/e273fc10d65b41a407797fef0f9953c…

1 month, 2 weeks

[kamailio/kamailio] msrp: add frame forward (PR #3934)

by Bruno Santos

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Add a new forward function to the MSRP module that adds the ability to perform MSRP proxying. The forward function allows frame replaying without multi-path. The frame can be relayed unmodified, or with a custom To/From-Path. If a replacement To-Path is provided, then the From-Path is replace either by the original To-Path or the replacement From-Path. Either the destination must be set prior or a replacement To-Path must be provided. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3934 -- Commit Summary -- * msrp: add forward support with path replacement -- File Changes -- M src/modules/msrp/doc/msrp_admin.xml (38) M src/modules/msrp/msrp_mod.c (72) M src/modules/msrp/msrp_netio.c (129) M src/modules/msrp/msrp_netio.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3934.patch https://github.com/kamailio/kamailio/pull/3934.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3934 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3934(a)github.com>

1 month, 2 weeks

git:master:aa417aca: msrp: add forward support with path replacement

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: aa417aca610b1c8a623847c22d9becba9a343241 URL: https://github.com/kamailio/kamailio/commit/aa417aca610b1c8a623847c22d9becb… Author: Bruno Santos <bsantos(a)cppdev.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-01T07:25:21+02:00 msrp: add forward support with path replacement - add function to allow forwarding of MSRP frames with optional To/From-Path replacement --- Modified: src/modules/msrp/doc/msrp_admin.xml Modified: src/modules/msrp/msrp_mod.c Modified: src/modules/msrp/msrp_netio.c Modified: src/modules/msrp/msrp_netio.h --- Diff: https://github.com/kamailio/kamailio/commit/aa417aca610b1c8a623847c22d9becb… Patch: https://github.com/kamailio/kamailio/commit/aa417aca610b1c8a623847c22d9becb…

1 month, 2 weeks

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2024