sr-dev March 2015

sr-dev@lists.kamailio.org

34 participants
191 discussions

git:master:795bacba: uac Add counters for uac_reg

by Olle E. Johansson

Module: kamailio Branch: master Commit: 795bacbaa1900127cd5e94847c4be401ab86966e URL: https://github.com/kamailio/kamailio/commit/795bacbaa1900127cd5e94847c4be40… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-02-24T22:03:53+01:00 uac Add counters for uac_reg --- Modified: modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/795bacbaa1900127cd5e94847c4be40… Patch: https://github.com/kamailio/kamailio/commit/795bacbaa1900127cd5e94847c4be40… --- diff --git a/modules/uac/uac_reg.c b/modules/uac/uac_reg.c index f0829fe..fdcc92e 100644 --- a/modules/uac/uac_reg.c +++ b/modules/uac/uac_reg.c @@ -116,6 +116,7 @@ str auth_password_column = str_init("auth_password"); str auth_proxy_column = str_init("auth_proxy"); str expires_column = str_init("expires"); + #if 0 INSERT INTO version (table_name, table_version) values ('uacreg','1'); CREATE TABLE uacreg ( @@ -140,9 +141,22 @@ extern pv_spec_t auth_username_spec; extern pv_spec_t auth_realm_spec; extern pv_spec_t auth_password_spec; +counter_handle_t regtotal; /* Total number of registrations in memory */ +counter_handle_t regactive; /* Active registrations - 200 OK */ +counter_handle_t regdisabled; /* Disabled registrations */ + +/* Init counters */ +static void uac_reg_counter_init() +{ + LM_DBG("*** Initializing UAC reg counters\n"); + counter_register(&regtotal, "uac", "regtotal", 0, 0, 0, "Total number of registration accounts in memory", 0); + counter_register(&regactive, "uac", "regactive", 0, 0, 0, "Number of successfully registred accounts (200 OK)", 0); + counter_register(&regdisabled, "uac", "regdisabled", 0, 0, 0, "Counter of failed registrations (not 200 OK)", 0); +} + /** - * + * Init the in-memory registration database in hash table */ int uac_reg_init_ht(unsigned int sz) { @@ -231,6 +245,9 @@ int uac_reg_init_ht(unsigned int sz) } } + /* Initialize uac reg counters */ + uac_reg_counter_init(); + return 0; } @@ -343,6 +360,10 @@ int uac_reg_reset_ht_gc(void) _reg_htable_gc->entries[i].byuser = NULL; _reg_htable_gc->entries[i].usize = 0; } + /* Reset all counters */ + counter_reset(regtotal); + counter_reset(regactive); + counter_reset(regdisabled); return 0; } @@ -364,7 +385,7 @@ int uac_reg_ht_shift(void) lock_get(_reg_htable_gc_lock); if(_reg_htable_gc->stime > tn-UAC_REG_GC_INTERVAL) { lock_release(_reg_htable_gc_lock); - LM_ERR("shifting the memory table is not possible in less than %d\n", UAC_REG_GC_INTERVAL); + LM_ERR("shifting the memory table is not possible in less than %d secs\n", UAC_REG_GC_INTERVAL); return -1; } uac_reg_reset_ht_gc(); @@ -516,6 +537,7 @@ int reg_ht_add(reg_uac_t *reg) reg_ht_add_byuser(nr); reg_ht_add_byuuid(nr); + counter_inc(regtotal); return 0; } @@ -876,14 +898,17 @@ void uac_reg_tm_callback( struct cell *t, int type, struct tmcb_params *ps) } error: - if(reg_retry_interval) + if(reg_retry_interval) { ri->timer_expires = time(NULL) + reg_retry_interval; - else + } else { ri->flags |= UAC_REG_DISABLED; + counter_inc(regdisabled); + } done: if(ri) ri->flags &= ~(UAC_REG_ONGOING|UAC_REG_AUTHSENT); shm_free(uuid); + counter_inc(regactive); } int uac_reg_update(reg_uac_t *reg, time_t tn) @@ -912,6 +937,7 @@ int uac_reg_update(reg_uac_t *reg, time_t tn) reg->timer_expires = tn; reg->flags |= UAC_REG_ONGOING; reg->flags &= ~UAC_REG_ONLINE; + counter_add(regactive, -1); /* Take it out of the active pool while re-registering */ uuid = (char*)shm_malloc(reg->l_uuid.len+1); if(uuid==NULL) { @@ -959,8 +985,10 @@ int uac_reg_update(reg_uac_t *reg, time_t tn) shm_free(uuid); if (reg_retry_interval) reg->timer_expires = (tn ? tn : time(NULL)) + reg_retry_interval; - else + else { reg->flags |= UAC_REG_DISABLED; + counter_inc(regdisabled); + } reg->flags &= ~UAC_REG_ONGOING; return -1; } @@ -1655,6 +1683,7 @@ static const char* rpc_uac_reg_enable_doc[2] = { static void rpc_uac_reg_enable(rpc_t* rpc, void* ctx) { rpc_uac_reg_update_flag(rpc, ctx, 0, UAC_REG_DISABLED); + counter_add(regdisabled, -1); } static const char* rpc_uac_reg_disable_doc[2] = { @@ -1665,6 +1694,7 @@ static const char* rpc_uac_reg_disable_doc[2] = { static void rpc_uac_reg_disable(rpc_t* rpc, void* ctx) { rpc_uac_reg_update_flag(rpc, ctx, 1, UAC_REG_DISABLED); + counter_inc(regdisabled); } static const char* rpc_uac_reg_reload_doc[2] = {

