sr-dev December 2018

sr-dev@lists.kamailio.org

23 participants
314 discussions

Re: [sr-dev] [kamailio/kamailio] dialog: safety checks for local cseq and contact vars (79946bb)
by Cui Gang 19 Dec '18

19 Dec '18

I found your commit in branch master, "dialog: check for cseq value only when getting it for caller/request". And I tested, It works well ! Could you commit that patch to branch 5.2? -- 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/79946bbb6d1731f503fc378ae38311b…

1 0

git:master:fbfca70e: modules: readme files regenerated - websocket ... [skip ci]
by Kamailio Dev 19 Dec '18

19 Dec '18

Module: kamailio Branch: master Commit: fbfca70ec60c41f3fa4050c8d022e75f7b1e1bba URL: https://github.com/kamailio/kamailio/commit/fbfca70ec60c41f3fa4050c8d022e75… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-12-19T14:16:41+01:00 modules: readme files regenerated - websocket ... [skip ci] --- Modified: src/modules/websocket/README --- Diff: https://github.com/kamailio/kamailio/commit/fbfca70ec60c41f3fa4050c8d022e75… Patch: https://github.com/kamailio/kamailio/commit/fbfca70ec60c41f3fa4050c8d022e75… --- diff --git a/src/modules/websocket/README b/src/modules/websocket/README index 6421646e09..c8241be6e6 100644 --- a/src/modules/websocket/README +++ b/src/modules/websocket/README @@ -34,6 +34,8 @@ Peter Dunkley 4.7. cors_mode (integer) 4.8. verbose_list (int) 4.9. event_callback (str) + 4.10. timer_interval (integer) + 4.11. rm_delay_interval (integer) 5. Functions @@ -70,10 +72,12 @@ Peter Dunkley 1.9. Set cors_mode parameter 1.10. Set verbose_list parameter 1.11. Set event_callback parameter - 1.12. ws_handle_handshake usage - 1.13. ws_close usage - 1.14. event_route[websocket:closed] usage - 1.15. $ws_conid usage + 1.12. Set timer_intervalparameter + 1.13. Set rm_timer_intervalparameter + 1.14. ws_handle_handshake usage + 1.15. ws_close usage + 1.16. event_route[websocket:closed] usage + 1.17. $ws_conid usage Chapter 1. Admin Guide @@ -102,6 +106,8 @@ Chapter 1. Admin Guide 4.7. cors_mode (integer) 4.8. verbose_list (int) 4.9. event_callback (str) + 4.10. timer_interval (integer) + 4.11. rm_delay_interval (integer) 5. Functions @@ -345,6 +351,8 @@ onreply_route[WS_REPLY] { 4.7. cors_mode (integer) 4.8. verbose_list (int) 4.9. event_callback (str) + 4.10. timer_interval (integer) + 4.11. rm_delay_interval (integer) 4.1. keepalive_mechanism (integer) @@ -483,6 +491,29 @@ function ksr_websocket_event(evname) end ... +4.10. timer_interval (integer) + + The number of seconds between each timer process run + + Default value is 1. + + Example 1.12. Set timer_intervalparameter +... +modparam("websocket", "timer_interval", 5) +... + +4.11. rm_delay_interval (integer) + + The number of seconds to wait before destroying the websocket + connection once put in remove state. + + Default value is 5. + + Example 1.13. Set rm_timer_intervalparameter +... +modparam("websocket", "rm_delay_interval", 2) +... + 5. Functions 5.1. ws_handle_handshake() @@ -503,7 +534,7 @@ Note request, when there is a problem. Otherwise, it returns 1 (or positive number) in case of success. - Example 1.12. ws_handle_handshake usage + Example 1.14. ws_handle_handshake usage ... ws_handle_handshake(); ... @@ -528,7 +559,7 @@ Note This function can be used from ANY_ROUTE. - Example 1.13. ws_close usage + Example 1.15. ws_close usage ... ws_close(4000, "Because I say so"); ... @@ -642,7 +673,7 @@ kamcmd ws.enable connection closes. The connection may be identified using the the $si and $sp pseudo-variables. - Example 1.14. event_route[websocket:closed] usage + Example 1.16. event_route[websocket:closed] usage ... event_route[websocket:closed] { xlog("L_INFO", "WebSocket connection from $si:$sp has closed\n"); @@ -658,7 +689,7 @@ event_route[websocket:closed] { Connection id of closed websocket connection. Can only be used in websocket:closed event route. - Example 1.15. $ws_conid usage + Example 1.17. $ws_conid usage ... event_route[websocket:closed] { xlog("L_INFO", "WebSocket connection with id $ws_conid has closed\n");

