sr-dev January 2010

sr-dev@lists.kamailio.org

28 participants
289 discussions

git:master: drouting: updated db schema definition
by Daniel-Constantin Mierla 27 Jan '10

27 Jan '10

Module: sip-router Branch: master Commit: 23bf29c92ae9d7f4635281a292a25e48698cb63b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=23bf29c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 27 12:27:51 2010 +0100 drouting: updated db schema definition - use module name in description - more appropriate field sizes --- lib/srdb1/schema/dr_gateways.xml | 26 +++++++++++--------------- lib/srdb1/schema/dr_groups.xml | 2 +- lib/srdb1/schema/dr_gw_lists.xml | 4 ++-- lib/srdb1/schema/dr_rules.xml | 28 +++++++++++++--------------- lib/srdb1/schema/kamailio-drouting.xml | 12 ++++++------ 5 files changed, 33 insertions(+), 39 deletions(-) diff --git a/lib/srdb1/schema/dr_gateways.xml b/lib/srdb1/schema/dr_gateways.xml index e595151..9763c4b 100644 --- a/lib/srdb1/schema/dr_gateways.xml +++ b/lib/srdb1/schema/dr_gateways.xml @@ -12,9 +12,8 @@ <version>3</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> - <db:para>This table is used by the Dynamic Routing module to store - information about the destinations/gateways where to route calls. - More information can be found at: &KAMAILIO_MOD_DOC;drouting.html. + <db:para>This table is used by the douting module - keeps the + gateways data. </db:para> </description> @@ -25,8 +24,7 @@ <autoincrement/> <primary/> <type db="dbtext">int,auto</type> - <description>GW unique ID - used to link the GW from - the routing rules + <description>Unique ID per gateway </description> </column> @@ -35,14 +33,14 @@ <type>unsigned int</type> <size>11</size> <default>0</default> - <description>Type/class of the GW (user defined)</description> + <description>Type of gateway</description> </column> <column id="address"> <name>address</name> <type>string</type> <size>128</size> - <description>GW/destination address as name/IP[:port]</description> + <description>Address of gateway (hostname or ip and port)</description> </column> <column id="strip"> @@ -50,18 +48,16 @@ <type>unsigned int</type> <size>11</size> <default>0</default> - <description>Number of digits to be striped out for the begining - of the username when using this GW/destination</description> + <description>Number of digits to strip from dialed number</description> </column> <column id="pri_prefix"> <name>pri_prefix</name> <type>string</type> - <size>16</size> + <size>64</size> <null/> <default><null/></default> - <description>String to prefix the username of RURI when using - this GW/destination</description> + <description>What to prefix to dialed number</description> </column> <column id="attrs"> @@ -70,8 +66,7 @@ <size>255</size> <null/> <default><null/></default> - <description>Generic string describing GW attributes - this string is - to be interpreted from the script</description> + <description>Generic string to be returned in cfg script</description> </column> <column id="description"> @@ -79,6 +74,7 @@ <type>string</type> <size>128</size> <default></default> - <description>Text description of the GW/destination</description> + <description>Short description of gateway</description> </column> </table> + diff --git a/lib/srdb1/schema/dr_groups.xml b/lib/srdb1/schema/dr_groups.xml index fa4d6df..92c2e5c 100644 --- a/lib/srdb1/schema/dr_groups.xml +++ b/lib/srdb1/schema/dr_groups.xml @@ -12,7 +12,7 @@ <version>2</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> - <db:para>This table is used by the Dynamic Routing module to store + <db:para>This table is used by the drouting module to store information about the routing groups (users mapped over groups). More information can be found at: &KAMAILIO_MOD_DOC;drouting.html. </db:para> diff --git a/lib/srdb1/schema/dr_gw_lists.xml b/lib/srdb1/schema/dr_gw_lists.xml index 7dd4c3e..6375c0d 100644 --- a/lib/srdb1/schema/dr_gw_lists.xml +++ b/lib/srdb1/schema/dr_gw_lists.xml @@ -12,7 +12,7 @@ <version>1</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> - <db:para>This table is used by the Dynamic Routing module to define + <db:para>This table is used by the drouting module to define lists of gateways to be used in rule definitions. More information can be found at: &KAMAILIO_MOD_DOC;drouting.html. </db:para> @@ -32,7 +32,7 @@ <name>gwlist</name> <type>string</type> <size>255</size> - <description>Reference to the GWs/destinations from the list. + <description>List of GW ids. </description> </column> diff --git a/lib/srdb1/schema/dr_rules.xml b/lib/srdb1/schema/dr_rules.xml index a114ea7..a469a77 100644 --- a/lib/srdb1/schema/dr_rules.xml +++ b/lib/srdb1/schema/dr_rules.xml @@ -12,9 +12,8 @@ <version>3</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> - <db:para>This table is used by the Dynamic Routing module to store - information about the routing rules. - More information can be found at: &KAMAILIO_MOD_DOC;drouting.html. + <db:para>This table is used by the drouting module - keeps the + routing rules data. </db:para> </description> @@ -33,8 +32,7 @@ <name>groupid</name> <type>string</type> <size>255</size> - <description>The ID(s) of the routing group(s) this rule is to be - used for - comma separeted list of numerical Ids + <description>list of routing group IDs </description> </column> @@ -42,14 +40,14 @@ <name>prefix</name> <type>string</type> <size>64</size> - <description>Numerical prefix to match this rule</description> + <description>Destination prefix for this rule</description> </column> <column id="timerec"> <name>timerec</name> <type>string</type> <size>255</size> - <description>Time recurrence used for matching this rule.</description> + <description>Time recurrence for this rule.</description> </column> <column id="priority"> @@ -57,24 +55,23 @@ <type>int</type> <size>11</size> <default>0</default> - <description>Priority of this rule (among rules with same prefix - and timerec).</description> + <description>Priority of the rule.</description> </column> <column id="routeid"> <name>routeid</name> <type>string</type> - <size>255</size> - <description>Route block (from cfg script) to be called when rule - matches.</description> + <size>64</size> + <description>Name of route block (from cfg script) to be + executed when matching this rule.</description> </column> <column id="gwlist"> <name>gwlist</name> <type>string</type> <size>255</size> - <description>Reference to the GWs/destinations to be used when - rule matches.</description> + <description>The list of destinations (gws) to be used when + matching this rule.</description> </column> <column id="description"> @@ -82,7 +79,8 @@ <type>string</type> <size>128</size> <default></default> - <description>Text description of the rule</description> + <description>Short description of the rule</description> </column> </table> + diff --git a/lib/srdb1/schema/kamailio-drouting.xml b/lib/srdb1/schema/kamailio-drouting.xml index d058f9b..7a95020 100644 --- a/lib/srdb1/schema/kamailio-drouting.xml +++ b/lib/srdb1/schema/kamailio-drouting.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE database PUBLIC "-//kamailio.org//DTD DBSchema V1.1//EN" - "http://kamailio.org/pub/kamailio/dbschema/dtd/1.1/dbschema.dtd" [ + "http://kamailio.org/pub/kamailio/dbschema/dtd/1.1/dbschema.dtd" [ <!ENTITY % entities SYSTEM "entities.xml"> %entities; @@ -8,9 +8,9 @@ ]> <database xmlns:xi="http://www.w3.org/2001/XInclude"> - <name>Dynamic Routing</name> - <xi:include href="dr_gateways.xml"/> - <xi:include href="dr_rules.xml"/> - <xi:include href="dr_gw_lists.xml"/> - <xi:include href="dr_groups.xml"/> + <name>DRouting</name> + <xi:include href="dr_gateways.xml"/> + <xi:include href="dr_rules.xml"/> + <xi:include href="dr_gw_lists.xml"/> + <xi:include href="dr_groups.xml"/> </database>

1 0

git:master: Merge remote branch 'origin/sr_3.0'
by Andrei Pelinescu-Onciul 27 Jan '10

27 Jan '10

Module: sip-router Branch: master Commit: 8791fc81eaa6dbcc545eabc648613d961b3c1b90 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8791fc8… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Jan 27 11:31:25 2010 +0100 Merge remote branch 'origin/sr_3.0' latest sr_3.0 and kamailio_3.0 backports * origin/sr_3.0: (90 commits) usrloc(k): rpc version for ul.dump core: init the len of sock_str attribute ctl: added parameters to control buffer size htable(k): rpc commad to dump htable pv(k): fixed $shv engine sanity: print From hdr in warning message nathelper(k): print bad contact uri core: more verbose when error parsing hdr kamailio.cfg: updated cfg with sample PSTN gw routing nathelper(k): fix for swap scenario presence(k): aliased MLA to SLA core: event parsing enahced for dialog;ma tm: documented t_relay_to() function tm: added t_relay_to(proxy, flags) tm: documented t_replicate() functions tm: t_replicate() can take avps & select as params tm: added t_replicate(uri) db_oracle: use PARAM_TYPE_MASK when checking param type snmpstats: fix param type checking core: define module_loaded to use find_module_by_name ... Conflicts: lib/srdb1/schema/dr_gateways.xml lib/srdb1/schema/dr_groups.xml lib/srdb1/schema/dr_gw_lists.xml lib/srdb1/schema/dr_rules.xml lib/srdb1/schema/kamailio-drouting.xml modules/ctl/README modules/topoh/README modules_k/uac/auth.c modules_k/uac/uac_send.c parser/parse_param.h utils/kamctl/mysql/drouting-create.sql utils/kamctl/oracle/drouting-create.sql utils/kamctl/postgres/drouting-create.sql ---

2 2

git:master: Makefile: intialization of FLAVOUR var
by Daniel-Constantin Mierla 27 Jan '10

27 Jan '10

Module: sip-router Branch: master Commit: fb143f66a129177b59985a268753e5305e30fd95 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fb143f6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 27 12:15:14 2010 +0100 Makefile: intialization of FLAVOUR var - use ?= instead of = to enable usage of value from env --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index eca85ad..d69925c 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -113,7 +113,7 @@ $(info normal Makefile.defs exec) endif # verbose # flavour: sip-router, ser or kamailio -FLAVOUR=sip-router +FLAVOUR?=sip-router ifeq ($(FLAVOUR),sip-router) # main binary name

1 0

core:proxy.c problem
by marius zbihlei 27 Jan '10

27 Jan '10

Hello, There seems to be a design problem in proxy.c mk_proxy(str* name, unsigned short port, unsigned short proto, int is_sips) function. The purpose of this function is to create a proxy and return a pointer to the created structure. The issue arises from the fact that the name (type struct str) member of the proxy structure is not deep copied from the given parameters(refer to the str* name ) (the hostent structure is instead deep copied). This isn't a problem for now but I have worked on a small patch that caches proxies (using add_proxy() and find_proxy()) and ,because of this shallow copy, things are broken. I said that this is a design problem because we can let the shallow copy happen (performance is better), and when needed the caller should provide a buffer that doesn't change (let him do the copy instead). This is not clearly documented but done from /modules(_k)/utils/conf.c. But it this way we may have a memory leak when the proxy is deallocated, because I doubt that the caller keeps track of the allocated buffers(the code in proxy.c doesn't take ownership of the given pointer). This affects functions mk_proxy and mk_shm_proxy in both kamailio(1.5 to speak of) and sip-router. I have created a patch that also does a deep copy of the name, thus removing the need for the caller to bother about the lifetime of the name buffer. Any ideas?! Cheers Marius

2 4

git:master: app_lua: added sl module to Lua
by Daniel-Constantin Mierla 26 Jan '10

26 Jan '10

Module: sip-router Branch: master Commit: 482db59aa2788737d9c6c0294a625bd3002d54c3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=482db59… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 26 23:40:49 2010 +0100 app_lua: added sl module to Lua - sl send_reply() function exported to Lua under module sr.sl - restructured existing code for easier extensibility - allow to register optional modules to Lua via new parameter 'register' --- modules/app_lua/README | 32 +++- modules/app_lua/app_lua_api.c | 336 +++++++++++++++++++++++++++++ modules/app_lua/app_lua_api.h | 57 +++++ modules/app_lua/app_lua_exp.c | 138 ++++++++++++ modules/app_lua/app_lua_exp.h | 34 +++ modules/app_lua/app_lua_mod.c | 13 +- modules/app_lua/app_lua_sr.c | 375 +++++++++------------------------ modules/app_lua/app_lua_sr.h | 14 +- modules/app_lua/doc/app_lua_admin.xml | 35 +++- 9 files changed, 742 insertions(+), 292 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=482…

1 0

git:andrei/cdefs2doc: doc: select doc generator: more fixes & core selects support
by Andrei Pelinescu-Onciul 26 Jan '10

26 Jan '10

Module: sip-router Branch: andrei/cdefs2doc Commit: 77523f394f3f37317f85917fe1df89d2c027392d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=77523f3… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Jan 26 19:34:53 2010 +0100 doc: select doc generator: more fixes & core selects support - support core select file: file with core selects that might be referenced from the current file. To use it the new "-c" or "--core" command line parameters must be used, e.g.: dump_selects.pl -f modules_s/textops/textops.c -c select_core.c - fixed handling of the NESTED and NESTED| CONSUME_* combinations --- doc/scripts/cdefs2doc/dump_selects.pl | 301 ++++++++++++++++++--------------- 1 files changed, 162 insertions(+), 139 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=775…

1 0

git:master: Makefile: excluded app_lua from compile list
by Daniel-Constantin Mierla 26 Jan '10

26 Jan '10

Module: sip-router Branch: master Commit: ba7f20f2bf1454283e62b8d87faff7d0c96611b1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ba7f20f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 26 20:31:18 2010 +0100 Makefile: excluded app_lua from compile list - depends on liblua5.1-dev --- Makefile | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index 3dff7a8..14668cb 100644 --- a/Makefile +++ b/Makefile @@ -226,6 +226,8 @@ else exclude_modules+= mtree # depends on libgeoip exclude_modules+= geoip + # depends on liblua5.1-dev + exclude_modules+= app_lua endif # always exclude the CVS dir

1 0

git:sr_3.0: Merge remote branch 'origin/tmp/k3.0_sr_backports' into sr_3.0
by Andrei Pelinescu-Onciul 26 Jan '10

26 Jan '10

Module: sip-router Branch: sr_3.0 Commit: 0e1baf00ab3419fe08f99680b9e4ca72623a15d8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0e1baf0… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Jan 26 20:10:53 2010 +0100 Merge remote branch 'origin/tmp/k3.0_sr_backports' into sr_3.0 * origin/tmp/k3.0_sr_backports: (86 commits) usrloc(k): rpc version for ul.dump core: init the len of sock_str attribute ctl: added parameters to control buffer size htable(k): rpc commad to dump htable pv(k): fixed $shv engine sanity: print From hdr in warning message nathelper(k): print bad contact uri core: more verbose when error parsing hdr kamailio.cfg: updated cfg with sample PSTN gw routing nathelper(k): fix for swap scenario presence(k): aliased MLA to SLA core: event parsing enahced for dialog;ma tm: documented t_relay_to() function tm: added t_relay_to(proxy, flags) tm: documented t_replicate() functions tm: t_replicate() can take avps & select as params tm: added t_replicate(uri) db_oracle: use PARAM_TYPE_MASK when checking param type snmpstats: fix param type checking core: define module_loaded to use find_module_by_name ... ---

1 0

git:master: reg(k): fix a (probably) copy and paste error
by Henning Westerholt 26 Jan '10

26 Jan '10

Module: sip-router Branch: master Commit: bf89ebf74025597c261b5b664e29fe0ab6bcfc25 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf89ebf… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Jan 26 17:50:02 2010 +0100 reg(k): fix a (probably) copy and paste error --- modules_k/registrar/README | 4 ++-- modules_k/registrar/doc/registrar_admin.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules_k/registrar/README b/modules_k/registrar/README index 9a2471c..e5c5721 100644 --- a/modules_k/registrar/README +++ b/modules_k/registrar/README @@ -110,7 +110,7 @@ Bogdan-Andre Iancu 1.25. registered usage 1.26. registered usage 1.27. registered usage - 1.28. $sht(name) usage + 1.28. $ulc(name) usage Chapter 1. Admin Guide @@ -787,7 +787,7 @@ reg_free_contacts("callee"); The pseudo-variable accepts positive index value to access a specific contact record. - Example 1.28. $sht(name) usage + Example 1.28. $ulc(name) usage ... if(reg_fetch_contacts("location", "$fu", "caller")) { diff --git a/modules_k/registrar/doc/registrar_admin.xml b/modules_k/registrar/doc/registrar_admin.xml index fabf4b2..9931a72 100644 --- a/modules_k/registrar/doc/registrar_admin.xml +++ b/modules_k/registrar/doc/registrar_admin.xml @@ -1076,7 +1076,7 @@ reg_free_contacts("callee"); </para> <example> - <title><function moreinfo="none">$sht(name)</function> usage</title> + <title><function moreinfo="none">$ulc(name)</function> usage</title> <programlisting format="linespecific"> ... if(reg_fetch_contacts("location", "$fu", "caller"))

1 0

SF.net SVN: openser:[5969] branches/1.5/modules/registrar
by Henning Westerholt 26 Jan '10

26 Jan '10

Revision: 5969 http://openser.svn.sourceforge.net/openser/?rev=5969&view=rev Author: henningw Date: 2010-01-26 16:49:59 +0000 (Tue, 26 Jan 2010) Log Message: ----------- * fix a (probably) copy and paste error Modified Paths: -------------- branches/1.5/modules/registrar/README branches/1.5/modules/registrar/doc/registrar_admin.xml This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
29
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2010