sr-dev May 2017

sr-dev@lists.kamailio.org

32 participants
298 discussions

git:master:2caec04a: core: updated log macros for re code

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2caec04ab428e8a90acf0e62d9351e868f726b69 URL: https://github.com/kamailio/kamailio/commit/2caec04ab428e8a90acf0e62d9351e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-24T04:51:36+02:00 core: updated log macros for re code --- Modified: src/core/re.c Modified: src/core/re.h --- Diff: https://github.com/kamailio/kamailio/commit/2caec04ab428e8a90acf0e62d9351e8… Patch: https://github.com/kamailio/kamailio/commit/2caec04ab428e8a90acf0e62d9351e8…

7 years, 6 months

git:4.4:cda757b6: core: fix mem_summary comparation when SIGUSR1 is received

by Victor Seva

Module: kamailio Branch: 4.4 Commit: cda757b682e0a61a9e9c9e6e9f83be4f899aa364 URL: https://github.com/kamailio/kamailio/commit/cda757b682e0a61a9e9c9e6e9f83be4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-05-24T11:51:58+02:00 core: fix mem_summary comparation when SIGUSR1 is received >From http://www.kamailio.org/wiki/cookbooks/4.4.x/core#mem_summary 1 - dump all the pkg used blocks (status) 2 - dump all the shm used blocks (status) 4 - summary of pkg used blocks 8 - summary of shm used blocks (cherry picked from commit b8750364571beeca6612b31a2948d62bddedc805) --- Modified: main.c --- Diff: https://github.com/kamailio/kamailio/commit/cda757b682e0a61a9e9c9e6e9f83be4… Patch: https://github.com/kamailio/kamailio/commit/cda757b682e0a61a9e9c9e6e9f83be4… --- diff --git a/main.c b/main.c index 8b2e8e8af9..b6f68df1a4 100644 --- a/main.c +++ b/main.c @@ -709,7 +709,7 @@ void handle_sigs(void) LOG(memlog, "Memory status (pkg):\n"); pkg_status(); } - if (cfg_get(core, core_cfg, mem_summary) & 2) { + if (cfg_get(core, core_cfg, mem_summary) & 4) { LOG(memlog, "Memory still-in-use summary (pkg):\n"); pkg_sums(); } @@ -717,11 +717,11 @@ void handle_sigs(void) #endif #ifdef SHM_MEM if (memlog <= cfg_get(core, core_cfg, debug)){ - if (cfg_get(core, core_cfg, mem_summary) & 1) { + if (cfg_get(core, core_cfg, mem_summary) & 2) { LOG(memlog, "Memory status (shm):\n"); shm_status(); } - if (cfg_get(core, core_cfg, mem_summary) & 2) { + if (cfg_get(core, core_cfg, mem_summary) & 8) { LOG(memlog, "Memory still-in-use summary (shm):\n"); shm_sums(); } @@ -821,7 +821,7 @@ void sig_usr(int signo) LOG(memlog, "Memory status (pkg):\n"); pkg_status(); } - if (cfg_get(core, core_cfg, mem_summary) & 2) { + if (cfg_get(core, core_cfg, mem_summary) & 4) { LOG(memlog, "Memory still-in-use summary (pkg):" "\n"); pkg_sums(); @@ -840,7 +840,7 @@ void sig_usr(int signo) LOG(memlog, "Memory status (pkg):\n"); pkg_status(); } - if (cfg_get(core, core_cfg, mem_summary) & 2) { + if (cfg_get(core, core_cfg, mem_summary) & 4) { LOG(memlog, "Memory still-in-use summary (pkg):\n"); pkg_sums(); }

7 years, 6 months

git:5.0:fef4f2c9: core: fix mem_summary comparation when SIGUSR1 is received

by Victor Seva

