sr-dev September 2018

sr-dev@lists.kamailio.org

24 participants
331 discussions

git:master:43451895: mem: f_malloc - better log message on ignoring double free

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 434518953c507b41b80adaf1a39b7b8f1e9a3048 URL: https://github.com/kamailio/kamailio/commit/434518953c507b41b80adaf1a39b7b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-24T14:27:23+02:00 mem: f_malloc - better log message on ignoring double free --- Modified: src/core/mem/f_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/434518953c507b41b80adaf1a39b7b8… Patch: https://github.com/kamailio/kamailio/commit/434518953c507b41b80adaf1a39b7b8… --- diff --git a/src/core/mem/f_malloc.c b/src/core/mem/f_malloc.c index 9deaa5b512..a157f03172 100644 --- a/src/core/mem/f_malloc.c +++ b/src/core/mem/f_malloc.c @@ -623,12 +623,17 @@ void fm_free(void* qmp, void* p) } #ifdef DBG_F_MALLOC if (p>(void*)qm->last_frag || p<(void*)qm->first_frag){ - LM_CRIT("BUG: bad pointer %p (out of memory block (%p)!)," + if(likely(cfg_get(core, core_cfg, mem_safety)==0)) { + LM_CRIT("BUG: bad pointer %p (out of memory block (%p)!)," " called from %s: %s(%d) - aborting\n", p, qm, file, func, line); - if(likely(cfg_get(core, core_cfg, mem_safety)==0)) abort(); - else return; + } else { + LM_CRIT("BUG: bad pointer %p (out of memory block (%p)!)," + " called from %s: %s(%d) - ignoring\n", p, qm, + file, func, line); + return; + } } #endif f=(struct fm_frag*) ((char*)p-sizeof(struct fm_frag));

6 years, 2 months

git:master:2cd82d39: mem: q_malloc - better log message on ignoring double free

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2cd82d39fe0fccf3237eb9947fd16b0be15c2270 URL: https://github.com/kamailio/kamailio/commit/2cd82d39fe0fccf3237eb9947fd16b0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-24T14:22:12+02:00 mem: q_malloc - better log message on ignoring double free --- Modified: src/core/mem/q_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/2cd82d39fe0fccf3237eb9947fd16b0… Patch: https://github.com/kamailio/kamailio/commit/2cd82d39fe0fccf3237eb9947fd16b0… --- diff --git a/src/core/mem/q_malloc.c b/src/core/mem/q_malloc.c index 0c3528544d..52d2ef722c 100644 --- a/src/core/mem/q_malloc.c +++ b/src/core/mem/q_malloc.c @@ -486,11 +486,15 @@ void qm_free(void* qmp, void* p) #ifdef DBG_QM_MALLOC if (p>(void*)qm->last_frag_end || p<(void*)qm->first_frag){ - LM_CRIT("BUG: bad pointer %p (out of memory block!)" + if(likely(cfg_get(core, core_cfg, mem_safety)==0)) { + LM_CRIT("BUG: bad pointer %p (out of memory block!)" " called from %s: %s(%d) - aborting\n", p, file, func, line); - if(likely(cfg_get(core, core_cfg, mem_safety)==0)) abort(); - else return; + } else { + LM_CRIT("BUG: bad pointer %p (out of memory block!)" + " called from %s: %s(%d) - ignoring\n", p, file, func, line); + return; + } } #endif @@ -499,12 +503,17 @@ void qm_free(void* qmp, void* p) #ifdef DBG_QM_MALLOC qm_debug_frag(qm, f, file, line); if (f->u.is_free){ - LM_CRIT("BUG: freeing already freed pointer (%p)," + if(likely(cfg_get(core, core_cfg, mem_safety)==0)) { + LM_CRIT("BUG: freeing already freed pointer (%p)," " called from %s: %s(%d), first free %s: %s(%ld) - aborting\n", p, file, func, line, f->file, f->func, f->line); - if(likely(cfg_get(core, core_cfg, mem_safety)==0)) abort(); - else return; + } else { + LM_CRIT("BUG: freeing already freed pointer (%p)," + " called from %s: %s(%d), first free %s: %s(%ld) - ignoring\n", + p, file, func, line, f->file, f->func, f->line); + return; + } } MDBG("freeing frag. %p alloc'ed from %s: %s(%ld)\n", f, f->file, f->func, f->line);

