sr-dev July 2012

sr-dev@lists.kamailio.org

24 participants
173 discussions

git:master: mqueue: Added MI command to get current size of mqueue.
by Alex Balashov 24 Jul '12

24 Jul '12

Module: sip-router Branch: master Commit: 41f77159c5851bb36ad12abecc2faf58602d6935 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=41f7715… Author: Alex Balashov <abalashov(a)evaristesys.com> Committer: Alex Balashov <abalashov(a)evaristesys.com> Date: Mon Jul 23 19:53:41 2012 -0400 mqueue: Added MI command to get current size of mqueue. There is currently no runtime visibility into the size of a given mqueue. To address this, added an MI command 'mq_get_size' that can return the size of an mqueue by name. Example: diminuendo-1:~/sip-router/modules/mqueue# kamctl fifo mq_get_size r_write mqueue:: name=r_write size=1 --- modules/mqueue/Makefile | 1 + modules/mqueue/mqueue_api.c | 16 ++++++++ modules/mqueue/mqueue_api.h | 2 + modules/mqueue/mqueue_mod.c | 82 ++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 100 insertions(+), 1 deletions(-) diff --git a/modules/mqueue/Makefile b/modules/mqueue/Makefile index bbf4862..02a5329 100644 --- a/modules/mqueue/Makefile +++ b/modules/mqueue/Makefile @@ -10,6 +10,7 @@ LIBS= DEFS+=-DOPENSER_MOD_INTERFACE SERLIBPATH=../../lib +SER_LIBS+=$(SERLIBPATH)/kmi/kmi SER_LIBS+=$(SERLIBPATH)/kcore/kcore include ../../Makefile.modules diff --git a/modules/mqueue/mqueue_api.c b/modules/mqueue/mqueue_api.c index 7f856f4..4a36909 100644 --- a/modules/mqueue/mqueue_api.c +++ b/modules/mqueue/mqueue_api.c @@ -456,3 +456,19 @@ int pv_get_mqv(struct sip_msg *msg, pv_param_t *param, return pv_get_strval(msg, param, res, &mp->item->val); } +/* Return head->csize for a given queue */ + +int _mq_get_csize(str *name) +{ + mq_head_t *mh = mq_head_get(name); + int mqueue_size = 0; + + if(mh == NULL) + return -1; + + lock_get(&mh->lock); + mqueue_size = mh->csize; + lock_release(&mh->lock); + + return mqueue_size; +} diff --git a/modules/mqueue/mqueue_api.h b/modules/mqueue/mqueue_api.h index 04ad1e4..cb695f1 100644 --- a/modules/mqueue/mqueue_api.h +++ b/modules/mqueue/mqueue_api.h @@ -41,5 +41,7 @@ int mq_head_fetch(str *name); void mq_pv_free(str *name); int mq_item_add(str *qname, str *key, str *val); +int _mq_get_csize(str *); + #endif diff --git a/modules/mqueue/mqueue_mod.c b/modules/mqueue/mqueue_mod.c index 458701c..1559c51 100644 --- a/modules/mqueue/mqueue_mod.c +++ b/modules/mqueue/mqueue_mod.c @@ -32,6 +32,7 @@ #include "../../ut.h" #include "../../pvar.h" #include "../../mod_fix.h" +#include "../../lib/kmi/mi.h" #include "../../parser/parse_param.h" #include "../../shm_init.h" @@ -50,6 +51,8 @@ int mq_param(modparam_t type, void *val); static int fixup_mq_add(void** param, int param_no); static int bind_mq(mq_api_t* api); +static struct mi_root *mq_mi_get_size(struct mi_root *, void *); + static pv_export_t mod_pvs[] = { { {"mqk", sizeof("mqk")-1}, PVT_OTHER, pv_get_mqk, 0, pv_parse_mq_name, 0, 0, 0 }, @@ -58,6 +61,10 @@ static pv_export_t mod_pvs[] = { { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } }; +static mi_export_t mi_cmds[] = { + { "mq_get_size", mq_mi_get_size, 0, 0, 0}, + { 0, 0, 0, 0, 0} +}; static cmd_export_t cmds[]={ {"mq_fetch", (cmd_function)w_mq_fetch, 1, fixup_spve_null, @@ -82,7 +89,7 @@ struct module_exports exports = { cmds, params, 0, - 0, /* exported MI functions */ + mi_cmds, /* exported MI functions */ mod_pvs, /* exported pseudo-variables */ 0, /* extra processes */ mod_init, /* module initialization function */ @@ -100,6 +107,12 @@ static int mod_init(void) { if(!mq_head_defined()) LM_WARN("no mqueue defined\n"); + + if(register_mi_mod(exports.name, mi_cmds) != 0) { + LM_ERR("failed to register MI commands\n"); + return 1; + } + return 0; } @@ -237,3 +250,70 @@ static int bind_mq(mq_api_t* api) api->add = mq_item_add; return 0; } + +/* Return the size of the specified mqueue */ + +static struct mi_root *mq_mi_get_size(struct mi_root *cmd_tree, + void *param) +{ + static struct mi_node *node = NULL, *rpl = NULL; + static struct mi_root *rpl_tree = NULL; + static struct mi_attr *attr = NULL; + str mqueue_name; + int mqueue_sz = 0; + char *p = NULL; + int len = 0; + + if((node = cmd_tree->node.kids) == NULL) { + return init_mi_tree(400, MI_MISSING_PARM_S, + MI_MISSING_PARM_LEN); + } + + mqueue_name = node->value; + + if(mqueue_name.len <= 0 || mqueue_name.s == NULL) { + LM_ERR("bad mqueue name\n"); + return init_mi_tree(500, MI_SSTR("bad mqueue name")); + } + + mqueue_sz = _mq_get_csize(&mqueue_name); + + if(mqueue_sz < 0) { + LM_ERR("no such mqueue\n"); + return init_mi_tree(404, MI_SSTR("no such mqueue")); + } + + rpl_tree = init_mi_tree(200, MI_OK_S, MI_OK_LEN); + + if(rpl_tree == NULL) + return 0; + + rpl = &rpl_tree->node; + + node = add_mi_node_child(rpl, MI_DUP_VALUE, "mqueue", strlen("mqueue"), + NULL, 0); + + if(node == NULL) { + free_mi_tree(rpl_tree); + return NULL; + } + + attr = add_mi_attr(node, MI_DUP_VALUE, "name", strlen("name"), + mqueue_name.s, mqueue_name.len); + + if(attr == NULL) goto error; + + p = int2str((unsigned long) mqueue_sz, &len); + + attr = add_mi_attr(node, MI_DUP_VALUE, "size", strlen("size"), + p, len); + + if(attr == NULL) goto error; + + return rpl_tree; + +error: + free_mi_tree(rpl_tree); + return NULL; +} +

