sr-dev July 2012

sr-dev@lists.kamailio.org

24 participants
172 discussions

git:master: rtpproxy: allow pv as parameter to set_rtpproxy_set() function

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: a4e2c43cd66a86bef2d8bda1b0ca0c6f93517a8d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a4e2c43… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 27 13:14:53 2012 +0200 rtpproxy: allow pv as parameter to set_rtpproxy_set() function --- modules/rtpproxy/README | 124 ++++++++++++++++--------------- modules/rtpproxy/doc/rtpproxy_admin.xml | 7 +- modules/rtpproxy/rtpproxy.c | 80 +++++++++++++++++--- 3 files changed, 134 insertions(+), 77 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=a4e…

12 years, 4 months

git:3.3: modules/lcr: improved documentation of lcr_count module param

by admin＠sip-router.org

Module: sip-router Branch: 3.3 Commit: 85bda41ac007464efe940713426b54c38e5d4303 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=85bda41… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Jul 27 13:08:21 2012 +0300 modules/lcr: improved documentation of lcr_count module param (cherry picked from commit 9a1450d99accef8e473cf2324412fdfc09a7cd11) --- modules/lcr/README | 2 +- modules/lcr/doc/lcr_admin.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/lcr/README b/modules/lcr/README index 178f265..081411f 100644 --- a/modules/lcr/README +++ b/modules/lcr/README @@ -638,7 +638,7 @@ modparam("lcr","weight_column", "target_weight") 3.27. lcr_count (integer) - Number of LCR instances. + Maximun value of lcr_id. Default value is 1. diff --git a/modules/lcr/doc/lcr_admin.xml b/modules/lcr/doc/lcr_admin.xml index d498904..00627a3 100644 --- a/modules/lcr/doc/lcr_admin.xml +++ b/modules/lcr/doc/lcr_admin.xml @@ -716,7 +716,7 @@ modparam("lcr","weight_column", "target_weight") <section> <title><varname>lcr_count</varname> (integer)</title> <para> - Number of LCR instances. + Maximun value of lcr_id. </para> <para> <emphasis>

12 years, 4 months

git:master: modules/lcr: improved documentation of lcr_count module param

by admin＠sip-router.org

Module: sip-router Branch: master Commit: 9a1450d99accef8e473cf2324412fdfc09a7cd11 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9a1450d… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Jul 27 13:08:21 2012 +0300 modules/lcr: improved documentation of lcr_count module param --- modules/lcr/README | 2 +- modules/lcr/doc/lcr_admin.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/lcr/README b/modules/lcr/README index 178f265..081411f 100644 --- a/modules/lcr/README +++ b/modules/lcr/README @@ -638,7 +638,7 @@ modparam("lcr","weight_column", "target_weight") 3.27. lcr_count (integer) - Number of LCR instances. + Maximun value of lcr_id. Default value is 1. diff --git a/modules/lcr/doc/lcr_admin.xml b/modules/lcr/doc/lcr_admin.xml index d498904..00627a3 100644 --- a/modules/lcr/doc/lcr_admin.xml +++ b/modules/lcr/doc/lcr_admin.xml @@ -716,7 +716,7 @@ modparam("lcr","weight_column", "target_weight") <section> <title><varname>lcr_count</varname> (integer)</title> <para> - Number of LCR instances. + Maximun value of lcr_id. </para> <para> <emphasis>

12 years, 4 months

git:3.3: modules/lcr: Fix printing of IPv4 addresses in lcr.dump_gws

by Richard Fuchs