6 years, 2 months

git:master:7385c1dc: modules: readme files regenerated - uac_redirect ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 7385c1dcfe8c7a31047a2b44c650874b49624b71 URL: https://github.com/kamailio/kamailio/commit/7385c1dcfe8c7a31047a2b44c650874… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-09-24T10:46:34+02:00 modules: readme files regenerated - uac_redirect ... [skip ci] --- Modified: src/modules/uac_redirect/README --- Diff: https://github.com/kamailio/kamailio/commit/7385c1dcfe8c7a31047a2b44c650874… Patch: https://github.com/kamailio/kamailio/commit/7385c1dcfe8c7a31047a2b44c650874… --- diff --git a/src/modules/uac_redirect/README b/src/modules/uac_redirect/README index db105862b0..0da60f08ad 100644 --- a/src/modules/uac_redirect/README +++ b/src/modules/uac_redirect/README @@ -196,12 +196,12 @@ modparam("uac_redirect","accept_filter",".*(a)siphub\.net") 4.4. acc_function (string) - Specifies the accounting function to be used. Just be defining this + Specifies the accounting function to be used. Just by defining this parameter, the accounting support will not be enabled. Accounting may only be enabled via two parameters set_accept_filter() scripting function. - Its values my be: + Its values may be: * acc_log_request * acc_db_request * acc_rad_request @@ -217,7 +217,7 @@ modparam("uac_redirect","acc_function","acc_db_request") 4.5. acc_db_table (string) Specifies the accounting table to be used if DB accounting was chosen - (acc_function was set to “acc_db_request”). Just be defining this + (acc_function was set to “acc_db_request”). Just by defining this parameter, the accounting support will not be enabled. Accounting may only be enabled via two parameters set_accept_filter() scripting function.

6 years, 2 months

git:master:37fb1b68: core: fix comment typo

by Mikko Lehto

Module: kamailio Branch: master Commit: 37fb1b68675c637c4d9bbfbc27572b2c748ad673 URL: https://github.com/kamailio/kamailio/commit/37fb1b68675c637c4d9bbfbc27572b2… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2018-09-24T11:34:12+03:00 core: fix comment typo --- Modified: src/core/msg_translator.c Modified: src/core/msg_translator.h --- Diff: https://github.com/kamailio/kamailio/commit/37fb1b68675c637c4d9bbfbc27572b2… Patch: https://github.com/kamailio/kamailio/commit/37fb1b68675c637c4d9bbfbc27572b2… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 6929b22e0f..487215c655 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2859,7 +2859,7 @@ char* via_builder( unsigned int *len, return line_buf; } -/* creates a via header honoring the protocol of the incomming socket +/* creates a via header honoring the protocol of the incoming socket * msg is an optional parameter */ char* create_via_hf( unsigned int *len, struct sip_msg *msg, diff --git a/src/core/msg_translator.h b/src/core/msg_translator.h index b6360ce3ff..1300cb5742 100644 --- a/src/core/msg_translator.h +++ b/src/core/msg_translator.h @@ -111,7 +111,7 @@ char* via_builder( unsigned int *len, struct dest_info* send_info, str *branch, str* extra_params, struct hostport *hp ); -/* creates a via header honoring the protocol of the incomming socket +/* creates a via header honoring the protocol of the incoming socket * msg is an optional parameter */ char* create_via_hf( unsigned int *len, struct sip_msg *msg,

6 years, 2 months

git:master:f7887665: uac_redirect: fix documentation typo

by Mikko Lehto