Module: kamailio Branch: 5.0 Commit: fef4f2c943ffe75f94f0985499fb9e46de409a50 URL: https://github.com/kamailio/kamailio/commit/fef4f2c943ffe75f94f0985499fb9e4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-05-24T11:49:50+02:00 core: fix mem_summary comparation when SIGUSR1 is received >From http://www.kamailio.org/wiki/cookbooks/4.4.x/core#mem_summary 1 - dump all the pkg used blocks (status) 2 - dump all the shm used blocks (status) 4 - summary of pkg used blocks 8 - summary of shm used blocks (cherry picked from commit b8750364571beeca6612b31a2948d62bddedc805) --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/fef4f2c943ffe75f94f0985499fb9e4… Patch: https://github.com/kamailio/kamailio/commit/fef4f2c943ffe75f94f0985499fb9e4… --- diff --git a/src/main.c b/src/main.c index 99feebbdf9..aecf0735a3 100644 --- a/src/main.c +++ b/src/main.c @@ -713,7 +713,7 @@ void handle_sigs(void) LOG(memlog, "Memory status (pkg):\n"); pkg_status(); } - if (cfg_get(core, core_cfg, mem_summary) & 2) { + if (cfg_get(core, core_cfg, mem_summary) & 4) { LOG(memlog, "Memory still-in-use summary (pkg):\n"); pkg_sums(); } @@ -721,11 +721,11 @@ void handle_sigs(void) #endif #ifdef SHM_MEM if (memlog <= cfg_get(core, core_cfg, debug)){ - if (cfg_get(core, core_cfg, mem_summary) & 1) { + if (cfg_get(core, core_cfg, mem_summary) & 2) { LOG(memlog, "Memory status (shm):\n"); shm_status(); } - if (cfg_get(core, core_cfg, mem_summary) & 2) { + if (cfg_get(core, core_cfg, mem_summary) & 8) { LOG(memlog, "Memory still-in-use summary (shm):\n"); shm_sums(); } @@ -825,7 +825,7 @@ void sig_usr(int signo) LOG(memlog, "Memory status (pkg):\n"); pkg_status(); } - if (cfg_get(core, core_cfg, mem_summary) & 2) { + if (cfg_get(core, core_cfg, mem_summary) & 4) { LOG(memlog, "Memory still-in-use summary (pkg):" "\n"); pkg_sums(); @@ -844,7 +844,7 @@ void sig_usr(int signo) LOG(memlog, "Memory status (pkg):\n"); pkg_status(); } - if (cfg_get(core, core_cfg, mem_summary) & 2) { + if (cfg_get(core, core_cfg, mem_summary) & 4) { LOG(memlog, "Memory still-in-use summary (pkg):\n"); pkg_sums(); }

7 years, 6 months

git:master:e235f832: modules/rr: add missing space to log statement

by Mikko Lehto

Module: kamailio Branch: master Commit: e235f8328e435dd580d02f97d2c3c15fefb482e8 URL: https://github.com/kamailio/kamailio/commit/e235f8328e435dd580d02f97d2c3c15… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-05-23T19:56:27+03:00 modules/rr: add missing space to log statement --- Modified: src/modules/rr/loose.c --- Diff: https://github.com/kamailio/kamailio/commit/e235f8328e435dd580d02f97d2c3c15… Patch: https://github.com/kamailio/kamailio/commit/e235f8328e435dd580d02f97d2c3c15… --- diff --git a/src/modules/rr/loose.c b/src/modules/rr/loose.c index 191525ed08..fa6fe4f7cc 100644 --- a/src/modules/rr/loose.c +++ b/src/modules/rr/loose.c @@ -520,7 +520,7 @@ static inline int process_outbound(struct sip_msg *_m, str flow_token) return -1; } else if (!ip_addr_cmp(&rcv->src_ip, &_m->rcv.src_ip) || rcv->src_port != _m->rcv.src_port) { - LM_DBG("\"incoming\" request found. Using flow-token for" + LM_DBG("\"incoming\" request found. Using flow-token for " "routing\n"); /* First, force the local socket */

7 years, 6 months

git:master:b8750364: core: fix mem_summary comparation when SIGUSR1 is received

by Victor Seva

