sr-dev July 2012

sr-dev@lists.kamailio.org

24 participants
173 discussions

git:master: db_sqlite: added notes about usage in readme
by Daniel-Constantin Mierla 30 Jul '12

30 Jul '12

Module: sip-router Branch: master Commit: 72942d8441e04c6f92c8072a373e1f0a9dcc0e61 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=72942d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jul 30 11:18:28 2012 +0200 db_sqlite: added notes about usage in readme - based on content by Meftah Tayeb --- modules_k/db_sqlite/README | 40 +++++++++++++++++++++++++-- modules_k/db_sqlite/doc/db_sqlite_admin.xml | 40 +++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 3 deletions(-) diff --git a/modules_k/db_sqlite/README b/modules_k/db_sqlite/README index a1ef4fa..34d1302 100644 --- a/modules_k/db_sqlite/README +++ b/modules_k/db_sqlite/README @@ -1,12 +1,12 @@ SQlite Module -Timo Teräs +Timo Ter�s Edited by -Timo Teräs +Timo Ter�s - Copyright © 2011 Timo Teräs + Copyright � 2011 Timo Ter�s __________________________________________________________________ Table of Contents @@ -21,6 +21,13 @@ Timo Teräs 3. Parameters 4. Functions + 5. Usage + + List of Examples + + 1.1. loading the module usage + 1.2. db_url module parameter usage + 1.3. DBURL define usage Chapter 1. Admin Guide @@ -34,6 +41,7 @@ Chapter 1. Admin Guide 3. Parameters 4. Functions + 5. Usage 1. Overview @@ -65,3 +73,29 @@ Chapter 1. Admin Guide 4. Functions NONE + +5. Usage + + To use the module, first you have to load it in the Kamailio + configuration file. + + Example 1.1. loading the module usage +... +loadmodule "db_sqlite.so" +... + + Then set the db_url (or similar) parameter of modules that have to use + the SQLite database to driver part 'sqlite://', followed by the path to + database file. For example: + + Example 1.2. db_url module parameter usage +... +modparam("auth_db", "db_url", "sqlite:///etc/kamailio/kamailio.db") +... + + In the default config file, defined token DBURL can be updated like: + + Example 1.3. DBURL define usage +... +#!define DBURL "sqlite:///etc/kamailio/kamailio.db" +... diff --git a/modules_k/db_sqlite/doc/db_sqlite_admin.xml b/modules_k/db_sqlite/doc/db_sqlite_admin.xml index 43c2d5d..8c11032 100644 --- a/modules_k/db_sqlite/doc/db_sqlite_admin.xml +++ b/modules_k/db_sqlite/doc/db_sqlite_admin.xml @@ -74,5 +74,45 @@ NONE </para> </section> + + <section> + <title>Usage</title> + <para> + To use the module, first you have to load it in the &kamailio; + configuration file. + </para> + <example> + <title><function>loading the module</function> usage</title> + <programlisting format="linespecific"> +... +loadmodule "db_sqlite.so" +... +</programlisting> + </example> + <para> + Then set the db_url (or similar) parameter of modules that have to + use the SQLite database to driver part 'sqlite://', followed by the + path to database file. For example: + </para> + <example> + <title><function>db_url module parameter</function> usage</title> + <programlisting format="linespecific"> +... +modparam("auth_db", "db_url", "sqlite:///etc/kamailio/kamailio.db") +... +</programlisting> + </example> + <para> + In the default config file, defined token DBURL can be updated like: + </para> + <example> + <title><function>DBURL define</function> usage</title> + <programlisting format="linespecific"> +... +#!define DBURL "sqlite:///etc/kamailio/kamailio.db" +... +</programlisting> + </example> + </section> </chapter>

1 0

git:master: rtpproxy: allow pv as parameter to set_rtpproxy_set() function
by Daniel-Constantin Mierla 27 Jul '12

27 Jul '12

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…

1 0

git:3.3: modules/lcr: improved documentation of lcr_count module param
by admin＠sip-router.org 27 Jul '12

27 Jul '12

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>

1 0

git:master: modules/lcr: improved documentation of lcr_count module param
by admin＠sip-router.org 27 Jul '12

27 Jul '12

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>

1 0

git:3.3: modules/lcr: Fix printing of IPv4 addresses in lcr.dump_gws
by Richard Fuchs 26 Jul '12

26 Jul '12

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);

2 1

git:master: modules/lcr: Fix printing of IPv4 addresses in lcr.dump_gws
by Richard Fuchs 26 Jul '12

26 Jul '12

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);

1 0

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

25 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) ---------- 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.

1 0

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

24 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) ---------- 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.

1 0

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

24 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) ---------- 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.

1 0

git:master: mqueue: Added mq_size() function to get runtime size of mqueue in script.
by Alex Balashov 24 Jul '12

24 Jul '12

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;

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