sr-dev

sr-dev@lists.kamailio.org

20 participants
45174 discussions

git:master:021d4de2: Merge pull request #2399 from lbalaceanu/mdb_availability_control
by GitHub 17 Jul '20

17 Jul '20

Module: kamailio Branch: master Commit: 021d4de2ad22f6453e8a48f0db841bfa6b1dbe88 URL: https://github.com/kamailio/kamailio/commit/021d4de2ad22f6453e8a48f0db841bf… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: GitHub <noreply(a)github.com> Date: 2020-07-17T10:43:30+03:00 Merge pull request #2399 from lbalaceanu/mdb_availability_control p_usrloc: reworking mdb_availability_control --- Modified: src/modules/p_usrloc/p_usrloc_mod.c Modified: src/modules/p_usrloc/p_usrloc_mod.h Modified: src/modules/p_usrloc/ul_db.c Modified: src/modules/p_usrloc/ul_db_watch.c Modified: src/modules/p_usrloc/ul_db_watch.h --- Diff: https://github.com/kamailio/kamailio/commit/021d4de2ad22f6453e8a48f0db841bf… Patch: https://github.com/kamailio/kamailio/commit/021d4de2ad22f6453e8a48f0db841bf…

1 0

git:master:5789c506: p_usrloc: reworking mdb_availability_control
by Lucian Balaceanu 17 Jul '20

17 Jul '20

Module: kamailio Branch: master Commit: 5789c506d022dd5713072cd1fcc07a25f42e098c URL: https://github.com/kamailio/kamailio/commit/5789c506d022dd5713072cd1fcc07a2… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2020-07-14T11:49:21+03:00 p_usrloc: reworking mdb_availability_control - simplify general implementation - avoid deadlock due to a process trying to acquire same lock twice --- Modified: src/modules/p_usrloc/p_usrloc_mod.c Modified: src/modules/p_usrloc/p_usrloc_mod.h Modified: src/modules/p_usrloc/ul_db.c Modified: src/modules/p_usrloc/ul_db_watch.c Modified: src/modules/p_usrloc/ul_db_watch.h --- Diff: https://github.com/kamailio/kamailio/commit/5789c506d022dd5713072cd1fcc07a2… Patch: https://github.com/kamailio/kamailio/commit/5789c506d022dd5713072cd1fcc07a2…

1 0

git:5.4:dc082cec: Makefile.defs: version set to 5.4.0-rc1
by Daniel-Constantin Mierla 17 Jul '20

17 Jul '20

Module: kamailio Branch: 5.4 Commit: dc082cec6f846df66ec3fa06a6c119b0d418ef19 URL: https://github.com/kamailio/kamailio/commit/dc082cec6f846df66ec3fa06a6c119b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-17T09:19:55+02:00 Makefile.defs: version set to 5.4.0-rc1 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/dc082cec6f846df66ec3fa06a6c119b… Patch: https://github.com/kamailio/kamailio/commit/dc082cec6f846df66ec3fa06a6c119b… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 9004a372dc..254c1096ec 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 4 SUBLEVEL = 0 -EXTRAVERSION = -rc0 +EXTRAVERSION = -rc1 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:18e4b6b4: Makefile.defs: version set to 5.5.0-dev1
by Daniel-Constantin Mierla 17 Jul '20

17 Jul '20

Module: kamailio Branch: master Commit: 18e4b6b44eb52acf206d2d1f2933b7d5437e39a0 URL: https://github.com/kamailio/kamailio/commit/18e4b6b44eb52acf206d2d1f2933b7d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-17T09:19:20+02:00 Makefile.defs: version set to 5.5.0-dev1 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/18e4b6b44eb52acf206d2d1f2933b7d… Patch: https://github.com/kamailio/kamailio/commit/18e4b6b44eb52acf206d2d1f2933b7d… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 17e61a8b45..296e7df727 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 5 SUBLEVEL = 0 -EXTRAVERSION = -dev0 +EXTRAVERSION = -dev1 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:c3962fff: modules: readme files regenerated - sipdump ... [skip ci]
by Kamailio Dev 17 Jul '20

17 Jul '20