1 0

git:master:3a20bb1a: websocket: docs for timer_interval and rm_delay_interval params
by Daniel-Constantin Mierla 19 Dec '18

19 Dec '18

Module: kamailio Branch: master Commit: 3a20bb1ad27b8a85ec932975e14bcec12237437b URL: https://github.com/kamailio/kamailio/commit/3a20bb1ad27b8a85ec932975e14bcec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-19T14:11:51+01:00 websocket: docs for timer_interval and rm_delay_interval params --- Modified: src/modules/websocket/doc/websocket_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3a20bb1ad27b8a85ec932975e14bcec… Patch: https://github.com/kamailio/kamailio/commit/3a20bb1ad27b8a85ec932975e14bcec… --- diff --git a/src/modules/websocket/doc/websocket_admin.xml b/src/modules/websocket/doc/websocket_admin.xml index 338d37ef22..6b6483d73f 100644 --- a/src/modules/websocket/doc/websocket_admin.xml +++ b/src/modules/websocket/doc/websocket_admin.xml @@ -477,6 +477,37 @@ end </example> </section> + <section id="websocket.p.timer_interval"> + <title><varname>timer_interval</varname> (integer)</title> + <para>The number of seconds between each timer process run + </para> + <para><emphasis>Default value is 1.</emphasis></para> + <example> + <title>Set <varname>timer_interval</varname>parameter</title> + <programlisting format="linespecific"> +... +modparam("websocket", "timer_interval", 5) +... +</programlisting> + </example> + </section> + + <section id="websocket.p.rm_delay_interval"> + <title><varname>rm_delay_interval</varname> (integer)</title> + <para>The number of seconds to wait before destroying the websocket + connection once put in remove state. + </para> + <para><emphasis>Default value is 5.</emphasis></para> + <example> + <title>Set <varname>rm_timer_interval</varname>parameter</title> + <programlisting format="linespecific"> +... +modparam("websocket", "rm_delay_interval", 2) +... +</programlisting> + </example> + </section> + </section> <section>

1 0

git:master:af09e224: websocket: destroy ws connections in dedicated timer process
by Daniel-Constantin Mierla 19 Dec '18

19 Dec '18

Module: kamailio Branch: master Commit: af09e224dba0c57c23fd58a7f83a24d2ffbaa07c URL: https://github.com/kamailio/kamailio/commit/af09e224dba0c57c23fd58a7f83a24d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-19T14:06:56+01:00 websocket: destroy ws connections in dedicated timer process - avoid races/invalid access when sending data failed and the connection was removed - added parameter to control the timer process: interval or running and delay interval for removing --- Modified: src/modules/websocket/websocket.c Modified: src/modules/websocket/ws_conn.c Modified: src/modules/websocket/ws_conn.h --- Diff: https://github.com/kamailio/kamailio/commit/af09e224dba0c57c23fd58a7f83a24d… Patch: https://github.com/kamailio/kamailio/commit/af09e224dba0c57c23fd58a7f83a24d…

1 0

git:master:71517152: websocket: fetch ws connections based on keepalive process index
by Daniel-Constantin Mierla 19 Dec '18

19 Dec '18

Module: kamailio Branch: master Commit: 71517152e7de26d6c47fd037c25dc854aa37734f URL: https://github.com/kamailio/kamailio/commit/71517152e7de26d6c47fd037c25dc85… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-19T13:15:36+01:00 websocket: fetch ws connections based on keepalive process index - get the ones with id that matches the index when doing modulo over the number of keepalive process in order to spread the load of doing the ping-pong --- Modified: src/modules/websocket/websocket.c Modified: src/modules/websocket/ws_conn.c Modified: src/modules/websocket/ws_conn.h Modified: src/modules/websocket/ws_frame.c --- Diff: https://github.com/kamailio/kamailio/commit/71517152e7de26d6c47fd037c25dc85… Patch: https://github.com/kamailio/kamailio/commit/71517152e7de26d6c47fd037c25dc85…

1 0

