sr-dev March 2020

sr-dev@lists.kamailio.org

27 participants
473 discussions

git:master:2771b041: dmq_usrloc: docs fix parameter name
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: master Commit: 2771b041d47339b76271d4115bd68ffa7514aa25 URL: https://github.com/kamailio/kamailio/commit/2771b041d47339b76271d4115bd68ff… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:17:04+01:00 dmq_usrloc: docs fix parameter name --- Modified: src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2771b041d47339b76271d4115bd68ff… Patch: https://github.com/kamailio/kamailio/commit/2771b041d47339b76271d4115bd68ff… --- diff --git a/src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml b/src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml index c4fd46b66d..52620f2b13 100644 --- a/src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml +++ b/src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml @@ -134,7 +134,7 @@ modparam("dmq_usrloc", "sync", 0) </emphasis> </para> <example> - <title>Set <varname>batch size</varname> parameter</title> + <title>Set <varname>batch_size</varname> parameter</title> <programlisting format="linespecific"> ... modparam("dmq_usrloc", "batch_size", 4000)

1 0

git:master:4b84dd2e: dispatcher: docs add missing parameter
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: master Commit: 4b84dd2e9387efcdab7e501b66a64a72b233a9c4 URL: https://github.com/kamailio/kamailio/commit/4b84dd2e9387efcdab7e501b66a64a7… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:17:04+01:00 dispatcher: docs add missing parameter --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4b84dd2e9387efcdab7e501b66a64a7… Patch: https://github.com/kamailio/kamailio/commit/4b84dd2e9387efcdab7e501b66a64a7… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index cd9afcced4..3a2eaaa49c 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -221,6 +221,27 @@ modparam("dispatcher", "priority_col", "dstpriority") </example> </section> + <section id="dispatcher.p.attrs_col"> + <title><varname>attrs_col</varname> (string)</title> + <para> + The column's name in the database storing the attributes for + destination URI. + </para> + <para> + <emphasis> + Default value is <quote>attrs</quote>. + </emphasis> + </para> + <example> + <title>Set <quote>attrs_col</quote> parameter</title> + <programlisting format="linespecific"> +... +modparam("dispatcher", "attrs_col", "dstattrs") +... +</programlisting> + </example> + </section> + <section id="dispatcher.p.force_dst"> <title><varname>force_dst</varname> (int)</title> <para>

1 0

git:master:8668d43c: cdp: docs add missing parameter
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: master Commit: 8668d43ccc814867be9716a548c9d3a4cbf0f3d9 URL: https://github.com/kamailio/kamailio/commit/8668d43ccc814867be9716a548c9d3a… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:17:04+01:00 cdp: docs add missing parameter --- Modified: src/modules/cdp/doc/cdp_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8668d43ccc814867be9716a548c9d3a… Patch: https://github.com/kamailio/kamailio/commit/8668d43ccc814867be9716a548c9d3a… --- diff --git a/src/modules/cdp/doc/cdp_admin.xml b/src/modules/cdp/doc/cdp_admin.xml index aaa229767c..698e3e3c04 100644 --- a/src/modules/cdp/doc/cdp_admin.xml +++ b/src/modules/cdp/doc/cdp_admin.xml @@ -127,7 +127,24 @@ modparam("cdp", "latency_threshold", 1000) </example> </section> <section> - <title>workerq_length_threshold_percentage (int)</title> + <title><varname>workerq_latency_threshold</varname> (int)</title> + + <para>The time in ms above which a log error is written to log file for + putting tasks into task queue.</para> + + <para><emphasis> Default value is <quote>100</quote>. </emphasis></para> + + <example> + <title>Set <varname>workerq_latency_threshold</varname> parameter</title> + + <programlisting format="linespecific">... +modparam("cdp", "workerq_latency_threshold", 250) +... + </programlisting> + </example> + </section> + <section> + <title><varname>workerq_length_threshold_percentage</varname> (int)</title> <para>The threshold of the length of the worker queue as a percentage of the maximum queue size - when exceeded a warning is written to the log

1 0

git:master:4830cf41: kamctl: db creation scripts regenerated
by Daniel-Constantin Mierla 14 Mar '20

14 Mar '20