Module: kamailio Branch: master Commit: f788766522cb0f9bb8bca42954337889198462ee URL: https://github.com/kamailio/kamailio/commit/f788766522cb0f9bb8bca4295433788… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2018-09-24T11:34:12+03:00 uac_redirect: fix documentation typo --- Modified: src/modules/uac_redirect/doc/uac_redirect_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f788766522cb0f9bb8bca4295433788… Patch: https://github.com/kamailio/kamailio/commit/f788766522cb0f9bb8bca4295433788… --- diff --git a/src/modules/uac_redirect/doc/uac_redirect_admin.xml b/src/modules/uac_redirect/doc/uac_redirect_admin.xml index e983c0d8c6..7e80126482 100644 --- a/src/modules/uac_redirect/doc/uac_redirect_admin.xml +++ b/src/modules/uac_redirect/doc/uac_redirect_admin.xml @@ -211,14 +211,14 @@ modparam("uac_redirect","accept_filter",".*(a)siphub\.net") <section> <title><varname>acc_function</varname> (string)</title> <para> - Specifies the accounting function to be used. Just be defining + Specifies the accounting function to be used. Just by defining this parameter, the accounting support will not be enabled. Accounting may only be enabled via two parameters <function moreinfo="none">set_accept_filter()</function> scripting function. </para> <para> - Its values my be: + Its values may be: </para> <itemizedlist> <listitem> @@ -253,7 +253,7 @@ modparam("uac_redirect","acc_function","acc_db_request") <para> Specifies the accounting table to be used if DB accounting was chosen (<varname>acc_function</varname> was set to - <quote>acc_db_request</quote>). Just be defining + <quote>acc_db_request</quote>). Just by defining this parameter, the accounting support will not be enabled. Accounting may only be enabled via two parameters <function moreinfo="none">set_accept_filter()</function>

6 years, 2 months

git:master:f7ac556e: rtpproxy: fix comment typo

by Mikko Lehto

Module: kamailio Branch: master Commit: f7ac556e699d323e816c14a554122c87d38b3a83 URL: https://github.com/kamailio/kamailio/commit/f7ac556e699d323e816c14a554122c8… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2018-09-24T11:34:12+03:00 rtpproxy: fix comment typo --- Modified: src/modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/f7ac556e699d323e816c14a554122c8… Patch: https://github.com/kamailio/kamailio/commit/f7ac556e699d323e816c14a554122c8… --- diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c index b0b7a67fcf..b2c9f5c0b6 100644 --- a/src/modules/rtpproxy/rtpproxy.c +++ b/src/modules/rtpproxy/rtpproxy.c @@ -2641,7 +2641,7 @@ force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer, LM_DBG("alter port body1='%.*s'\n", body1.len, body1.s); #endif /* do not do it if old port was 0 (means media disable) - * - check if actually should be better done in rtpptoxy, + * - check if actually should be better done in rtpproxy, * by returning also 0 * - or by not sending to rtpproxy the old port if 0 */

6 years, 2 months

git:master:62790cc2: src: Fix misspelled Kamailio

by Mikko Lehto

Module: kamailio Branch: master Commit: 62790cc279550fef9ce3f7a6c0ee8dcc055f9625 URL: https://github.com/kamailio/kamailio/commit/62790cc279550fef9ce3f7a6c0ee8dc… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2018-09-24T11:34:12+03:00 src: Fix misspelled Kamailio --- Modified: src/core/sr_module.h Modified: src/modules/erlang/cnode.c Modified: src/modules/erlang/erlang_mod.c Modified: src/modules/xcap_server/xcap_misc.h --- Diff: https://github.com/kamailio/kamailio/commit/62790cc279550fef9ce3f7a6c0ee8dc… Patch: https://github.com/kamailio/kamailio/commit/62790cc279550fef9ce3f7a6c0ee8dc… --- diff --git a/src/core/sr_module.h b/src/core/sr_module.h index 4dd6523f3b..5571a76c44 100644 --- a/src/core/sr_module.h +++ b/src/core/sr_module.h @@ -218,7 +218,7 @@ struct ser_cmd_export_ { }; -/** kamailo/openser version */ +/** kamailio/openser version */ struct kam_cmd_export_ { char* name; /**< null terminated command name */ cmd_function function; /**< pointer to the corresponding function */ diff --git a/src/modules/erlang/cnode.c b/src/modules/erlang/cnode.c index ce24c1dff4..b3e7892899 100644 --- a/src/modules/erlang/cnode.c +++ b/src/modules/erlang/cnode.c @@ -49,7 +49,7 @@ csockfd_handler_t *csocket_handler = NULL; erlang_pid *cnode_reply_to_pid = NULL; /** - * @brief Initialize Kamailo as C node by active connect as client. + * @brief Initialize Kamailio as C node by active connect as client. */ int cnode_connect_to(cnode_handler_t *phandler, ei_cnode *ec, const str *nodename ) { diff --git a/src/modules/erlang/erlang_mod.c b/src/modules/erlang/erlang_mod.c index 83d007aa68..5bf7633283 100644 --- a/src/modules/erlang/erlang_mod.c +++ b/src/modules/erlang/erlang_mod.c @@ -164,7 +164,7 @@ static pv_export_t pvs[] = { /* exported parameters */ static param_export_t parameters[] = { - /* Kamailo C node parameters */ + /* Kamailio C node parameters */ { "no_cnodes", PARAM_INT, &no_cnodes }, { "cnode_alivename", PARAM_STR, &cnode_alivename }, { "cnode_host", PARAM_STR, &cnode_host }, diff --git a/src/modules/xcap_server/xcap_misc.h b/src/modules/xcap_server/xcap_misc.h index 4873da2bda..0f461744f9 100644 --- a/src/modules/xcap_server/xcap_misc.h +++ b/src/modules/xcap_server/xcap_misc.h @@ -7,12 +7,12 @@ * * This file is part of kamailio, a free SIP server. * - * Kamailo is free software; you can redistribute it and/or modify + * Kamailio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version * - * Kamailo is distributed in the hope that it will be useful, + * Kamailio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details.

