sr-dev January 2017

sr-dev@lists.kamailio.org

33 participants
538 discussions

Re: [sr-dev] [kamailio/kamailio] Makefile.groups: remove kazoo group and move kazoo to rabbitmq (71d42ee)

by lazedo

@linuxmaniac that would create problems when upgrading. also, why would kazoo require rabbitmq module to be installed ? everything that rabbitmq module does, kazoo module already does it, why is this module needed ? -- 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/71d42ee8d7ad2bb4e00b460276e4853…

7 years, 9 months

Re: [sr-dev] [kamailio/kamailio] Makefile.groups: remove kazoo group and move kazoo to rabbitmq (71d42ee)

by Victor Seva

@lazedo now we have rabbitmq group, lets use it. Makes no sense to me having kazoo group since both depends on librabbitmq library and ``rabbitmq`` name seems more generic than ``kazoo`` -- 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/71d42ee8d7ad2bb4e00b460276e4853…

7 years, 9 months

Re: [sr-dev] [kamailio/kamailio] pkg/kamailio/deb: remove kazoo package (e3297bc)

by lazedo

@linuxmaniac what's the reasoning for this ? -- 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/e3297bccc97ddc4349bcf69de59eb33…

7 years, 9 months

Re: [sr-dev] [kamailio/kamailio] Makefile.groups: remove kazoo group and move kazoo to rabbitmq (71d42ee)

by lazedo

7 years, 9 months

git:master:e8f25501: modules: readme files regenerated - websocket ...

by Kamailio Dev

Module: kamailio Branch: master Commit: e8f25501e63d4aa433d147593922b46a139d6e0f URL: https://github.com/kamailio/kamailio/commit/e8f25501e63d4aa433d147593922b46… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-01-31T12:31:15+01:00 modules: readme files regenerated - websocket ... --- Modified: src/modules/websocket/README --- Diff: https://github.com/kamailio/kamailio/commit/e8f25501e63d4aa433d147593922b46… Patch: https://github.com/kamailio/kamailio/commit/e8f25501e63d4aa433d147593922b46… --- diff --git a/src/modules/websocket/README b/src/modules/websocket/README index 764f1ce..3541db9 100644 --- a/src/modules/websocket/README +++ b/src/modules/websocket/README @@ -32,6 +32,7 @@ Peter Dunkley 4.5. ping_application_data (string) 4.6. sub_protocols (integer) 4.7. cors_mode (integer) + 4.8. verbose_list (int) 5. Functions @@ -66,10 +67,11 @@ Peter Dunkley 1.7. Set ping_application_data parameter 1.8. Set sub_protocols parameter 1.9. Set cors_mode parameter - 1.10. ws_handle_handshake usage - 1.11. ws_close usage - 1.12. event_route[websocket:closed] usage - 1.13. $ws_conid usage + 1.10. Set verbose_list parameter + 1.11. ws_handle_handshake usage + 1.12. ws_close usage + 1.13. event_route[websocket:closed] usage + 1.14. $ws_conid usage Chapter 1. Admin Guide @@ -96,6 +98,7 @@ Chapter 1. Admin Guide 4.5. ping_application_data (string) 4.6. sub_protocols (integer) 4.7. cors_mode (integer) + 4.8. verbose_list (int) 5. Functions @@ -337,6 +340,7 @@ onreply_route[WS_REPLY] { 4.5. ping_application_data (string) 4.6. sub_protocols (integer) 4.7. cors_mode (integer) + 4.8. verbose_list (int) 4.1. keepalive_mechanism (integer) @@ -440,6 +444,19 @@ modparam("websocket", "sub_protocols", 2) modparam("websocket", "cors_mode", 2) ... +4.8. verbose_list (int) + + Allows to enable/disable the printing of debug messages when getting + the list of websocket connections. If enabled, it prints debug messages + every second for ping operations. + + Default value is 0 (disabled). + + Example 1.10. Set verbose_list parameter +... +modparam("websocket", "verbose_list", 1) +... + 5. Functions 5.1. ws_handle_handshake() @@ -459,7 +476,7 @@ Note This function returns 0, stopping all further processing of the request, when there is a problem. - Example 1.10. ws_handle_handshake usage + Example 1.11. ws_handle_handshake usage ... ws_handle_handshake(); ... @@ -484,7 +501,7 @@ Note This function can be used from ANY_ROUTE. - Example 1.11. ws_close usage + Example 1.12. ws_close usage ... ws_close(4000, "Because I say so"); ... @@ -598,7 +615,7 @@ kamcmd ws.enable connection closes. The connection may be identified using the the $si and $sp pseudo-variables. - Example 1.12. event_route[websocket:closed] usage + Example 1.13. event_route[websocket:closed] usage ... event_route[websocket:closed] { xlog("L_INFO", "WebSocket connection from $si:$sp has closed\n"); @@ -614,7 +631,7 @@ event_route[websocket:closed] { Connection id of closed websocket connection. Can only be used in websocket:closed event route. - Example 1.13. $ws_conid usage + Example 1.14. $ws_conid usage ... event_route[websocket:closed] { xlog("L_INFO", "WebSocket connection with id $ws_conid has closed\n");

