sr-dev March 2021

sr-dev@lists.kamailio.org

28 participants
490 discussions

git:master:39ae2a44: lwsc: added verbosity parameter
by Daniel-Constantin Mierla 24 Mar '21

24 Mar '21

Module: kamailio Branch: master Commit: 39ae2a441ffda8c8df1774917c3385ad7cc78bcf URL: https://github.com/kamailio/kamailio/commit/39ae2a441ffda8c8df1774917c3385a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-24T17:42:26+01:00 lwsc: added verbosity parameter - control debug messages verbosity --- Modified: src/modules/lwsc/lwsc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/39ae2a441ffda8c8df1774917c3385a… Patch: https://github.com/kamailio/kamailio/commit/39ae2a441ffda8c8df1774917c3385a… --- diff --git a/src/modules/lwsc/lwsc_mod.c b/src/modules/lwsc/lwsc_mod.c index ada873f215..15d8ea296c 100644 --- a/src/modules/lwsc/lwsc_mod.c +++ b/src/modules/lwsc/lwsc_mod.c @@ -54,6 +54,7 @@ static int _lwsc_timeout_send = 0; static int _lwsc_timeout_read = 2000000; static int _lwsc_timeout_init = 2000000; static str _lwsc_protocol = str_init("kmsg"); +static int _lwsc_verbosity = 0; static cmd_export_t cmds[]={ {"lwsc_request", (cmd_function)w_lwsc_request, 2, @@ -71,6 +72,7 @@ static param_export_t params[]={ { "timeout_read", PARAM_INT, &_lwsc_timeout_read }, { "timeout_init", PARAM_INT, &_lwsc_timeout_init }, { "protocol", PARAM_STR, &_lwsc_protocol }, + { "verbosity", PARAM_INT, &_lwsc_verbosity }, { 0, 0, 0 } }; @@ -215,7 +217,9 @@ static int ksr_lwsc_callback(struct lws *wsi, enum lws_callback_reasons reason, str rbuf = STR_NULL; str wbuf = STR_NULL; - LM_DBG("callback called with reason %d\n", reason); + if(_lwsc_verbosity>1) { + LM_DBG("callback called with reason %d\n", reason); + } switch (reason) { @@ -292,7 +296,9 @@ static int ksr_lwsc_callback(struct lws *wsi, enum lws_callback_reasons reason, break; case LWS_CALLBACK_TIMER: - LM_DBG("LWS_CALLBACK_TIMER - wsi: %p\n", wsi); + if(_lwsc_verbosity>0) { + LM_DBG("LWS_CALLBACK_TIMER - wsi: %p\n", wsi); + } // lws_callback_on_writable(wsi); break; @@ -340,7 +346,9 @@ static int ksr_lwsc_callback(struct lws *wsi, enum lws_callback_reasons reason, ep->wsi = NULL; break; default: - LM_DBG("unhandled reason %d\n", reason); + if(_lwsc_verbosity>1) { + LM_DBG("unhandled reason %d\n", reason); + } break; }

1 0

git:master:dfbd4e12: lwsc: added inter-module api
by Daniel-Constantin Mierla 24 Mar '21

24 Mar '21

