sr-dev July 2022

sr-dev@lists.kamailio.org

11 participants
229 discussions

git:5.6:09e9fa84: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.6 Commit: 09e9fa84bc550411c1840e5af325407ba4e25a7c URL: https://github.com/kamailio/kamailio/commit/09e9fa84bc550411c1840e5af325407… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-07-04T11:01:46+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/nats/README --- Diff: https://github.com/kamailio/kamailio/commit/09e9fa84bc550411c1840e5af325407… Patch: https://github.com/kamailio/kamailio/commit/09e9fa84bc550411c1840e5af325407… --- 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")

2 years, 4 months

git:5.6:3839eed2: auth: coherent log message content with header parsing

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.6 Commit: 3839eed219ab2da2e441cdfb82adbba24b03c035 URL: https://github.com/kamailio/kamailio/commit/3839eed219ab2da2e441cdfb82adbba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-04T10:36:13+02:00 auth: coherent log message content with header parsing (cherry picked from commit 267d4ad48ac8426b3d5c53724281605a74d07999) --- Modified: src/modules/auth/auth_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3839eed219ab2da2e441cdfb82adbba… Patch: https://github.com/kamailio/kamailio/commit/3839eed219ab2da2e441cdfb82adbba… --- diff --git a/src/modules/auth/auth_mod.c b/src/modules/auth/auth_mod.c index cc16643eb49..53e02f21056 100644 --- a/src/modules/auth/auth_mod.c +++ b/src/modules/auth/auth_mod.c @@ -450,12 +450,12 @@ int ki_has_credentials(sip_msg_t *msg, str* srealm) ret = find_credentials(msg, srealm, HDR_PROXYAUTH_T, &hdr); if(ret==0) { - LM_DBG("found www credentials with realm [%.*s]\n", srealm->len, srealm->s); + LM_DBG("found proxy credentials with realm [%.*s]\n", srealm->len, srealm->s); return 1; } ret = find_credentials(msg, srealm, HDR_AUTHORIZATION_T, &hdr); if(ret==0) { - LM_DBG("found proxy credentials with realm [%.*s]\n", srealm->len, srealm->s); + LM_DBG("found www credentials with realm [%.*s]\n", srealm->len, srealm->s); return 1; }

2 years, 4 months

git:5.6:11a191e8: siptrace: lookup socket by name if not set for hep

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.6 Commit: 11a191e837821c535832382ce9f0ed244e4d66b9 URL: https://github.com/kamailio/kamailio/commit/11a191e837821c535832382ce9f0ed2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-04T10:36:01+02:00 siptrace: lookup socket by name if not set for hep - GH #3174 (cherry picked from commit 66f175f40e6145e895fa22952b40b372e4eff381) --- Modified: src/modules/siptrace/siptrace_hep.c --- Diff: https://github.com/kamailio/kamailio/commit/11a191e837821c535832382ce9f0ed2… Patch: https://github.com/kamailio/kamailio/commit/11a191e837821c535832382ce9f0ed2… --- diff --git a/src/modules/siptrace/siptrace_hep.c b/src/modules/siptrace/siptrace_hep.c index 412eb8abdc6..6a4fa1f25e4 100644 --- a/src/modules/siptrace/siptrace_hep.c +++ b/src/modules/siptrace/siptrace_hep.c @@ -588,6 +588,9 @@ int hlog(struct sip_msg *msg, str *correlationid, str *message) pkg_free(p); if(trace_send_sock_name_str.s) { + if(!trace_send_sock_info) { + trace_send_sock_info = ksr_get_socket_by_name(&trace_send_sock_name_str); + } dst.send_sock = trace_send_sock_info; } else if(trace_send_sock_str.s) { LM_DBG("send sock activated - find the sock info\n");

2 years, 4 months

git:5.6:d83ec54b: kamctl: propagate DB_PATH to DBTEXT_PATH

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.6 Commit: d83ec54bfc13ac1ddc5a6d39dfaa4f3313d976a9 URL: https://github.com/kamailio/kamailio/commit/d83ec54bfc13ac1ddc5a6d39dfaa4f3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-04T10:35:48+02:00 kamctl: propagate DB_PATH to DBTEXT_PATH - GH #3170 (cherry picked from commit 1f6ec9022f2358441233e8b139e13cbdcf0947aa) --- Modified: utils/kamctl/kamctl.dbtext --- Diff: https://github.com/kamailio/kamailio/commit/d83ec54bfc13ac1ddc5a6d39dfaa4f3… Patch: https://github.com/kamailio/kamailio/commit/d83ec54bfc13ac1ddc5a6d39dfaa4f3… --- diff --git a/utils/kamctl/kamctl.dbtext b/utils/kamctl/kamctl.dbtext index 2198d30db2..0e5f9c424a 100644 --- a/utils/kamctl/kamctl.dbtext +++ b/utils/kamctl/kamctl.dbtext @@ -19,7 +19,11 @@ fi; # path to the dbtext database if [ -z "$DBTEXT_PATH" ] ; then - DBTEXT_PATH="/usr/local/share/kamailio/dbtext/kamailio" + if [ -z "$DB_PATH" ] ; then + DBTEXT_PATH="/usr/local/share/kamailio/dbtext/kamailio" + else + DBTEXT_PATH=$DB_PATH + fi fi export DBTEXT_PATH

