sr-dev June 2023

sr-dev@lists.kamailio.org

10 participants
308 discussions

git:master:6a19434d: modules: readme files regenerated - mqueue ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 6a19434d4b93a8ec6e345b55ff1b83ff6bd38596 URL: https://github.com/kamailio/kamailio/commit/6a19434d4b93a8ec6e345b55ff1b83f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-06-12T18:16:32+02:00 modules: readme files regenerated - mqueue ... [skip ci] --- Modified: src/modules/mqueue/README --- Diff: https://github.com/kamailio/kamailio/commit/6a19434d4b93a8ec6e345b55ff1b83f… Patch: https://github.com/kamailio/kamailio/commit/6a19434d4b93a8ec6e345b55ff1b83f… --- diff --git a/src/modules/mqueue/README b/src/modules/mqueue/README index a8981a68aee..3db56e8f54b 100644 --- a/src/modules/mqueue/README +++ b/src/modules/mqueue/README @@ -176,12 +176,12 @@ val character varying(4096) DEFAULT "" NOT NULL + size: size of the queue. Specifies the maximum number of items in queue. If exceeded the oldest one is removed. If not set the queue will be limitless. - + dbmode: If set to 1, the content of the queue is written to - database table when the SIP server is stopped (i.e., ensure - persistency over restarts). If set to 2, it is written at - shutdown but not read at startup. If set to 3, it is read at - sartup but not written at shutdown. Default value is 0 (no db - table interaction). + + dbmode: If set to 1, the content of the queue is read from + database at startup and is written to database table when the + SIP server is stopped (i.e., ensure persistency over + restarts). If set to 2, it is read at startup but not written + at shutdown. If set to 3, it is written at shutdown but not + read at startup. Default value is 0 (no db table interaction). + addmode: how to add new (key,value) pairs. o 0: Will push all new (key,value) pairs at the end of the queue. (default)

1 year, 6 months

git:master:23d43645: mqueue: fix documentation to match the code

by Ovidiu Sas

Module: kamailio Branch: master Commit: 23d43645332451ec1ec6dab11da777f9c3bfe304 URL: https://github.com/kamailio/kamailio/commit/23d43645332451ec1ec6dab11da777f… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2023-06-12T12:00:13-04:00 mqueue: fix documentation to match the code --- Modified: src/modules/mqueue/doc/mqueue_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/23d43645332451ec1ec6dab11da777f… Patch: https://github.com/kamailio/kamailio/commit/23d43645332451ec1ec6dab11da777f… --- diff --git a/src/modules/mqueue/doc/mqueue_admin.xml b/src/modules/mqueue/doc/mqueue_admin.xml index 750a54e7f45..ae3fa54f407 100644 --- a/src/modules/mqueue/doc/mqueue_admin.xml +++ b/src/modules/mqueue/doc/mqueue_admin.xml @@ -124,10 +124,11 @@ val character varying(4096) DEFAULT "" NOT NULL <listitem> <para> <emphasis>dbmode</emphasis>: If set to 1, the content of the queue + is read from database at startup and is written to database table when the SIP server is stopped (i.e., ensure persistency over restarts). - If set to 2, it is written at shutdown but not read at startup. - If set to 3, it is read at sartup but not written at shutdown. + If set to 2, it is read at startup but not written at shutdown. + If set to 3, it is written at shutdown but not read at startup. Default value is 0 (no db table interaction). </para> </listitem>

1 year, 6 months

git:master:39f09877: cdp: check setsockopt() return code

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 39f09877e650d66e820ca7eb0d61416818d174fc URL: https://github.com/kamailio/kamailio/commit/39f09877e650d66e820ca7eb0d61416… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-12T17:16:53+02:00 cdp: check setsockopt() return code --- Modified: src/modules/cdp/tcp_accept.c --- Diff: https://github.com/kamailio/kamailio/commit/39f09877e650d66e820ca7eb0d61416… Patch: https://github.com/kamailio/kamailio/commit/39f09877e650d66e820ca7eb0d61416… --- diff --git a/src/modules/cdp/tcp_accept.c b/src/modules/cdp/tcp_accept.c index 968a245eb6a..43ff83c14a2 100644 --- a/src/modules/cdp/tcp_accept.c +++ b/src/modules/cdp/tcp_accept.c @@ -139,8 +139,11 @@ int create_socket( goto error; } option = 1; - setsockopt( - server_sock, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option)); + if(setsockopt(server_sock, SOL_SOCKET, SO_REUSEADDR, &option, + sizeof(option)) + < 0) { + LM_WARN("failed to set SO_REUSEADDR option for server socket\n"); + } if(bind(server_sock, ainfo->ai_addr, ainfo->ai_addrlen) == -1) { LM_ERR("create_socket(): error binding on %s port %s >"