Module: kamailio Branch: master Commit: 4830cf41f7a0460c08491f0f14adf8fa84ebe639 URL: https://github.com/kamailio/kamailio/commit/4830cf41f7a0460c08491f0f14adf8f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-14T18:34:10+01:00 kamctl: db creation scripts regenerated --- Modified: utils/kamctl/db_berkeley/kamailio/version Modified: utils/kamctl/db_redis/kamailio/version Modified: utils/kamctl/db_sqlite/standard-create.sql Modified: utils/kamctl/dbtext/kamailio/version Modified: utils/kamctl/mongodb/kamailio/version.json Modified: utils/kamctl/mysql/standard-create.sql Modified: utils/kamctl/oracle/standard-create.sql Modified: utils/kamctl/postgres/standard-create.sql Modified: utils/kamctl/xhttp_pi/pi_framework.xml Modified: utils/kamctl/xhttp_pi/standard-mod Modified: utils/kamctl/xhttp_pi/standard-table --- Diff: https://github.com/kamailio/kamailio/commit/4830cf41f7a0460c08491f0f14adf8f… Patch: https://github.com/kamailio/kamailio/commit/4830cf41f7a0460c08491f0f14adf8f…

1 0

git:master:5409a604: lib/srdb1: schema - description fields and id column for version table
by Daniel-Constantin Mierla 14 Mar '20

14 Mar '20

Module: kamailio Branch: master Commit: 5409a60421a7d5cda281c0fd94cbc2bd038f0dbb URL: https://github.com/kamailio/kamailio/commit/5409a60421a7d5cda281c0fd94cbc2b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-14T18:30:13+01:00 lib/srdb1: schema - description fields and id column for version table - no change from perspective of kamailio internal usage, just coherence across tables and easier format for management tools --- Modified: src/lib/srdb1/schema/version.xml --- Diff: https://github.com/kamailio/kamailio/commit/5409a60421a7d5cda281c0fd94cbc2b… Patch: https://github.com/kamailio/kamailio/commit/5409a60421a7d5cda281c0fd94cbc2b… --- diff --git a/src/lib/srdb1/schema/version.xml b/src/lib/srdb1/schema/version.xml index c18ea3b0c3..42734bb2b9 100644 --- a/src/lib/srdb1/schema/version.xml +++ b/src/lib/srdb1/schema/version.xml @@ -10,17 +10,35 @@ <name>version</name> <version>1</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> + <description> + <db:para> + This table is used by Kamailio modules to check if the structure + of database tables has the expected number. + </db:para> + </description> + + <column id="id"> + <name>id</name> + <type>unsigned int</type> + <size>&table_id_len;</size> + <autoincrement/> + <primary/> + <type db="dbtext">int,auto</type> + <description>Unique ID</description> + </column> <column id="table_name"> <name>table_name</name> <type>string</type> <size>32</size> <natural/> + <description>Table name</description> </column> <column id="table_version"> <name>table_version</name> <type>unsigned int</type> <default>0</default> + <description>Version number</description> </column> <index> <name>table_name_idx</name>

1 0

git:master:41841dfc: kamctl: cmd trap output file with txt extension
by Daniel-Constantin Mierla 14 Mar '20

14 Mar '20

Module: kamailio Branch: master Commit: 41841dfc153894a97609bdc95d78a12cb2b304ca URL: https://github.com/kamailio/kamailio/commit/41841dfc153894a97609bdc95d78a12… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-14T18:16:34+01:00 kamctl: cmd trap output file with txt extension - easier to view inline when sent via email, without extensions being binary encoding and requiring explicit download --- Modified: utils/kamctl/kamctl --- Diff: https://github.com/kamailio/kamailio/commit/41841dfc153894a97609bdc95d78a12… Patch: https://github.com/kamailio/kamailio/commit/41841dfc153894a97609bdc95d78a12… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index 7fd9197a35..ffac93065c 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -2918,7 +2918,7 @@ kamailio_trap() { exit fi DATE=`/bin/date +%Y%m%d_%H%M%S` - LOG_FILE=/tmp/gdb_kamailio_$DATE + LOG_FILE=/tmp/gdb_kamailio_${DATE}.txt minfo "Trap file: $LOG_FILE" ctl_cmd_run core.psx > $LOG_FILE echo -n "Trapping Kamailio with gdb: "

1 0

git:5.3:c4908816: siptrace: proper setting of dst field when correlation id is not set
by Daniel-Constantin Mierla 14 Mar '20

14 Mar '20