1 0

[tracker] Comment added: kamailio tls debug error
by sip-router 23 Jul '12

23 Jul '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#245 - kamailio tls debug error User who did this - Klaus Darilion (klaus3000) ---------- I found this thread about "bad record mac": https://groups.google.com/forum/?fromgroups#!topic/mailing.openssl.users/-X… "Well, textbook explanation of SSL is not short, but once the connection is established, each party will have a set keys composed of a MAC key (message authentication code) and an encryption key. Within the SSL record, the payload is encrypted, and the MAC is basically a hash of the MAC Key + data + sequence + nonce + etc (I don’t remember the exact list of parameters that are authenticated by the MAC off the top of my head). Also, at the end of the handshake, there is a final exchange of the MAC of all of the Records sent before the connection was “settled”. If any of the items of the SSL Record change the client will be able to detect that because the MAC will not match. First place I would look is at the firewall logs, or maybe any app (such as HIDS/NIDS) that might be doing something to the packet." So maybe there is really somebody modifying packets, or openSSL uses a wrong key for MAC checks, or maybe has some other problem during MAC checking and produces this incorrect error. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=245#comment721 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Comment added: kamailio tls debug error
by sip-router 23 Jul '12

23 Jul '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#245 - kamailio tls debug error User who did this - Shaobin.Feng (saxon_leo) ---------- tcpdump package,filter by src public ip and port(which could be got in error log). ========================== step1 : client hello step2 : server hello with certificate step3 : client key exchange step4 : Alert(leve:fatal description:bad record mac) .... then server send fin close connection --------------------------------------------------- Any suggestion,any advice would be nice! ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=245#comment720 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Comment added: kamailio tls debug error
by sip-router 23 Jul '12