Module: kamailio Branch: master Commit: dfbd4e12d6c4b3c9664d58ffbc479de9ea68f03e URL: https://github.com/kamailio/kamailio/commit/dfbd4e12d6c4b3c9664d58ffbc479de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-24T17:42:26+01:00 lwsc: added inter-module api - exported lwsc request function to send data to a ws target and proto, then wait for response data for a specific time interval --- Added: src/modules/lwsc/api.h Modified: src/modules/lwsc/lwsc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/dfbd4e12d6c4b3c9664d58ffbc479de… Patch: https://github.com/kamailio/kamailio/commit/dfbd4e12d6c4b3c9664d58ffbc479de… --- diff --git a/src/modules/lwsc/api.h b/src/modules/lwsc/api.h new file mode 100644 index 0000000000..c76fb8c6b1 --- /dev/null +++ b/src/modules/lwsc/api.h @@ -0,0 +1,65 @@ +/* + * Copyright (C) 2021 Daniel-Constantin Mierla (asipto.com) + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * @brief LWSC - API definitions + * @ingroup lwsc + * Module: @ref lwsc + */ + +#ifndef _LWSC_API_H_ +#define _LWSC_API_H_ + +#include "../../core/str.h" + +typedef int (*lwsc_api_request_f)(str *wsurl, str *wsproto, str *sdata, + str *rdata, int rtimeout); + +/** + * @brief Stateless (sl) API structure + */ +typedef struct lwsc_api { + lwsc_api_request_f request; /* send and receice data */ +} lwsc_api_t; + +typedef int (*bind_lwsc_f)(lwsc_api_t* api); + +/** + * @brief Load the LWSX API + */ +static inline int lwsc_load_api(lwsc_api_t *lwscb) +{ + bind_lwsc_f bindlwsc; + + bindlwsc = (bind_lwsc_f)find_export("bind_lwsc", 0, 0); + if ( bindlwsc == 0) { + LM_ERR("cannot find bind_lwsc exported function\n"); + return -1; + } + if (bindlwsc(lwscb)==-1) + { + LM_ERR("cannot bind lwsc api\n"); + return -1; + } + return 0; +} + +#endif diff --git a/src/modules/lwsc/lwsc_mod.c b/src/modules/lwsc/lwsc_mod.c index 8e5e068bdd..ada873f215 100644 --- a/src/modules/lwsc/lwsc_mod.c +++ b/src/modules/lwsc/lwsc_mod.c @@ -36,12 +36,15 @@ #include "../../core/kemi.h" #include "../../core/parser/parse_param.h" +#include "api.h" + MODULE_VERSION static int mod_init(void); static int child_init(int); static void mod_destroy(void); +static int bind_lwsc(lwsc_api_t* api); static int w_lwsc_request(sip_msg_t* msg, char* pwsurl, char* pdata); static int w_lwsc_notify(sip_msg_t* msg, char* pwsurl, char* pdata); @@ -57,6 +60,8 @@ static cmd_export_t cmds[]={ fixup_spve_all, 0, ANY_ROUTE}, {"lwsc_notify", (cmd_function)w_lwsc_notify, 2, fixup_spve_all, 0, ANY_ROUTE}, + {"bind_lwsc", (cmd_function)bind_lwsc, 0, + 0, 0, 0}, {0, 0, 0, 0, 0, 0} }; @@ -759,6 +764,20 @@ static int lwsc_pv_parse_name(pv_spec_t *sp, str *in) return 0; } +/** + * @brief bind functions to LWSC API structure + */ +static int bind_lwsc(lwsc_api_t* api) +{ + if (!api) { + LM_ERR("invalid parameter value\n"); + return -1; + } + api->request = lwsc_api_request; + + return 0; +} + /** * */

1 0

git:master:8c8080a4: lwsc: store lws protocols structure in endpoint
by Daniel-Constantin Mierla 24 Mar '21

24 Mar '21

Module: kamailio Branch: master Commit: 8c8080a4ce714fc2b7efb3a285c474f8a583e851 URL: https://github.com/kamailio/kamailio/commit/8c8080a4ce714fc2b7efb3a285c474f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-24T17:42:25+01:00 lwsc: store lws protocols structure in endpoint - more flexibility in specifying ws sub-protocols per connection --- Modified: src/modules/lwsc/lwsc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8c8080a4ce714fc2b7efb3a285c474f… Patch: https://github.com/kamailio/kamailio/commit/8c8080a4ce714fc2b7efb3a285c474f…

1 0

git:master:1001e9e1: mohqueue: use ptime
by Robert Boisvert 24 Mar '21

24 Mar '21