1 year, 6 months

git:master:fb19f0ea: auth_diameter: free req in some cases of errors

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: fb19f0ea4c656afe7b60788efb8804e552fd37f9 URL: https://github.com/kamailio/kamailio/commit/fb19f0ea4c656afe7b60788efb8804e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-12T16:27:46+02:00 auth_diameter: free req in some cases of errors --- Modified: src/modules/auth_diameter/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/fb19f0ea4c656afe7b60788efb8804e… Patch: https://github.com/kamailio/kamailio/commit/fb19f0ea4c656afe7b60788efb8804e… --- diff --git a/src/modules/auth_diameter/authorize.c b/src/modules/auth_diameter/authorize.c index a3cc682b0c2..a15758754f6 100644 --- a/src/modules/auth_diameter/authorize.c +++ b/src/modules/auth_diameter/authorize.c @@ -255,12 +255,12 @@ int authorize(struct sip_msg *msg, pv_elem_t *realm, int hftype) /* * This function creates and submits diameter authentication request as per - * draft-srinivas-aaa-basic-digest-00.txt. + * draft-srinivas-aaa-basic-digest-00.txt. * Service type of the request is Authenticate-Only. * Returns: * 1 - success * -1 - error - * + * */ int diameter_authorize(struct hdr_field *hdr, str *p_method, sip_uri_t *uri, sip_uri_t *ruri, unsigned int m_id, rd_buf_t *rb) @@ -294,6 +294,7 @@ int diameter_authorize(struct hdr_field *hdr, str *p_method, sip_uri_t *uri, user_name.s = (char *)ad_malloc(user_name.len * sizeof(char)); if(!(user_name.s)) { PKG_MEM_ERROR; + AAAFreeMessage(&req); return -1; } memset(user_name.s, 0, user_name.len); @@ -417,6 +418,7 @@ int diameter_authorize(struct hdr_field *hdr, str *p_method, sip_uri_t *uri, user_name.s = (char *)ad_malloc(user_name.len * sizeof(char)); if(!(user_name.s)) { PKG_MEM_ERROR; + AAAFreeMessage(&req); return -1; } memset(user_name.s, 0, user_name.len);

1 year, 6 months

git:master:f99b116e: dialplan: restructured condition on input and output params

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f99b116e876170709ad364ac2b8093969a939d4a URL: https://github.com/kamailio/kamailio/commit/f99b116e876170709ad364ac2b80939… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-12T15:53:38+02:00 dialplan: restructured condition on input and output params --- Modified: src/modules/dialplan/dialplan.c --- Diff: https://github.com/kamailio/kamailio/commit/f99b116e876170709ad364ac2b80939… Patch: https://github.com/kamailio/kamailio/commit/f99b116e876170709ad364ac2b80939… --- diff --git a/src/modules/dialplan/dialplan.c b/src/modules/dialplan/dialplan.c index b7372769813..b5286d2b613 100644 --- a/src/modules/dialplan/dialplan.c +++ b/src/modules/dialplan/dialplan.c @@ -857,11 +857,14 @@ static int ki_dp_translate( return -1; } - if(input_spv == NULL && output_spv == NULL) { - pvs_i = pv_cache_get(&dp_default_param_s); + if(input_spv == NULL || input_spv->len <= 0) { pvs_o = pv_cache_get(&dp_default_param_s); } else { pvs_i = pv_cache_get(input_spv); + } + if(output_spv == NULL || output_spv->len <= 0) { + pvs_i = pv_cache_get(&dp_default_param_s); + } else { pvs_o = pv_cache_get(output_spv); }

1 year, 6 months