23 Jul '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#245 - kamailio tls debug error User who did this - Shaobin.Feng (saxon_leo) ---------- restart 4 servers, one of them debug error now !----------- ----------------------log------------------ Jul 23 08:53:57 vm-sipserver4 /usr/local/sbin/kamailio[16560]: INFO: TLS_TRACE: tls [tls_server.c:915]: (0x7f107ec6b758, 0x7fffca493270 (0)) start (xxx.xxx.xxx.xxx:14203 -> xx.xxx.xxx.xxx:5061*) Jul 23 08:53:57 vm-sipserver4 /usr/local/sbin/kamailio[16560]: INFO: TLS_TRACE: tls [tls_server.c:970]: (0x7f107ec6b758, 0x7fffca493270) tcp_read_data(..., 4095, *1) => 126 bytes Jul 23 08:53:57 vm-sipserver4 /usr/local/sbin/kamailio[16560]: INFO: TLS_TRACE: tls [tls_server.c:1030]: (0x7f107ec6b758, 0x7fffca493270) tls_accept() => -1 (err=1) Jul 23 08:53:57 vm-sipserver4 /usr/local/sbin/kamailio[16560]: INFO: TLS_TRACE: tls [tls_server.c:1114]: (0x7f107ec6b758, 0x7fffca493270) tcpconn_send_unsafe 7 bytes Jul 23 08:53:57 vm-sipserver4 /usr/local/sbin/kamailio[16560]: ERROR: tls [tls_server.c:1174]: TLS accept:error:1408F119:SSL routines:SSL3_GET_RECORD:decryption failed or bad record mac Jul 23 08:53:57 vm-sipserver4 /usr/local/sbin/kamailio[16560]: INFO: TLS_TRACE: tls [tls_server.c:1331]: (0x7f107ec6b758, 0x7fffca493270) end error => 0 (*flags=1) ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=245#comment719 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:3.1: modules/matrix Fixed MI command not exported
by Anca Vamanu 20 Jul '12

20 Jul '12

