sr-dev

sr-dev@lists.kamailio.org

20 participants
45178 discussions

git:master:cff8e22d: Merge pull request #2431 from nferreyra/siptrace/fix_drop_in_event_route
by GitHub 12 Aug '20

12 Aug '20

Module: kamailio Branch: master Commit: cff8e22da160933b63b7cfa296386adb5155d0b1 URL: https://github.com/kamailio/kamailio/commit/cff8e22da160933b63b7cfa296386ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-08-12T16:31:42+02:00 Merge pull request #2431 from nferreyra/siptrace/fix_drop_in_event_route siptrace: fix drop() usage in siptrace:msg event route --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/cff8e22da160933b63b7cfa296386ad… Patch: https://github.com/kamailio/kamailio/commit/cff8e22da160933b63b7cfa296386ad… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 1b7b014d0e..2e8e690ac0 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -2053,7 +2053,7 @@ static int siptrace_exec_evcb_msg(siptrace_data_t *sto) init_run_actions_ctx(&ctx); if(_siptrace_evrt_msg_idx>=0) { - run_top_route(event_rt.rlist[_siptrace_evrt_msg_idx], &msg, 0); + run_top_route(event_rt.rlist[_siptrace_evrt_msg_idx], &msg, &ctx); } else { keng = sr_kemi_eng_get(); if (keng!=NULL) {

1 0

git:master:ef992449: siptrace: fix run_top_route() call to set ctx
by Nuno Ferreira 12 Aug '20

12 Aug '20

Module: kamailio Branch: master Commit: ef9924495dd007a5a7b7ab36049200e78e7ab10d URL: https://github.com/kamailio/kamailio/commit/ef9924495dd007a5a7b7ab36049200e… Author: Nuno Ferreira <nferreira(a)fuze.com> Committer: Nuno Ferreira <nferreira(a)fuze.com> Date: 2020-08-07T19:20:00+01:00 siptrace: fix run_top_route() call to set ctx - fix drop() usage in siptrace:msg event route --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/ef9924495dd007a5a7b7ab36049200e… Patch: https://github.com/kamailio/kamailio/commit/ef9924495dd007a5a7b7ab36049200e… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 1b7b014d0e..2e8e690ac0 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -2053,7 +2053,7 @@ static int siptrace_exec_evcb_msg(siptrace_data_t *sto) init_run_actions_ctx(&ctx); if(_siptrace_evrt_msg_idx>=0) { - run_top_route(event_rt.rlist[_siptrace_evrt_msg_idx], &msg, 0); + run_top_route(event_rt.rlist[_siptrace_evrt_msg_idx], &msg, &ctx); } else { keng = sr_kemi_eng_get(); if (keng!=NULL) {

1 0

[kamailio/kamailio] xhttp_prom: add support for histogram metrics. (#2435)
by vhernando 11 Aug '20

11 Aug '20

#### 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  Histogram metric and minor issues. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2435 -- Commit Summary -- * xhttp_prom: add support for histogram metrics. -- File Changes -- M src/modules/xhttp_prom/doc/xhttp_prom_admin.xml (203) M src/modules/xhttp_prom/prom.c (102) M src/modules/xhttp_prom/prom.h (21) M src/modules/xhttp_prom/prom_metric.c (909) M src/modules/xhttp_prom/prom_metric.h (50) M src/modules/xhttp_prom/xhttp_prom.c (630) M src/modules/xhttp_prom/xhttp_prom.h (25) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2435.patch https://github.com/kamailio/kamailio/pull/2435.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/2435

2 2

Re: [sr-dev] [kamailio/kamailio] core: keep a global flag in shm for shut down phase (6da946e)
by Daniel-Constantin Mierla 11 Aug '20

11 Aug '20

Indeed, thanks! Pushed a commit using NULL comparison to follow recommendations to highlight is about pointers. -- 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/commit/6da946e4a3d6d6949dd6babe9cf3919…

1 0

git:master:27b2ddf9: core: proper test when initializing _ksr_shutdown_phase shm pointer
by Daniel-Constantin Mierla 11 Aug '20

11 Aug '20

Module: kamailio Branch: master Commit: 27b2ddf926240b1dd269eb1d96767d73edf9c6e6 URL: https://github.com/kamailio/kamailio/commit/27b2ddf926240b1dd269eb1d96767d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-11T16:33:02+02:00 core: proper test when initializing _ksr_shutdown_phase shm pointer --- Modified: src/core/sr_module.c --- Diff: https://github.com/kamailio/kamailio/commit/27b2ddf926240b1dd269eb1d96767d7… Patch: https://github.com/kamailio/kamailio/commit/27b2ddf926240b1dd269eb1d96767d7… --- diff --git a/src/core/sr_module.c b/src/core/sr_module.c index 545845fdc5..56ba8bca59 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -110,11 +110,11 @@ unsigned int set_modinit_delay(unsigned int v) } /* shut down phase for instance - kept in shared memory */ -static int *_ksr_shutdown_phase = 0; +static int *_ksr_shutdown_phase = NULL; int ksr_shutdown_phase_init(void) { - if(_ksr_shutdown_phase) { + if(_ksr_shutdown_phase == NULL) { _ksr_shutdown_phase = (int*)shm_malloc(sizeof(int)); } return 0;

1 0

Re: [sr-dev] [kamailio/kamailio] core: keep a global flag in shm for shut down phase (6da946e)
by Andrey Deykunov 11 Aug '20

11 Aug '20

if(_ksr_shutdown_phase) { instance of _ksr_shutdown_phase cannot be initialized here. it supposed to be: if(!_ksr_shutdown_phase) { -- 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/commit/6da946e4a3d6d6949dd6babe9cf3919…

1 0

[kamailio/kamailio] dual-stack bonding when used network interface name (#2404)
by sergey-safarov 11 Aug '20

11 Aug '20

### Description I prefer to use interface name for `listen` *example* ``` listen=udp:eth0:5060 ``` When `kamailo` started then bounded only to IPv4 address. Could be added feature dual-stack bounding when used interface name. tested latest master. -- 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/issues/2404

2 10

git:master:046126b4: topoh: check if via param has the expected prefix, otherwise skip
by Daniel-Constantin Mierla 11 Aug '20

11 Aug '20

Module: kamailio Branch: master Commit: 046126b4a90090bf5b8f9b517ba5218793e6b973 URL: https://github.com/kamailio/kamailio/commit/046126b4a90090bf5b8f9b517ba5218… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-11T12:36:02+02:00 topoh: check if via param has the expected prefix, otherwise skip - GH #2437 --- Modified: src/modules/topoh/th_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/046126b4a90090bf5b8f9b517ba5218… Patch: https://github.com/kamailio/kamailio/commit/046126b4a90090bf5b8f9b517ba5218… --- diff --git a/src/modules/topoh/th_msg.c b/src/modules/topoh/th_msg.c index 990128c01e..46fecb184a 100644 --- a/src/modules/topoh/th_msg.c +++ b/src/modules/topoh/th_msg.c @@ -408,7 +408,7 @@ int th_unmask_via(sip_msg_t *msg, str *cookie) if (th_uri_prefix_checks && (via->host.len!=th_ip.len || strncasecmp(via->host.s, th_ip.s, th_ip.len)!=0)) { - LM_DBG("via %d is not encoded",i); + LM_DBG("via %d is not encoded - skip\n",i); continue; } @@ -418,9 +418,16 @@ int th_unmask_via(sip_msg_t *msg, str *cookie) LM_ERR("cannot find param in via %d\n", i); return -1; } - if(vp->value.len <= th_vparam_prefix.len) { - LM_ERR("invalid param len in via %d\n", i); - return -1; + if(th_vparam_prefix.len > 0) { + if(vp->value.len <= th_vparam_prefix.len) { + LM_DBG("shorter param len in via %d - skip\n", i); + continue; + } + if(strncmp(vp->value.s, th_vparam_prefix.s, + th_vparam_prefix.len) != 0) { + LM_DBG("no prefix in via %d - skip\n", i); + continue; + } } if(i==2) { out.s = th_mask_decode(vp->value.s, vp->value.len,

1 0

[kamailio/kamailio] python3, tm.t_relay not return int (#2366)
by Jorge Cadena Argote 11 Aug '20

11 Aug '20

Extract from examples. ``` Jun 19 11:07:47 localhost kamailio[8645]: 5(8658) ERROR: app_python3 [python_support.c:156]: python_handle_exception(): apy_exec: ksr_request_route((null)): Unhandled exception in the Python code: Jun 19 11:07:47 localhost kamailio[8645]: AttributeError: 'kamailio' object has no attribute 'ksr_onsend_route' Jun 19 11:07:47 localhost kamailio[8645]: During handling of the above exception, another exception occurred: Jun 19 11:07:47 localhost kamailio[8645]: Traceback (most recent call last): Jun 19 11:07:47 localhost kamailio[8645]: File "/etc/kamailio/kamailio.py", line 68, in ksr_request_route Jun 19 11:07:47 localhost kamailio[8645]: if self.ksr_route_withindlg(msg) ==- 255: Jun 19 11:07:47 localhost kamailio[8645]: File "/etc/kamailio/kamailio.py", line 202, in ksr_route_withindlg Jun 19 11:07:47 localhost kamailio[8645]: self.ksr_route_relay(msg) Jun 19 11:07:47 localhost kamailio[8645]: File "/etc/kamailio/kamailio.py", line 135, in ksr_route_relay Jun 19 11:07:47 localhost kamailio[8645]: if KSR.tm.t_relay(): Jun 19 11:07:47 localhost kamailio[8645]: SystemError: <built-in function t_relay> returned a result with an error set Jun 19 11:07:47 localhost kamailio[8645]: 5(8658) DEBUG: app_python3 [apy_kemi.c:112]: sr_kemi_config_engine_python(): execution of route type 1 with no name returned -1 ``` -- 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/issues/2366

2 4

[kamailio/kamailio] app_java.so: undefined symbol: JNI_CreateJavaVM please help (#1969)
by xevilstar 11 Aug '20

11 Aug '20

### Description  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- 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/issues/1969

4 29

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev