sr-dev August 2018

sr-dev@lists.kamailio.org

22 participants
281 discussions

git:master:f6f68cb9: core: print log_prefix after loglevel for more intuitive parsing

by Armen Babikyan

Module: kamailio Branch: master Commit: f6f68cb91a1a1143d5cd64f7a847002cd897eb8b URL: https://github.com/kamailio/kamailio/commit/f6f68cb91a1a1143d5cd64f7a847002… Author: Armen Babikyan <armen(a)firespotter.com> Committer: Armen Babikyan <armen(a)firespotter.com> Date: 2018-08-01T14:01:53-07:00 core: print log_prefix after loglevel for more intuitive parsing --- Modified: src/core/dprint.h --- Diff: https://github.com/kamailio/kamailio/commit/f6f68cb91a1a1143d5cd64f7a847002… Patch: https://github.com/kamailio/kamailio/commit/f6f68cb91a1a1143d5cd64f7a847002… --- diff --git a/src/core/dprint.h b/src/core/dprint.h index 67a4ac3d7e..8a7a283875 100644 --- a/src/core/dprint.h +++ b/src/core/dprint.h @@ -221,10 +221,10 @@ void log_prefix_init(void); if (unlikely(log_stderr)) { \ if (unlikely(log_color)) dprint_color(__llevel); \ if(unlikely(log_prefix_val)) { \ - fprintf(stderr, "%.*s%2d(%d) %s: %s" fmt, \ - log_prefix_val->len, log_prefix_val->s, \ + fprintf(stderr, "%2d(%d) %s: %.*s%s" fmt, \ process_no, my_pid(), \ (lname)?(lname):LOG_LEVEL2NAME(__llevel), \ + log_prefix_val->len, log_prefix_val->s, \ (prefix) , __VA_ARGS__);\ } else { \ fprintf(stderr, "%2d(%d) %s: %s" fmt, \ @@ -239,9 +239,9 @@ void log_prefix_init(void); (((facility) != DEFAULT_FACILITY) ? \ (facility) : \ get_debug_facility(LOG_MNAME, LOG_MNAME_LEN)), \ - "%.*s%s: %s" fmt,\ - log_prefix_val->len, log_prefix_val->s, \ + "%s: %.*s%s" fmt,\ (lname)?(lname):LOG_LEVEL2NAME(__llevel),\ + log_prefix_val->len, log_prefix_val->s, \ (prefix) , __VA_ARGS__); \ } else { \ _km_log_func(LOG2SYSLOG_LEVEL(__llevel) |\ @@ -299,10 +299,10 @@ void log_prefix_init(void); if (unlikely(log_stderr)) { \ if (unlikely(log_color)) dprint_color(__llevel); \ if(unlikely(log_prefix_val)) { \ - fprintf(stderr, "%.*s%2d(%d) %s: %s" fmt, \ - log_prefix_val->len, log_prefix_val->s, \ + fprintf(stderr, "%2d(%d) %s: %.*s%s" fmt, \ process_no, my_pid(), \ (lname)?(lname):LOG_LEVEL2NAME(__llevel), \ + log_prefix_val->len, log_prefix_val->s, \ (prefix) , ## args);\ } else { \ fprintf(stderr, "%2d(%d) %s: %s" fmt, \ @@ -317,9 +317,9 @@ void log_prefix_init(void); (((facility) != DEFAULT_FACILITY) ? \ (facility) : \ get_debug_facility(LOG_MNAME, LOG_MNAME_LEN)), \ - "%.*s%s: %s" fmt,\ - log_prefix_val->len, log_prefix_val->s, \ + "%s: %.*s%s" fmt,\ (lname)?(lname):LOG_LEVEL2NAME(__llevel),\ + log_prefix_val->len, log_prefix_val->s, \ (prefix) , ## args); \ } else { \ _km_log_func(LOG2SYSLOG_LEVEL(__llevel) |\

5 years, 9 months

[kamailio/kamailio] Added msg_get_pv and msg_set_pv to app_python module (#1612)

by David Minh Phan

These methods allow setting/getting pseudo variable values from Python module.   #### 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  Two new methods msg_get_pv and msg_set_pv are added to app_python/python_msgobj.c In python script, we can call *msg.set_pv* or *msg.get_pv* to set/get value from a pseudo variable ``` class RouteHelper: def normalize_number(self, msg, number): ret = number if number.startswith('00'): ret = '+' + number[2:] elif number.startswith('0'): ret = '+33' + number[1:] msg.set_pv("$var(normalized_number)", ret) return 1 def mod_init(): return RouteHelper() ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1612 -- Commit Summary -- * app_python: Ability to get/set pseudo variable value from Python module -- File Changes -- M src/modules/app_python/python_msgobj.c (92) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1612.patch https://github.com/kamailio/kamailio/pull/1612.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1612

5 years, 9 months

git:5.1:d2d3491a: tmx: bug fix in cancel for current branches in helper, reported in GH #1620

by Henning Westerholt

Module: kamailio Branch: 5.1 Commit: d2d3491a5edc58eaf92de641c4454bf535285066 URL: https://github.com/kamailio/kamailio/commit/d2d3491a5edc58eaf92de641c4454bf… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-08-13T21:21:46+02:00 tmx: bug fix in cancel for current branches in helper, reported in GH #1620 (cherry picked from commit 8a66803610f2c822f319899cd2bf8675615348bc) --- Modified: src/modules/tmx/tmx_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d2d3491a5edc58eaf92de641c4454bf… Patch: https://github.com/kamailio/kamailio/commit/d2d3491a5edc58eaf92de641c4454bf… --- diff --git a/src/modules/tmx/tmx_mod.c b/src/modules/tmx/tmx_mod.c index 770fcc20bf..28c68d4704 100644 --- a/src/modules/tmx/tmx_mod.c +++ b/src/modules/tmx/tmx_mod.c @@ -318,6 +318,8 @@ static int t_cancel_branches_helper(sip_msg_t* msg, int n) if(tcx != NULL) idx = tcx->branch_index; init_cancel_info(&cancel_data); + /* tm function: prepare_to_cancel(struct cell *t, branch_bm_t *cancel_bm, + branch_bm_t skip_branches) */ switch(n) { case 1: /* prepare cancel for every branch except idx (others) */ @@ -329,6 +331,7 @@ static int t_cancel_branches_helper(sip_msg_t* msg, int n) if(msg->first_line.u.reply.statuscode>=200) break; cancel_data.cancel_bitmap = 1<<idx; + _tmx_tmb.prepare_to_cancel(t, &cancel_data.cancel_bitmap, 0); break; default: /* prepare cancel for all branches */

5 years, 9 months

git:5.1:877d753a: uac: fix typo in module README

by Henning Westerholt

Module: kamailio Branch: 5.1 Commit: 877d753acf18691b9d8b2208b57c085721151b38 URL: https://github.com/kamailio/kamailio/commit/877d753acf18691b9d8b2208b57c085… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-08-13T21:21:43+02:00 uac: fix typo in module README (cherry picked from commit 00ba2193d60e8255ea863a99b52e86f841f16bdb) --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/877d753acf18691b9d8b2208b57c085… Patch: https://github.com/kamailio/kamailio/commit/877d753acf18691b9d8b2208b57c085… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 052bc2dc7a..a0520ece71 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -987,7 +987,7 @@ event_route[uac:reply] { Return the details of a remote registration record based on a filter. The command has two parameter: attribute and value. The attribute can be: l_uuid, l_username, r_username or auth_username. - The value is what should be matcheg against the value of the attribute + The value is what should be matched against the value of the attribute in the remote registration record. </para> <para> @@ -1029,7 +1029,7 @@ event_route[uac:reply] { Enable a remote registration record based on a filter. The command has two parameter: attribute and value. The attribute can be: l_uuid, l_username, r_username or auth_username. - The value is what should be matcheg against the value of the attribute + The value is what should be matched against the value of the attribute in the remote registration record. </para> <example> @@ -1050,7 +1050,7 @@ event_route[uac:reply] { Disable a remote registration record based on a filter. The command has two parameter: attribute and value. The attribute can be: l_uuid, l_username, r_username or auth_username. - The value is what should be matcheg against the value of the attribute + The value is what should be matched against the value of the attribute in the remote registration record. </para> <example>

5 years, 9 months

git:5.0:59acb6f9: tmx: bug fix in cancel for current branches in helper, reported in GH #1620

by Henning Westerholt

Module: kamailio Branch: 5.0 Commit: 59acb6f9c6b81d0ffae4ce5af4f772e1060d115d URL: https://github.com/kamailio/kamailio/commit/59acb6f9c6b81d0ffae4ce5af4f772e… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-08-13T21:21:28+02:00 tmx: bug fix in cancel for current branches in helper, reported in GH #1620 (cherry picked from commit 8a66803610f2c822f319899cd2bf8675615348bc) --- Modified: src/modules/tmx/tmx_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/59acb6f9c6b81d0ffae4ce5af4f772e… Patch: https://github.com/kamailio/kamailio/commit/59acb6f9c6b81d0ffae4ce5af4f772e… --- diff --git a/src/modules/tmx/tmx_mod.c b/src/modules/tmx/tmx_mod.c index 27e6d96683..a381e259a6 100644 --- a/src/modules/tmx/tmx_mod.c +++ b/src/modules/tmx/tmx_mod.c @@ -320,6 +320,8 @@ static int t_cancel_branches(sip_msg_t* msg, char *k, char *s2) idx = tcx->branch_index; n = (int)(long)k; init_cancel_info(&cancel_data); + /* tm function: prepare_to_cancel(struct cell *t, branch_bm_t *cancel_bm, + branch_bm_t skip_branches) */ switch(n) { case 1: /* prepare cancel for every branch except idx (others) */ @@ -331,6 +333,7 @@ static int t_cancel_branches(sip_msg_t* msg, char *k, char *s2) if(msg->first_line.u.reply.statuscode>=200) break; cancel_data.cancel_bitmap = 1<<idx; + _tmx_tmb.prepare_to_cancel(t, &cancel_data.cancel_bitmap, 0); break; default: /* prepare cancel for all branches */

5 years, 9 months

git:5.0:4552c85c: uac: fix typo in module README

by Henning Westerholt

Module: kamailio Branch: 5.0 Commit: 4552c85c36f1e1b5abda7b29c7c453467f4b8ec1 URL: https://github.com/kamailio/kamailio/commit/4552c85c36f1e1b5abda7b29c7c4534… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-08-13T21:20:57+02:00 uac: fix typo in module README (cherry picked from commit 00ba2193d60e8255ea863a99b52e86f841f16bdb) --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4552c85c36f1e1b5abda7b29c7c4534… Patch: https://github.com/kamailio/kamailio/commit/4552c85c36f1e1b5abda7b29c7c4534… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index f409454196..a3d4b7b840 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -987,7 +987,7 @@ event_route[uac:reply] { Return the details of a remote registration record based on a filter. The command has two parameter: attribute and value. The attribute can be: l_uuid, l_username, r_username or auth_username. - The value is what should be matcheg against the value of the attribute + The value is what should be matched against the value of the attribute in the remote registration record. </para> <para> @@ -1029,7 +1029,7 @@ event_route[uac:reply] { Enable a remote registration record based on a filter. The command has two parameter: attribute and value. The attribute can be: l_uuid, l_username, r_username or auth_username. - The value is what should be matcheg against the value of the attribute + The value is what should be matched against the value of the attribute in the remote registration record. </para> <example> @@ -1050,7 +1050,7 @@ event_route[uac:reply] { Disable a remote registration record based on a filter. The command has two parameter: attribute and value. The attribute can be: l_uuid, l_username, r_username or auth_username. - The value is what should be matcheg against the value of the attribute + The value is what should be matched against the value of the attribute in the remote registration record. </para> <example>

5 years, 9 months

wrong cherry-pick to uac README

by Henning Westerholt

Hello, sorry for the wrong cherry-pick to the README files in the stable branches, I was misguided from the git output. Will not happen again. Best regards, Henning -- Henning Westerholt https://skalatan.de/blog/

5 years, 9 months

git:5.1:c87df98e: modules: readme files regenerated - uac ... [skip ci]

by Henning Westerholt

Module: kamailio Branch: 5.1 Commit: c87df98e726cf5acefa4ea6d382602c88dc76919 URL: https://github.com/kamailio/kamailio/commit/c87df98e726cf5acefa4ea6d382602c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-08-13T21:18:25+02:00 modules: readme files regenerated - uac ... [skip ci] (cherry picked from commit d6eff66b185d442d0848a03c5b4681d6ab74373a) --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/c87df98e726cf5acefa4ea6d382602c… Patch: https://github.com/kamailio/kamailio/commit/c87df98e726cf5acefa4ea6d382602c… --- diff --git a/src/modules/uac/README b/src/modules/uac/README index 848279a2c2..a69d481a2f 100644 --- a/src/modules/uac/README +++ b/src/modules/uac/README @@ -838,7 +838,7 @@ event_route[uac:reply] { Return the details of a remote registration record based on a filter. The command has two parameter: attribute and value. The attribute can be: l_uuid, l_username, r_username or auth_username. The value is what - should be matcheg against the value of the attribute in the remote + should be matched against the value of the attribute in the remote registration record. The state of the registration is reflected in the flags field: @@ -859,7 +859,7 @@ event_route[uac:reply] { Enable a remote registration record based on a filter. The command has two parameter: attribute and value. The attribute can be: l_uuid, l_username, r_username or auth_username. The value is what should be - matcheg against the value of the attribute in the remote registration + matched against the value of the attribute in the remote registration record. Example 1.33. uac.reg_enable usage @@ -872,7 +872,7 @@ event_route[uac:reply] { Disable a remote registration record based on a filter. The command has two parameter: attribute and value. The attribute can be: l_uuid, l_username, r_username or auth_username. The value is what should be - matcheg against the value of the attribute in the remote registration + matched against the value of the attribute in the remote registration record. Example 1.34. uac.reg_disable usage

5 years, 9 months

git:5.0:97bbdb67: modules: readme files regenerated - uac ... [skip ci]

by Henning Westerholt

Module: kamailio Branch: 5.0 Commit: 97bbdb67d31e0f4d73f56fc19d01c2152a0af005 URL: https://github.com/kamailio/kamailio/commit/97bbdb67d31e0f4d73f56fc19d01c21… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-08-13T21:18:09+02:00 modules: readme files regenerated - uac ... [skip ci] (cherry picked from commit d6eff66b185d442d0848a03c5b4681d6ab74373a) --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/97bbdb67d31e0f4d73f56fc19d01c21… Patch: https://github.com/kamailio/kamailio/commit/97bbdb67d31e0f4d73f56fc19d01c21… --- diff --git a/src/modules/uac/README b/src/modules/uac/README index c9a1dca942..59200d70ee 100644 --- a/src/modules/uac/README +++ b/src/modules/uac/README @@ -838,7 +838,7 @@ event_route[uac:reply] { Return the details of a remote registration record based on a filter. The command has two parameter: attribute and value. The attribute can be: l_uuid, l_username, r_username or auth_username. The value is what - should be matcheg against the value of the attribute in the remote + should be matched against the value of the attribute in the remote registration record. The state of the registration is reflected in the flags field: @@ -859,7 +859,7 @@ event_route[uac:reply] { Enable a remote registration record based on a filter. The command has two parameter: attribute and value. The attribute can be: l_uuid, l_username, r_username or auth_username. The value is what should be - matcheg against the value of the attribute in the remote registration + matched against the value of the attribute in the remote registration record. Example 1.33. uac.reg_enable usage @@ -872,7 +872,7 @@ event_route[uac:reply] { Disable a remote registration record based on a filter. The command has two parameter: attribute and value. The attribute can be: l_uuid, l_username, r_username or auth_username. The value is what should be - matcheg against the value of the attribute in the remote registration + matched against the value of the attribute in the remote registration record. Example 1.34. uac.reg_disable usage

5 years, 9 months

git:master:8a668036: tmx: bug fix in cancel for current branches in helper, reported in GH #1620

by Henning Westerholt

Module: kamailio Branch: master Commit: 8a66803610f2c822f319899cd2bf8675615348bc URL: https://github.com/kamailio/kamailio/commit/8a66803610f2c822f319899cd2bf867… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-08-13T21:17:38+02:00 tmx: bug fix in cancel for current branches in helper, reported in GH #1620 --- Modified: src/modules/tmx/tmx_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8a66803610f2c822f319899cd2bf867… Patch: https://github.com/kamailio/kamailio/commit/8a66803610f2c822f319899cd2bf867… --- diff --git a/src/modules/tmx/tmx_mod.c b/src/modules/tmx/tmx_mod.c index 2a703362d6..cf7c1080da 100644 --- a/src/modules/tmx/tmx_mod.c +++ b/src/modules/tmx/tmx_mod.c @@ -321,6 +321,8 @@ static int t_cancel_branches_helper(sip_msg_t* msg, int n) if(tcx != NULL) idx = tcx->branch_index; init_cancel_info(&cancel_data); + /* tm function: prepare_to_cancel(struct cell *t, branch_bm_t *cancel_bm, + branch_bm_t skip_branches) */ switch(n) { case 1: /* prepare cancel for every branch except idx (others) */ @@ -332,6 +334,7 @@ static int t_cancel_branches_helper(sip_msg_t* msg, int n) if(msg->first_line.u.reply.statuscode>=200) break; cancel_data.cancel_bitmap = 1<<idx; + _tmx_tmb.prepare_to_cancel(t, &cancel_data.cancel_bitmap, 0); break; default: /* prepare cancel for all branches */

5 years, 9 months

← Newer
1
...
19
20
21
22
23
24
25
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2018