Module: kamailio Branch: master Commit: b8750364571beeca6612b31a2948d62bddedc805 URL: https://github.com/kamailio/kamailio/commit/b8750364571beeca6612b31a2948d62… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-05-23T18:14:56+02:00 core: fix mem_summary comparation when SIGUSR1 is received >From http://www.kamailio.org/wiki/cookbooks/4.4.x/core#mem_summary 1 - dump all the pkg used blocks (status) 2 - dump all the shm used blocks (status) 4 - summary of pkg used blocks 8 - summary of shm used blocks --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/b8750364571beeca6612b31a2948d62… Patch: https://github.com/kamailio/kamailio/commit/b8750364571beeca6612b31a2948d62… --- diff --git a/src/main.c b/src/main.c index 3fdf070054..0aff706ffb 100644 --- a/src/main.c +++ b/src/main.c @@ -710,7 +710,7 @@ void handle_sigs(void) LOG(memlog, "Memory status (pkg):\n"); pkg_status(); } - if (cfg_get(core, core_cfg, mem_summary) & 2) { + if (cfg_get(core, core_cfg, mem_summary) & 4) { LOG(memlog, "Memory still-in-use summary (pkg):\n"); pkg_sums(); } @@ -718,11 +718,11 @@ void handle_sigs(void) #endif #ifdef SHM_MEM if (memlog <= cfg_get(core, core_cfg, debug)){ - if (cfg_get(core, core_cfg, mem_summary) & 1) { + if (cfg_get(core, core_cfg, mem_summary) & 2) { LOG(memlog, "Memory status (shm):\n"); shm_status(); } - if (cfg_get(core, core_cfg, mem_summary) & 2) { + if (cfg_get(core, core_cfg, mem_summary) & 8) { LOG(memlog, "Memory still-in-use summary (shm):\n"); shm_sums(); } @@ -834,7 +834,7 @@ void sig_usr(int signo) LOG(memlog, "Memory status (pkg):\n"); pkg_status(); } - if (cfg_get(core, core_cfg, mem_summary) & 2) { + if (cfg_get(core, core_cfg, mem_summary) & 4) { LOG(memlog, "Memory still-in-use summary (pkg):" "\n"); pkg_sums(); @@ -853,7 +853,7 @@ void sig_usr(int signo) LOG(memlog, "Memory status (pkg):\n"); pkg_status(); } - if (cfg_get(core, core_cfg, mem_summary) & 2) { + if (cfg_get(core, core_cfg, mem_summary) & 4) { LOG(memlog, "Memory still-in-use summary (pkg):\n"); pkg_sums(); }

7 years, 6 months

git:master:09b8fbd0: Merge pull request #1135 from snen/presence_dialog

by GitHub

Module: kamailio Branch: master Commit: 09b8fbd0864c908f221f86dca83fe64061461d62 URL: https://github.com/kamailio/kamailio/commit/09b8fbd0864c908f221f86dca83fe64… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-05-23T02:47:06+02:00 Merge pull request #1135 from snen/presence_dialog pua dialoginfo --- Modified: src/modules/pua_dialoginfo/README Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/09b8fbd0864c908f221f86dca83fe64… Patch: https://github.com/kamailio/kamailio/commit/09b8fbd0864c908f221f86dca83fe64… --- diff --git a/src/modules/pua_dialoginfo/README b/src/modules/pua_dialoginfo/README index 4544ed8dde..edb4c29f00 100644 --- a/src/modules/pua_dialoginfo/README +++ b/src/modules/pua_dialoginfo/README @@ -54,7 +54,7 @@ Phil Lavin 5.10. pubruri_caller_avp (int) 5.11. pubruri_callee_avp (int) 5.12. pubruri_caller_dlg_var (str) - 5.13. pubruri_callee_dlg_var (int) + 5.13. pubruri_callee_dlg_var (str) 5.14. callee_trying (int) 6. Functions @@ -102,7 +102,7 @@ Chapter 1. Admin Guide 5.10. pubruri_caller_avp (int) 5.11. pubruri_callee_avp (int) 5.12. pubruri_caller_dlg_var (str) - 5.13. pubruri_callee_dlg_var (int) + 5.13. pubruri_callee_dlg_var (str) 5.14. callee_trying (int) 6. Functions @@ -165,7 +165,9 @@ Chapter 1. Admin Guide example: <?xml version="1.0" encoding="UTF-8"?> <dialog-info xmlns="urn:ietf:params:xml:ns:dialog-info" - version="1" state="full"> + version="1" + state="full" + entity="sip:alice@example.com"> <dialog id="as7d900as8" call-id="a84b4c76e66710" local-tag="1928301774" @@ -284,7 +286,7 @@ Chapter 1. Admin Guide 5.10. pubruri_caller_avp (int) 5.11. pubruri_callee_avp (int) 5.12. pubruri_caller_dlg_var (str) - 5.13. pubruri_callee_dlg_var (int) + 5.13. pubruri_callee_dlg_var (str) 5.14. callee_trying (int) 5.1. include_callid (int) @@ -456,7 +458,7 @@ modparam("pua_dialoginfo", "pubruri_callee_avp", "$avp(s:puburis_callee)") modparam("pua_dialoginfo", "pubruri_caller_dlg_var", "pubruri_caller") ... -5.13. pubruri_callee_dlg_var (int) +5.13. pubruri_callee_dlg_var (str) Must be set to the name of dialog variable where to store the URI for callee, used to send the notifications. This is needed to restored the diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c index ed1f107f28..6141e3bdec 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -238,10 +238,6 @@ __dialog_cbtest(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) LM_ERR("dialog callback type 'DLGCB_RESPONSE_WITHIN' received, from=%.*s\n", dlg->from_uri.len, dlg->from_uri.s); break; - case DLGCB_MI_CONTEXT: - LM_ERR("dialog callback type 'DLGCB_MI_CONTEXT' received, from=%.*s\n", - dlg->from_uri.len, dlg->from_uri.s); - break; case DLGCB_DESTROY: LM_ERR("dialog callback type 'DLGCB_DESTROY' received, from=%.*s\n", dlg->from_uri.len, dlg->from_uri.s); @@ -605,7 +601,7 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type) DLGCB_FAILED| DLGCB_CONFIRMED_NA | DLGCB_CONFIRMED | DLGCB_REQ_WITHIN | DLGCB_TERMINATED | DLGCB_EXPIRED | DLGCB_EARLY | DLGCB_RESPONSE_FWDED | DLGCB_RESPONSE_WITHIN - | DLGCB_MI_CONTEXT | DLGCB_DESTROY, + | DLGCB_DESTROY, __dialog_cbtest, NULL, NULL) != 0) { LM_ERR("cannot register callback for all dialog types\n"); free_dlginfo_cell(dlginfo);

7 years, 6 months

git:master:3a6b28d2: pua_dialoginfo: docs typo fix

by Dmitri Savolainen

Module: kamailio Branch: master Commit: 3a6b28d2cbab37091485ed7802fc5d2ecbd4803a URL: https://github.com/kamailio/kamailio/commit/3a6b28d2cbab37091485ed7802fc5d2… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Committer: Dmitri Savolainen <savolainen(a)erinaco.ru> Date: 2017-05-22T18:53:38+03:00 pua_dialoginfo: docs typo fix --- Modified: src/modules/pua_dialoginfo/README --- Diff: https://github.com/kamailio/kamailio/commit/3a6b28d2cbab37091485ed7802fc5d2… Patch: https://github.com/kamailio/kamailio/commit/3a6b28d2cbab37091485ed7802fc5d2… --- diff --git a/src/modules/pua_dialoginfo/README b/src/modules/pua_dialoginfo/README index 4544ed8dde..edb4c29f00 100644 --- a/src/modules/pua_dialoginfo/README +++ b/src/modules/pua_dialoginfo/README @@ -54,7 +54,7 @@ Phil Lavin 5.10. pubruri_caller_avp (int) 5.11. pubruri_callee_avp (int) 5.12. pubruri_caller_dlg_var (str) - 5.13. pubruri_callee_dlg_var (int) + 5.13. pubruri_callee_dlg_var (str) 5.14. callee_trying (int) 6. Functions @@ -102,7 +102,7 @@ Chapter 1. Admin Guide 5.10. pubruri_caller_avp (int) 5.11. pubruri_callee_avp (int) 5.12. pubruri_caller_dlg_var (str) - 5.13. pubruri_callee_dlg_var (int) + 5.13. pubruri_callee_dlg_var (str) 5.14. callee_trying (int) 6. Functions @@ -165,7 +165,9 @@ Chapter 1. Admin Guide example: <?xml version="1.0" encoding="UTF-8"?> <dialog-info xmlns="urn:ietf:params:xml:ns:dialog-info" - version="1" state="full"> + version="1" + state="full" + entity="sip:alice@example.com"> <dialog id="as7d900as8" call-id="a84b4c76e66710" local-tag="1928301774" @@ -284,7 +286,7 @@ Chapter 1. Admin Guide 5.10. pubruri_caller_avp (int) 5.11. pubruri_callee_avp (int) 5.12. pubruri_caller_dlg_var (str) - 5.13. pubruri_callee_dlg_var (int) + 5.13. pubruri_callee_dlg_var (str) 5.14. callee_trying (int) 5.1. include_callid (int) @@ -456,7 +458,7 @@ modparam("pua_dialoginfo", "pubruri_callee_avp", "$avp(s:puburis_callee)") modparam("pua_dialoginfo", "pubruri_caller_dlg_var", "pubruri_caller") ... -5.13. pubruri_callee_dlg_var (int) +5.13. pubruri_callee_dlg_var (str) Must be set to the name of dialog variable where to store the URI for callee, used to send the notifications. This is needed to restored the

