sr-dev October 2020

sr-dev@lists.kamailio.org

19 participants
527 discussions

git:master:f78bc10d: sqlops: docs for results_maxsize modparam

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f78bc10dfc4b39ed3d5967b884202cb29cf834b8 URL: https://github.com/kamailio/kamailio/commit/f78bc10dfc4b39ed3d5967b884202cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-07T17:34:51+02:00 sqlops: docs for results_maxsize modparam --- Modified: src/modules/sqlops/doc/sqlops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f78bc10dfc4b39ed3d5967b884202cb… Patch: https://github.com/kamailio/kamailio/commit/f78bc10dfc4b39ed3d5967b884202cb… --- diff --git a/src/modules/sqlops/doc/sqlops_admin.xml b/src/modules/sqlops/doc/sqlops_admin.xml index 671fe79858..ef7756b9a5 100644 --- a/src/modules/sqlops/doc/sqlops_admin.xml +++ b/src/modules/sqlops/doc/sqlops_admin.xml @@ -212,6 +212,32 @@ modparam("sqlops", "tr_buf_size", 4096) ... modparam("sqlops", "connect_mode", 1) ... +</programlisting> + </example> + </section> + <section id="sqlops.results_maxsize"> + <title><varname>results_maxsize</varname> (int)</title> + <para> + Set the upper limit of how many result containers are going to be + defined. + </para> + <para> + Note that a result container can be used for different SQL queries, it + is not required to have result container per SQL query. Use different + containers when the result records are needed at the same time (e.g., + compare a field from one result with a field from another result). + </para> + <para> + <emphasis> + Default value is 32. + </emphasis> + </para> + <example> + <title>Set <varname>results_maxsize</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("sqlops", "results_maxsize", 4096) +... </programlisting> </example> </section>

3 years, 9 months

git:master:61677fed: sqlops: new modparam results_maxsize

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 61677fed1b693fbb163ecd8dcd9d9ae37e4da066 URL: https://github.com/kamailio/kamailio/commit/61677fed1b693fbb163ecd8dcd9d9ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-07T17:34:51+02:00 sqlops: new modparam results_maxsize - allow setting the maximum size of the result containers list --- Modified: src/modules/sqlops/sql_api.c Modified: src/modules/sqlops/sqlops.c --- Diff: https://github.com/kamailio/kamailio/commit/61677fed1b693fbb163ecd8dcd9d9ae… Patch: https://github.com/kamailio/kamailio/commit/61677fed1b693fbb163ecd8dcd9d9ae… --- diff --git a/src/modules/sqlops/sql_api.c b/src/modules/sqlops/sql_api.c index 748d77320e..d67f30ccef 100644 --- a/src/modules/sqlops/sql_api.c +++ b/src/modules/sqlops/sql_api.c @@ -35,7 +35,7 @@ #include "sql_api.h" -#define SQLOPS_RESULT_MAXSIZE 32 +extern int sqlops_results_maxsize; sql_con_t *_sql_con_root = NULL; sql_result_t *_sql_result_root = NULL; @@ -225,7 +225,7 @@ sql_result_t* sql_get_result(str *name) i++; sr = sr->next; } - if(i>SQLOPS_RESULT_MAXSIZE) + if(i>sqlops_results_maxsize) { LM_ERR("too many result containers defined\n"); return NULL; diff --git a/src/modules/sqlops/sqlops.c b/src/modules/sqlops/sqlops.c index 5eec552b65..fb35907d59 100644 --- a/src/modules/sqlops/sqlops.c +++ b/src/modules/sqlops/sqlops.c @@ -79,6 +79,8 @@ static int sql_res_param(modparam_t type, void* val); extern int sqlops_tr_buf_size; +int sqlops_results_maxsize = 32; + static int sqlops_connect_mode = 0; static pv_export_t mod_pvs[] = { @@ -111,6 +113,7 @@ static param_export_t params[]={ {"sqlres", PARAM_STRING|USE_FUNC_PARAM, (void*)sql_res_param}, {"tr_buf_size", PARAM_INT, &sqlops_tr_buf_size}, {"connect_mode", PARAM_INT, &sqlops_connect_mode}, + {"results_maxsize", PARAM_INT, &sqlops_results_maxsize}, {0,0,0} };

3 years, 9 months