Module: kamailio Branch: master Commit: 1001e9e1dbfdec525f4a5f96f7dd3fcc22e51888 URL: https://github.com/kamailio/kamailio/commit/1001e9e1dbfdec525f4a5f96f7dd3fc… Author: Robert Boisvert <rdboisvert(a)gmail.com> Committer: Robert Boisvert <rdboisvert(a)gmail.com> Date: 2021-03-24T12:17:20-04:00 mohqueue: use ptime - version 1.7 - match ptime of incoming call; otherwise, default to 20ms - update copyright dates --- Modified: src/modules/mohqueue/mohq_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/1001e9e1dbfdec525f4a5f96f7dd3fc… Patch: https://github.com/kamailio/kamailio/commit/1001e9e1dbfdec525f4a5f96f7dd3fc… --- diff --git a/src/modules/mohqueue/mohq_funcs.c b/src/modules/mohqueue/mohq_funcs.c index c9c8d6704e..dd9f105bfc 100644 --- a/src/modules/mohqueue/mohq_funcs.c +++ b/src/modules/mohqueue/mohq_funcs.c @@ -222,7 +222,7 @@ else return; } } - if (ptm->t_release (ptcell) < 0) + if (ptm->t_release_transaction (ptcell) < 0) { LM_ERR ("%sRelease transaction failed for call (%s)!\n", pfncname, pcall->call_from); @@ -2160,7 +2160,7 @@ int nsession; sdp_session_cell_t *psession; char pflagbuf [5]; strcpy (pflagbuf, "z20"); -fparam_t pzflag [1] = {0, FPARAM_STRING, {pflagbuf}, 0}; +fparam_t pzflag [1] = {"", FPARAM_STRING, {pflagbuf}, 0}; for (nsession = 0; (psession = get_sdp_session (pmsg, nsession)); nsession++) { int nstream;

1 0

Kamailio mohqueu warning
by Daniel-Constantin Mierla 24 Mar '21

24 Mar '21

Hello, compiling the latest version of Kamailio results in a warning for mohqueue module: CC (gcc) [M mohqueue.so] mohq_funcs.o mohq_funcs.c:225:23: warning: incompatible pointer types passing 'tm_cell_t *' (aka 'struct cell *') to parameter of type 'struct sip_msg *' [-Wincompatible-pointer-types] if (ptm->t_release (ptcell) < 0) I noticed you pushed some changes recently, likely the warning was introduced by them, not noticing it before. Anyhow, it seems something that should be reviewed and fixed, otherwise may result in a crash by passing incorrect structure pointer. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Funding: https://www.paypal.me/dcmierla

2 1

Errored: kamailio/kamailio#10016 (master - 5756225)
by Travis CI 24 Mar '21

24 Mar '21

Build Update for kamailio/kamailio ------------------------------------- Build: #10016 Status: Errored Duration: 7 mins and 13 secs Commit: 5756225 (master) Author: Victor Seva Message: pkg/kamailio/deb: version set 5.5.0~dev5 View the changeset: https://github.com/kamailio/kamailio/compare/868ff72ad175...575622520df0 View the full build log and details: https://travis-ci.org/github/kamailio/kamailio/builds/764219968?utm_medium=… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:master:57562252: pkg/kamailio/deb: version set 5.5.0~dev5
by Victor Seva 24 Mar '21

24 Mar '21

Module: kamailio Branch: master Commit: 575622520df06e769ad6174c36ad142b59cfa96e URL: https://github.com/kamailio/kamailio/commit/575622520df06e769ad6174c36ad142… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-03-24T12:09:08+01:00 pkg/kamailio/deb: version set 5.5.0~dev5 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/575622520df06e769ad6174c36ad142… Patch: https://github.com/kamailio/kamailio/commit/575622520df06e769ad6174c36ad142…

1 0

git:master:868ff72a: modules: readme files regenerated - pv ... [skip ci]
by Kamailio Dev 24 Mar '21

24 Mar '21