Module: kamailio Branch: 5.3 Commit: c4908816950d12eade4a320f399f74eb4ec91599 URL: https://github.com/kamailio/kamailio/commit/c4908816950d12eade4a320f399f74e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-14T18:03:30+01:00 siptrace: proper setting of dst field when correlation id is not set - GH #2250 (cherry picked from commit f0ae3c37cdaf4c5d8034062bf27ebeb03aacb99f) --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/c4908816950d12eade4a320f399f74e… Patch: https://github.com/kamailio/kamailio/commit/c4908816950d12eade4a320f399f74e… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 861161996b..ccd0b72508 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -814,6 +814,7 @@ static int sip_trace_helper(sip_msg_t *msg, dest_info_t *dst, str *duri, str *corid, char *dir, enum siptrace_type_t trace_type) { siptrace_info_t* info = NULL; + char *p = NULL; if (trace_type == SIPTRACE_TRANSACTION || trace_type == SIPTRACE_DIALOG) { int alloc_size = sizeof(siptrace_info_t); @@ -857,17 +858,18 @@ static int sip_trace_helper(sip_msg_t *msg, dest_info_t *dst, str *duri, } memset(info, 0, alloc_size); + p = (char *)(info + 1); /* could use the dest_info we've already parsed but there's no way to pass * it to DLGCB_CREATED callback so the only thing to do is keep * it as uri, serialize in a dlg_var and parse again in DLGCB_CREATED */ if(corid) { - info->correlation_id.s = (char *)(info + 1); + info->correlation_id.s = p; info->correlation_id.len = corid->len; memcpy(info->correlation_id.s, corid->s, corid->len); } if (duri) { info->uriState = STRACE_RAW_URI; - info->u.dup_uri.s = (char *)info->correlation_id.s + info->correlation_id.len; + info->u.dup_uri.s = p + ((info->correlation_id.s)?info->correlation_id.len:0); memcpy(info->u.dup_uri.s, duri->s, duri->len); info->u.dup_uri.len = duri->len; } else {

1 0

git:5.3:a20891f5: db_mysql: use cast to (const void*) for mysql_options() value
by Daniel-Constantin Mierla 14 Mar '20

14 Mar '20

Module: kamailio Branch: 5.3 Commit: a20891f5d1696db9a87e2a9236572623638d599a URL: https://github.com/kamailio/kamailio/commit/a20891f5d1696db9a87e2a923657262… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-14T18:02:58+01:00 db_mysql: use cast to (const void*) for mysql_options() value - match the function signature, cast to (char*) or (const char*) being used so far (cherry picked from commit 3bfc01f0f57a25fb53de1dc45d39af747edf309a) --- Modified: src/modules/db_mysql/km_my_con.c Modified: src/modules/db_mysql/my_con.c --- Diff: https://github.com/kamailio/kamailio/commit/a20891f5d1696db9a87e2a923657262… Patch: https://github.com/kamailio/kamailio/commit/a20891f5d1696db9a87e2a923657262… --- diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c index bd69d9f109..bed21f92a7 100644 --- a/src/modules/db_mysql/km_my_con.c +++ b/src/modules/db_mysql/km_my_con.c @@ -71,7 +71,7 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) egrp = 0; memset(ptr, 0, sizeof(struct my_con)); ptr->ref = 1; - + ptr->con = (MYSQL*)pkg_malloc(sizeof(MYSQL)); if (!ptr->con) { PKG_MEM_ERROR; @@ -94,7 +94,7 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) } // read [client] and [<grp>] sections in the order // given in my.cnf - mysql_options(ptr->con, MYSQL_READ_DEFAULT_GROUP, grp); + mysql_options(ptr->con, MYSQL_READ_DEFAULT_GROUP, (const void*)grp); } else { host = id->host; @@ -109,14 +109,14 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) } // set connect, read and write timeout, the value counts three times - mysql_options(ptr->con, MYSQL_OPT_CONNECT_TIMEOUT, (const char *)&db_mysql_timeout_interval); - mysql_options(ptr->con, MYSQL_OPT_READ_TIMEOUT, (const char *)&db_mysql_timeout_interval); - mysql_options(ptr->con, MYSQL_OPT_WRITE_TIMEOUT, (const char *)&db_mysql_timeout_interval); + mysql_options(ptr->con, MYSQL_OPT_CONNECT_TIMEOUT, (const void*)&db_mysql_timeout_interval); + mysql_options(ptr->con, MYSQL_OPT_READ_TIMEOUT, (const void*)&db_mysql_timeout_interval); + mysql_options(ptr->con, MYSQL_OPT_WRITE_TIMEOUT, (const void*)&db_mysql_timeout_interval); #if MYSQL_VERSION_ID > 50012 /* set reconnect flag if enabled */ if (db_mysql_auto_reconnect) { rec = 1; - mysql_options(ptr->con, MYSQL_OPT_RECONNECT, &rec); + mysql_options(ptr->con, MYSQL_OPT_RECONNECT, (const void*)&rec); } #else if (db_mysql_auto_reconnect) diff --git a/src/modules/db_mysql/my_con.c b/src/modules/db_mysql/my_con.c index 2314b754de..f64a90f0aa 100644 --- a/src/modules/db_mysql/my_con.c +++ b/src/modules/db_mysql/my_con.c @@ -67,7 +67,7 @@ int my_con_connect(db_con_t* con) if (my_connect_to) { if (mysql_options(mcon->con, MYSQL_OPT_CONNECT_TIMEOUT, - (char*)&my_connect_to)) + (const void*)&my_connect_to)) WARN("failed to set MYSQL_OPT_CONNECT_TIMEOUT\n"); } @@ -77,12 +77,12 @@ int my_con_connect(db_con_t* con) (my_client_ver < 50000))) { if (my_send_to) { if (mysql_options(mcon->con, MYSQL_OPT_WRITE_TIMEOUT , - (char*)&my_send_to)) + (const void*)&my_send_to)) WARN("failed to set MYSQL_OPT_WRITE_TIMEOUT\n"); } if (my_recv_to){ if (mysql_options(mcon->con, MYSQL_OPT_READ_TIMEOUT , - (char*)&my_recv_to)) + (const void*)&my_recv_to)) WARN("failed to set MYSQL_OPT_READ_TIMEOUT\n"); } }

1 0

git:5.3:2776dc9e: db_cluster: trailing spaces removed
by Daniel-Constantin Mierla 14 Mar '20

14 Mar '20

Module: kamailio Branch: 5.3 Commit: 2776dc9e2add3acca8c47323559fd479104fc533 URL: https://github.com/kamailio/kamailio/commit/2776dc9e2add3acca8c47323559fd47… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-14T18:02:11+01:00 db_cluster: trailing spaces removed (cherry picked from commit 40128763d8a987e4c64d51584f1d72872b53dff5) --- Modified: src/modules/db_cluster/db_cluster_mod.c Modified: src/modules/db_cluster/dbcl_api.c Modified: src/modules/db_cluster/dbcl_api.h Modified: src/modules/db_cluster/dbcl_data.c Modified: src/modules/db_cluster/dbcl_data.h --- Diff: https://github.com/kamailio/kamailio/commit/2776dc9e2add3acca8c47323559fd47… Patch: https://github.com/kamailio/kamailio/commit/2776dc9e2add3acca8c47323559fd47…

1 0

git:master:bd387b41: modules: readme files regenerated - sipcapture ... [skip ci]
by Kamailio Dev 13 Mar '20

13 Mar '20

Module: kamailio Branch: master Commit: bd387b4160f67d28fea79bd4168fb7280493ce10 URL: https://github.com/kamailio/kamailio/commit/bd387b4160f67d28fea79bd4168fb72… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-13T11:46:15+01:00 modules: readme files regenerated - sipcapture ... [skip ci] --- Modified: src/modules/sipcapture/README --- Diff: https://github.com/kamailio/kamailio/commit/bd387b4160f67d28fea79bd4168fb72… Patch: https://github.com/kamailio/kamailio/commit/bd387b4160f67d28fea79bd4168fb72… --- diff --git a/src/modules/sipcapture/README b/src/modules/sipcapture/README index cd82e0f6e4..201243ac17 100644 --- a/src/modules/sipcapture/README +++ b/src/modules/sipcapture/README @@ -85,7 +85,7 @@ Alexandr Dubovikov 1.11. Set raw_socket_listen parameter 1.12. Set raw_interface parameter 1.13. Set raw_sock_children parameter - 1.14. Set promiscous_on parameter + 1.14. Set promiscuous_on parameter 1.15. Set raw_moni_bpf_on parameter 1.16. Set capture_node parameter 1.17. Set insert_retries parameter @@ -396,7 +396,7 @@ modparam("sipcapture", "raw_sock_children", 6) Default value is "0". - Example 1.14. Set promiscous_on parameter + Example 1.14. Set promiscuous_on parameter ... modparam("sipcapture", "promiscuous_on", 1) ...

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
48
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 2020