7 years, 6 months

git:master:d6490589: pua_dialoginfo: remove DLGCB_MI_CONTEXT

by Dmitri Savolainen

Module: kamailio Branch: master Commit: d64905895f68932b9d8ce39ab17a84022630343b URL: https://github.com/kamailio/kamailio/commit/d64905895f68932b9d8ce39ab17a840… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Committer: Dmitri Savolainen <savolainen(a)erinaco.ru> Date: 2017-05-22T17:48:42+03:00 pua_dialoginfo: remove DLGCB_MI_CONTEXT - DLGCB_MI_CONTEXT was deleted in dialog module --- Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/d64905895f68932b9d8ce39ab17a840… Patch: https://github.com/kamailio/kamailio/commit/d64905895f68932b9d8ce39ab17a840… --- diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c index ed1f107f28..6141e3bdec 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -238,10 +238,6 @@ __dialog_cbtest(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) LM_ERR("dialog callback type 'DLGCB_RESPONSE_WITHIN' received, from=%.*s\n", dlg->from_uri.len, dlg->from_uri.s); break; - case DLGCB_MI_CONTEXT: - LM_ERR("dialog callback type 'DLGCB_MI_CONTEXT' received, from=%.*s\n", - dlg->from_uri.len, dlg->from_uri.s); - break; case DLGCB_DESTROY: LM_ERR("dialog callback type 'DLGCB_DESTROY' received, from=%.*s\n", dlg->from_uri.len, dlg->from_uri.s); @@ -605,7 +601,7 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type) DLGCB_FAILED| DLGCB_CONFIRMED_NA | DLGCB_CONFIRMED | DLGCB_REQ_WITHIN | DLGCB_TERMINATED | DLGCB_EXPIRED | DLGCB_EARLY | DLGCB_RESPONSE_FWDED | DLGCB_RESPONSE_WITHIN - | DLGCB_MI_CONTEXT | DLGCB_DESTROY, + | DLGCB_DESTROY, __dialog_cbtest, NULL, NULL) != 0) { LM_ERR("cannot register callback for all dialog types\n"); free_dlginfo_cell(dlginfo);

7 years, 6 months

[kamailio/kamailio] pua dialoginfo (#1135)

by Dmitri Savolainen

some docs fix & compile error with PUA_DIALOGINFO_DEBUG enabled You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1135 -- Commit Summary -- * pua_dialoginfo: remove DLGCB_MI_CONTEXT * pua_dialoginfo: docs typo fix -- File Changes -- M src/modules/pua_dialoginfo/README (12) M src/modules/pua_dialoginfo/pua_dialoginfo.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1135.patch https://github.com/kamailio/kamailio/pull/1135.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/1135

7 years, 6 months

git:master:0a740417: modules: readme files regenerated - htable ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 0a7404174975153658acfc547ecfe2d9ecef1ee9 URL: https://github.com/kamailio/kamailio/commit/0a7404174975153658acfc547ecfe2d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-05-23T02:46:19+02:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/0a7404174975153658acfc547ecfe2d… Patch: https://github.com/kamailio/kamailio/commit/0a7404174975153658acfc547ecfe2d… --- diff --git a/src/modules/htable/README b/src/modules/htable/README index 83eff15a37..fffa45a219 100644 --- a/src/modules/htable/README +++ b/src/modules/htable/README @@ -108,7 +108,7 @@ Ovidiu Sas 1.19. sht_rm_name_re usage 1.20. sht_rm_value_re usage 1.21. sht_rm_name usage - 1.22. sht_rm_value_re usage + 1.22. sht_rm_value usage 1.23. sht_reset usage 1.24. sht_lock usage 1.25. sht_unlock usage @@ -703,6 +703,7 @@ sht_rm_value_re("ha=>.*"); The op parameter can be: * re - match the val parameter as regular expression. + * sw - match the val parameter as 'starts with'. All parameters can be static strings or contain variables. @@ -720,12 +721,13 @@ sht_rm_name("ha", "re", ".*"); The op parameter can be: * re - match the val parameter as regular expression. + * sw - match the val parameter as 'starts with'. All parameters can be static strings or contain variables. This function can be used from ANY_ROUTE. - Example 1.22. sht_rm_value_re usage + Example 1.22. sht_rm_value usage ... sht_rm_value("ha", "re", ".*"); ...

7 years, 6 months

← Newer
1
...
9
10
11
12
13
14
15
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2017