sr-dev December 2017

sr-dev@lists.kamailio.org

26 participants
477 discussions

[kamailio/kamailio] schema: add indexes to topos Mysql tables (#1355)
by sergey-vb 08 Dec '17

08 Dec '17

#### 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 Using topos module in production I have found slow queries in MySQL. After analyzing it I have add indexes to topos_t and topos_d tables. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1355 -- Commit Summary -- * schema: add indexes to topos Mysql tables (#13) -- File Changes -- M src/lib/srdb1/schema/topos_d.xml (10) M src/lib/srdb1/schema/topos_t.xml (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1355.patch https://github.com/kamailio/kamailio/pull/1355.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/1355

2 2

git:5.1:56a9993c: log_systemd: fixed typo in previous commit
by Daniel-Constantin Mierla 07 Dec '17

07 Dec '17

Module: kamailio Branch: 5.1 Commit: 56a9993c81123c4ee95ecc347aee28abbecb7e2a URL: https://github.com/kamailio/kamailio/commit/56a9993c81123c4ee95ecc347aee28a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T15:25:40+01:00 log_systemd: fixed typo in previous commit (cherry picked from commit 41d66fa2293386bcc3765d6025c2f9b1bd89cd16) --- Modified: src/modules/log_systemd/log_systemd_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/56a9993c81123c4ee95ecc347aee28a… Patch: https://github.com/kamailio/kamailio/commit/56a9993c81123c4ee95ecc347aee28a… --- diff --git a/src/modules/log_systemd/log_systemd_mod.c b/src/modules/log_systemd/log_systemd_mod.c index eac379c0ab..d948b9a60b 100644 --- a/src/modules/log_systemd/log_systemd_mod.c +++ b/src/modules/log_systemd/log_systemd_mod.c @@ -106,7 +106,7 @@ static int ki_sd_journal_print(sip_msg_t* msg, str* slev, str* stxt) /* one of LOG_EMERG, LOG_ALERT, LOG_CRIT, LOG_ERR, LOG_WARNING, * LOG_NOTICE, LOG_INFO, LOG_DEBUG, as defined in syslog.h, see syslog(3) */ ilev = LOG_DEBUG; - if(slev->len==9 && strncasecmp(slev->1s, "LOG_EMERG", slev->len)==0) { + if(slev->len==9 && strncasecmp(slev->s, "LOG_EMERG", slev->len)==0) { ilev = LOG_EMERG; } else if(slev->len==9 && strncasecmp(slev->s, "LOG_ALERT", slev->len)==0) { ilev = LOG_ALERT;

1 0

git:master:41d66fa2: log_systemd: fixed typo in previous commit
by Daniel-Constantin Mierla 07 Dec '17

07 Dec '17

Module: kamailio Branch: master Commit: 41d66fa2293386bcc3765d6025c2f9b1bd89cd16 URL: https://github.com/kamailio/kamailio/commit/41d66fa2293386bcc3765d6025c2f9b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T15:24:44+01:00 log_systemd: fixed typo in previous commit --- Modified: src/modules/log_systemd/log_systemd_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/41d66fa2293386bcc3765d6025c2f9b… Patch: https://github.com/kamailio/kamailio/commit/41d66fa2293386bcc3765d6025c2f9b… --- diff --git a/src/modules/log_systemd/log_systemd_mod.c b/src/modules/log_systemd/log_systemd_mod.c index eac379c0ab..d948b9a60b 100644 --- a/src/modules/log_systemd/log_systemd_mod.c +++ b/src/modules/log_systemd/log_systemd_mod.c @@ -106,7 +106,7 @@ static int ki_sd_journal_print(sip_msg_t* msg, str* slev, str* stxt) /* one of LOG_EMERG, LOG_ALERT, LOG_CRIT, LOG_ERR, LOG_WARNING, * LOG_NOTICE, LOG_INFO, LOG_DEBUG, as defined in syslog.h, see syslog(3) */ ilev = LOG_DEBUG; - if(slev->len==9 && strncasecmp(slev->1s, "LOG_EMERG", slev->len)==0) { + if(slev->len==9 && strncasecmp(slev->s, "LOG_EMERG", slev->len)==0) { ilev = LOG_EMERG; } else if(slev->len==9 && strncasecmp(slev->s, "LOG_ALERT", slev->len)==0) { ilev = LOG_ALERT;

1 0

Broken: kamailio/kamailio#5196 (master - 73e9139)
by Travis CI 07 Dec '17

07 Dec '17

Build Update for kamailio/kamailio ------------------------------------- Build: #5196 Status: Broken Duration: 6 minutes and 20 seconds Commit: 73e9139 (master) Author: Daniel-Constantin Mierla Message: sca: exported functions to kemi framework View the changeset: https://github.com/kamailio/kamailio/compare/778a7a68618c...73e9139c5246 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/312974018?utm_source=email&u… -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

git: new commits in branch 5.1
by Daniel-Constantin Mierla 07 Dec '17

07 Dec '17

- URL: https://github.com/kamailio/kamailio/commit/81581e707df098a19be21316668b157… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:55:16+01:00 acc_radius: functions exported to kemi framework (cherry picked from commit afbc1a7099eb59dcd8c11a202c9abb1bcf972751) - URL: https://github.com/kamailio/kamailio/commit/39b93755fa75bb9212397c300d48f61… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:55:26+01:00 auth_radius: clang format the code (cherry picked from commit 1c07ddb50cf56ea9566effb8ff7ada3de8f1d48b) - URL: https://github.com/kamailio/kamailio/commit/63ef6271da5a8a1867e45756776e60a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:55:36+01:00 acc_radius: clang format the code (cherry picked from commit 7453fc5f8da8fed0941d5d8c759cec97e0647bfd) - URL: https://github.com/kamailio/kamailio/commit/444b2134fa252f409ae53b493e78ac0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:55:46+01:00 auth_radius: use core fixup helper functions (cherry picked from commit fe0c386cebebbf6c68b598269ecdfc25bfe1bcc2) - URL: https://github.com/kamailio/kamailio/commit/cdce438952ee97e91552e2d706db558… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:55:59+01:00 auth_radius: exported functions to kemi framework (cherry picked from commit cf043326abc792317335954fe75927f8294fa40e) - URL: https://github.com/kamailio/kamailio/commit/b833df0382d5194973134db477cb837… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:56:10+01:00 misc_radius: clang format the code (cherry picked from commit f283fe291917f67320061af3e35259859e448408) - URL: https://github.com/kamailio/kamailio/commit/96f30cbe88f9c6587894b18208cda87… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:56:20+01:00 misc_radius: use spve fixup helper instead of pvar - simplifies getting params (cherry picked from commit f06e4d4b81e0df1009c3f2bbc54f0be1bb4a5d32) - URL: https://github.com/kamailio/kamailio/commit/90a116e77a39e8c25f3ae4c91021da6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:56:36+01:00 misc_radius: fixed accessing str* params after previous commit (cherry picked from commit 613350632c842c1775e1b5696b4cda4c96e5ba4c) - URL: https://github.com/kamailio/kamailio/commit/508328d51fc7c42a1bd5dc0a038aced… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:56:47+01:00 misc_radius: exported functions to kemi framework (cherry picked from commit 95da4cda2c68ff25f7e14501a28cfe2ec0ebc50f) - URL: https://github.com/kamailio/kamailio/commit/ec9199a5e1993610e50ccc043fdee6f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:57:00+01:00 nat_traversal: clang format the code (cherry picked from commit 3bad00732994813bc21c84d41342772783a5bddd) - URL: https://github.com/kamailio/kamailio/commit/066410bfb78eb9980d599aec76523a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:57:13+01:00 nat_traversal: exported functions to kemi framework (cherry picked from commit 04cfb0662be9cc429e66b79545daf578993dab1f) - URL: https://github.com/kamailio/kamailio/commit/b3ad080bb34eb3ec80043b3562b63b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:57:23+01:00 topos: update contact in branch record before sending response - might be updated in config execution - reported by GH #1339 (cherry picked from commit ebf570f83c878363dfd1f53882de9a0f907f5971) - URL: https://github.com/kamailio/kamailio/commit/855a13a938fcee7e05546a40c07a174… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:57:34+01:00 dmq: use core fixup helper functions directly (cherry picked from commit 727b5c5fed1e0972b80f005a801089a4afa2f114) - URL: https://github.com/kamailio/kamailio/commit/a9275cb5a1e5176b87e6c1f3e90c5b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:57:45+01:00 dmq: exported functions to kemi framework (cherry picked from commit 2b7ae0f01ae7f9ee9a9ccf12ef9ffad24a76764f) - URL: https://github.com/kamailio/kamailio/commit/09cc9abb57636bbf01b9128b1d79db3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:57:57+01:00 crypto: exported functions to kemi interface (cherry picked from commit e7d1e96007683efcc193e0f6df16a1acb02be6b8) - URL: https://github.com/kamailio/kamailio/commit/7733c84fcc421b0408f0c6bd3ec1e43… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:58:28+01:00 http_client: clang format the code (cherry picked from commit 56a357a7cbd85e2ef69ab4508f26a1510cde16d6) - URL: https://github.com/kamailio/kamailio/commit/1c243828254b8f17a9834b502cb2a80… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:58:38+01:00 http_client: exported functions to kemi framework (cherry picked from commit 8141ccaf6a0367cae57b6033e7720674c4eb889b) - URL: https://github.com/kamailio/kamailio/commit/a79c89807cb7e7c4a2d3756bc72bb9b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:58:50+01:00 http_async_client: use route_lookup() instead of route_get() - avoids creating a useless route block structure (cherry picked from commit 1f8bc9fd5a4067b25994e87e27801d9df5cb5eb7) - URL: https://github.com/kamailio/kamailio/commit/ba1a1588e4f8249ecfdda2eb261d389… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:59:10+01:00 http_async_client: use directly the core fixup helper (cherry picked from commit ad68b65693936240a0101938de1bd466cb5e1bd0) - URL: https://github.com/kamailio/kamailio/commit/8804e7a18ddfaef4b6da584664e17bd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:59:21+01:00 http_async_client: propagate route name to https async callback - lookup actions in target process, rather than in originating one (cherry picked from commit 2469b7963ac612e323478e172da4ab0e3a1773a9) - URL: https://github.com/kamailio/kamailio/commit/e6ef2547888b59370dda5c355df1319… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:59:32+01:00 tm: allow execution of t_continue with callback name - t_continue_cb() exported to tm api (cherry picked from commit 020f6b1ed77be268a981633cea8543cfc9521604) - URL: https://github.com/kamailio/kamailio/commit/859e4bea6df65de31e6836bc6ab5d73… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:59:42+01:00 tmx: exported the rest of the functions to kemi framework (cherry picked from commit 08de83884bc40c5b426136c5dcb796e369c50027) - URL: https://github.com/kamailio/kamailio/commit/d83991d7daeea39f9e5900a1438e627… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T13:59:53+01:00 http_async_client: exported functions to kemi framework (cherry picked from commit b7d170607ccc1ecac6cb2bf210790c8382386f2a) - URL: https://github.com/kamailio/kamailio/commit/b9f172bb2b925c0eaf810b4eb597fd3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T14:00:06+01:00 async: use t_continue_cb() for executing via kemi framework (cherry picked from commit 6bdf8119c1103b92e179144216bc19bbc8cdae0d) - URL: https://github.com/kamailio/kamailio/commit/fa6f5c35fa24fd1467ddd153ad0a056… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T14:00:18+01:00 ndb_mongodb: exported functions to kemi framework (cherry picked from commit 74208c2160ffb6200dd6a8982fd4d94a2c00d879) - URL: https://github.com/kamailio/kamailio/commit/7b158195c4617a55ce19b09a1e64f32… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T14:00:31+01:00 mediaproxy: export functions to kemi framework (cherry picked from commit a04368528a3350a14038101a4bf17b4b742e362d) - URL: https://github.com/kamailio/kamailio/commit/2c75d2707d74966eddf2fe4b4338f56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T14:00:41+01:00 uri_db: functions exported to kemi framework (cherry picked from commit 2de661667ce0452a0095cd60d4913007045bb628) - URL: https://github.com/kamailio/kamailio/commit/2773c98604575c6472359eb360e5c97… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T14:00:52+01:00 userblacklist: exported user check functions to kemi framework (cherry picked from commit 50c055a880f16cbb6c1a74b4ef82248bc3519f01) - URL: https://github.com/kamailio/kamailio/commit/a78a9d84d25862e0ca28909799f838a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T14:01:02+01:00 tm: t_check_status exported to kemi framework (cherry picked from commit 3de068a8897917d088993923f3028ca98aadc765) - URL: https://github.com/kamailio/kamailio/commit/aca608f2419498dbb3e805b572344b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T14:01:59+01:00 http_async_client: exported query function to kemi interface (cherry picked from commit f04c812b2af2d933e61b0d643bd245cc91c5f3eb) - URL: https://github.com/kamailio/kamailio/commit/31425aa48b8f19e52781b151341241b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T14:02:14+01:00 group: is_user_in() exported to kemi framework (cherry picked from commit 9139bd2991a28a6a1ef67692e76e71ba807913d8) - URL: https://github.com/kamailio/kamailio/commit/16ff4d966ce7e53716bbfb5e19e9a7b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T14:02:27+01:00 benchmark: exported functions to kemi framework - new parameter 'register' - register a timer id, required when using kemi framework, because there is no fixup mechanism to register timer ids based on function params (cherry picked from commit f382c10e18248423c2f8f4fb3469f7faea1504e3) - URL: https://github.com/kamailio/kamailio/commit/0c5816740984eb94e66144a140de848… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T14:02:37+01:00 benchmark: documentation for register parameter (cherry picked from commit 9c01580fd858f995dc8e680545f628f4716a77a4) - URL: https://github.com/kamailio/kamailio/commit/85cd536f8ea9e80c2b09addd6ecb6bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T14:02:52+01:00 uac_redirect: exported get_redirects() variants to kemi framework (cherry picked from commit 5a5bc72a66d2129aae8a8e200c905ff326e9f659) - URL: https://github.com/kamailio/kamailio/commit/0e0f8555457c53ef7925e7b721e9263… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T14:03:02+01:00 rabbitmq: clang format the code (cherry picked from commit 759e9d530c75e8c6c9d54764162cd17a8d8fe78e) - URL: https://github.com/kamailio/kamailio/commit/481a5cf29a0fafd987faa0d4a7a165f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T14:03:14+01:00 auth_ephemeral: variants of auth functions exported to kemi (cherry picked from commit 4861c7e831697bd0f139c87485c3dfb601a34599) - URL: https://github.com/kamailio/kamailio/commit/9b0bc6c17555aba525b53ce6f879b05… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T14:03:24+01:00 rabbitmq: functions exported to kemi framework (cherry picked from commit 97b1fa994dfb5f463dd06b2f201423e19db5e508) - URL: https://github.com/kamailio/kamailio/commit/d01dfedd8361328c24acc350805fe43… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T14:03:35+01:00 rls: exported functions to kemi framework (cherry picked from commit 90bd1b06f98cccff6419dcb1991fde686a37a34e) - URL: https://github.com/kamailio/kamailio/commit/592774ff1c326bb4f1fe3bca26adcd8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T14:03:47+01:00 msilo: exported functions to kemi framework (cherry picked from commit 778a7a68618cb1d148b929bd80db4113a0ca0f46) - URL: https://github.com/kamailio/kamailio/commit/43df11808a1eef6a9db77efcf313712… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T15:07:10+01:00 counters: exported functions to kemi interface (cherry picked from commit 2c2ae33d639671fe3596df23aaee5087c7c70d86) - URL: https://github.com/kamailio/kamailio/commit/83df0d3348bcbb4ffbb48def0bd4cfe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T15:07:19+01:00 log_systemd: exported functions to kemi framework (cherry picked from commit 6668999dfee8c77a1b8329eee38265b536386845) - URL: https://github.com/kamailio/kamailio/commit/cce6599d36f9a42baa2bc6e9d24a444… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T15:07:27+01:00 sca: get cfg int parameter in wrapper functions (cherry picked from commit 3ecd1958a5dfa8b21e67e52fc4f329dc58bffbf8) - URL: https://github.com/kamailio/kamailio/commit/46df53778bf30ca88b5b7c64b0d3e2a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T15:07:39+01:00 sca: exported functions to kemi framework (cherry picked from commit 73e9139c5246d3882474d8c9c613105bcbc6d90a)

1 0

git:master:73e9139c: sca: exported functions to kemi framework
by Daniel-Constantin Mierla 07 Dec '17

07 Dec '17

Module: kamailio Branch: master Commit: 73e9139c5246d3882474d8c9c613105bcbc6d90a URL: https://github.com/kamailio/kamailio/commit/73e9139c5246d3882474d8c9c613105… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T15:05:54+01:00 sca: exported functions to kemi framework --- Modified: src/modules/sca/sca.c Modified: src/modules/sca/sca_subscribe.c Modified: src/modules/sca/sca_subscribe.h --- Diff: https://github.com/kamailio/kamailio/commit/73e9139c5246d3882474d8c9c613105… Patch: https://github.com/kamailio/kamailio/commit/73e9139c5246d3882474d8c9c613105… --- diff --git a/src/modules/sca/sca.c b/src/modules/sca/sca.c index f1dae14cb6..14dbf78ecb 100644 --- a/src/modules/sca/sca.c +++ b/src/modules/sca/sca.c @@ -41,6 +41,7 @@ #include "../../core/timer.h" #include "../../core/timer_proc.h" #include "../../core/mod_fix.h" +#include "../../core/kemi.h" #include "sca.h" #include "sca_appearance.h" @@ -479,6 +480,19 @@ static int sca_call_info_update_3_f(sip_msg_t* msg, return sca_call_info_update(msg, update_mask, &uri_to, &uri_from); } +int ki_sca_call_info_update_default(sip_msg_t *msg) +{ + return sca_call_info_update(msg, SCA_CALL_INFO_SHARED_BOTH, NULL, NULL); +} +int ki_sca_call_info_update_mask(sip_msg_t *msg, int umask) +{ + return sca_call_info_update(msg, umask, NULL, NULL); +} +int ki_sca_call_info_update_turi(sip_msg_t *msg, int umask, str *sto) +{ + return sca_call_info_update(msg, umask, sto, NULL); +} + int fixup_ciu(void **param, int param_no) { switch (param_no) { @@ -504,3 +518,44 @@ int fixup_free_ciu(void **param, int param_no) return E_UNSPEC; } } + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_sca_exports[] = { + { str_init("sca"), str_init("handle_subscribe"), + SR_KEMIP_INT, ki_sca_handle_subscribe, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("sca"), str_init("call_info_update_default"), + SR_KEMIP_INT, ki_sca_call_info_update_default, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("sca"), str_init("call_info_update_mask"), + SR_KEMIP_INT, ki_sca_call_info_update_mask, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("sca"), str_init("call_info_update_turi"), + SR_KEMIP_INT, ki_sca_call_info_update_turi, + { SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("sca"), str_init("call_info_update"), + SR_KEMIP_INT, sca_call_info_update, + { SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; +/* clang-format on */ + +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_sca_exports); + return 0; +} \ No newline at end of file diff --git a/src/modules/sca/sca_subscribe.c b/src/modules/sca/sca_subscribe.c index 48b0d58870..8040d49aab 100644 --- a/src/modules/sca/sca_subscribe.c +++ b/src/modules/sca/sca_subscribe.c @@ -1135,7 +1135,7 @@ int sca_subscription_from_request(sca_mod *scam, sip_msg_t *msg, int event_type, return (-1); } -int sca_handle_subscribe(sip_msg_t *msg, char *p1, char *p2) +int ki_sca_handle_subscribe(sip_msg_t *msg) { sca_subscription req_sub; sca_subscription *sub = NULL; @@ -1354,6 +1354,11 @@ int sca_handle_subscribe(sip_msg_t *msg, char *p1, char *p2) return (rc); } +int sca_handle_subscribe(sip_msg_t *msg, char *p1, char *p2) +{ + return ki_sca_handle_subscribe(msg); +} + int sca_subscription_reply(sca_mod *scam, int status_code, char *status_msg, int event_type, int expires, sip_msg_t *msg) { diff --git a/src/modules/sca/sca_subscribe.h b/src/modules/sca/sca_subscribe.h index 2ef56d53da..e91971756e 100644 --- a/src/modules/sca/sca_subscribe.h +++ b/src/modules/sca/sca_subscribe.h @@ -88,5 +88,6 @@ void sca_subscription_state_to_str(int, str *); int sca_subscription_aor_has_subscribers(int, str *); int sca_subscription_delete_subscriber_for_event(sca_mod *, str *, str *, str *); int sca_subscription_terminate(sca_mod *, str *, int, str *, int, int); +int ki_sca_handle_subscribe(sip_msg_t *msg); #endif // SCA_SUBSCRIBE_H

1 0

git:master:3ecd1958: sca: get cfg int parameter in wrapper functions
by Daniel-Constantin Mierla 07 Dec '17

07 Dec '17

Module: kamailio Branch: master Commit: 3ecd1958a5dfa8b21e67e52fc4f329dc58bffbf8 URL: https://github.com/kamailio/kamailio/commit/3ecd1958a5dfa8b21e67e52fc4f329d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T14:44:00+01:00 sca: get cfg int parameter in wrapper functions --- Modified: src/modules/sca/sca.c Modified: src/modules/sca/sca_call_info.c Modified: src/modules/sca/sca_call_info.h --- Diff: https://github.com/kamailio/kamailio/commit/3ecd1958a5dfa8b21e67e52fc4f329d… Patch: https://github.com/kamailio/kamailio/commit/3ecd1958a5dfa8b21e67e52fc4f329d…

1 0

git:master:6668999d: log_systemd: exported functions to kemi framework
by Daniel-Constantin Mierla 07 Dec '17

07 Dec '17

Module: kamailio Branch: master Commit: 6668999dfee8c77a1b8329eee38265b536386845 URL: https://github.com/kamailio/kamailio/commit/6668999dfee8c77a1b8329eee38265b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T14:43:11+01:00 log_systemd: exported functions to kemi framework --- Modified: src/modules/log_systemd/log_systemd_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6668999dfee8c77a1b8329eee38265b… Patch: https://github.com/kamailio/kamailio/commit/6668999dfee8c77a1b8329eee38265b…

1 0

git:master:2c2ae33d: counters: exported functions to kemi interface
by Daniel-Constantin Mierla 07 Dec '17

07 Dec '17

Module: kamailio Branch: master Commit: 2c2ae33d639671fe3596df23aaee5087c7c70d86 URL: https://github.com/kamailio/kamailio/commit/2c2ae33d639671fe3596df23aaee508… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-07T14:19:57+01:00 counters: exported functions to kemi interface --- Modified: src/modules/counters/counters.c --- Diff: https://github.com/kamailio/kamailio/commit/2c2ae33d639671fe3596df23aaee508… Patch: https://github.com/kamailio/kamailio/commit/2c2ae33d639671fe3596df23aaee508… --- diff --git a/src/modules/counters/counters.c b/src/modules/counters/counters.c index 20410092a1..29bce00743 100644 --- a/src/modules/counters/counters.c +++ b/src/modules/counters/counters.c @@ -31,6 +31,7 @@ #include "../../core/dprint.h" #include "../../core/compiler_opt.h" #include "../../core/counters.h" +#include "../../core/kemi.h" MODULE_VERSION @@ -238,7 +239,9 @@ static int cnt_int_fixup(void** param, int param_no) } - +/** + * + */ static int cnt_inc_f(struct sip_msg* msg, char* handle, char* bar) { counter_handle_t h; @@ -248,8 +251,39 @@ static int cnt_inc_f(struct sip_msg* msg, char* handle, char* bar) return 1; } +#define cnt_op_handle_get() \ + do { \ + name = sname->s; \ + grp = cnt_script_grp; /* default group */ \ + if ((p = strchr(name, '.')) != 0) { \ + /* found group */ \ + grp = name; \ + name = p+1; \ + *p = 0; \ + } \ + if (counter_lookup(&h, grp, name) < 0) { \ + ERR("counter %s.%s does not exist (forgot to define it?)\n", \ + grp, name); \ + return -1; \ + } \ + } while(0) + +static int ki_cnt_inc(sip_msg_t* msg, str *sname) +{ + char* name; + char* grp; + char* p; + counter_handle_t h; + + cnt_op_handle_get(); + counter_inc(h); + return 1; +} +/** + * + */ static int cnt_add_f(struct sip_msg* msg, char* handle, char* val) { counter_handle_t h; @@ -264,8 +298,22 @@ static int cnt_add_f(struct sip_msg* msg, char* handle, char* val) return 1; } +static int ki_cnt_add(sip_msg_t* msg, str *sname, int v) +{ + char* name; + char* grp; + char* p; + counter_handle_t h; + + cnt_op_handle_get(); + counter_add(h, v); + return 1; +} +/** + * + */ static int cnt_reset_f(struct sip_msg* msg, char* handle, char* bar) { counter_handle_t h; @@ -276,6 +324,19 @@ static int cnt_reset_f(struct sip_msg* msg, char* handle, char* bar) } +static int ki_cnt_reset(sip_msg_t* msg, str *sname) +{ + char* name; + char* grp; + char* p; + counter_handle_t h; + + cnt_op_handle_get(); + + counter_reset(h); + return 1; +} + static void cnt_grp_get_all(rpc_t* rpc, void* c, char* group); @@ -461,4 +522,35 @@ static void cnt_help_rpc(rpc_t* rpc, void* ctx) return; } -/* vi: set ts=4 sw=4 tw=79:ai:cindent: */ +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_counters_exports[] = { + { str_init("counters"), str_init("inc"), + SR_KEMIP_INT, ki_cnt_inc, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("counters"), str_init("add"), + SR_KEMIP_INT, ki_cnt_add, + { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("counters"), str_init("reset"), + SR_KEMIP_INT, ki_cnt_reset, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; +/* clang-format on */ + +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_counters_exports); + return 0; +} + +/* vi: set ts=4 sw=4 tw=79:ai:cindent: */ \ No newline at end of file

1 0

[kamailio/kamailio] topos: BYE befor 200 OK creates new connection (#1339)
by sergey-vb 07 Dec '17

07 Dec '17

### Description If call has ended with BYE after 180/183 before 200 OK, kamailio tries to create new connection to destination, not to use existing. With firewall enabled and TLS transport this is issue. ### Troubleshooting #### Reproduction Load topos module, register client (asterisk, it shows port 5061 in contact but real query comes from random tcp port) using TLS, make call to it, terminate call with BYE, before answering. #### Log Messages [kamailio-topos.gz](https://github.com/kamailio/kamailio/files/1505189/kamai… #### SIP Traffic [topos-by-befor-ack.tar.gz](https://github.com/kamailio/kamailio/files/15051… ### Additional Information version: kamailio 5.2.0-dev1 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 09:24:06 Nov 27 2017 with gcc 4.8.5 * **Operating System**: Red Hat Enterprise Linux Server 7.3 3.10.0-514.el7.x86_64 #1 SMP Wed Oct 19 11:24:13 EDT 2016 x86_64 x86_64 x86_64 GNU/Linux -- 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/issues/1339

2 6

← Newer
1
...
37
38
39
40
41
42
43
...
48
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2017