7 years, 9 months

git:master:f787d63f: websocket: docs for verbose_list parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f787d63fe0520f798983b439ebccda1b77932f55 URL: https://github.com/kamailio/kamailio/commit/f787d63fe0520f798983b439ebccda1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-31T12:26:16+01:00 websocket: docs for verbose_list parameter --- Modified: src/modules/websocket/doc/websocket_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f787d63fe0520f798983b439ebccda1… Patch: https://github.com/kamailio/kamailio/commit/f787d63fe0520f798983b439ebccda1… --- diff --git a/src/modules/websocket/doc/websocket_admin.xml b/src/modules/websocket/doc/websocket_admin.xml index a9cb121..c887c05 100644 --- a/src/modules/websocket/doc/websocket_admin.xml +++ b/src/modules/websocket/doc/websocket_admin.xml @@ -429,6 +429,22 @@ modparam("websocket", "cors_mode", 2) </programlisting> </example> </section> + <section id="websocket.p.verbose_list"> + <title><varname>verbose_list</varname> (int)</title> + <para>Allows to enable/disable the printing of debug + messages when getting the list of websocket connections. If enabled, + it prints debug messages every second for ping operations.</para> + <para><emphasis>Default value is 0 (disabled).</emphasis></para> + <example> + <title>Set <varname>verbose_list</varname> + parameter</title> + <programlisting format="linespecific"> +... +modparam("websocket", "verbose_list", 1) +... +</programlisting> + </example> + </section> </section>

7 years, 9 months