Module: sip-router Branch: 3.1 Commit: f2cc7832a2010948298a0dc64c6551f350739275 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f2cc783… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Fri Jul 20 16:59:52 2012 +0300 modules/matrix Fixed MI command not exported Added missing register_mi_mod() call in mod_init. (cherry picked from commit b26f862322ad311e3c42d899f72eaa1fb665b755) --- modules/matrix/matrix.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/modules/matrix/matrix.c b/modules/matrix/matrix.c index 67d117e..d9fb9cf 100644 --- a/modules/matrix/matrix.c +++ b/modules/matrix/matrix.c @@ -584,6 +584,12 @@ static int mod_init(void) { matrix_db_vars(); + if(register_mi_mod(exports.name, mi_cmds)!=0) + { + LM_ERR("failed to register MI commands\n"); + return -1; + } + if (init_shmlock() != 0) return -1; if (matrix_db_init() != 0) return -1; if (matrix_db_open() != 0) return -1;

1 0

git:3.2: modules/matrix Fixed MI command not exported
by Anca Vamanu 20 Jul '12

20 Jul '12

Module: sip-router Branch: 3.2 Commit: c963bd1eeece75d9cb5a8d8f7bc286bf55d2eb53 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c963bd1… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Fri Jul 20 16:59:52 2012 +0300 modules/matrix Fixed MI command not exported Added missing register_mi_mod() call in mod_init. (cherry picked from commit b26f862322ad311e3c42d899f72eaa1fb665b755) --- modules/matrix/matrix.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/modules/matrix/matrix.c b/modules/matrix/matrix.c index 67d117e..d9fb9cf 100644 --- a/modules/matrix/matrix.c +++ b/modules/matrix/matrix.c @@ -584,6 +584,12 @@ static int mod_init(void) { matrix_db_vars(); + if(register_mi_mod(exports.name, mi_cmds)!=0) + { + LM_ERR("failed to register MI commands\n"); + return -1; + } + if (init_shmlock() != 0) return -1; if (matrix_db_init() != 0) return -1; if (matrix_db_open() != 0) return -1;

1 0

git:3.3: modules/matrix Fixed MI command not exported
by Anca Vamanu 20 Jul '12

20 Jul '12

Module: sip-router Branch: 3.3 Commit: 3a8288482aa38afd8048193ef45b8ad979cacfab URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3a82884… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Fri Jul 20 16:59:52 2012 +0300 modules/matrix Fixed MI command not exported Added missing register_mi_mod() call in mod_init. (cherry picked from commit b26f862322ad311e3c42d899f72eaa1fb665b755) --- modules/matrix/matrix.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/modules/matrix/matrix.c b/modules/matrix/matrix.c index 67d117e..d9fb9cf 100644 --- a/modules/matrix/matrix.c +++ b/modules/matrix/matrix.c @@ -584,6 +584,12 @@ static int mod_init(void) { matrix_db_vars(); + if(register_mi_mod(exports.name, mi_cmds)!=0) + { + LM_ERR("failed to register MI commands\n"); + return -1; + } + if (init_shmlock() != 0) return -1; if (matrix_db_init() != 0) return -1; if (matrix_db_open() != 0) return -1;

1 0

git:master: modules/matrix Fixed MI command not exported
by Anca Vamanu 20 Jul '12

20 Jul '12

Module: sip-router Branch: master Commit: b26f862322ad311e3c42d899f72eaa1fb665b755 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b26f862… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Fri Jul 20 16:59:52 2012 +0300 modules/matrix Fixed MI command not exported Added missing register_mi_mod() call in mod_init. --- modules/matrix/matrix.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/modules/matrix/matrix.c b/modules/matrix/matrix.c index 67d117e..d9fb9cf 100644 --- a/modules/matrix/matrix.c +++ b/modules/matrix/matrix.c @@ -584,6 +584,12 @@ static int mod_init(void) { matrix_db_vars(); + if(register_mi_mod(exports.name, mi_cmds)!=0) + { + LM_ERR("failed to register MI commands\n"); + return -1; + } + if (init_shmlock() != 0) return -1; if (matrix_db_init() != 0) return -1; if (matrix_db_open() != 0) return -1;

1 0

git:master: modules/sipcapture: Extended sipcapture to support multiple tables
by Marius Zbihlei 20 Jul '12

20 Jul '12

Module: sip-router Branch: master Commit: 9a4b9061387ac88c9c0db7945b41c8a24986b7bc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9a4b906… Author: Dragos Dinu <dragos.dinu(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Fri Jul 20 10:48:48 2012 +0300 modules/sipcapture: Extended sipcapture to support multiple tables The sipcapture module can support storing the information to multiple sql tables. Tests have shown that a major bottleneck against scalability on multi core CPU of the capture node instance was caused by using a single MySQL Table. The frontend (HOMER) will be soon patched to support retrieval of data from multiple sources. The decision to select witch table is written to, can be configured from random, round robin or hashing via username or callid. --- modules/sipcapture/README | 170 ++++++++++++++++----------- modules/sipcapture/doc/sipcapture_admin.xml | 43 +++++++- modules/sipcapture/hash_mode.c | 129 ++++++++++++++++++++ modules/sipcapture/hash_mode.h | 61 ++++++++++ modules/sipcapture/sipcapture.c | 163 +++++++++++++++++++------- modules/sipcapture/sipcapture.h | 41 +++++++ 6 files changed, 495 insertions(+), 112 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=9a4…

1 0

Kamailio v3.2.4 Released
by Daniel-Constantin Mierla 19 Jul '12

19 Jul '12

Hello, Kamailio v3.2.4 is out -- this is a minor release packaged from previous stable branch, GIT 3.2. Anyone running 3.2.x should update to it in order to benefit of latest fixes, there is no change required to be done in database structure or configuration file, just re-install over the old deployment. As usual, a backup is recommended to be in the safe side. More details about this release at: * http://www.kamailio.org/w/2012/07/kamailio-v3-2-4-released/ New installations should start with latest stable series 3.3.x, at this time latest Kamailio version being v3.3.0. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio Advanced Training, Seattle, USA, Sep 23-26, 2012 - http://asipto.com/u/katu Kamailio Practical Workshop, Netherlands, Sep 10-12, 2012 - http://asipto.com/u/kpw

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2012