Module: kamailio Branch: master Commit: 868ff72ad17573657ce19239a6f394cb117475c6 URL: https://github.com/kamailio/kamailio/commit/868ff72ad17573657ce19239a6f394c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-03-24T10:31:18+01:00 modules: readme files regenerated - pv ... [skip ci] --- Modified: src/modules/pv/README --- Diff: https://github.com/kamailio/kamailio/commit/868ff72ad17573657ce19239a6f394c… Patch: https://github.com/kamailio/kamailio/commit/868ff72ad17573657ce19239a6f394c… --- diff --git a/src/modules/pv/README b/src/modules/pv/README index 4aaa44c225..10698c1dd4 100644 --- a/src/modules/pv/README +++ b/src/modules/pv/README @@ -194,16 +194,16 @@ Chapter 1. Admin Guide The value of the parameter has the format: _name_ '=' _type_ ':' _value_ - - Note: this is special useful for usage with KEMI scripts, the $shv(...) - variables must be defined during Kamailio initialization in order to - become available in all worker processes. * _name_: shared variable name * _type_: type of the value + “i”: integer value + “s”: string value * _value_: value to be set + Note: this is special useful for usage with KEMI scripts, the $shv(...) + variables must be defined during Kamailio initialization in order to + become available in all worker processes. + Default value is “NULL”. Example 1.1. shvset parameter usage

1 0

git:master:c959a3c5: pv: docs - relocated shvset note outside of param definition details [skip ci]
by Daniel-Constantin Mierla 24 Mar '21

24 Mar '21

Module: kamailio Branch: master Commit: c959a3c5f5efa1158bd53a31476f33d080793928 URL: https://github.com/kamailio/kamailio/commit/c959a3c5f5efa1158bd53a31476f33d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-24T10:21:07+01:00 pv: docs - relocated shvset note outside of param definition details [skip ci] --- Modified: src/modules/pv/doc/pv_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c959a3c5f5efa1158bd53a31476f33d… Patch: https://github.com/kamailio/kamailio/commit/c959a3c5f5efa1158bd53a31476f33d… --- diff --git a/src/modules/pv/doc/pv_admin.xml b/src/modules/pv/doc/pv_admin.xml index 5fbe706c8e..1c4c84e0fb 100644 --- a/src/modules/pv/doc/pv_admin.xml +++ b/src/modules/pv/doc/pv_admin.xml @@ -63,11 +63,6 @@ The value of the parameter has the format: _name_ '=' _type_ ':' _value_ </para> - <para> - Note: this is special useful for usage with KEMI scripts, the $shv(...) - variables must be defined during Kamailio initialization in order to - become available in all worker processes. - </para> <itemizedlist> <listitem><para>_name_: shared variable name</para></listitem> @@ -81,6 +76,11 @@ <listitem><para>_value_: value to be set</para></listitem> </itemizedlist> <para> + Note: this is special useful for usage with KEMI scripts, the $shv(...) + variables must be defined during Kamailio initialization in order to + become available in all worker processes. + </para> + <para> Default value is <quote>NULL</quote>. </para> <example>

1 0

git:master:fa136eda: modules: readme files regenerated - pv ... [skip ci]
by Kamailio Dev 24 Mar '21

24 Mar '21

Module: kamailio Branch: master Commit: fa136edab5e552ed7b9e01af602bc09c98afce35 URL: https://github.com/kamailio/kamailio/commit/fa136edab5e552ed7b9e01af602bc09… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-03-24T10:16:24+01:00 modules: readme files regenerated - pv ... [skip ci] --- Modified: src/modules/pv/README --- Diff: https://github.com/kamailio/kamailio/commit/fa136edab5e552ed7b9e01af602bc09… Patch: https://github.com/kamailio/kamailio/commit/fa136edab5e552ed7b9e01af602bc09… --- diff --git a/src/modules/pv/README b/src/modules/pv/README index a6702afa12..4aaa44c225 100644 --- a/src/modules/pv/README +++ b/src/modules/pv/README @@ -189,11 +189,15 @@ Chapter 1. Admin Guide 3.1. shvset (string) - Set the value of a shared variable ($shv(name)). The parameter can be - set many times. + Set the initial value of a shared variable ($shv(name)). The parameter + can be set many times. The value of the parameter has the format: _name_ '=' _type_ ':' _value_ + + Note: this is special useful for usage with KEMI scripts, the $shv(...) + variables must be defined during Kamailio initialization in order to + become available in all worker processes. * _name_: shared variable name * _type_: type of the value + “i”: integer value

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
49
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2021