sr-dev August 2022

sr-dev@lists.kamailio.org

16 participants
278 discussions

git:master:da017867: tm: add a comment to tm_xdata_swap

by Henning Westerholt

Module: kamailio Branch: master Commit: da0178673f9a47600329fff2c3105e0fbfbd78f7 URL: https://github.com/kamailio/kamailio/commit/da0178673f9a47600329fff2c3105e0… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-08-09T14:15:04Z tm: add a comment to tm_xdata_swap --- Modified: src/modules/tm/h_table.c --- Diff: https://github.com/kamailio/kamailio/commit/da0178673f9a47600329fff2c3105e0… Patch: https://github.com/kamailio/kamailio/commit/da0178673f9a47600329fff2c3105e0… --- diff --git a/src/modules/tm/h_table.c b/src/modules/tm/h_table.c index 6149c363d4..74e47ef7d8 100644 --- a/src/modules/tm/h_table.c +++ b/src/modules/tm/h_table.c @@ -514,6 +514,7 @@ struct s_table *init_hash_table() * backup xdata from/to msg context to local var and use T lists * - mode = 0 - from msg context to _txdata and use T lists * - mode = 1 - restore to msg context from _txdata + * the function can be also used to restore the core context from transacation data */ void tm_xdata_swap(tm_cell_t *t, tm_xlinks_t *xd, int mode) {

1 year, 9 months

git:master:25bec8ef: tm: use similar coding style for tm_xdata_replace as for tm_xdata_swap

by Henning Westerholt

Module: kamailio Branch: master Commit: 25bec8eff91b332530095ada3997b92edbb5cce6 URL: https://github.com/kamailio/kamailio/commit/25bec8eff91b332530095ada3997b92… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-08-09T14:05:00Z tm: use similar coding style for tm_xdata_replace as for tm_xdata_swap --- Modified: src/modules/tm/h_table.c --- Diff: https://github.com/kamailio/kamailio/commit/25bec8eff91b332530095ada3997b92… Patch: https://github.com/kamailio/kamailio/commit/25bec8eff91b332530095ada3997b92… --- diff --git a/src/modules/tm/h_table.c b/src/modules/tm/h_table.c index db6117e557..6149c363d4 100644 --- a/src/modules/tm/h_table.c +++ b/src/modules/tm/h_table.c @@ -575,10 +575,7 @@ void tm_xdata_replace(tm_xdata_t *newxd, tm_xlinks_t *bakxd) xavp_set_list(bakxd->xavps_list); xavu_set_list(bakxd->xavus_list); xavi_set_list(bakxd->xavis_list); - return; - } - - if(newxd != NULL && bakxd != NULL) { + } else if(newxd != NULL && bakxd != NULL) { LM_DBG("replace existing list in backup xd from new xd\n"); bakxd->uri_avps_from = set_avp_list( AVP_TRACK_FROM | AVP_CLASS_URI, &newxd->uri_avps_from); @@ -595,7 +592,6 @@ void tm_xdata_replace(tm_xdata_t *newxd, tm_xlinks_t *bakxd) bakxd->xavps_list = xavp_set_list(&newxd->xavps_list); bakxd->xavus_list = xavu_set_list(&newxd->xavus_list); bakxd->xavis_list = xavi_set_list(&newxd->xavis_list); - return; } }

1 year, 9 months

git:master:5ad00361: tm: add some more debug messages to debug X/AVP and transaction handling

by Henning Westerholt

Module: kamailio Branch: master Commit: 5ad003617bb79ea647fbfb1eb3c3ebfc4a44280d URL: https://github.com/kamailio/kamailio/commit/5ad003617bb79ea647fbfb1eb3c3ebf… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-08-09T14:03:22Z tm: add some more debug messages to debug X/AVP and transaction handling --- Modified: src/modules/tm/h_table.c --- Diff: https://github.com/kamailio/kamailio/commit/5ad003617bb79ea647fbfb1eb3c3ebf… Patch: https://github.com/kamailio/kamailio/commit/5ad003617bb79ea647fbfb1eb3c3ebf… --- diff --git a/src/modules/tm/h_table.c b/src/modules/tm/h_table.c index de98d99e46..db6117e557 100644 --- a/src/modules/tm/h_table.c +++ b/src/modules/tm/h_table.c @@ -410,6 +410,7 @@ struct cell *build_cell(struct sip_msg *p_msg) init_synonym_id(p_msg, new_cell->md5); init_cell_lock(new_cell); t_stats_created(); + LM_DBG("created new cell %p\n", new_cell); return new_cell; error: @@ -444,6 +445,7 @@ struct cell *build_cell(struct sip_msg *p_msg) xavp_reset_list(); xavu_reset_list(); xavi_reset_list(); + LM_DBG("could not create cell\n"); return NULL; } @@ -524,6 +526,7 @@ void tm_xdata_swap(tm_cell_t *t, tm_xlinks_t *xd, int mode) x = xd; if(mode == 0) { + LM_DBG("copy X/AVPs from msg context to txdata\n"); if(t == NULL) return; x->uri_avps_from = @@ -542,7 +545,7 @@ void tm_xdata_swap(tm_cell_t *t, tm_xlinks_t *xd, int mode) x->xavus_list = xavu_set_list(&t->xavus_list); x->xavis_list = xavi_set_list(&t->xavis_list); } else if(mode == 1) { - /* restore original avp list */ + LM_DBG("restore X/AVPs msg context from txdata\n"); set_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI, x->uri_avps_from); set_avp_list(AVP_TRACK_TO | AVP_CLASS_URI, x->uri_avps_to); set_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER, x->user_avps_from); @@ -561,6 +564,7 @@ void tm_xdata_swap(tm_cell_t *t, tm_xlinks_t *xd, int mode) void tm_xdata_replace(tm_xdata_t *newxd, tm_xlinks_t *bakxd) { if(newxd == NULL && bakxd != NULL) { + LM_DBG("restore X/AVP msg context from backup data\n"); set_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI, bakxd->uri_avps_from); set_avp_list(AVP_TRACK_TO | AVP_CLASS_URI, bakxd->uri_avps_to); set_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER, bakxd->user_avps_from); @@ -575,6 +579,7 @@ void tm_xdata_replace(tm_xdata_t *newxd, tm_xlinks_t *bakxd) } if(newxd != NULL && bakxd != NULL) { + LM_DBG("replace existing list in backup xd from new xd\n"); bakxd->uri_avps_from = set_avp_list( AVP_TRACK_FROM | AVP_CLASS_URI, &newxd->uri_avps_from); bakxd->uri_avps_to =

1 year, 9 months

git:master:6b83bc4c: tm: use internal function tm_xdata_swap instead of manually copy X/AVPs

by Henning Westerholt

Module: kamailio Branch: master Commit: 6b83bc4cd6da55582793321e6c1f36ff71c4233a URL: https://github.com/kamailio/kamailio/commit/6b83bc4cd6da55582793321e6c1f36f… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-08-09T13:52:42Z tm: use internal function tm_xdata_swap instead of manually copy X/AVPs --- Modified: src/modules/tm/t_hooks.c --- Diff: https://github.com/kamailio/kamailio/commit/6b83bc4cd6da55582793321e6c1f36f… Patch: https://github.com/kamailio/kamailio/commit/6b83bc4cd6da55582793321e6c1f36f…

1 year, 9 months

