sr-dev May 2023

sr-dev@lists.kamailio.org

16 participants
322 discussions

git:master:ba9d663c: htable: set dbload filed on empty db result

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ba9d663c5d382edef3c98b31aa4341b21c307a34 URL: https://github.com/kamailio/kamailio/commit/ba9d663c5d382edef3c98b31aa4341b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-05-16T17:28:02+02:00 htable: set dbload filed on empty db result --- Modified: src/modules/htable/ht_db.c --- Diff: https://github.com/kamailio/kamailio/commit/ba9d663c5d382edef3c98b31aa4341b… Patch: https://github.com/kamailio/kamailio/commit/ba9d663c5d382edef3c98b31aa4341b… --- diff --git a/src/modules/htable/ht_db.c b/src/modules/htable/ht_db.c index 2b2eb25bfd..19edb9f97a 100644 --- a/src/modules/htable/ht_db.c +++ b/src/modules/htable/ht_db.c @@ -249,6 +249,7 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) if(RES_ROW_N(db_res)==0) { ht_dbf.free_result(ht_db_con, db_res); + ht->dbload = 1; LM_DBG("Nothing to be loaded in hash table\n"); return 0; } @@ -261,6 +262,7 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) if( ret==0) { ht_dbf.free_result(ht_db_con, db_res); + ht->dbload = 1; return 0; } else { goto error;

1 year, 7 months

[kamailio/kamailio] usrloc RPC commands don't work with PSQL in 5.6 (Issue #3452)

by Jake Greene

### Description I'm noticing an issue with certain RPC after upgrading to 5.6. I'm using "db_postgres". If I run ul.flush like this: ``` kamcmd ul.flush # no output ``` None of the in-memory registrations are flushed to the DB and in the log I see a bunch of lines like this: ``` May 12 20:39:16 <dummy-hostname> /usr/sbin/kamailio[9006]: ERROR: <core> [db.c:481]: db_use_table(): invalid connection parameter May 12 20:39:16 <dummy-hostname> /usr/sbin/kamailio[9006]: ERROR: usrloc [ucontact.c:1142]: db_update_ucontact_ruid(): sql use_table failed May 12 20:39:16 <dummy-hostname> /usr/sbin/kamailio[9006]: ERROR: usrloc [urecord.c:433]: wb_timer(): updating contact in db failed (aor: fake-1(a)aor.com) May 12 20:39:16 <dummy-hostname> /usr/sbin/kamailio[9006]: ERROR: <core> [db.c:481]: db_use_table(): invalid connection parameter May 12 20:39:16 <dummy-hostname> /usr/sbin/kamailio[9006]: ERROR: usrloc [ucontact.c:1142]: db_update_ucontact_ruid(): sql use_table failed May 12 20:39:16 <dummy-hostname> /usr/sbin/kamailio[9006]: ERROR: usrloc [urecord.c:433]: wb_timer(): updating contact in db failed (aor: fake-2(a)aor.com) ``` I see the same thing with ul.db_users: ``` kamcmd ul.db_users location # returns the following output error: 500 - Failed to use table # in the log ERROR: <core> [db.c:481]: db_use_table(): invalid connection parameter ``` ### Troubleshooting #### Reproduction Seems to happen consistently on 5.6, using psql as the db engine. I tested on 5.4 and it's not happening. It's easier to test with ```kamcmd ul.db_users location``` because you need registrations that haven't been flushed to the DB for the error to manifest. * **Operating System**: ``` Distributor ID: Debian Description: Debian GNU/Linux 10 (buster) Release: 10 Codename: buster Kernel: 4.19.0-21-cloud-amd64 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3452 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3452(a)github.com>

1 year, 7 months

git:master:3823056e: modules: readme files regenerated - usrloc ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 3823056e55db45831abc584a7df2b8998c18cf10 URL: https://github.com/kamailio/kamailio/commit/3823056e55db45831abc584a7df2b89… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-05-16T14:16:33+02:00 modules: readme files regenerated - usrloc ... [skip ci] --- Modified: src/modules/usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/3823056e55db45831abc584a7df2b89… Patch: https://github.com/kamailio/kamailio/commit/3823056e55db45831abc584a7df2b89… --- diff --git a/src/modules/usrloc/README b/src/modules/usrloc/README index 2eedbf74dc..00b0743e9a 100644 --- a/src/modules/usrloc/README +++ b/src/modules/usrloc/README @@ -1305,7 +1305,9 @@ modparam("usrloc", "db_clean_tcp", 1) 4.5. ul.flush - Triggers the flush of USRLOC memory cache into DB. + Triggers the flush of USRLOC memory cache into DB from the RPC process. + It succeeds only if the the db_mode is set to a value that enables + connectivity to database. 4.6. ul.add