2 years, 4 months

git:5.6:bdd1c561: core: init pv buffers earlier to be avaialble for cli params

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.6 Commit: bdd1c561ed640bc79a270532ed70346c5478001f URL: https://github.com/kamailio/kamailio/commit/bdd1c561ed640bc79a270532ed70346… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-04T10:35:38+02:00 core: init pv buffers earlier to be avaialble for cli params - GH #3152 (cherry picked from commit a78adb5340ae6cb57f756189d070c32c49bfa426) --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/bdd1c561ed640bc79a270532ed70346… Patch: https://github.com/kamailio/kamailio/commit/bdd1c561ed640bc79a270532ed70346… --- diff --git a/src/main.c b/src/main.c index cb0c92e357..4ee5afe9d0 100644 --- a/src/main.c +++ b/src/main.c @@ -2172,6 +2172,10 @@ int main(int argc, char** argv) init_tcp_options(); /* set the defaults before the config */ #endif + if (pv_init_buffer()<0) { + goto error; + } + pp_define_core(); /* process command line (cfg. file path etc) */

2 years, 4 months

git:5.6:73ff08bc: ipops: added fixup free functions and use of ANY_ROUTE

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.6 Commit: 73ff08bc5aada525017766121342676058507638 URL: https://github.com/kamailio/kamailio/commit/73ff08bc5aada525017766121342676… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-04T10:35:23+02:00 ipops: added fixup free functions and use of ANY_ROUTE (cherry picked from commit fa6a2d79aca3bc4733276ce99a53efd8fe63ffd5) --- Modified: src/modules/ipops/ipops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/73ff08bc5aada525017766121342676… Patch: https://github.com/kamailio/kamailio/commit/73ff08bc5aada525017766121342676…

2 years, 4 months

git:5.6:0ac60f61: nats: add KEMI publish function and event_callback param (#3154)

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.6 Commit: 0ac60f613674cd686e80aa3ab87a17bcc97ef44f URL: https://github.com/kamailio/kamailio/commit/0ac60f613674cd686e80aa3ab87a17b… Author: Seven Du <dujinfang(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-04T10:35:06+02:00 nats: add KEMI publish function and event_callback param (#3154) (cherry picked from commit 25d42b7e69cc6242c66887a2816499d841e3ba89) --- 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/0ac60f613674cd686e80aa3ab87a17b… Patch: https://github.com/kamailio/kamailio/commit/0ac60f613674cd686e80aa3ab87a17b…

2 years, 4 months

git:5.6:272649c1: nats: fix the nats:connected event_route not being triggered on a successful connect

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.6 Commit: 272649c1c4b718067abc776186529b0e0c40e363 URL: https://github.com/kamailio/kamailio/commit/272649c1c4b718067abc776186529b0… Author: Seven Du <dujinfang(a)x-y-t.cn> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-04T10:33:56+02:00 nats: fix the nats:connected event_route not being triggered on a successful connect (cherry picked from commit b3c8329cfbfa19613dfbadaea7f220443dbb7f55) --- Modified: src/modules/nats/nats_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/272649c1c4b718067abc776186529b0… Patch: https://github.com/kamailio/kamailio/commit/272649c1c4b718067abc776186529b0… --- diff --git a/src/modules/nats/nats_mod.c b/src/modules/nats/nats_mod.c index 2a53beda82f..6108d555e81 100644 --- a/src/modules/nats/nats_mod.c +++ b/src/modules/nats/nats_mod.c @@ -298,7 +298,10 @@ int _nats_pub_worker_proc( != NATS_OK) { LM_ERR("could not connect to nats servers [%s]\n", natsStatus_GetText(s)); + } else { + connectedCB(worker->nc->conn, NULL); } + s = natsOptions_SetEventLoop(worker->nc->opts, (void *)worker->uvLoop, natsLibuv_Attach, natsLibuv_Read, natsLibuv_Write, natsLibuv_Detach);

2 years, 4 months

[kamailio/kamailio] presence: be more resilient doing clean up of presentity values (PR #3169)

by Victor Seva

#### 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description previously if an error was found we were bailing out and the value was kept so at next round the value will be there and no more values where removed You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3169 -- Commit Summary -- * presence: be more resilient doing clean up of presentity values -- File Changes -- M src/modules/presence/publish.c (47) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3169.patch https://github.com/kamailio/kamailio/pull/3169.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3169 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3169(a)github.com>

2 years, 4 months

git:master:444adb0b: presence: be more resilient doing clean up of presentity values

by Victor Seva

Module: kamailio Branch: master Commit: 444adb0b27d62fbd2af25e4f555b6aab5ca7bc96 URL: https://github.com/kamailio/kamailio/commit/444adb0b27d62fbd2af25e4f555b6aa… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-07-04T10:20:49+02:00 presence: be more resilient doing clean up of presentity values previously if an error was found we were bailing out and the value was kept so at next round the value will be there and no more values where removed --- Modified: src/modules/presence/publish.c --- Diff: https://github.com/kamailio/kamailio/commit/444adb0b27d62fbd2af25e4f555b6aa… Patch: https://github.com/kamailio/kamailio/commit/444adb0b27d62fbd2af25e4f555b6aa…

2 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2022