6 years, 2 months

[kamailio/kamailio] kex: Extend kamailio rcv_replies statistics (#1646)

by rromrrom

- ability to count reply groups for each SIP method added. - statistics for 2xx and 4xx replies on invite added   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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) - [ ] 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/1646 -- Commit Summary -- * kex: Extend kamailio rcv_replies statistics -- File Changes -- M src/modules/kex/core_stats.c (57) M src/modules/kex/core_stats.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1646.patch https://github.com/kamailio/kamailio/pull/1646.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/1646

6 years, 2 months

git:master:9113defb: Merge pull request #1646 from rromrrom/stats_by_method

by GitHub

Module: kamailio Branch: master Commit: 9113defb29b152cf41a961f7e82b1630d30464bd URL: https://github.com/kamailio/kamailio/commit/9113defb29b152cf41a961f7e82b163… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-09-24T09:29:38+02:00 Merge pull request #1646 from rromrrom/stats_by_method kex: Extend kamailio rcv_replies statistics --- Modified: src/modules/kex/core_stats.c Modified: src/modules/kex/core_stats.h --- Diff: https://github.com/kamailio/kamailio/commit/9113defb29b152cf41a961f7e82b163… Patch: https://github.com/kamailio/kamailio/commit/9113defb29b152cf41a961f7e82b163… --- diff --git a/src/modules/kex/core_stats.c b/src/modules/kex/core_stats.c index ad8f42964d..5d2bcc13a1 100644 --- a/src/modules/kex/core_stats.c +++ b/src/modules/kex/core_stats.c @@ -82,6 +82,29 @@ stat_var* rcv_rpls_486; stat_var* rcv_rpls_5xx; stat_var* rcv_rpls_6xx; +#define VAR_NAME(method) rcv_rpls_ ## method + +#define STAT_NAME(method, group) "rcv_replies_" #group "xx_" #method + +#define DECLARE_STAT_VARS(method) stat_var* VAR_NAME(method)[6]; + +#define DECLARE_STATS(method) \ + { STAT_NAME(method, 1), 0, &VAR_NAME(method)[0] }, \ + { STAT_NAME(method, 2), 0, &VAR_NAME(method)[1] }, \ + { STAT_NAME(method, 3), 0, &VAR_NAME(method)[2] }, \ + { STAT_NAME(method, 4), 0, &VAR_NAME(method)[3] }, \ + { STAT_NAME(method, 5), 0, &VAR_NAME(method)[4] }, \ + { STAT_NAME(method, 6), 0, &VAR_NAME(method)[5] } + +DECLARE_STAT_VARS(invite); +DECLARE_STAT_VARS(cancel); +DECLARE_STAT_VARS(bye); +DECLARE_STAT_VARS(reg); +DECLARE_STAT_VARS(message); +DECLARE_STAT_VARS(prack); +DECLARE_STAT_VARS(update); +DECLARE_STAT_VARS(refer); + /*! exported core statistics */ stat_export_t core_stats[] = { {"rcv_requests" , 0, &rcv_reqs }, @@ -121,6 +144,14 @@ stat_export_t core_stats[] = { {"bad_URIs_rcvd", 0, &bad_URIs }, {"unsupported_methods", 0, &unsupported_methods }, {"bad_msg_hdr", 0, &bad_msg_hdr }, + DECLARE_STATS(invite), + DECLARE_STATS(cancel), + DECLARE_STATS(bye), + DECLARE_STATS(reg), + DECLARE_STATS(message), + DECLARE_STATS(prack), + DECLARE_STATS(update), + DECLARE_STATS(refer), {0,0,0} }; @@ -200,6 +231,28 @@ static int km_cb_req_stats(struct sip_msg *msg, return 1; } +static int km_cb_rpl_stats_by_method(struct sip_msg *msg, + unsigned int flags, void *param) +{ + int method = get_cseq(msg)->method_id; + int group = msg->first_line.u.reply.statuscode / 100 - 1; + + if (group >= 1 && group <= 6) { + switch(method) { + case METHOD_INVITE: update_stat( VAR_NAME(invite)[group], 1); break; + case METHOD_CANCEL: update_stat( VAR_NAME(cancel)[group], 1); break; + case METHOD_BYE: update_stat( VAR_NAME(bye)[group], 1); break; + case METHOD_REGISTER: update_stat( VAR_NAME(reg)[group], 1); break; + case METHOD_MESSAGE: update_stat( VAR_NAME(message)[group], 1); break; + case METHOD_PRACK: update_stat( VAR_NAME(prack)[group], 1); break; + case METHOD_UPDATE: update_stat( VAR_NAME(update)[group], 1); break; + case METHOD_REFER: update_stat( VAR_NAME(refer)[group], 1); break; + } + } + + return 1; +} + static int km_cb_rpl_stats(struct sip_msg *msg, unsigned int flags, void *param) { @@ -321,6 +374,10 @@ int register_core_stats(void) LM_ERR("failed to register PRE request callback\n"); return -1; } + if (register_script_cb(km_cb_rpl_stats_by_method, PRE_SCRIPT_CB|ONREPLY_CB, 0)<0 ) { + LM_ERR("failed to register PRE request callback\n"); + return -1; + } if (stats_proc_stats_init_rpc()<0) return -1; sr_event_register_cb(SREV_CORE_STATS, sts_update_core_stats); diff --git a/src/modules/kex/core_stats.h b/src/modules/kex/core_stats.h index ae59e9463f..72a5f5becc 100644 --- a/src/modules/kex/core_stats.h +++ b/src/modules/kex/core_stats.h @@ -69,6 +69,8 @@ extern stat_var* rcv_rpls_480; extern stat_var* rcv_rpls_486; extern stat_var* rcv_rpls_5xx; extern stat_var* rcv_rpls_6xx; +extern stat_var* rcv_rpls_2xx_invite; +extern stat_var* rcv_rpls_4xx_invite; /*! \brief forwarded requests */ extern stat_var* fwd_reqs;

6 years, 2 months

git:master:e7ff1a13: kex: Extend kamailio rcv_replies statistics

by Roman Romanchenko

Module: kamailio Branch: master Commit: e7ff1a13a244eb4b034a53774a00eeec0895e1d9 URL: https://github.com/kamailio/kamailio/commit/e7ff1a13a244eb4b034a53774a00eee… Author: Roman Romanchenko <rromanchenko(a)sipwise.com> Committer: Roman Romanchenko <rromanchenko(a)sipwise.com> Date: 2018-09-17T16:43:01+03:00 kex: Extend kamailio rcv_replies statistics - ability to count reply groups for each SIP method added. - statistics for 2xx and 4xx replies on invite added --- Modified: src/modules/kex/core_stats.c Modified: src/modules/kex/core_stats.h --- Diff: https://github.com/kamailio/kamailio/commit/e7ff1a13a244eb4b034a53774a00eee… Patch: https://github.com/kamailio/kamailio/commit/e7ff1a13a244eb4b034a53774a00eee… --- diff --git a/src/modules/kex/core_stats.c b/src/modules/kex/core_stats.c index ad8f42964d..5d2bcc13a1 100644 --- a/src/modules/kex/core_stats.c +++ b/src/modules/kex/core_stats.c @@ -82,6 +82,29 @@ stat_var* rcv_rpls_486; stat_var* rcv_rpls_5xx; stat_var* rcv_rpls_6xx; +#define VAR_NAME(method) rcv_rpls_ ## method + +#define STAT_NAME(method, group) "rcv_replies_" #group "xx_" #method + +#define DECLARE_STAT_VARS(method) stat_var* VAR_NAME(method)[6]; + +#define DECLARE_STATS(method) \ + { STAT_NAME(method, 1), 0, &VAR_NAME(method)[0] }, \ + { STAT_NAME(method, 2), 0, &VAR_NAME(method)[1] }, \ + { STAT_NAME(method, 3), 0, &VAR_NAME(method)[2] }, \ + { STAT_NAME(method, 4), 0, &VAR_NAME(method)[3] }, \ + { STAT_NAME(method, 5), 0, &VAR_NAME(method)[4] }, \ + { STAT_NAME(method, 6), 0, &VAR_NAME(method)[5] } + +DECLARE_STAT_VARS(invite); +DECLARE_STAT_VARS(cancel); +DECLARE_STAT_VARS(bye); +DECLARE_STAT_VARS(reg); +DECLARE_STAT_VARS(message); +DECLARE_STAT_VARS(prack); +DECLARE_STAT_VARS(update); +DECLARE_STAT_VARS(refer); + /*! exported core statistics */ stat_export_t core_stats[] = { {"rcv_requests" , 0, &rcv_reqs }, @@ -121,6 +144,14 @@ stat_export_t core_stats[] = { {"bad_URIs_rcvd", 0, &bad_URIs }, {"unsupported_methods", 0, &unsupported_methods }, {"bad_msg_hdr", 0, &bad_msg_hdr }, + DECLARE_STATS(invite), + DECLARE_STATS(cancel), + DECLARE_STATS(bye), + DECLARE_STATS(reg), + DECLARE_STATS(message), + DECLARE_STATS(prack), + DECLARE_STATS(update), + DECLARE_STATS(refer), {0,0,0} }; @@ -200,6 +231,28 @@ static int km_cb_req_stats(struct sip_msg *msg, return 1; } +static int km_cb_rpl_stats_by_method(struct sip_msg *msg, + unsigned int flags, void *param) +{ + int method = get_cseq(msg)->method_id; + int group = msg->first_line.u.reply.statuscode / 100 - 1; + + if (group >= 1 && group <= 6) { + switch(method) { + case METHOD_INVITE: update_stat( VAR_NAME(invite)[group], 1); break; + case METHOD_CANCEL: update_stat( VAR_NAME(cancel)[group], 1); break; + case METHOD_BYE: update_stat( VAR_NAME(bye)[group], 1); break; + case METHOD_REGISTER: update_stat( VAR_NAME(reg)[group], 1); break; + case METHOD_MESSAGE: update_stat( VAR_NAME(message)[group], 1); break; + case METHOD_PRACK: update_stat( VAR_NAME(prack)[group], 1); break; + case METHOD_UPDATE: update_stat( VAR_NAME(update)[group], 1); break; + case METHOD_REFER: update_stat( VAR_NAME(refer)[group], 1); break; + } + } + + return 1; +} + static int km_cb_rpl_stats(struct sip_msg *msg, unsigned int flags, void *param) { @@ -321,6 +374,10 @@ int register_core_stats(void) LM_ERR("failed to register PRE request callback\n"); return -1; } + if (register_script_cb(km_cb_rpl_stats_by_method, PRE_SCRIPT_CB|ONREPLY_CB, 0)<0 ) { + LM_ERR("failed to register PRE request callback\n"); + return -1; + } if (stats_proc_stats_init_rpc()<0) return -1; sr_event_register_cb(SREV_CORE_STATS, sts_update_core_stats); diff --git a/src/modules/kex/core_stats.h b/src/modules/kex/core_stats.h index ae59e9463f..72a5f5becc 100644 --- a/src/modules/kex/core_stats.h +++ b/src/modules/kex/core_stats.h @@ -69,6 +69,8 @@ extern stat_var* rcv_rpls_480; extern stat_var* rcv_rpls_486; extern stat_var* rcv_rpls_5xx; extern stat_var* rcv_rpls_6xx; +extern stat_var* rcv_rpls_2xx_invite; +extern stat_var* rcv_rpls_4xx_invite; /*! \brief forwarded requests */ extern stat_var* fwd_reqs;

6 years, 2 months

← Newer
1
...
15
16
17
18
19
20
21
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2018