git:master:30d372cd: websocket: option to avoid repetitive logs each 1 sec during pinging

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 30d372cd4b3dd2ed24456c49a6f69ecdc9b42f0e URL: https://github.com/kamailio/kamailio/commit/30d372cd4b3dd2ed24456c49a6f69ec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-31T12:26:16+01:00 websocket: option to avoid repetitive logs each 1 sec during pinging - few debug messages are printed each second while fetching the list of active connections for pining, making the log full while troubleshooting --- Modified: src/modules/websocket/websocket.c Modified: src/modules/websocket/ws_conn.c --- Diff: https://github.com/kamailio/kamailio/commit/30d372cd4b3dd2ed24456c49a6f69ec… Patch: https://github.com/kamailio/kamailio/commit/30d372cd4b3dd2ed24456c49a6f69ec… --- diff --git a/src/modules/websocket/websocket.c b/src/modules/websocket/websocket.c index 826c540..1466667 100644 --- a/src/modules/websocket/websocket.c +++ b/src/modules/websocket/websocket.c @@ -67,6 +67,8 @@ static int ws_keepalive_timeout = DEFAULT_KEEPALIVE_TIMEOUT; #define DEFAULT_KEEPALIVE_PROCESSES 1 static int ws_keepalive_processes = DEFAULT_KEEPALIVE_PROCESSES; +int ws_verbose_list = 0; + static cmd_export_t cmds[] = { /* ws_frame.c */ { "ws_close", (cmd_function) ws_close, @@ -101,6 +103,7 @@ static param_export_t params[] = { { "keepalive_interval", INT_PARAM, &ws_keepalive_interval }, { "keepalive_processes", INT_PARAM, &ws_keepalive_processes }, + { "verbose_list", PARAM_INT, &ws_verbose_list }, { 0, 0, 0 } }; diff --git a/src/modules/websocket/ws_conn.c b/src/modules/websocket/ws_conn.c index 4abe960..900847b 100644 --- a/src/modules/websocket/ws_conn.c +++ b/src/modules/websocket/ws_conn.c @@ -36,6 +36,8 @@ /* Maximum number of connections to display when using the ws.dump command */ #define MAX_WS_CONNS_DUMP 50 +extern int ws_verbose_list; + ws_connection_t **wsconn_id_hash = NULL; #define wsconn_listadd tcpconn_listadd #define wsconn_listrm tcpconn_listrm @@ -454,7 +456,7 @@ ws_connection_t **wsconn_get_list(void) size_t list_len = 0; size_t i = 0; - LM_DBG("wsconn_get_list\n"); + if(ws_verbose_list) LM_DBG("wsconn get list - starting\n"); WSCONN_LOCK; @@ -462,7 +464,8 @@ ws_connection_t **wsconn_get_list(void) wsc = wsconn_used_list->head; while (wsc) { - LM_DBG("counter wsc [%p] prev => [%p] next => [%p]\n", wsc, wsc->used_prev, wsc->used_next); + if(ws_verbose_list) LM_DBG("counter wsc [%p] prev => [%p] next => [%p]\n", + wsc, wsc->used_prev, wsc->used_next); list_len++; wsc = wsc->used_next; } @@ -489,7 +492,7 @@ ws_connection_t **wsconn_get_list(void) list[i] = wsc; wsconn_ref(wsc); - LM_DBG("wsc [%p] id [%d] ref++\n", wsc, wsc->id); + if(ws_verbose_list) LM_DBG("wsc [%p] id [%d] ref++\n", wsc, wsc->id); wsc = wsc->used_next; } @@ -498,7 +501,8 @@ ws_connection_t **wsconn_get_list(void) end: WSCONN_UNLOCK; - LM_DBG("wsconn_get_list returns list [%p] with [%d] members\n", list, (int)list_len); + if(ws_verbose_list) LM_DBG("wsconn_get_list returns list [%p]" + " with [%d] members\n", list, (int)list_len); return list; }

7 years, 9 months

git:master:cb4cd24b: Merge pull request #959 from vance-od/master

by GitHub