Module: kamailio Branch: master Commit: c3962fff1c0efbd9ba2939b8f173efd08c263bac URL: https://github.com/kamailio/kamailio/commit/c3962fff1c0efbd9ba2939b8f173efd… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-07-17T08:01:20+02:00 modules: readme files regenerated - sipdump ... [skip ci] --- Modified: src/modules/sipdump/README --- Diff: https://github.com/kamailio/kamailio/commit/c3962fff1c0efbd9ba2939b8f173efd… Patch: https://github.com/kamailio/kamailio/commit/c3962fff1c0efbd9ba2939b8f173efd… --- diff --git a/src/modules/sipdump/README b/src/modules/sipdump/README index 7b8aebedff..a699336f53 100644 --- a/src/modules/sipdump/README +++ b/src/modules/sipdump/README @@ -154,8 +154,10 @@ modparam("sipdump", "enable", 1) 3.2. mode (int) Set the type of activity done by the module, the value can be set based - on flags: 1 (value 1) - write to text files; 2 (value 2) - execute - event route; 3 (value 4) - write to pcap files. + on flags index: 0 (value 1) - write to text files; 1 (value 2) - + execute event route; 2 (value 4) - write to pcap files; 3 (value 8) - + insert the P-KSR-SIPDump header with meta data inside the SIP message + written in pcap file. To enable several activity modes, set the parameter to the sum of corresponding values.

1 0

git:master:e63c52d0: sipdump: docs about mode flag 3 (value 8)
by Daniel-Constantin Mierla 17 Jul '20

17 Jul '20

Module: kamailio Branch: master Commit: e63c52d02465575dbcf38c2181607fc391cbb390 URL: https://github.com/kamailio/kamailio/commit/e63c52d02465575dbcf38c2181607fc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-17T07:55:53+02:00 sipdump: docs about mode flag 3 (value 8) - corrected indexes for flags --- Modified: src/modules/sipdump/doc/sipdump_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e63c52d02465575dbcf38c2181607fc… Patch: https://github.com/kamailio/kamailio/commit/e63c52d02465575dbcf38c2181607fc… --- diff --git a/src/modules/sipdump/doc/sipdump_admin.xml b/src/modules/sipdump/doc/sipdump_admin.xml index 9ddb55735c..7e642f6010 100644 --- a/src/modules/sipdump/doc/sipdump_admin.xml +++ b/src/modules/sipdump/doc/sipdump_admin.xml @@ -96,9 +96,11 @@ modparam("sipdump", "enable", 1) <title><varname>mode</varname> (int)</title> <para> Set the type of activity done by the module, the value can be set - based on flags: 1 (value 1) - write to text files; - 2 (value 2) - execute event route; - 3 (value 4) - write to pcap files. + based on flags index: 0 (value 1) - write to text files; + 1 (value 2) - execute event route; + 2 (value 4) - write to pcap files; 3 (value 8) - insert the + P-KSR-SIPDump header with meta data inside the SIP message written + in pcap file. </para> <para> To enable several activity modes, set the parameter to the sum of

1 0