[kamailio/kamailio] pdb: change log level for pdb query response time from LM_INFO to LM_DBG (PR #3296)

by mtryfoss

- using LM_INFO cause a lot of log events on a busy server with normal log level   #### 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 - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] 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 Proposal to change log level of the query response time. If this is of interest, it should probably be monitored in some other metric and not flood the syslog. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3296 -- Commit Summary -- * pdb: change log level for pdb query response time from LM_INFO to LM_DBG -- File Changes -- M src/modules/pdb/pdb.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3296.patch https://github.com/kamailio/kamailio/pull/3296.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3296 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3296(a)github.com>

1 year, 6 months

git:master:060a9605: modules: readme files regenerated - pdb ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 060a96057309000592f126956cd343656a26ecba URL: https://github.com/kamailio/kamailio/commit/060a96057309000592f126956cd3436… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-06-12T14:01:24+02:00 modules: readme files regenerated - pdb ... [skip ci] --- Modified: src/modules/pdb/README --- Diff: https://github.com/kamailio/kamailio/commit/060a96057309000592f126956cd3436… Patch: https://github.com/kamailio/kamailio/commit/060a96057309000592f126956cd3436… --- diff --git a/src/modules/pdb/README b/src/modules/pdb/README index 60b329d8421..52ebab2e8ae 100644 --- a/src/modules/pdb/README +++ b/src/modules/pdb/README @@ -29,6 +29,7 @@ Pawel Kuzak 3.1. timeout (integer) 3.2. server (string) + 3.3. ll_info (int) 4. Functions @@ -44,10 +45,11 @@ Pawel Kuzak 1.1. Set timeout parameter 1.2. Set server parameter - 1.3. pdb_query usage - 1.4. pdb.status usage - 1.5. pdb.activate usage - 1.6. pdb.deactivate usage + 1.3. Set ll_info parameter + 1.4. pdb_query usage + 1.5. pdb.status usage + 1.6. pdb.activate usage + 1.7. pdb.deactivate usage Chapter 1. Admin Guide @@ -63,6 +65,7 @@ Chapter 1. Admin Guide 3.1. timeout (integer) 3.2. server (string) + 3.3. ll_info (int) 4. Functions @@ -113,6 +116,7 @@ Chapter 1. Admin Guide 3.1. timeout (integer) 3.2. server (string) + 3.3. ll_info (int) 3.1. timeout (integer) @@ -136,6 +140,19 @@ modparam("pdb", "timeout", 10) modparam("pdb", "server", "localhost:10001,host.name:10001,192.168.1.7:10002") ... +3.3. ll_info (int) + + Local log level (per module) for specific INFO messages. It has to be a + valid log level value (see xlog() function from xlog module for more + details). + + Default value is ��2��. + + Example 1.3. Set ll_info parameter +... +modparam("pdb", "ll_info", 3) +... + 4. Functions 4.1. pdb_query (string query, string dstavp) @@ -149,7 +166,7 @@ modparam("pdb", "server", "localhost:10001,host.name:10001,192.168.1.7:10002") a two byte integer value in network byte order. The integer value will be stored in the given AVP. - Example 1.3. pdb_query usage + Example 1.4. pdb_query usage ... # query external service for routing information if (!pdb_query("$rU", "$avp(i:82)")) @@ -169,7 +186,7 @@ cr_route("$avp(i:82)", "$rd", "$rU", "$rU", "call_id"); Prints the status of the module. This can either be "active" or "deactivated". - Example 1.4. pdb.status usage + Example 1.5. pdb.status usage ... kamcmd pdb.status ... @@ -178,7 +195,7 @@ kamcmd pdb.status Activates the module. This is the default after loading the module. - Example 1.5. pdb.activate usage + Example 1.6. pdb.activate usage ... kamcmd pdb.activate ... @@ -189,7 +206,7 @@ kamcmd pdb.activate activated again. As long as the module is deactivated, the pdb_query function will return -1. - Example 1.6. pdb.deactivate usage + Example 1.7. pdb.deactivate usage ... kamcmd pdb.deactivate ...

1 year, 6 months

git:master:7d7e6dfc: pdb: docs for ll_info mod param

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7d7e6dfcdaf21cae4b98ca5520e667b4f8f09145 URL: https://github.com/kamailio/kamailio/commit/7d7e6dfcdaf21cae4b98ca5520e667b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-12T13:54:34+02:00 pdb: docs for ll_info mod param --- Modified: src/modules/pdb/doc/pdb_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7d7e6dfcdaf21cae4b98ca5520e667b… Patch: https://github.com/kamailio/kamailio/commit/7d7e6dfcdaf21cae4b98ca5520e667b… --- diff --git a/src/modules/pdb/doc/pdb_admin.xml b/src/modules/pdb/doc/pdb_admin.xml index da2ecb3a01e..19b00bd99d8 100644 --- a/src/modules/pdb/doc/pdb_admin.xml +++ b/src/modules/pdb/doc/pdb_admin.xml @@ -94,6 +94,27 @@ modparam("pdb", "timeout", 10) <programlisting format="linespecific"> ... modparam("pdb", "server", "localhost:10001,host.name:10001,192.168.1.7:10002") +... + </programlisting> + </example> + </section> + <section> + <title><varname>ll_info</varname> (int)</title> + <para> + Local log level (per module) for specific INFO messages. It has to + be a valid log level value (see xlog() function from xlog module for + more details). + </para> + <para> + <emphasis> + Default value is <quote>2</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>ll_info</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("pdb", "ll_info", 3) ... </programlisting> </example>

1 year, 6 months

git:master:88d8c466: Makefile.modules: define MOD_NAMEID to module name without quotes

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 88d8c46603f6e45ba90c51b7c8d80acae7fb400a URL: https://github.com/kamailio/kamailio/commit/88d8c46603f6e45ba90c51b7c8d80ac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-12T13:48:31+02:00 Makefile.modules: define MOD_NAMEID to module name without quotes --- Modified: src/Makefile.modules --- Diff: https://github.com/kamailio/kamailio/commit/88d8c46603f6e45ba90c51b7c8d80ac… Patch: https://github.com/kamailio/kamailio/commit/88d8c46603f6e45ba90c51b7c8d80ac… --- diff --git a/src/Makefile.modules b/src/Makefile.modules index 7c3722d03e1..3521d44a93d 100644 --- a/src/Makefile.modules +++ b/src/Makefile.modules @@ -58,7 +58,7 @@ override static_modules_path= # INCLUDES += -I$(COREPATH) # temporary def (visible only in the module, not exported) -DEFS += -DMOD_NAME='"$(MOD_NAME)"' +DEFS += -DMOD_NAME='"$(MOD_NAME)"' -DMOD_NAMEID='$(MOD_NAME)' ifneq ($(makefile_defs_included),1)

1 year, 6 months

git:master:e818baa1: pdb: use local log level for an info log message

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e818baa1b21249529c93990ef0340dd8b56b26cf URL: https://github.com/kamailio/kamailio/commit/e818baa1b21249529c93990ef0340dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-12T13:47:18+02:00 pdb: use local log level for an info log message - new mod param to allow remapping local log level for info - related to GH #3296 --- Modified: src/modules/pdb/pdb.c --- Diff: https://github.com/kamailio/kamailio/commit/e818baa1b21249529c93990ef0340dd… Patch: https://github.com/kamailio/kamailio/commit/e818baa1b21249529c93990ef0340dd… --- diff --git a/src/modules/pdb/pdb.c b/src/modules/pdb/pdb.c index 75013cccb7a..2cb54de8372 100644 --- a/src/modules/pdb/pdb.c +++ b/src/modules/pdb/pdb.c @@ -48,6 +48,7 @@ static int timeoutlogs = -10; /*!< for aggregating timeout logs */ static int *active = NULL; static uint16_t *global_id = NULL; +ksr_loglevels_t _ksr_loglevels_pdb = KSR_LOGLEVELS_DEFAULTS; /*! * Generic parameter that holds a string, an int or a pseudo-variable @@ -103,9 +104,15 @@ static cmd_export_t cmds[] = { {0, 0, 0, 0, 0, 0}}; -static param_export_t params[] = {{"server", PARAM_STRING, &modp_server}, - {"timeout", INT_PARAM, &timeout}, {0, 0, 0}}; +/* clang-format off */ +static param_export_t params[] = { + {"server", PARAM_STRING, &modp_server}, + {"timeout", PARAM_INT, &timeout}, + {"ll_info", PARAM_INT, &_ksr_loglevels_pdb.ll_info}, + {0, 0, 0} +}; +/* clang-format on */ struct module_exports exports = { "pdb", /* module name */ @@ -429,7 +436,7 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, timeoutlogs = -10; } if(gettimeofday(&tnow, NULL) == 0) { - LM_INFO("got an answer in %f ms\n", + LLM_INFO("got an answer in %f ms\n", ((double)(tnow.tv_usec - tstart.tv_usec + (tnow.tv_sec - tstart.tv_sec) * 1000000)) / 1000);

1 year, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2023