9 years, 9 months

[kamailio] sac Adding counters for remote registrations (#100)

by Olle E. Johansson

Adding three counters. * Total number of in-memory registrations * Total number of successful registrations * Total number of disabled registrations This is for review. Will add documentation before commit. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/100 -- Commit Summary -- * uac Add counters for uac_reg * Merge branch 'master' into uacregstat -- File Changes -- M modules/uac/uac_reg.c (40) -- Patch Links -- https://github.com/kamailio/kamailio/pull/100.patch https://github.com/kamailio/kamailio/pull/100.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/100

9 years, 9 months

git:master:53de5da6: dialplan: Remove SVN ID's and history notes

by Olle E. Johansson

Module: kamailio Branch: master Commit: 53de5da64ab71e0609db2b58a65651a0a7863f63 URL: https://github.com/kamailio/kamailio/commit/53de5da64ab71e0609db2b58a65651a… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-03-16T19:26:36+01:00 dialplan: Remove SVN ID's and history notes --- Modified: modules/dialplan/dialplan.c Modified: modules/dialplan/dialplan.h Modified: modules/dialplan/dp_db.c Modified: modules/dialplan/dp_db.h Modified: modules/dialplan/dp_repl.c --- Diff: https://github.com/kamailio/kamailio/commit/53de5da64ab71e0609db2b58a65651a… Patch: https://github.com/kamailio/kamailio/commit/53de5da64ab71e0609db2b58a65651a…

9 years, 9 months

git:master:af626162: pua: Remove SVN ID and history

by Olle E. Johansson

Module: kamailio Branch: master Commit: af62616212b543502cf09654f05a7ab0e055e719 URL: https://github.com/kamailio/kamailio/commit/af62616212b543502cf09654f05a7ab… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-03-16T19:22:23+01:00 pua: Remove SVN ID and history --- Modified: modules/pua/add_events.c Modified: modules/pua/add_events.h Modified: modules/pua/event_list.c Modified: modules/pua/event_list.h Modified: modules/pua/hash.c Modified: modules/pua/hash.h Modified: modules/pua/pidf.c Modified: modules/pua/pidf.h Modified: modules/pua/pua.c Modified: modules/pua/pua.h Modified: modules/pua/pua_bind.c Modified: modules/pua/pua_bind.h Modified: modules/pua/pua_callback.c Modified: modules/pua/pua_callback.h Modified: modules/pua/pua_db.c Modified: modules/pua/pua_db.h Modified: modules/pua/send_publish.c Modified: modules/pua/send_publish.h Modified: modules/pua/send_subscribe.c Modified: modules/pua/send_subscribe.h --- Diff: https://github.com/kamailio/kamailio/commit/af62616212b543502cf09654f05a7ab… Patch: https://github.com/kamailio/kamailio/commit/af62616212b543502cf09654f05a7ab…

9 years, 9 months

git:master:57e49875: siptrace: Remove SVN ID

by Olle E. Johansson

Module: kamailio Branch: master Commit: 57e49875abfb2ae3ba1dbb6ef32bc84f2ba1f213 URL: https://github.com/kamailio/kamailio/commit/57e49875abfb2ae3ba1dbb6ef32bc84… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-03-16T19:18:46+01:00 siptrace: Remove SVN ID --- Modified: modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/57e49875abfb2ae3ba1dbb6ef32bc84… Patch: https://github.com/kamailio/kamailio/commit/57e49875abfb2ae3ba1dbb6ef32bc84… --- diff --git a/modules/siptrace/siptrace.c b/modules/siptrace/siptrace.c index 643eb2f..07e3a1a 100644 --- a/modules/siptrace/siptrace.c +++ b/modules/siptrace/siptrace.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * siptrace module - helper module to trace sip messages * * Copyright (C) 2006 Voice Sistem S.R.L.

9 years, 9 months

git:master:c3a29047: xhttp_rpc: Remove SVN ID

by Olle E. Johansson

Module: kamailio Branch: master Commit: c3a29047c21d278d60f0185e3e3b5d789605d238 URL: https://github.com/kamailio/kamailio/commit/c3a29047c21d278d60f0185e3e3b5d7… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-03-16T19:17:06+01:00 xhttp_rpc: Remove SVN ID --- Modified: modules/xhttp_rpc/xhttp_rpc.c Modified: modules/xhttp_rpc/xhttp_rpc.h Modified: modules/xhttp_rpc/xhttp_rpc_fnc.c Modified: modules/xhttp_rpc/xhttp_rpc_fnc.h --- Diff: https://github.com/kamailio/kamailio/commit/c3a29047c21d278d60f0185e3e3b5d7… Patch: https://github.com/kamailio/kamailio/commit/c3a29047c21d278d60f0185e3e3b5d7… --- diff --git a/modules/xhttp_rpc/xhttp_rpc.c b/modules/xhttp_rpc/xhttp_rpc.c index 4e0bef2..7f6f791 100644 --- a/modules/xhttp_rpc/xhttp_rpc.c +++ b/modules/xhttp_rpc/xhttp_rpc.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2011 VoIP Embedded, Inc. * * This file is part of Kamailio, a free SIP server. @@ -19,7 +17,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - * 2011-11-11 initial version (osas) */ #include <string.h> diff --git a/modules/xhttp_rpc/xhttp_rpc.h b/modules/xhttp_rpc/xhttp_rpc.h index 2cb423c..74662de 100644 --- a/modules/xhttp_rpc/xhttp_rpc.h +++ b/modules/xhttp_rpc/xhttp_rpc.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2011 VoIP Embedded, Inc. * * This file is part of Kamailio, a free SIP server. @@ -19,7 +17,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - * 2011-11-11 initial version (osas) */ diff --git a/modules/xhttp_rpc/xhttp_rpc_fnc.c b/modules/xhttp_rpc/xhttp_rpc_fnc.c index da4c0c9..6975d1f 100644 --- a/modules/xhttp_rpc/xhttp_rpc_fnc.c +++ b/modules/xhttp_rpc/xhttp_rpc_fnc.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2011 VoIP Embedded, Inc. * * This file is part of Kamailio, a free SIP server. @@ -19,7 +17,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - * 2011-11-11 initial version (osas) */ #include <string.h> diff --git a/modules/xhttp_rpc/xhttp_rpc_fnc.h b/modules/xhttp_rpc/xhttp_rpc_fnc.h index db1ba79..980fa4a 100644 --- a/modules/xhttp_rpc/xhttp_rpc_fnc.h +++ b/modules/xhttp_rpc/xhttp_rpc_fnc.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2011 VoIP Embedded, Inc. * * This file is part of Kamailio, a free SIP server. @@ -19,7 +17,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - * 2011-11-11 initial version (osas) */

9 years, 9 months

git:master:01de7863: xmlrpc: Remove SVN ID's

by Olle E. Johansson

Module: kamailio Branch: master Commit: 01de786379c7814b21e6446e1015451d0414497a URL: https://github.com/kamailio/kamailio/commit/01de786379c7814b21e6446e1015451… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-03-16T19:14:01+01:00 xmlrpc: Remove SVN ID's --- Modified: modules/xmlrpc/http.c Modified: modules/xmlrpc/http.h Modified: modules/xmlrpc/xmlrpc.c Modified: modules/xmlrpc/xmlrpc.h --- Diff: https://github.com/kamailio/kamailio/commit/01de786379c7814b21e6446e1015451… Patch: https://github.com/kamailio/kamailio/commit/01de786379c7814b21e6446e1015451…

9 years, 9 months

git:master:d2db2229: rtpengine: small addition to nh_show_rtpp

by lucian balanceanu

Module: kamailio Branch: master Commit: d2db2229f83cdf584c1dbb3485c31f01bc3e7dab URL: https://github.com/kamailio/kamailio/commit/d2db2229f83cdf584c1dbb3485c31f0… Author: lucian balanceanu <lucian.balanceanu(a)1and1.ro> Committer: lucian balanceanu <lucian.balanceanu(a)1and1.ro> Date: 2015-03-16T09:42:09+02:00 rtpengine: small addition to nh_show_rtpp - if a RTP proxy has been disabled by a mi command a "(permanent)" quote will appear when printing the disabled status. --- Modified: modules/rtpengine/doc/rtpengine_admin.xml Modified: modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/d2db2229f83cdf584c1dbb3485c31f0… Patch: https://github.com/kamailio/kamailio/commit/d2db2229f83cdf584c1dbb3485c31f0… --- diff --git a/modules/rtpengine/doc/rtpengine_admin.xml b/modules/rtpengine/doc/rtpengine_admin.xml index 576dd80..c03bc7d 100644 --- a/modules/rtpengine/doc/rtpengine_admin.xml +++ b/modules/rtpengine/doc/rtpengine_admin.xml @@ -797,7 +797,9 @@ $ &ctltool; fifo nh_enable_rtpp udp:192.168.2.133:8081 0 <title><function moreinfo="none">nh_show_rtpp</function></title> <para> Displays all the &rtp; proxies and their information: set and - status (disabled or not, weight and recheck_ticks). + status (disabled or not, weight and recheck_ticks). If a RTP proxy has been disabled by a mi command + a "(permanent)" quote will appear when printing the disabled status. This is to differentiate from + a temporary disable due to the proxy being not found responsive by kamailio. </para> <para> No parameter. diff --git a/modules/rtpengine/rtpengine.c b/modules/rtpengine/rtpengine.c index 8b2a5b3..63fdba5 100644 --- a/modules/rtpengine/rtpengine.c +++ b/modules/rtpengine/rtpengine.c @@ -109,6 +109,8 @@ MODULE_VERSION #define MI_RTP_PROXY_NOT_FOUND_LEN (sizeof(MI_RTP_PROXY_NOT_FOUND)-1) #define MI_PING_DISABLED "NATping disabled from script" #define MI_PING_DISABLED_LEN (sizeof(MI_PING_DISABLED)-1) +#define MI_DISABLED_PERMANENT "1 (permanent)" +#define MI_DISABLED_PERMANENT_LEN (sizeof(MI_DISABLED_PERMANENT)-1) #define MI_SET "set" #define MI_SET_LEN (sizeof(MI_SET)-1) #define MI_INDEX "index" @@ -760,8 +762,19 @@ static struct mi_root* mi_show_rtpproxies(struct mi_root* cmd_tree, add_rtpp_node_int_info(crt_node, MI_INDEX, MI_INDEX_LEN, crt_rtpp->idx, child, len,string,error); - add_rtpp_node_int_info(crt_node, MI_DISABLED, MI_DISABLED_LEN, - crt_rtpp->rn_disabled, child, len,string,error); + + if (( 1 == crt_rtpp->rn_disabled ) && ( crt_rtpp->rn_recheck_ticks == MI_MAX_RECHECK_TICKS)) { + if( !(child = add_mi_node_child(crt_node, MI_DUP_VALUE, MI_DISABLED, MI_DISABLED_LEN, + MI_DISABLED_PERMANENT, MI_DISABLED_PERMANENT_LEN))) { + LM_ERR("cannot add disabled (permanent) message\n"); + goto error; + } + } + else { + add_rtpp_node_int_info(crt_node, MI_DISABLED, MI_DISABLED_LEN, + crt_rtpp->rn_disabled, child, len,string,error); + } + add_rtpp_node_int_info(crt_node, MI_WEIGHT, MI_WEIGHT_LEN, crt_rtpp->rn_weight, child, len, string,error); add_rtpp_node_int_info(crt_node, MI_RECHECK_TICKS,MI_RECHECK_T_LEN,

9 years, 9 months

git:master:7f55064f: ndb_redis: enable authentication when reconnecting.

by Vicente Hernando

Module: kamailio Branch: master Commit: 7f55064f3a2eeee16b9659d3c5c29e531bc92e62 URL: https://github.com/kamailio/kamailio/commit/7f55064f3a2eeee16b9659d3c5c29e5… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: 2015-03-13T14:10:48+01:00 ndb_redis: enable authentication when reconnecting. --- Modified: modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/7f55064f3a2eeee16b9659d3c5c29e5… Patch: https://github.com/kamailio/kamailio/commit/7f55064f3a2eeee16b9659d3c5c29e5… --- diff --git a/modules/ndb_redis/redis_client.c b/modules/ndb_redis/redis_client.c index 23cb2cb..0476ed2 100644 --- a/modules/ndb_redis/redis_client.c +++ b/modules/ndb_redis/redis_client.c @@ -249,7 +249,7 @@ redisc_server_t *redisc_get_server(str *name) */ int redisc_reconnect_server(redisc_server_t *rsrv) { - char *addr, *unix_sock_path = NULL; + char *addr, *pass, *unix_sock_path = NULL; unsigned int port, db; param_t *pit = NULL; struct timeval tv; @@ -259,6 +259,7 @@ int redisc_reconnect_server(redisc_server_t *rsrv) addr = "127.0.0.1"; port = 6379; db = 0; + pass = NULL; for (pit = rsrv->attrs; pit; pit=pit->next) { if(pit->name.len==4 && strncmp(pit->name.s, "unix", 4)==0) { @@ -273,6 +274,9 @@ int redisc_reconnect_server(redisc_server_t *rsrv) } else if(pit->name.len==2 && strncmp(pit->name.s, "db", 2)==0) { if(str2int(&pit->body, &db) < 0) db = 0; + } else if(pit->name.len==4 && strncmp(pit->name.s, "pass", 4)==0) { + pass = pit->body.s; + pass[pit->body.len] = '\0'; } } if(rsrv->ctxRedis!=NULL) { @@ -289,6 +293,8 @@ int redisc_reconnect_server(redisc_server_t *rsrv) goto err; if (rsrv->ctxRedis->err) goto err2; + if ((pass != NULL) && redisc_check_auth(rsrv, pass)) + goto err2; if (redisCommandNR(rsrv->ctxRedis, "PING")) goto err2; if (redisCommandNR(rsrv->ctxRedis, "SELECT %i", db))

9 years, 9 months

UAC registrations - notes for the archive

by Olle E. Johansson

Yesterday I used the UAC module to register 10.000 accounts while testing a platform. I guess this is something it wasn't built for. I just wanted to add some notes to the archives about this: - The module seems to read all 10.000 entries from the database in one go and then add them to shared memory. It may be good for the future to limit the amounts of records for each read and take it in multiple batches (other modules have this functionality). - The module registers all at once, it's very fast. I think we could add a throttle and register in batches in the future. - The error handling seems very simple. If something goes bad, we disable the account. I am not sure if the TM module will handle failover and retries if we get a 503 with retry-after. There's no code in uac_reg.c for it. - There's no different handling of local timeouts and remote 408s. Again, maybe the TM module handles some of that. - Maybe we need an event route for disabling/enabling registrations. I created a branch and added counter support for all database entries, disabled entries and active entries (working registrations). Pull request will come :-) All in all, while this is not a normal use of it, I think it is a very good tool for testing of new platforms. As usual - Kamailio rocks! /O

9 years, 9 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2015