1 year, 7 months

git:master:f4deff8d: usrloc: docs updated for ul.flush to indicate it depends on db mode

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f4deff8d064e9931fd4ee4fe1bbe166901e7c617 URL: https://github.com/kamailio/kamailio/commit/f4deff8d064e9931fd4ee4fe1bbe166… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-05-16T14:07:22+02:00 usrloc: docs updated for ul.flush to indicate it depends on db mode --- Modified: src/modules/usrloc/doc/usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f4deff8d064e9931fd4ee4fe1bbe166… Patch: https://github.com/kamailio/kamailio/commit/f4deff8d064e9931fd4ee4fe1bbe166… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index ca2295ac67a..61491648a0c 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -1633,7 +1633,9 @@ modparam("usrloc", "db_clean_tcp", 1) <function moreinfo="none">ul.flush</function> </title> <para> - Triggers the flush of USRLOC memory cache into DB. + Triggers the flush of USRLOC memory cache into DB from the RPC process. It + succeeds only if the the db_mode is set to a value that enables connectivity + to database. </para> </section> <section id="usrloc.r.add">

1 year, 7 months

git:master:f4dc6885: topos: formatting and debug cleanup after last commit with callid masking

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f4dc688548aa7753af93ce6e9089b53e9fc4c7ec URL: https://github.com/kamailio/kamailio/commit/f4dc688548aa7753af93ce6e9089b53… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-05-16T13:33:08+02:00 topos: formatting and debug cleanup after last commit with callid masking --- Modified: src/modules/topos/topos_mod.c Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/f4dc688548aa7753af93ce6e9089b53… Patch: https://github.com/kamailio/kamailio/commit/f4dc688548aa7753af93ce6e9089b53…

1 year, 7 months

git:master:f5f681c4: modules: readme files regenerated - topos ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: f5f681c43a4736e4ec3ce5f16e11e61305384d79 URL: https://github.com/kamailio/kamailio/commit/f5f681c43a4736e4ec3ce5f16e11e61… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-05-16T13:31:19+02:00 modules: readme files regenerated - topos ... [skip ci] --- Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/f5f681c43a4736e4ec3ce5f16e11e61… Patch: https://github.com/kamailio/kamailio/commit/f5f681c43a4736e4ec3ce5f16e11e61… --- diff --git a/src/modules/topos/README b/src/modules/topos/README index 1f8e8c191d..be21cb2ef5 100644 --- a/src/modules/topos/README +++ b/src/modules/topos/README @@ -171,6 +171,7 @@ Chapter 1. Admin Guide requests). * database module - to store the data for topology stripping and restoring. + * topoh module - in case of Call-ID mask for Call-ID masking. 2.2. External Libraries or Applications @@ -228,11 +229,11 @@ modparam("topos", "db_url", "dbdriver://username:password@dbhost/dbname") 3.3. mask_callid (int) - Note: this functionality is not implemented yet - the parameter is - present in order to be in pair with topoh module. - - Whether to replace or not the Call-ID with another unique id generated - by Kamailio. + Whether to encode the Call-id: header. Some SIP extensions include the + Call-id in the SIP message payload or header, so it is safe to not + encode Call-id in such cases. Well-known extensions such as call + transfer or conference join will be added to work with encoded Call-id. + Topoh module should be loaded with use_mode paramerter set to 1 Default value is 0 (do not mask).

1 year, 7 months

[kamailio/kamailio] Topos: Added Call-ID mask support for Topos (PR #3347)

by Harish S

Added Call-ID mask Support for Topos with API call from Topoh to mask the callID Call-ID mask happens before the request is sent downstream and unmasked when received from downstream.   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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) - [ ] 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3347 -- Commit Summary -- * Topos: Added Call ID mask when sending to Downstream * Topos: Added CallID Mask Document for Topos -- File Changes -- M src/modules/topos/doc/topos_admin.xml (20) M src/modules/topos/topos_mod.c (119) M src/modules/topos/tps_msg.c (37) M src/modules/topos/tps_msg.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3347.patch https://github.com/kamailio/kamailio/pull/3347.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3347 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3347(a)github.com>