Module: kamailio Branch: master Commit: cb4cd24b73224ca643fbdf0434d9e394081994d0 URL: https://github.com/kamailio/kamailio/commit/cb4cd24b73224ca643fbdf0434d9e39… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-01-31T12:23:22+01:00 Merge pull request #959 from vance-od/master Update jansson_path.c --- Modified: src/modules/jansson/jansson_path.c --- Diff: https://github.com/kamailio/kamailio/commit/cb4cd24b73224ca643fbdf0434d9e39… Patch: https://github.com/kamailio/kamailio/commit/cb4cd24b73224ca643fbdf0434d9e39… --- diff --git a/src/modules/jansson/jansson_path.c b/src/modules/jansson/jansson_path.c index 095146c..b6f76bc 100644 --- a/src/modules/jansson/jansson_path.c +++ b/src/modules/jansson/jansson_path.c @@ -18,9 +18,9 @@ #include "../../core/mod_fix.h" /* jansson private helper functions */ -void *jsonp_malloc(size_t size); -void jsonp_free(void *ptr); -char *jsonp_strdup(const char *str); +static void *jsonp_malloc(size_t size); +static void jsonp_free(void *ptr); +static char *jsonp_strdup(const char *str); static json_malloc_t do_malloc = malloc; static json_free_t do_free = free; @@ -252,21 +252,21 @@ int json_path_set(json_t *json, const char *path, json_t *value, } /* jansson private helper functions */ -void *jsonp_malloc(size_t size) { +static void *jsonp_malloc(size_t size) { if(!size) return NULL; return (*do_malloc)(size); } -void jsonp_free(void *ptr) { +static void jsonp_free(void *ptr) { if(!ptr) return; (*do_free)(ptr); } -char *jsonp_strdup(const char *str) { +static char *jsonp_strdup(const char *str) { char *new_str; new_str = jsonp_malloc(strlen(str) + 1);

7 years, 9 months

git:master:7dcc6bd1: Update jansson_path.c

by GitHub

Module: kamailio Branch: master Commit: 7dcc6bd18b5b5ae4078c32087c6cf85c0fa9bce1 URL: https://github.com/kamailio/kamailio/commit/7dcc6bd18b5b5ae4078c32087c6cf85… Author: Vasiliy Ganchev <vance(a)ukr.net> Committer: GitHub <noreply(a)github.com> Date: 2017-01-31T08:29:08+02:00 Update jansson_path.c in case of build on old debian (lenny) - statically linked libjansson has to be used, as a result build throw errors, cos libjansson has functions with the same names --- Modified: src/modules/jansson/jansson_path.c --- Diff: https://github.com/kamailio/kamailio/commit/7dcc6bd18b5b5ae4078c32087c6cf85… Patch: https://github.com/kamailio/kamailio/commit/7dcc6bd18b5b5ae4078c32087c6cf85… --- diff --git a/src/modules/jansson/jansson_path.c b/src/modules/jansson/jansson_path.c index 095146c..b6f76bc 100644 --- a/src/modules/jansson/jansson_path.c +++ b/src/modules/jansson/jansson_path.c @@ -18,9 +18,9 @@ #include "../../core/mod_fix.h" /* jansson private helper functions */ -void *jsonp_malloc(size_t size); -void jsonp_free(void *ptr); -char *jsonp_strdup(const char *str); +static void *jsonp_malloc(size_t size); +static void jsonp_free(void *ptr); +static char *jsonp_strdup(const char *str); static json_malloc_t do_malloc = malloc; static json_free_t do_free = free; @@ -252,21 +252,21 @@ int json_path_set(json_t *json, const char *path, json_t *value, } /* jansson private helper functions */ -void *jsonp_malloc(size_t size) { +static void *jsonp_malloc(size_t size) { if(!size) return NULL; return (*do_malloc)(size); } -void jsonp_free(void *ptr) { +static void jsonp_free(void *ptr) { if(!ptr) return; (*do_free)(ptr); } -char *jsonp_strdup(const char *str) { +static char *jsonp_strdup(const char *str) { char *new_str; new_str = jsonp_malloc(strlen(str) + 1);

7 years, 9 months

[kamailio/kamailio] Update jansson_path.c (#959)

by Vasiliy Ganchev

Hi Daniel, community! in case of build on old debian (e.g. lenny) - statically linked libjansson has to be used, as a result build throw errors, cos libjansson has functions with the same names proposed changes - fixed issues that I have with build on lenny You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/959 -- Commit Summary -- * Update jansson_path.c -- File Changes -- M src/modules/jansson/jansson_path.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/959.patch https://github.com/kamailio/kamailio/pull/959.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/959

7 years, 9 months

← Newer
1
...
4
5
6
7
8
9
10
...
54
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2017