RFC: updates to some core functions
by Daniel-Constantin Mierla 19 Dec '18

19 Dec '18

Hello, it was brought into discussions several times in the past about core functions not accepting variables in the parameters. I think it is time to update them during the 5.3 release development. For few of them, I added in the past some alternative function in the corex module (e.g., force_send_socket() in core and set_send_socket() in corex module). So, I see two options: 1) add a function with similar name in corex module and same behaviour like the one from core 2) remove the function export from the core and export one with the same name from the corex module First one will ensure that configs using the functions right now keep working without any update. The second one will be better in long term from the point of documentation (no duplicated docs), but there might be few cases that would require updates in the config -- iirc, there are some functions that can get special tokens in the parameters (like forward(uri:host, uri:port)), they will get an equivalent with variables, but old config will not be compatible. Obviously the reason for this email is to ask the developers and users what would be the preferred way from own point of view. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - May 6-8, 2019 -- www.kamailioworld.com Kamailio Advanced Training - Mar 4-6, 2019 in Berlin; Mar 25-27, 2019, in Washington, DC, USA -- www.asipto.com

8 12

Re: [sr-dev] [kamailio/kamailio] dialog: safety checks for local cseq and contact vars (79946bb)
by Daniel-Constantin Mierla 19 Dec '18

19 Dec '18

Looks like a regression introduced with a patch that tried to avoid a crash -- I pushed another commit to skip the test on cseq when not taken from sip request. It is already in branch 5.2, can you test and see if all ok now? -- 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/79946bbb6d1731f503fc378ae38311b…

1 0

git:master:740bc8ce: dialog: check for cseq value only when getting it for caller/request
by Daniel-Constantin Mierla 19 Dec '18

19 Dec '18

Module: kamailio Branch: master Commit: 740bc8ce88da612ac30a73db0145908355cab192 URL: https://github.com/kamailio/kamailio/commit/740bc8ce88da612ac30a73db0145908… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-19T11:56:41+01:00 dialog: check for cseq value only when getting it for caller/request --- Modified: src/modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/740bc8ce88da612ac30a73db0145908… Patch: https://github.com/kamailio/kamailio/commit/740bc8ce88da612ac30a73db0145908… --- diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index a94dd641a4..983e82d7dd 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -208,7 +208,7 @@ int populate_leg_info( struct dlg_cell *dlg, struct sip_msg *msg, /* use the same as in request */ cseq = dlg->cseq[DLG_CALLEE_LEG]; } - if(cseq.s==NULL || cseq.len<=0) { + if ((leg==DLG_CALLER_LEG) && (cseq.s==NULL || cseq.len<=0)) { LM_ERR("empty CSeq number\n"); goto error0; }

1 0

Re: [sr-dev] [kamailio/kamailio] dialog: safety checks for local cseq and contact vars (79946bb)
by Cui Gang 19 Dec '18

19 Dec '18

Hi, My kamailio configuration file works well on the first release 5.2.0(535e13b). When I update kamailio server to the 5.2.0 branch last version, include this commit, dialog always ERROR like: ERROR: {...} dialog [dlg_handlers.c:212]: populate_leg_info(): empty CSeq number Why? And how can I fix it? Thanks! -- 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/79946bbb6d1731f503fc378ae38311b…

1 0

[kamailio/kamailio] core: Add PROXY protocol implementation (#1765)
by Sebastian Lauwers 19 Dec '18

19 Dec '18

#### 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 - [x] Related to issue #1757 #### Description  Note: This PR follows the discussion in #1757. - introduce new global variable `ksr_tcp_accept_proxy`. - this variable can be modified by using the `tcp_accept_proxy=yes` configuration parameter. - when active, inbound TCP connections are expected to behave according to the PROXY protocol[1]. - Both the v1 (human-readable) and v2 (binary) versions of the protocol are supported. [1]: https://www.haproxy.org/download/1.8/doc/proxy-protocol.txt You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1765 -- Commit Summary -- * core: Add PROXY protocol implementation -- File Changes -- M src/core/cfg.lex (3) M src/core/cfg.y (9) M src/core/globals.h (1) M src/core/tcp_main.c (244) M src/core/tcp_read.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1765.patch https://github.com/kamailio/kamailio/pull/1765.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/1765

4 11

← Newer
1
...
16
17
18
19
20
21
22
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2018