[kamailio/kamailio] core websocket close event (#2397)
by lazedo 16 Jul '20

16 Jul '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 allow kamailio modules to be notified when a websocket is closed without depending on script callbacks. this allows for multiple independent modules to subscribe to new core event `SREV_TCP_WS_CLOSE` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2397 -- Commit Summary -- * core: add websocket event * websocket: emit core event on close -- File Changes -- M src/core/events.c (20) M src/core/events.h (2) M src/modules/websocket/ws_conn.c (21) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2397.patch https://github.com/kamailio/kamailio/pull/2397.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/2397

2 5

git:master:16914788: websocket: emit core event on close
by lazedo 16 Jul '20

16 Jul '20

Module: kamailio Branch: master Commit: 16914788ba49b69aaabc8e75ca9b5d95dce6b825 URL: https://github.com/kamailio/kamailio/commit/16914788ba49b69aaabc8e75ca9b5d9… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2020-07-16T21:55:15Z websocket: emit core event on close --- Modified: src/modules/websocket/ws_conn.c --- Diff: https://github.com/kamailio/kamailio/commit/16914788ba49b69aaabc8e75ca9b5d9… Patch: https://github.com/kamailio/kamailio/commit/16914788ba49b69aaabc8e75ca9b5d9… --- diff --git a/src/modules/websocket/ws_conn.c b/src/modules/websocket/ws_conn.c index 8570afa086..7ffedd9be5 100644 --- a/src/modules/websocket/ws_conn.c +++ b/src/modules/websocket/ws_conn.c @@ -31,6 +31,7 @@ #include "../../core/counters.h" #include "../../core/kemi.h" #include "../../core/mem/mem.h" +#include "../../core/events.h" #include "ws_conn.h" #include "websocket.h" @@ -261,6 +262,14 @@ int wsconn_add(struct receive_info *rcv, unsigned int sub_protocol) return 0; } +static void wsconn_run_close_callback(ws_connection_t *wsc) +{ + sr_event_param_t evp = {0}; + wsc->rcv.proto_reserved1 = wsc->id; + evp.rcv = &wsc->rcv; + sr_event_exec(SREV_TCP_WS_CLOSE, &evp); +} + static void wsconn_run_route(ws_connection_t *wsc) { int rt, backup_rt; @@ -321,6 +330,8 @@ static void wsconn_dtor(ws_connection_t *wsc) if(wsc->run_event) wsconn_run_route(wsc); + wsconn_run_close_callback(wsc); + shm_free(wsc); LM_DBG("wsconn_dtor for [%p] destroyed\n", wsc);

1 0

git:master:815b8dee: core: add websocket event
by lazedo 16 Jul '20

16 Jul '20

Module: kamailio Branch: master Commit: 815b8dee38df74395d4e840db3dc582695c02baa URL: https://github.com/kamailio/kamailio/commit/815b8dee38df74395d4e840db3dc582… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2020-07-16T21:55:15Z core: add websocket event * allows multiple consumers * returns last result --- Modified: src/core/events.c Modified: src/core/events.h --- Diff: https://github.com/kamailio/kamailio/commit/815b8dee38df74395d4e840db3dc582… Patch: https://github.com/kamailio/kamailio/commit/815b8dee38df74395d4e840db3dc582… --- diff --git a/src/core/events.c b/src/core/events.c index 91df673996..2d8400f829 100644 --- a/src/core/events.c +++ b/src/core/events.c @@ -189,6 +189,15 @@ int sr_event_register_cb(int type, sr_event_cb_f f) } if(i==SREV_CB_LIST_SIZE) return -1; break; + case SREV_TCP_WS_CLOSE: + for(i=0; i<SREV_CB_LIST_SIZE; i++) { + if(_sr_events_list.tcp_ws_close[i]==0) { + _sr_events_list.tcp_ws_close[i] = f; + break; + } + } + if(i==SREV_CB_LIST_SIZE) return -1; + break; default: return -1; } @@ -335,6 +344,15 @@ int sr_event_exec(int type, sr_event_param_t *evp) ret |= _sr_events_list.sip_reply_out[i](evp); } } else return 1; + case SREV_TCP_WS_CLOSE: + if(unlikely(_sr_events_list.tcp_ws_close[0]!=0)) + { + ret = 0; + for(i=0; i<SREV_CB_LIST_SIZE + && _sr_events_list.tcp_ws_close[i]; i++) { + ret = _sr_events_list.tcp_ws_close[i](evp); + } + } else return 1; default: return -1; } @@ -378,6 +396,8 @@ int sr_event_enabled(int type) return (_sr_events_list.net_data_send!=0)?1:0; case SREV_SIP_REPLY_OUT: return (_sr_events_list.sip_reply_out[0]!=0)?1:0; + case SREV_TCP_WS_CLOSE: + return (_sr_events_list.tcp_ws_close[0]!=0)?1:0; } return 0; } diff --git a/src/core/events.h b/src/core/events.h index 2208d8038d..4d53067dba 100644 --- a/src/core/events.h +++ b/src/core/events.h @@ -38,6 +38,7 @@ #define SREV_NET_DATA_RECV 14 #define SREV_NET_DATA_SEND 15 #define SREV_SIP_REPLY_OUT 16 +#define SREV_TCP_WS_CLOSE 17 #define SREV_CB_LIST_SIZE 8 @@ -71,6 +72,7 @@ typedef struct sr_event_cb { sr_event_cb_f net_data_recv; sr_event_cb_f net_data_send; sr_event_cb_f sip_reply_out[SREV_CB_LIST_SIZE]; + sr_event_cb_f tcp_ws_close[SREV_CB_LIST_SIZE]; } sr_event_cb_t; void sr_event_cb_init(void);

1 0

CommCon 2020 Online - Now presentation about Kamailio
by Daniel-Constantin Mierla 16 Jul '20

16 Jul '20

Hello, being a bit late with this announcement, as it started a couple of minutes ago, but if anyone wants to watch the live presentation about Kamailio by Fred Posner at CommCon 2020 Online, here is the link: - https://www.youtube.com/watch?v=FGZF7dYdRng Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Funding: https://www.paypal.me/dcmierla

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev