sr-dev March 2020

sr-dev@lists.kamailio.org

27 participants
473 discussions

git:5.3:7b90c4e6: dialog: update event route statistics

by Stefan Mititelu

Module: kamailio Branch: 5.3 Commit: 7b90c4e610b3d07b40b3eb883623981294732652 URL: https://github.com/kamailio/kamailio/commit/7b90c4e610b3d07b40b3eb883623981… Author: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Committer: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Date: 2020-03-11T10:06:25+02:00 dialog: update event route statistics If dialog was deleted while running the event route, update statistics for early and active dialogs. (cherry picked from commit c6faf3af06129f636f86f9919f0b9db84ca0dab6) --- Modified: src/modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/7b90c4e610b3d07b40b3eb883623981… Patch: https://github.com/kamailio/kamailio/commit/7b90c4e610b3d07b40b3eb883623981… --- diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index 71f29e24fc..48899e3215 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -1810,6 +1810,16 @@ int dlg_run_event_route(dlg_cell_t *dlg, sip_msg_t *msg, int ostate, int nstate) if (dlg0==0) { LM_ALERT("after event route - dialog not found [%u:%u] (%d/%d) (%p) (%.*s)\n", h_entry, h_id, ostate, nstate, dlg, evname.len, evname.s); + if (nstate == DLG_STATE_DELETED) { + if (ostate == DLG_STATE_UNCONFIRMED) { + if_update_stat(dlg_enable_stats, failed_dlgs, 1); + } else if (ostate == DLG_STATE_EARLY) { + if_update_stat(dlg_enable_stats, early_dlgs, -1); + if_update_stat(dlg_enable_stats, failed_dlgs, 1); + } else if (ostate != DLG_STATE_DELETED) { + if_update_stat(dlg_enable_stats, active_dlgs, -1); + } + } return -1; } else { dlg_release(dlg0);

4 years, 9 months

git:5.2:c670ba6f: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.2 Commit: c670ba6f18c0df83f64a87bf4d02de84b848ad26 URL: https://github.com/kamailio/kamailio/commit/c670ba6f18c0df83f64a87bf4d02de8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-11T09:01:39+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/siptrace/README --- Diff: https://github.com/kamailio/kamailio/commit/c670ba6f18c0df83f64a87bf4d02de8… Patch: https://github.com/kamailio/kamailio/commit/c670ba6f18c0df83f64a87bf4d02de8… --- diff --git a/src/modules/siptrace/README b/src/modules/siptrace/README index 3841e32a2e..5b1c2264d9 100644 --- a/src/modules/siptrace/README +++ b/src/modules/siptrace/README @@ -10,20 +10,14 @@ Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> -Edited by - Daniel-Constantin Mierla <miconda(a)gmail.com> -Edited by - Giacomo Vacca <giacomo.vacca(a)gmail.com> -Edited by - Camille Oudot <camille.oudot(a)orange.com> @@ -80,7 +74,7 @@ Camille Oudot List of Examples 1.1. Set db_url parameter - 1.2. Set sip_trace parameter + 1.2. Set table parameter 1.3. Set trace_flag parameter 1.4. Set trace_on parameter 1.5. Set traced_user_avp parameter @@ -225,7 +219,7 @@ modparam("siptrace", "db_url", "dbdriver://username:password@dbhost/dbname") Default value is “sip_trace”. - Example 1.2. Set sip_trace parameter + Example 1.2. Set table parameter ... modparam("siptrace", "table", "strace") ...

4 years, 9 months

[kamailio/kamailio] dialog: update event route statistics (#2243)

by Stefan Mititelu

If dialog was deleted while running the event route, update statistics for early and active dialogs.   #### 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:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Please let me know if I can backport it to 5.3 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2243 -- Commit Summary -- * dialog: update event route statistics -- File Changes -- M src/modules/dialog/dlg_handlers.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2243.patch https://github.com/kamailio/kamailio/pull/2243.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/2243

4 years, 9 months

git:master:c6faf3af: dialog: update event route statistics

by Stefan Mititelu

Module: kamailio Branch: master Commit: c6faf3af06129f636f86f9919f0b9db84ca0dab6 URL: https://github.com/kamailio/kamailio/commit/c6faf3af06129f636f86f9919f0b9db… Author: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Committer: Stefan Mititelu <stefan.mititelu(a)enea.com> Date: 2020-03-11T10:01:27+02:00 dialog: update event route statistics If dialog was deleted while running the event route, update statistics for early and active dialogs. --- Modified: src/modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/c6faf3af06129f636f86f9919f0b9db… Patch: https://github.com/kamailio/kamailio/commit/c6faf3af06129f636f86f9919f0b9db… --- diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index 71f29e24fc..48899e3215 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -1810,6 +1810,16 @@ int dlg_run_event_route(dlg_cell_t *dlg, sip_msg_t *msg, int ostate, int nstate) if (dlg0==0) { LM_ALERT("after event route - dialog not found [%u:%u] (%d/%d) (%p) (%.*s)\n", h_entry, h_id, ostate, nstate, dlg, evname.len, evname.s); + if (nstate == DLG_STATE_DELETED) { + if (ostate == DLG_STATE_UNCONFIRMED) { + if_update_stat(dlg_enable_stats, failed_dlgs, 1); + } else if (ostate == DLG_STATE_EARLY) { + if_update_stat(dlg_enable_stats, early_dlgs, -1); + if_update_stat(dlg_enable_stats, failed_dlgs, 1); + } else if (ostate != DLG_STATE_DELETED) { + if_update_stat(dlg_enable_stats, active_dlgs, -1); + } + } return -1; } else { dlg_release(dlg0);

4 years, 9 months

git:5.3:acc5cb10: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.3 Commit: acc5cb10fe8f83269ad9ef953d2745aee323fa35 URL: https://github.com/kamailio/kamailio/commit/acc5cb10fe8f83269ad9ef953d2745a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-11T09:01:24+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/siptrace/README --- Diff: https://github.com/kamailio/kamailio/commit/acc5cb10fe8f83269ad9ef953d2745a… Patch: https://github.com/kamailio/kamailio/commit/acc5cb10fe8f83269ad9ef953d2745a… --- diff --git a/src/modules/siptrace/README b/src/modules/siptrace/README index 749c89ea65..5eab39eb23 100644 --- a/src/modules/siptrace/README +++ b/src/modules/siptrace/README @@ -75,7 +75,7 @@ Camille Oudot List of Examples 1.1. Set db_url parameter - 1.2. Set sip_trace parameter + 1.2. Set table parameter 1.3. Set trace_flag parameter 1.4. Set trace_on parameter 1.5. Set traced_user_avp parameter @@ -222,7 +222,7 @@ modparam("siptrace", "db_url", "dbdriver://username:password@dbhost/dbname") Default value is “sip_trace”. - Example 1.2. Set sip_trace parameter + Example 1.2. Set table parameter ... modparam("siptrace", "table", "strace") ...

4 years, 9 months

git:5.2:3ce82b7d: siptrace: fix table parameter in example (related to GH#2244)

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: 3ce82b7db0cef0f16fd43fd4ce9029ed6d02c5bb URL: https://github.com/kamailio/kamailio/commit/3ce82b7db0cef0f16fd43fd4ce9029e… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-11T08:58:40+01:00 siptrace: fix table parameter in example (related to GH#2244) (cherry picked from commit 836c6297820014c5ba9519a5039c775fb399f073) --- Modified: src/modules/siptrace/doc/siptrace_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3ce82b7db0cef0f16fd43fd4ce9029e… Patch: https://github.com/kamailio/kamailio/commit/3ce82b7db0cef0f16fd43fd4ce9029e… --- diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml index 504e6e98b8..4e1d8af852 100644 --- a/src/modules/siptrace/doc/siptrace_admin.xml +++ b/src/modules/siptrace/doc/siptrace_admin.xml @@ -125,7 +125,7 @@ modparam("siptrace", "db_url", "&exampledb;") </emphasis> </para> <example> - <title>Set <varname>sip_trace</varname> parameter</title> + <title>Set <varname>table</varname> parameter</title> <programlisting format="linespecific"> ... modparam("siptrace", "table", "strace")

4 years, 9 months

git:5.3:836c6297: siptrace: fix table parameter in example (related to GH#2244)

by Henning Westerholt

Module: kamailio Branch: 5.3 Commit: 836c6297820014c5ba9519a5039c775fb399f073 URL: https://github.com/kamailio/kamailio/commit/836c6297820014c5ba9519a5039c775… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-11T08:57:40+01:00 siptrace: fix table parameter in example (related to GH#2244) --- Modified: src/modules/siptrace/doc/siptrace_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/836c6297820014c5ba9519a5039c775… Patch: https://github.com/kamailio/kamailio/commit/836c6297820014c5ba9519a5039c775… --- diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml index abf3f47c26..6b3a1f49f8 100644 --- a/src/modules/siptrace/doc/siptrace_admin.xml +++ b/src/modules/siptrace/doc/siptrace_admin.xml @@ -118,7 +118,7 @@ modparam("siptrace", "db_url", "&exampledb;") </emphasis> </para> <example> - <title>Set <varname>sip_trace</varname> parameter</title> + <title>Set <varname>table</varname> parameter</title> <programlisting format="linespecific"> ... modparam("siptrace", "table", "strace")

4 years, 9 months

git:master:3bfc01f0: db_mysql: use cast to (const void*) for mysql_options() value

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3bfc01f0f57a25fb53de1dc45d39af747edf309a URL: https://github.com/kamailio/kamailio/commit/3bfc01f0f57a25fb53de1dc45d39af7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-11T08:41:19+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 --- Modified: src/modules/db_mysql/km_my_con.c Modified: src/modules/db_mysql/my_con.c --- Diff: https://github.com/kamailio/kamailio/commit/3bfc01f0f57a25fb53de1dc45d39af7… Patch: https://github.com/kamailio/kamailio/commit/3bfc01f0f57a25fb53de1dc45d39af7… --- 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"); } }

4 years, 9 months

git:master:64cb2f6c: kamctl: kamctlrc - small adjustmet to rpc fifo file to match default naming

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 64cb2f6c121fe748696f55f797c8342415965c88 URL: https://github.com/kamailio/kamailio/commit/64cb2f6c121fe748696f55f797c8342… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-10T20:24:52+01:00 kamctl: kamctlrc - small adjustmet to rpc fifo file to match default naming --- Modified: utils/kamctl/kamctlrc --- Diff: https://github.com/kamailio/kamailio/commit/64cb2f6c121fe748696f55f797c8342… Patch: https://github.com/kamailio/kamailio/commit/64cb2f6c121fe748696f55f797c8342… --- diff --git a/utils/kamctl/kamctlrc b/utils/kamctl/kamctlrc index abe4afffbc..4751350934 100644 --- a/utils/kamctl/kamctlrc +++ b/utils/kamctl/kamctlrc @@ -136,7 +136,7 @@ # CTLENGINE="RPCFIFO" ## path to FIFO file for engine RPCFIFO -# RPCFIFOPATH="/run/kamailio/kamailio_rpc_fifo" +# RPCFIFOPATH="/run/kamailio/kamailio_rpc.fifo" ## check ACL names; default on (1); off (0) # VERIFY_ACL=1

4 years, 9 months

git:master:9f5dc8aa: modules: readme files regenerated - db_cluster ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 9f5dc8aa20c1f71f54821432837a2bea96e8b6b9 URL: https://github.com/kamailio/kamailio/commit/9f5dc8aa20c1f71f54821432837a2be… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-10T20:16:10+01:00 modules: readme files regenerated - db_cluster ... [skip ci] --- Modified: src/modules/db_cluster/README --- Diff: https://github.com/kamailio/kamailio/commit/9f5dc8aa20c1f71f54821432837a2be… Patch: https://github.com/kamailio/kamailio/commit/9f5dc8aa20c1f71f54821432837a2be… --- diff --git a/src/modules/db_cluster/README b/src/modules/db_cluster/README index 7fd611aea5..4e52d0ab24 100644 --- a/src/modules/db_cluster/README +++ b/src/modules/db_cluster/README @@ -69,8 +69,12 @@ Chapter 1. Admin Guide robin write and read. The following database commands are considered to be write operations: - INSERT, DELETE, UPDATE, REPLACE, INSERT-DELAYED, INSERT-UPDATE. The - read operations are done for database commands: QUERY and RAW-QUERY. + INSERT, DELETE, UPDATE, REPLACE, INSERT-DELAYED, INSERT-UPDATE, + INSERT-ASYNC. The read operations are done for database commands: QUERY + and RAW-QUERY. + + Note: if INSERT-ASYNC is not implemented by DB connector module, then + standard INSERT operation is done. 2. Dependencies

4 years, 9 months

← Newer
1
...
31
32
33
34
35
36
37
...
48
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2020