sr-dev June 2022

sr-dev@lists.kamailio.org

20 participants
280 discussions

git:master:87b698f7: modules: readme files regenerated - textops ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 87b698f7deca1794019f98167ba49d3e4737ba71 URL: https://github.com/kamailio/kamailio/commit/87b698f7deca1794019f98167ba49d3… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-06-24T16:01:17+02:00 modules: readme files regenerated - textops ... [skip ci] --- Modified: src/modules/textops/README Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/87b698f7deca1794019f98167ba49d3… Patch: https://github.com/kamailio/kamailio/commit/87b698f7deca1794019f98167ba49d3… --- diff --git a/src/modules/textops/README b/src/modules/textops/README index fabc8e3371..c187c4c8db 100644 --- a/src/modules/textops/README +++ b/src/modules/textops/README @@ -157,8 +157,8 @@ Ovidiu Sas 1.43. has_body usage 1.44. is_audio_on_hold usage 1.45. is_privacy usage - 1.46. in_list() usage - 1.47. in_list() usage + 1.46. in_list usage + 1.47. in_list_prefix usage 1.48. cmp_str usage 1.49. cmp_str usage 1.50. starts_with usage @@ -1239,7 +1239,7 @@ if(is_privacy("id")) Function can be used from all kinds of routes. - Example 1.46. in_list() usage + Example 1.46. in_list usage ... $var(subject) = "fi"; $var(list) = "dk,fi,no,se"; @@ -1257,7 +1257,7 @@ if (in_list("$var(subject)", "$var(list)", ",")) { Function can be used from all kinds of routes. - Example 1.47. in_list() usage + Example 1.47. in_list_prefix usage ... $var(subject) = "final"; $var(list) = "dk,fi,no,se"; diff --git a/src/modules/tls/README b/src/modules/tls/README index 94c8cfc069..c9bed56ec5 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -250,7 +250,7 @@ Chapter 1. Admin Guide The most important parameters to set the path to the public certificate and private key files. You can either have them in different file or in the same file in PEM format. The parameters for them are certificate - and private_key. They can be given as modparam or or provided in the + and private_key. They can be given as modparam or provided in the profiles of tls.cfg file. When installing tls module of kamailio, a sample 'tls.cfg' file is

1 year, 11 months

[kamailio/kamailio] Fix typos (PR #3162)

by Akash Gupta

#### 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/3162 -- Commit Summary -- * textops: Fix typos * tls: Fix typo -- File Changes -- M src/modules/textops/doc/textops_admin.xml (4) M src/modules/tls/doc/tls.xml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3162.patch https://github.com/kamailio/kamailio/pull/3162.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3162 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3162(a)github.com>

1 year, 11 months

git:master:4570b3eb: tls: Fix typo

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4570b3ebc6da35efc3cc55b1f4418446b9071688 URL: https://github.com/kamailio/kamailio/commit/4570b3ebc6da35efc3cc55b1f441844… Author: Akash Gupta <akash(a)telnyx.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-24T15:49:50+02:00 tls: Fix typo --- Modified: src/modules/tls/doc/tls.xml --- Diff: https://github.com/kamailio/kamailio/commit/4570b3ebc6da35efc3cc55b1f441844… Patch: https://github.com/kamailio/kamailio/commit/4570b3ebc6da35efc3cc55b1f441844… --- diff --git a/src/modules/tls/doc/tls.xml b/src/modules/tls/doc/tls.xml index e356d5bff7c..f3ff2321c78 100644 --- a/src/modules/tls/doc/tls.xml +++ b/src/modules/tls/doc/tls.xml @@ -84,7 +84,7 @@ The most important parameters to set the path to the public certificate and private key files. You can either have them in different file or in the same file in PEM format. The parameters for them are <varname>certificate</varname> and <varname>private_key</varname>. - They can be given as modparam or or provided in the profiles of tls.cfg file. + They can be given as modparam or provided in the profiles of tls.cfg file. </para> <para> When installing tls module of kamailio, a sample 'tls.cfg' file is deployed in the same

1 year, 11 months

git:master:c5cd4002: textops: Fix typos

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c5cd400287e27fce6fcf6272a4efe9a9fa8aa419 URL: https://github.com/kamailio/kamailio/commit/c5cd400287e27fce6fcf6272a4efe9a… Author: Akash Gupta <akash(a)telnyx.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-24T15:49:50+02:00 textops: Fix typos --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c5cd400287e27fce6fcf6272a4efe9a… Patch: https://github.com/kamailio/kamailio/commit/c5cd400287e27fce6fcf6272a4efe9a… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 9805aac6aab..dbca57e5f0a 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -1711,7 +1711,7 @@ if(is_privacy("id")) Function can be used from all kinds of routes. </para> <example> - <title><function>in_list()</function> usage</title> + <title><function>in_list</function> usage</title> <programlisting format="linespecific"> ... $var(subject) = "fi"; @@ -1735,7 +1735,7 @@ if (in_list("$var(subject)", "$var(list)", ",")) { Function can be used from all kinds of routes. </para> <example> - <title><function>in_list()</function> usage</title> + <title><function>in_list_prefix</function> usage</title> <programlisting format="linespecific"> ... $var(subject) = "final";

1 year, 11 months

[kamailio/kamailio] Fix typos (PR #3161)

by Akash Gupta

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] 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) - [ ] 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/3161 -- Commit Summary -- * Fix typos -- File Changes -- M src/modules/textops/doc/textops_admin.xml (4) M src/modules/tls/doc/tls.xml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3161.patch https://github.com/kamailio/kamailio/pull/3161.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3161 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3161(a)github.com>

1 year, 11 months

git:master:65a484df: modules: readme files regenerated - nats ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 65a484dffa3c854bc17068175cee3dc37fd09d18 URL: https://github.com/kamailio/kamailio/commit/65a484dffa3c854bc17068175cee3dc… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-06-24T12:46:16+02:00 modules: readme files regenerated - nats ... [skip ci] --- Modified: src/modules/nats/README --- Diff: https://github.com/kamailio/kamailio/commit/65a484dffa3c854bc17068175cee3dc… Patch: https://github.com/kamailio/kamailio/commit/65a484dffa3c854bc17068175cee3dc… --- diff --git a/src/modules/nats/README b/src/modules/nats/README index f7f1ad7239..29cef171b7 100644 --- a/src/modules/nats/README +++ b/src/modules/nats/README @@ -35,6 +35,7 @@ Emmanuel Schmidbauer 4.1. nats_url (str) 4.2. num_publish_workers (int) 4.3. subject_queue_group (str) + 4.4. event_callback (str) 5. Functions @@ -48,9 +49,10 @@ Emmanuel Schmidbauer 1.1. Set nats_url parameter 1.2. Set num_publish_workers parameter 1.3. Set subject_queue_group parameter - 1.4. nats_publish usage - 1.5. Example usage of $natsData pseudo variable - 1.6. Define the event routes + 1.4. Set event_callback parameter + 1.5. nats_publish usage + 1.6. Example usage of $natsData pseudo variable + 1.7. Define the event routes Chapter 1. Admin Guide @@ -68,6 +70,7 @@ Chapter 1. Admin Guide 4.1. nats_url (str) 4.2. num_publish_workers (int) 4.3. subject_queue_group (str) + 4.4. event_callback (str) 5. Functions @@ -115,6 +118,7 @@ Chapter 1. Admin Guide 4.1. nats_url (str) 4.2. num_publish_workers (int) 4.3. subject_queue_group (str) + 4.4. event_callback (str) 4.1. nats_url (str) @@ -161,6 +165,24 @@ modparam("nats", "subject_queue_group", "MyQueue1:2021") modparam("nats", "subject_queue_group", "MyQueue2:2021") ... +4.4. event_callback (str) + + Name of the KEMI function to be executed instead of the event route. + + Default value is not set. + + Example 1.4. Set event_callback parameter +... +modparam("nats", "event_callback", "ksr_nats_event") + +-- event callback function implemented in Lua +function ksr_nats_event(evname) + KSR.info("===== nats module received event: " .. evname .. + ", data:" .. KSR.pv.gete('$natsData') .. "\n"); + return 1; +end +... + 5. Functions 5.1. nats_publish(subject, payload) @@ -169,7 +191,7 @@ modparam("nats", "subject_queue_group", "MyQueue2:2021") Publishes the payload to subject. - Example 1.4. nats_publish usage + Example 1.5. nats_publish usage ... $var(my_info) = "$ci=" + $ci + " $fU=" + $fU; nats_publish("mysubject", "$var(my_info)"); # publish $var(my_info) to "mysubjec @@ -178,7 +200,7 @@ t" 6. Pseudo Variables - Example 1.5. Example usage of $natsData pseudo variable + Example 1.6. Example usage of $natsData pseudo variable ... xlog("L_INFO", "received payload $natsData"); } @@ -191,7 +213,7 @@ t" received payload. The name of the event-route name must match the subject of the message. - Example 1.6. Define the event routes + Example 1.7. Define the event routes ... modparam("nats", "subject_queue_group", "Kamailio-World:2021") modparam("nats", "subject_queue_group", "MyQueue1:2021")

1 year, 11 months

[kamailio/kamailio] nats: add KEMI publish function and event_callback param (PR #3154)

by Seven Du

#### 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) - [ ] 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  - add `event_callback` KEMI param like in other modules - expose `KSR.nats.publish` I can fix module doc if it looks good. How to generate docs locally btw? You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3154 -- Commit Summary -- * nats: add KEMI publish function and event_callback param -- File Changes -- M src/modules/nats/defs.h (3) M src/modules/nats/nats_mod.c (88) M src/modules/nats/nats_mod.h (3) M src/modules/nats/nats_pub.c (5) M src/modules/nats/nats_pub.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3154.patch https://github.com/kamailio/kamailio/pull/3154.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3154 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3154(a)github.com>

1 year, 11 months

git:master:25d42b7e: nats: add KEMI publish function and event_callback param (#3154)

by GitHub

Module: kamailio Branch: master Commit: 25d42b7e69cc6242c66887a2816499d841e3ba89 URL: https://github.com/kamailio/kamailio/commit/25d42b7e69cc6242c66887a2816499d… Author: Seven Du <dujinfang(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2022-06-24T12:44:28+02:00 nats: add KEMI publish function and event_callback param (#3154) --- Modified: src/modules/nats/defs.h Modified: src/modules/nats/doc/nats_admin.xml Modified: src/modules/nats/nats_mod.c Modified: src/modules/nats/nats_mod.h Modified: src/modules/nats/nats_pub.c Modified: src/modules/nats/nats_pub.h --- Diff: https://github.com/kamailio/kamailio/commit/25d42b7e69cc6242c66887a2816499d… Patch: https://github.com/kamailio/kamailio/commit/25d42b7e69cc6242c66887a2816499d…

1 year, 11 months

git:5.6:967b8290: topos_redis: use tag based on direction for early dialog transaction record loading

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.6 Commit: 967b8290d1e5081966425cbf705bd4ba36d5e98e URL: https://github.com/kamailio/kamailio/commit/967b8290d1e5081966425cbf705bd4b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-24T11:09:40+02:00 topos_redis: use tag based on direction for early dialog transaction record loading - GH #3112 (cherry picked from commit 06679174fc3d9cc6a18bc3edc7f2fb985c50d27b) --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/967b8290d1e5081966425cbf705bd4b… Patch: https://github.com/kamailio/kamailio/commit/967b8290d1e5081966425cbf705bd4b… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index 456d54ebee5..a1d6c85d016 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -54,6 +54,11 @@ static str _tps_redis_dprefix = str_init("d:z:"); static char _tps_redis_cbuf[TPS_REDIS_DATA_SIZE]; +static str _tps_redis_empty = str_init(""); + +#define TPS_REDIS_STRZ(_s) ((_s).s)?(_s):(_tps_redis_empty) + + /** * storage keys */ @@ -594,6 +599,7 @@ int tps_redis_load_initial_method_branch(sip_msg_t *msg, tps_data_t *md, tps_dat str skey = STR_NULL; str sval = STR_NULL; str xuuid = str_init(""); + str xtag = str_init(""); str smethod = str_init("INVITE"); if(msg==NULL || md==NULL || sd==NULL) @@ -615,6 +621,11 @@ int tps_redis_load_initial_method_branch(sip_msg_t *msg, tps_data_t *md, tps_dat memset(argvlen, 0, TPS_REDIS_NR_KEYS * sizeof(size_t)); argc = 0; + if(md->direction==TPS_DIR_DOWNSTREAM) { + xtag = TPS_REDIS_STRZ(md->b_tag); + } else { + xtag = TPS_REDIS_STRZ(md->a_tag); + } if(md->a_uuid.len>1) { xuuid.s = md->a_uuid.s + 1; xuuid.len = md->a_uuid.len - 1; @@ -641,7 +652,7 @@ int tps_redis_load_initial_method_branch(sip_msg_t *msg, tps_data_t *md, tps_dat _tps_redis_bprefix.len, _tps_redis_bprefix.s, smethod.len, smethod.s, md->a_callid.len, md->a_callid.s, - md->b_tag.len, md->b_tag.s, + xtag.len, xtag.s, xuuid.len, xuuid.s); if(rkey.len<0 || rkey.len>=TPS_REDIS_DATA_SIZE) { LM_ERR("error or insufficient buffer size: %d\n", rkey.len);

1 year, 11 months

git:5.6:a4fc8afe: kamctl/dbtextdb: solve TypeError: a bytes-like object is required, not 'str'

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.6 Commit: a4fc8afea094b6778b9d264cf9911b69c1a6d22f URL: https://github.com/kamailio/kamailio/commit/a4fc8afea094b6778b9d264cf9911b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-24T11:09:27+02:00 kamctl/dbtextdb: solve TypeError: a bytes-like object is required, not 'str' - GH #2469 (cherry picked from commit 6aa1a84c6e37e0d6d5a725d43636debeaf5fa3b4) --- Modified: utils/kamctl/dbtextdb/dbtextdb.py --- Diff: https://github.com/kamailio/kamailio/commit/a4fc8afea094b6778b9d264cf9911b6… Patch: https://github.com/kamailio/kamailio/commit/a4fc8afea094b6778b9d264cf9911b6… --- diff --git a/utils/kamctl/dbtextdb/dbtextdb.py b/utils/kamctl/dbtextdb/dbtextdb.py index 581496c309d..0efe419026c 100755 --- a/utils/kamctl/dbtextdb/dbtextdb.py +++ b/utils/kamctl/dbtextdb/dbtextdb.py @@ -1135,7 +1135,7 @@ def WriteTempTable(self): else: header = '%s)' % header - self.temp_file.write(header.strip() + '\n') + self.temp_file.write((header.strip() + '\n').encode()) # write data for row in self.data: @@ -1143,7 +1143,7 @@ def WriteTempTable(self): for col in columns: row_str = '%s:%s' % (row_str, row[col]) - self.temp_file.write(row_str[1:] + '\n') + self.temp_file.write((row_str[1:] + '\n').encode()) self.temp_file.flush()

1 year, 11 months

← Newer
1
...
11
12
13
14
15
16
17
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2022