[kamailio/kamailio] xhttp_prom: optional disabling of metrics deletion (#2430)

by Marat

#### 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2430 -- Commit Summary -- * xhttp_prom: optional disabling of metrics deletion -- File Changes -- M src/modules/xhttp_prom/doc/xhttp_prom_admin.xml (3) M src/modules/xhttp_prom/prom_metric.c (12) M src/modules/xhttp_prom/xhttp_prom.c (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2430.patch https://github.com/kamailio/kamailio/pull/2430.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/2430

3 years, 9 months

[kamailio/kamailio] dispatcher: add an attribute to preset the latency estimator (#2492)

by Julien Chavanton

3 years, 9 months

git:master:e8ce5cff: modules: readme files regenerated - dispatcher ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: e8ce5cff74c3d53df361e42746bb4a7c1f8b6214 URL: https://github.com/kamailio/kamailio/commit/e8ce5cff74c3d53df361e42746bb4a7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-06T22:31:12+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/e8ce5cff74c3d53df361e42746bb4a7… Patch: https://github.com/kamailio/kamailio/commit/e8ce5cff74c3d53df361e42746bb4a7… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index a30d001f66..2d07fe7669 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -762,7 +762,8 @@ modparam("dispatcher", "ds_probing_mode", 1) 3.26. ds_ping_latency_stats (int) - Enable latency measurement when pinging nodes + Enable latency measurement when pinging nodes The estimator can be + initialized at startup and reload using the attribute latency. * If set to 0, disable latency measurement. * If set to 1, enable latency measurement. @@ -776,6 +777,9 @@ DEST: { URI: sip:1.2.3.4 FLAGS: AX PRIORITY: 9 + ATTRS: { + BODY: latency=24 + } LATENCY: { AVG: 24.250000 # weighted moving average for the last few weeks STD: 1.035000 # standard deviation of AVG @@ -1695,6 +1699,7 @@ kamctl rpc dispatcher.hash 4 bob server.com overwrites the general ds_ping_from parameter. * 'obproxy' - SIP URI of outbound proxy to be used when sending pings. It overwrites the general ds_outbound_proxy parameter. + * 'latency' - latency_stats initialization in ms. 6.1.2. File Format

3 years, 9 months

git:master:8429ef38: dispatcher: add an attribute to preset the

by Julien Chavanton

Module: kamailio Branch: master Commit: 8429ef380517f321ea05c2c2e2cdbd221712df49 URL: https://github.com/kamailio/kamailio/commit/8429ef380517f321ea05c2c2e2cdbd2… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2020-10-06T13:20:25-07:00 dispatcher: add an attribute to preset the latency estimator --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8429ef380517f321ea05c2c2e2cdbd2… Patch: https://github.com/kamailio/kamailio/commit/8429ef380517f321ea05c2c2e2cdbd2… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 8e798a871b..23b4d16967 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -319,6 +319,11 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) } else if(pit->name.len == 6 && strncasecmp(pit->name.s, "weight", 6) == 0) { str2sint(&pit->body, &dest->attrs.weight); + } else if(pit->name.len == 7 + && strncasecmp(pit->name.s, "latency", 7) == 0) { + int initial_latency = 0; + if (str2sint(&pit->body, &initial_latency) == 0) + latency_stats_init(&dest->latency_stats, initial_latency, 10000); } else if(pit->name.len == 7 && strncasecmp(pit->name.s, "maxload", 7) == 0) { str2sint(&pit->body, &dest->attrs.maxload); @@ -2587,6 +2592,16 @@ int ds_mark_dst(struct sip_msg *msg, int state) return (ret == 0) ? 1 : -1; } +void latency_stats_init(ds_latency_stats_t *latency_stats, int latency, int count) { + latency_stats->stdev = 0.0f; + latency_stats->m2 = 0.0f; + latency_stats->max = latency; + latency_stats->min = latency; + latency_stats->average = latency; + latency_stats->estimate = latency; + latency_stats->count = count; +} + static inline void latency_stats_update(ds_latency_stats_t *latency_stats, int latency) { int training_count = 10000; @@ -2596,18 +2611,14 @@ static inline void latency_stats_update(ds_latency_stats_t *latency_stats, int l } else { /* We adjust the sum of squares used by the oneline algorithm proportionally */ latency_stats->m2 -= latency_stats->m2/latency_stats->count; } - if (latency_stats->count == 1) { - latency_stats->stdev = 0.0f; - latency_stats->m2 = 0.0f; - latency_stats->max = latency; - latency_stats->min = latency; - latency_stats->average = latency; - latency_stats->estimate = latency; - } + + if (latency_stats->count == 1) + latency_stats_init(latency_stats, latency, 1); /* stabilize-train the estimator if the average is stable after 10 samples */ if (latency_stats->count > 10 && latency_stats->count < training_count && latency_stats->stdev < 0.5) latency_stats->count = training_count; + if (latency_stats->min > latency) latency_stats->min = latency; if (latency_stats->max < latency) diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index 2bd63dc64b..dada7ed5d8 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -204,6 +204,8 @@ typedef struct _ds_latency_stats { uint32_t timeout; } ds_latency_stats_t; +void latency_stats_init(ds_latency_stats_t *latency_stats, int latency, int count); + typedef struct _ds_dest { str uri; /*!< address/uri */ int flags; /*!< flags */ diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 0b9b4495b0..d4ed3261ec 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -709,6 +709,7 @@ modparam("dispatcher", "ds_probing_mode", 1) <title><varname>ds_ping_latency_stats</varname> (int)</title> <para> Enable latency measurement when pinging nodes + The estimator can be initialized at startup and reload using the attribute latency. </para> <itemizedlist> @@ -735,6 +736,9 @@ DEST: { URI: sip:1.2.3.4 FLAGS: AX PRIORITY: 9 + ATTRS: { + BODY: latency=24 + } LATENCY: { AVG: 24.250000 # weighted moving average for the last few weeks STD: 1.035000 # standard deviation of AVG @@ -2126,6 +2130,9 @@ kamctl rpc dispatcher.hash 4 bob server.com <para>'obproxy' - SIP URI of outbound proxy to be used when sending pings. It overwrites the general ds_outbound_proxy parameter.</para> </listitem> + <listitem> + <para>'latency' - latency_stats initialization in ms.</para> + </listitem> </itemizedlist> </para> </section>

3 years, 9 months

git:master:8d004477: rtpproxy: renamed extract_mediaip() to rp_extract_mediaip()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8d0044770e94eaf7099eabbb55abe177e52e5373 URL: https://github.com/kamailio/kamailio/commit/8d0044770e94eaf7099eabbb55abe17… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-06T12:59:50+02:00 rtpproxy: renamed extract_mediaip() to rp_extract_mediaip() - extract_mediaip() is also in core sdp parser --- Modified: src/modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/8d0044770e94eaf7099eabbb55abe17… Patch: https://github.com/kamailio/kamailio/commit/8d0044770e94eaf7099eabbb55abe17… --- diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c index 8aef20019f..23c8357e4b 100644 --- a/src/modules/rtpproxy/rtpproxy.c +++ b/src/modules/rtpproxy/rtpproxy.c @@ -114,7 +114,7 @@ static str DEFAULT_RTPP_SET_ID_STR = str_init("0"); #define PTL_CPROTOVER "20081102" #define CPORT "22222" -static int extract_mediaip(str *, str *, int *, char *); +static int rp_extract_mediaip(str *, str *, int *, char *); static int alter_mediaip(struct sip_msg *, str *, str *, int, str *, int, int); static int alter_mediaport(struct sip_msg *, str *, str *, str *, int); static int alter_rtcp(struct sip_msg *msg, str *body, str *oldport, str *newport); @@ -958,7 +958,7 @@ replace_sdp_ip(struct sip_msg* msg, str *org_body, char *line, str *ip) } body1 = body; for(;;) { - if (extract_mediaip(&body1, &oldip, &pf,line) == -1) + if (rp_extract_mediaip(&body1, &oldip, &pf,line) == -1) break; if (pf != AF_INET) { LM_ERR("not an IPv4 address in '%s' SDP\n",line); @@ -988,7 +988,7 @@ replace_sdp_ip(struct sip_msg* msg, str *org_body, char *line, str *ip) } static int -extract_mediaip(str *body, str *mediaip, int *pf, char *line) +rp_extract_mediaip(str *body, str *mediaip, int *pf, char *line) { char *cp, *cp1; int len, nextisip;

3 years, 9 months

git:master:b84b67a0: core: kemi - new function hdr.match_content(hname, op, mval, hidx)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b84b67a0847cf5129418185d1a482a0943fd9986 URL: https://github.com/kamailio/kamailio/commit/b84b67a0847cf5129418185d1a482a0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-06T12:58:01+02:00 core: kemi - new function hdr.match_content(hname, op, mval, hidx) - return true/false based on matching header content --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/b84b67a0847cf5129418185d1a482a0… Patch: https://github.com/kamailio/kamailio/commit/b84b67a0847cf5129418185d1a482a0…

3 years, 9 months

git:master:48d0953b: core: parser - wrapper function to parse str header name

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 48d0953b5fd1f6fed97ce6b016f05860b25cd97f URL: https://github.com/kamailio/kamailio/commit/48d0953b5fd1f6fed97ce6b016f0586… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-06T12:58:01+02:00 core: parser - wrapper function to parse str header name --- Modified: src/core/parser/parse_hname2.c Modified: src/core/parser/parse_hname2.h --- Diff: https://github.com/kamailio/kamailio/commit/48d0953b5fd1f6fed97ce6b016f0586… Patch: https://github.com/kamailio/kamailio/commit/48d0953b5fd1f6fed97ce6b016f0586… --- diff --git a/src/core/parser/parse_hname2.c b/src/core/parser/parse_hname2.c index 598008214a..ab56fa4ea5 100644 --- a/src/core/parser/parse_hname2.c +++ b/src/core/parser/parse_hname2.c @@ -309,3 +309,9 @@ char* parse_hname2_short(char* const begin, const char* const end, struct hdr_fi { return parse_sip_header_name(begin, end, hdr, 0); } + +char* parse_hname2_str (str* const hbuf, hdr_field_t* const hdr) +{ + return parse_sip_header_name(hbuf->s, hbuf->s + hbuf->len, hdr, 1); +} + diff --git a/src/core/parser/parse_hname2.h b/src/core/parser/parse_hname2.h index 9eef0bb53e..2c864857d6 100644 --- a/src/core/parser/parse_hname2.h +++ b/src/core/parser/parse_hname2.h @@ -15,13 +15,13 @@ * 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 + * 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 Parser :: Fast 32-bit Header Field Name Parser + * \brief Parser :: Fast Header Field Name Parser * * \ingroup parser */ @@ -37,6 +37,7 @@ */ char* parse_hname2(char* const begin, const char* const end, struct hdr_field* const hdr); char* parse_hname2_short(char* const begin, const char* const end, struct hdr_field* const hdr); +char* parse_hname2_str (str* const hbuf, hdr_field_t* const hdr); int ksr_hname_init_index(void); int ksr_hname_init_config(void);

3 years, 9 months

git:master:b0f239a2: nathelper: renamed extract_mediaip() to nh_extract_mediaip()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b0f239a2c16b71b8b7e7b325ea121ffc48afa78e URL: https://github.com/kamailio/kamailio/commit/b0f239a2c16b71b8b7e7b325ea121ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-06T12:58:01+02:00 nathelper: renamed extract_mediaip() to nh_extract_mediaip() - extract_mediaip() is also in core sdp parser --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/b0f239a2c16b71b8b7e7b325ea121ff… Patch: https://github.com/kamailio/kamailio/commit/b0f239a2c16b71b8b7e7b325ea121ff… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 3a295e2067..12206ba152 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -116,7 +116,7 @@ static int pv_get_rr_count_f(struct sip_msg *, pv_param_t *, pv_value_t *); static int pv_get_rr_top_count_f(struct sip_msg *, pv_param_t *, pv_value_t *); static int fix_nated_sdp_f(struct sip_msg *, char *, char *); static int is_rfc1918_f(struct sip_msg *, char *, char *); -static int extract_mediaip(str *, str *, int *, char *, int); +static int nh_extract_mediaip(str *, str *, int *, char *, int); static int alter_mediaip(struct sip_msg *, str *, str *, int, str *, int, int); static int fix_nated_register_f(struct sip_msg *, char *, char *); static int fixup_fix_nated_register(void **param, int param_no); @@ -1631,7 +1631,7 @@ static inline int replace_sdp_ip( } body1 = body; for(;;) { - if(extract_mediaip(&body1, &oldip, &pf, line, linelen) == -1) + if(nh_extract_mediaip(&body1, &oldip, &pf, line, linelen) == -1) break; if(pf != AF_INET) { LM_ERR("not an IPv4 address in '%s' SDP\n", line); @@ -1786,7 +1786,8 @@ static int fix_nated_sdp_f(struct sip_msg *msg, char *str1, char *str2) return ki_fix_nated_sdp_ip(msg, level, &ip); } -static int extract_mediaip(str *body, str *mediaip, int *pf, char *line, int linelen) +static int nh_extract_mediaip(str *body, str *mediaip, int *pf, char *line, + int linelen) { char *cp, *cp1; int len, nextisip;

3 years, 9 months

← Newer
1
...
36
37
38
39
40
41
42
...
53
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2020