[kamailio/kamailio] Add 5.6 branch packages for Ubuntu 22.04 (Issue #3147)

by compuwizz

Is it possible to add the 5.6 branch deb/ubuntu packages to https://deb.kamailio.org/ for Ubuntu 22.04? I see Ubuntu 22.04 native repos have kamailio 5.5 in them but I'd like to use 5.6. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3147 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3147(a)github.com>

1 year, 9 months

[kamailio/kamailio] uac.reg_add (PR #3198)

by sznoname

#### 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) - [ ] 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/3198 -- Commit Summary -- * uac.reg_add -- File Changes -- M src/modules/uac/doc/uac_admin.xml (2) M src/modules/uac/uac_reg.c (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3198.patch https://github.com/kamailio/kamailio/pull/3198.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3198 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3198(a)github.com>

1 year, 9 months

git:master:1f1297b4: modules: readme files regenerated - uac ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 1f1297b407be0525e314b9d734d39a1a20ed886d URL: https://github.com/kamailio/kamailio/commit/1f1297b407be0525e314b9d734d39a1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-08-08T16:01:20+02:00 modules: readme files regenerated - uac ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/1f1297b407be0525e314b9d734d39a1… Patch: https://github.com/kamailio/kamailio/commit/1f1297b407be0525e314b9d734d39a1… --- diff --git a/src/modules/uac/README b/src/modules/uac/README index f1a6e6f5e83..172fa4886de 100644 --- a/src/modules/uac/README +++ b/src/modules/uac/README @@ -1246,8 +1246,8 @@ event_route[uac:reply] { * socket * contact_addr - Use a dot (.) if no value should be set for auth_password, auth_ha1, or - contact_addr. + Use a dot (.) if no value should be set for realm, auth_password, + auth_ha1, socket or contact_addr. Example 1.50. uac.reg_add usage ...

1 year, 9 months

git:master:a900fef0: uac.reg_add

by Henning Westerholt

Module: kamailio Branch: master Commit: a900fef06bbb71c722f29edfde130d618a784174 URL: https://github.com/kamailio/kamailio/commit/a900fef06bbb71c722f29edfde130d6… Author: sznoname <342899761(a)qq.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-08-08T15:57:26+02:00 uac.reg_add --- Modified: src/modules/uac/doc/uac_admin.xml Modified: src/modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/a900fef06bbb71c722f29edfde130d6… Patch: https://github.com/kamailio/kamailio/commit/a900fef06bbb71c722f29edfde130d6… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index a15fbbc90b2..2cdee2f66f7 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -1508,7 +1508,7 @@ event_route[uac:reply] { </itemizedlist> </para> <para> - Use a dot (.) if no value should be set for auth_password, auth_ha1, + Use a dot (.) if no value should be set for realm, auth_password, auth_ha1, socket or contact_addr. </para> diff --git a/src/modules/uac/uac_reg.c b/src/modules/uac/uac_reg.c index 85fe266c92c..02138101c07 100644 --- a/src/modules/uac/uac_reg.c +++ b/src/modules/uac/uac_reg.c @@ -2170,6 +2170,11 @@ static void rpc_uac_reg_add(rpc_t* rpc, void* ctx) return; } + if(reg.realm.len==1 && reg.realm.s[0] == '.') { + reg.realm.s = NULL; + reg.realm.len = 0; + } + if(reg.auth_password.len==1 && reg.auth_password.s[0] == '.') { reg.auth_password.s = NULL; reg.auth_password.len = 0; @@ -2180,6 +2185,11 @@ static void rpc_uac_reg_add(rpc_t* rpc, void* ctx) reg.auth_ha1.len = 0; } + if(reg.socket.len==1 && reg.socket.s[0] == '.') { + reg.socket.s = NULL; + reg.socket.len = 0; + } + if(reg.contact_addr.len==1 && reg.contact_addr.s[0] == '.') { reg.contact_addr = reg_contact_addr; }

1 year, 9 months

git:master:cd1bf830: modules: readme files regenerated - siptrace ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: cd1bf8302920b5fa08f6e79a334af175e8b520e1 URL: https://github.com/kamailio/kamailio/commit/cd1bf8302920b5fa08f6e79a334af17… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-08-08T15:31:21+02:00 modules: readme files regenerated - siptrace ... [skip ci] --- Modified: src/modules/siptrace/README --- Diff: https://github.com/kamailio/kamailio/commit/cd1bf8302920b5fa08f6e79a334af17… Patch: https://github.com/kamailio/kamailio/commit/cd1bf8302920b5fa08f6e79a334af17… --- diff --git a/src/modules/siptrace/README b/src/modules/siptrace/README index 59f677e899..2ec0fb1de3 100644 --- a/src/modules/siptrace/README +++ b/src/modules/siptrace/README @@ -63,6 +63,8 @@ Camille Oudot 3.22. trace_mode (integer) 3.23. auth_key (integer) 3.24. evcb_msg (str) + 3.25. trace_dialog_ack (str) + 3.26. trace_dialog_spiral (str) 4. Functions @@ -106,10 +108,12 @@ Camille Oudot 1.21. Set trace_mode parameter 1.22. Set auth_key parameter 1.23. Set evcb_msg parameter - 1.24. sip_trace() usage - 1.25. sip_trace_mode() usage - 1.26. hlog() usage - 1.27. Send relayed ACK message + 1.24. Set trace_dialog_ack parameter + 1.25. Set trace_dialog_spiral parameter + 1.26. sip_trace() usage + 1.27. sip_trace_mode() usage + 1.28. hlog() usage + 1.29. Send relayed ACK message Chapter 1. Admin Guide @@ -147,6 +151,8 @@ Chapter 1. Admin Guide 3.22. trace_mode (integer) 3.23. auth_key (integer) 3.24. evcb_msg (str) + 3.25. trace_dialog_ack (str) + 3.26. trace_dialog_spiral (str) 4. Functions @@ -231,6 +237,8 @@ Chapter 1. Admin Guide 3.22. trace_mode (integer) 3.23. auth_key (integer) 3.24. evcb_msg (str) + 3.25. trace_dialog_ack (str) + 3.26. trace_dialog_spiral (str) 3.1. db_url (str) @@ -565,6 +573,28 @@ modparam("siptrace", "auth_key", "spoihepuirthpeuia") modparam("siptrace", "evcb_msg", "ksr_siptrace_msg") ... +3.25. trace_dialog_ack (str) + + Enable tracing of in-dialog ACK. + + Default value is 1 (enabled). + + Example 1.24. Set trace_dialog_ack parameter +... +modparam("siptrace", "trace_dialog_ack", 1) +... + +3.26. trace_dialog_spiral (str) + + Enable tracing of dialog spirals. + + Default value is 1 (enabled). + + Example 1.25. Set trace_dialog_spiral parameter +... +modparam("siptrace", "trace_dialog_spiral", 1) +... + 4. Functions 4.1. sip_trace([address][,correlation_id][,mode]) @@ -595,7 +625,7 @@ modparam("siptrace", "evcb_msg", "ksr_siptrace_msg") ONREPLY_ROUTE, BRANCH_ROUTE. Default value is "NULL". - Example 1.24. sip_trace() usage + Example 1.26. sip_trace() usage ... sip_trace(); ... @@ -621,7 +651,7 @@ sip_trace("sip:10.1.1.2:5085", "$ci-abc", "d"); This function can be used in ANY_ROUTE. - Example 1.25. sip_trace_mode() usage + Example 1.27. sip_trace_mode() usage ... sip_trace_mode("t"); ... @@ -638,7 +668,7 @@ sip_trace_mode("t"); * message - The text to send to Homer as log event. (This parameter may contain PVs) - Example 1.26. hlog() usage + Example 1.28. hlog() usage ... hlog("[cfg:$cfg(line)] This is a log from kamailio to Homer"); ... @@ -712,7 +742,7 @@ event_route[siptrace:msg] { this name will result in overlapping internal avp used by the module therefore causing unknown consequences. - Example 1.27. Send relayed ACK message + Example 1.29. Send relayed ACK message ... onsend_route { if (is_method("ACK")) {

1 year, 9 months

git:master:f5142e20: siptrace: enable tracing of in-dialog ACKs and spiraled dialogs, analog to the setting of dialog module

by Henning Westerholt

Module: kamailio Branch: master Commit: f5142e2059e1cf2d65f7fb0fe2ae6b5fdd0e3651 URL: https://github.com/kamailio/kamailio/commit/f5142e2059e1cf2d65f7fb0fe2ae6b5… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-08-08T13:18:59Z siptrace: enable tracing of in-dialog ACKs and spiraled dialogs, analog to the setting of dialog module --- Modified: src/modules/siptrace/doc/siptrace_admin.xml Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/f5142e2059e1cf2d65f7fb0fe2ae6b5… Patch: https://github.com/kamailio/kamailio/commit/f5142e2059e1cf2d65f7fb0fe2ae6b5… --- diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml index 7852647f37..ec5a5da63c 100644 --- a/src/modules/siptrace/doc/siptrace_admin.xml +++ b/src/modules/siptrace/doc/siptrace_admin.xml @@ -658,7 +658,7 @@ modparam("siptrace", "evcb_msg", "ksr_siptrace_msg") Enable tracing of in-dialog ACK. </para> <para> - Default value is 0 (disabled). + Default value is 1 (enabled). </para> <example> <title>Set <varname>trace_dialog_ack</varname> parameter</title> @@ -676,7 +676,7 @@ modparam("siptrace", "trace_dialog_ack", 1) Enable tracing of dialog spirals. </para> <para> - Default value is 0 (disabled). + Default value is 1 (enabled). </para> <example> <title>Set <varname>trace_dialog_spiral</varname> parameter</title> diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 81913f064d..4d1a4243e2 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -195,8 +195,8 @@ static str trace_local_ip = {NULL, 0}; static db1_con_t *db_con = NULL; /*!< database connection */ static db_func_t db_funcs; /*!< Database functions */ -int trace_dialog_ack = 0; -int trace_dialog_spiral = 0; +int trace_dialog_ack = 1; +int trace_dialog_spiral = 1; static int spiral_tracked; int pv_parse_siptrace_name(pv_spec_t *sp, str *in);

1 year, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2022