Module: sip-router Branch: 3.3 Commit: 28be16549831df46dd1b8312da223b02359d8a9c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=28be165… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: Thu Jul 26 09:41:26 2012 -0400 modules/lcr: Fix printing of IPv4 addresses in lcr.dump_gws IPv4 addresses were printed incorrectly. Also add special handling for null gw addresses and print them as 0.0.0.0 for backwards compatibility. --- modules/lcr/lcr_rpc.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/modules/lcr/lcr_rpc.c b/modules/lcr/lcr_rpc.c index 5aec547..698b89f 100644 --- a/modules/lcr/lcr_rpc.c +++ b/modules/lcr/lcr_rpc.c @@ -87,13 +87,15 @@ static void dump_gws(rpc_t* rpc, void* c) } else { rpc->struct_add(st, "s", "scheme", "sips"); } - if (gws[i].ip_addr.af == AF_INET) + switch (gws[i].ip_addr.af) { + case AF_INET: rpc->struct_printf(st, "ip_addr", "%d.%d.%d.%d", - gws[i].ip_addr.u.addr32[0], - gws[i].ip_addr.u.addr32[1], - gws[i].ip_addr.u.addr32[2], - gws[i].ip_addr.u.addr32[3]); - else /* AF_INET6 */ + gws[i].ip_addr.u.addr[0], + gws[i].ip_addr.u.addr[1], + gws[i].ip_addr.u.addr[2], + gws[i].ip_addr.u.addr[3]); + break; + case AF_INET6: rpc->struct_printf(st, "ip_addr", "%x:%x:%x:%x:%x:%x:%x:%x", gws[i].ip_addr.u.addr16[0], gws[i].ip_addr.u.addr16[1], @@ -103,6 +105,11 @@ static void dump_gws(rpc_t* rpc, void* c) gws[i].ip_addr.u.addr16[5], gws[i].ip_addr.u.addr16[6], gws[i].ip_addr.u.addr16[7]); + break; + case 0: + rpc->struct_add(st, "s", "ip_addr", "0.0.0.0"); + break; + } hostname.s=gws[i].hostname; hostname.len=gws[i].hostname_len; rpc->struct_add(st, "S", "hostname", &hostname);

12 years, 4 months

git:master: modules/lcr: Fix printing of IPv4 addresses in lcr.dump_gws

by Richard Fuchs

Module: sip-router Branch: master Commit: 1c2cb66a8c9a4482ac278604f32bd772973a787f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1c2cb66… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: Thu Jul 26 09:41:26 2012 -0400 modules/lcr: Fix printing of IPv4 addresses in lcr.dump_gws IPv4 addresses were printed incorrectly. Also add special handling for null gw addresses and print them as 0.0.0.0 for backwards compatibility. --- modules/lcr/lcr_rpc.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/modules/lcr/lcr_rpc.c b/modules/lcr/lcr_rpc.c index 5aec547..698b89f 100644 --- a/modules/lcr/lcr_rpc.c +++ b/modules/lcr/lcr_rpc.c @@ -87,13 +87,15 @@ static void dump_gws(rpc_t* rpc, void* c) } else { rpc->struct_add(st, "s", "scheme", "sips"); } - if (gws[i].ip_addr.af == AF_INET) + switch (gws[i].ip_addr.af) { + case AF_INET: rpc->struct_printf(st, "ip_addr", "%d.%d.%d.%d", - gws[i].ip_addr.u.addr32[0], - gws[i].ip_addr.u.addr32[1], - gws[i].ip_addr.u.addr32[2], - gws[i].ip_addr.u.addr32[3]); - else /* AF_INET6 */ + gws[i].ip_addr.u.addr[0], + gws[i].ip_addr.u.addr[1], + gws[i].ip_addr.u.addr[2], + gws[i].ip_addr.u.addr[3]); + break; + case AF_INET6: rpc->struct_printf(st, "ip_addr", "%x:%x:%x:%x:%x:%x:%x:%x", gws[i].ip_addr.u.addr16[0], gws[i].ip_addr.u.addr16[1], @@ -103,6 +105,11 @@ static void dump_gws(rpc_t* rpc, void* c) gws[i].ip_addr.u.addr16[5], gws[i].ip_addr.u.addr16[6], gws[i].ip_addr.u.addr16[7]); + break; + case 0: + rpc->struct_add(st, "s", "ip_addr", "0.0.0.0"); + break; + } hostname.s=gws[i].hostname; hostname.len=gws[i].hostname_len; rpc->struct_add(st, "S", "hostname", &hostname);

12 years, 4 months

[tracker] Comment added: kamailio tls debug error

by sip-router

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) ---------- 1,The problem could be reproduced. Well,about how to reproduce it.I don't know for sure. 3,No wrapper,just start/stop it manually serval times. 4,kamailio ver=3.2.1, openssl ver=1.0.0e(self built on unbuntu 11.04) ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=245#comment724 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.

12 years, 5 months

[tracker] Comment added: kamailio tls debug error

by sip-router

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) ---------- So you can reproduce the problem? How do reproduce it? do you have a wrapper script around "openssl client" or do you just start/stop it manually? Reliable reproducing the issue would help in finding the problem. Further, which Kamailio versions and which OpenSSL versions (self built or from the Linux distribution? which distribution?) do you use? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=245#comment723 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.

12 years, 5 months

[tracker] Comment added: kamailio tls debug error