1 year, 7 months

git:master:14d4b242: Topos: Added CallID Mask Document for Topos

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 14d4b2422c0fed27fecf01665197f9d0669aa24e URL: https://github.com/kamailio/kamailio/commit/14d4b2422c0fed27fecf01665197f9d… Author: harish <toharishs(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-05-16T13:17:44+02:00 Topos: Added CallID Mask Document for Topos Added document for Call-ID Mask in Topos Module --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/14d4b2422c0fed27fecf01665197f9d… Patch: https://github.com/kamailio/kamailio/commit/14d4b2422c0fed27fecf01665197f9d… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index dcf61a0fed6..82e7c1e45eb 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -57,6 +57,12 @@ for topology stripping and restoring. </para> </listitem> + <listitem> + <para> + <emphasis>topoh module</emphasis> - in case of Call-ID mask + for Call-ID masking. + </para> + </listitem> </itemizedlist> </para> </section> @@ -130,14 +136,14 @@ modparam("topos", "db_url", "&exampledb;") <section id="topos.p.mask_callid"> <title><varname>mask_callid</varname> (int)</title> <para> - Note: this functionality is not implemented yet - the - parameter is present in order to be in pair with topoh - module. - </para> - <para> - Whether to replace or not the Call-ID with another - unique id generated by &kamailio;. + Whether to encode the Call-id: header. Some SIP extensions include + the Call-id in the SIP message payload or header, so it is safe to + not encode Call-id in such cases. Well-known extensions such as + call transfer or conference join will be added to work with encoded + Call-id. + Topoh module should be loaded with use_mode paramerter set to 1 </para> + <para> <emphasis> Default value is 0 (do not mask).

1 year, 7 months

git:master:d98ff2aa: Topos: Added Call ID mask when sending to Downstream

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d98ff2aab3d3e379fa27da187fbd069c23fb0fe9 URL: https://github.com/kamailio/kamailio/commit/d98ff2aab3d3e379fa27da187fbd069… Author: harish <toharishs(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-05-16T13:17:44+02:00 Topos: Added Call ID mask when sending to Downstream Added Call-ID mask while sending the request to Downstream and unmasking when receiveing from downstream --- Modified: src/modules/topos/topos_mod.c Modified: src/modules/topos/tps_msg.c Modified: src/modules/topos/tps_msg.h --- Diff: https://github.com/kamailio/kamailio/commit/d98ff2aab3d3e379fa27da187fbd069… Patch: https://github.com/kamailio/kamailio/commit/d98ff2aab3d3e379fa27da187fbd069…

1 year, 7 months

git:master:c8893cc0: usrloc: check if database handle is initialized for db_update_ucontact_ruid()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c8893cc05b0cabf7bde1b1a8db49bf46266632aa URL: https://github.com/kamailio/kamailio/commit/c8893cc05b0cabf7bde1b1a8db49bf4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-05-16T13:03:05+02:00 usrloc: check if database handle is initialized for db_update_ucontact_ruid() --- Modified: src/modules/usrloc/ucontact.c --- Diff: https://github.com/kamailio/kamailio/commit/c8893cc05b0cabf7bde1b1a8db49bf4… Patch: https://github.com/kamailio/kamailio/commit/c8893cc05b0cabf7bde1b1a8db49bf4… --- diff --git a/src/modules/usrloc/ucontact.c b/src/modules/usrloc/ucontact.c index b423d276e24..08e98c6a324 100644 --- a/src/modules/usrloc/ucontact.c +++ b/src/modules/usrloc/ucontact.c @@ -1000,6 +1000,11 @@ int db_update_ucontact_ruid(ucontact_t* _c) return -1; } + if (ul_dbh==NULL) { + LM_ERR("database connection handle not initialized\n"); + return -1; + } + n1 = 0; keys1[n1] = &ul_ruid_col; vals1[n1].type = DB1_STR;

1 year, 7 months

← Newer
1
...
18
19
20
21
22
23
24
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2023