by sip-router

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) ---------- Thanks for your reply! Here's a new situation. I used openssl client connected to the server which is debuging error log,and closed the connection pretty quick. Meanwhile, I used tcpdump to capture packet. After serval times,I found "bad record mac" in dump packets. Most of the packets is ok. Cause,In same network environment, used same openssl client connect same server serval times ,some ok,some not. I thought there must be something wrong in tls module. I have enabled ssl_release_buffers config and ssl_freelist_max_len config . Maybe some memory release action cause handshake session incorrect? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=245#comment722 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.

12 years, 5 months

git:master: mqueue: Added mq_size() function to get runtime size of mqueue in script.

by Alex Balashov

Module: sip-router Branch: master Commit: f492b41bd12904e3132260562073e79d76a003a5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f492b41… Author: Alex Balashov <abalashov(a)evaristesys.com> Committer: Alex Balashov <abalashov(a)evaristesys.com> Date: Mon Jul 23 22:23:36 2012 -0400 mqueue: Added mq_size() function to get runtime size of mqueue in script. --- modules/mqueue/doc/mqueue.xml | 6 ++++++ modules/mqueue/doc/mqueue_admin.xml | 18 ++++++++++++++++++ modules/mqueue/mqueue_mod.c | 21 +++++++++++++++++++++ 3 files changed, 45 insertions(+), 0 deletions(-) diff --git a/modules/mqueue/doc/mqueue.xml b/modules/mqueue/doc/mqueue.xml index 4ad3797..af880f6 100644 --- a/modules/mqueue/doc/mqueue.xml +++ b/modules/mqueue/doc/mqueue.xml @@ -23,6 +23,12 @@ <surname>Modroiu</surname> <email>ramona(a)asipto.com</email> </editor> + <editor> + <firstname>Alex</firstname> + <surname>Balashov</surname> + <email>abalashov(a)evaristesys.com</email> + <affiliation><orgname>Evariste Systems</orgname></affiliation> + </editor> </authorgroup> <copyright> <year>2010</year> diff --git a/modules/mqueue/doc/mqueue_admin.xml b/modules/mqueue/doc/mqueue_admin.xml index 1b0363c..3a6ce9e 100644 --- a/modules/mqueue/doc/mqueue_admin.xml +++ b/modules/mqueue/doc/mqueue_admin.xml @@ -155,6 +155,24 @@ mq_pv_free("myq"); </programlisting> </example> </section> + + <section> + <title> + <function moreinfo="none">mq_size(queue)</function> + </title> + <para> + Returns the current number of elements in the mqueue. + </para> + <example> + <title><function>mq_size</function> usage</title> + <programlisting format="linespecific"> +... +$var(q_size) = mq_size("queue"); +xlog("L_INFO", "Size of queue is: $var(q_size)\n"); +... +</programlisting> + </example> + </section> </section> diff --git a/modules/mqueue/mqueue_mod.c b/modules/mqueue/mqueue_mod.c index 1559c51..3eacf02 100644 --- a/modules/mqueue/mqueue_mod.c +++ b/modules/mqueue/mqueue_mod.c @@ -45,6 +45,7 @@ static int mod_init(void); static void mod_destroy(void); static int w_mq_fetch(struct sip_msg* msg, char* mq, char* str2); +static int w_mq_size(struct sip_msg *msg, char *mq, char *str2); static int w_mq_add(struct sip_msg* msg, char* mq, char* key, char* val); static int w_mq_pv_free(struct sip_msg* msg, char* mq, char* str2); int mq_param(modparam_t type, void *val); @@ -73,6 +74,8 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE}, {"mq_pv_free", (cmd_function)w_mq_pv_free, 1, fixup_spve_null, 0, ANY_ROUTE}, + {"mq_size", (cmd_function) w_mq_size, 1, fixup_spve_null, + 0, ANY_ROUTE}, {"bind_mq", (cmd_function)bind_mq, 1, 0, 0, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} @@ -140,6 +143,24 @@ static int w_mq_fetch(struct sip_msg* msg, char* mq, char* str2) return 1; } +static int w_mq_size(struct sip_msg *msg, char *mq, char *str2) +{ + int ret; + str q; + + if(fixup_get_svalue(msg, (gparam_t *) mq, &q) < 0) { + LM_ERR("cannot get queue parameter\n"); + return -1; + } + + ret = _mq_get_csize(&q); + + if(ret < 0) + LM_ERR("mqueue not found\n"); + + return ret; +} + static int w_mq_add(struct sip_msg* msg, char* mq, char* key, char* val) { str q;

12 years, 5 months

git:master: mqueue: Added MI command to get current size of mqueue.

by Alex Balashov

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; +} +

12 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2012