sr-dev December 2012

sr-dev@lists.kamailio.org

34 participants
438 discussions

git:master: usrloc(k): fixed position of xavp_contact parameter in docs
by Daniel-Constantin Mierla 28 Dec '12

28 Dec '12

Module: sip-router Branch: master Commit: 27570b56727e788da939fedc84304cf87fc1e179 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=27570b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 28 22:25:29 2012 +0100 usrloc(k): fixed position of xavp_contact parameter in docs --- modules_k/usrloc/README | 107 +++++++++++++++++---------------- modules_k/usrloc/doc/usrloc_admin.xml | 17 +++--- 2 files changed, 62 insertions(+), 62 deletions(-) diff --git a/modules_k/usrloc/README b/modules_k/usrloc/README index 3fb1710..77d1f83 100644 --- a/modules_k/usrloc/README +++ b/modules_k/usrloc/README @@ -66,24 +66,24 @@ Bogdan-Andrei Iancu 3.28. db_update_as_insert (string) 3.29. db_check_update (string) 3.30. timer_procs (string) + 3.31. xavp_contact (string) 4. Functions - 5. xavp_contact (string) - 6. MI Commands + 5. MI Commands - 6.1. ul_rm - 6.2. ul_rm_contact - 6.3. ul_dump - 6.4. ul_flush - 6.5. ul_add - 6.6. ul_show_contact + 5.1. ul_rm + 5.2. ul_rm_contact + 5.3. ul_dump + 5.4. ul_flush + 5.5. ul_add + 5.6. ul_show_contact - 7. Statistics + 6. Statistics - 7.1. users - 7.2. contacts - 7.3. expires - 7.4. registered_users + 6.1. users + 6.2. contacts + 6.3. expires + 6.4. registered_users 2. Developer Guide @@ -188,24 +188,24 @@ Chapter 1. Admin Guide 3.28. db_update_as_insert (string) 3.29. db_check_update (string) 3.30. timer_procs (string) + 3.31. xavp_contact (string) 4. Functions - 5. xavp_contact (string) - 6. MI Commands + 5. MI Commands - 6.1. ul_rm - 6.2. ul_rm_contact - 6.3. ul_dump - 6.4. ul_flush - 6.5. ul_add - 6.6. ul_show_contact + 5.1. ul_rm + 5.2. ul_rm_contact + 5.3. ul_dump + 5.4. ul_flush + 5.5. ul_add + 5.6. ul_show_contact - 7. Statistics + 6. Statistics - 7.1. users - 7.2. contacts - 7.3. expires - 7.4. registered_users + 6.1. users + 6.2. contacts + 6.3. expires + 6.4. registered_users 1. Overview @@ -295,6 +295,7 @@ Chapter 1. Admin Guide 3.28. db_update_as_insert (string) 3.29. db_check_update (string) 3.30. timer_procs (string) + 3.31. xavp_contact (string) 3.1. nat_bflag (integer) @@ -704,11 +705,7 @@ modparam("usrloc", "db_check_update", 1) modparam("usrloc", "timer_procs", 4) ... -4. Functions - - There are no exported functions that could be used in scripts. - -5. xavp_contact (string) +3.31. xavp_contact (string) The name of XAVP storring the attributes per contact. They are saved in location record and restored at lookup. @@ -720,16 +717,20 @@ modparam("usrloc", "timer_procs", 4) modparam("usrloc", "xavp_contact", "ulattrs") ... -6. MI Commands +4. Functions + + There are no exported functions that could be used in scripts. + +5. MI Commands - 6.1. ul_rm - 6.2. ul_rm_contact - 6.3. ul_dump - 6.4. ul_flush - 6.5. ul_add - 6.6. ul_show_contact + 5.1. ul_rm + 5.2. ul_rm_contact + 5.3. ul_dump + 5.4. ul_flush + 5.5. ul_add + 5.6. ul_show_contact -6.1. ul_rm +5.1. ul_rm Deletes an entire AOR record (including its contacts). @@ -738,7 +739,7 @@ modparam("usrloc", "xavp_contact", "ulattrs") * AOR - user AOR in username[@domain] format (domain must be supplied only if use_domain option is on). -6.2. ul_rm_contact +5.2. ul_rm_contact Deletes a contact from an AOR record. @@ -748,7 +749,7 @@ modparam("usrloc", "xavp_contact", "ulattrs") only if use_domain option is on). * contact - exact contact to be removed -6.3. ul_dump +5.3. ul_dump Dumps the entire content of the USRLOC in memory cache @@ -757,11 +758,11 @@ modparam("usrloc", "xavp_contact", "ulattrs") "brief", a brief dump will be done (only AOR and contacts, with no other details) -6.4. ul_flush +5.4. ul_flush Triggers the flush of USRLOC memory cache into DB. -6.5. ul_add +5.5. ul_add Adds a new contact for an user AOR. @@ -777,7 +778,7 @@ modparam("usrloc", "xavp_contact", "ulattrs") * cflags - per branch flags of the contact * methods - mask with supported requests of the contact -6.6. ul_show_contact +5.6. ul_show_contact Dumps the contacts of an user AOR. @@ -786,33 +787,33 @@ modparam("usrloc", "xavp_contact", "ulattrs") * AOR - user AOR in username[@domain] format (domain must be supplied only if use_domain option is on). -7. Statistics +6. Statistics - 7.1. users - 7.2. contacts - 7.3. expires - 7.4. registered_users + 6.1. users + 6.2. contacts + 6.3. expires + 6.4. registered_users Exported statistics are listed in the next sections. -7.1. users +6.1. users Number of AOR existing in the USRLOC memory cache for that domain - can not be resetted; this statistic will be register for each used domain (Ex: location). -7.2. contacts +6.2. contacts Number of contacts existing in the USRLOC memory cache for that domain - can not be resetted; this statistic will be register for each used domain (Ex: location). -7.3. expires +6.3. expires Total number of expired contacts for that domain - can be resetted; this statistic will be register for each used domain (Ex: location). -7.4. registered_users +6.4. registered_users Total number of AOR existing in the USRLOC memory cache for all domains - can not be resetted. diff --git a/modules_k/usrloc/doc/usrloc_admin.xml b/modules_k/usrloc/doc/usrloc_admin.xml index 85fa2a2..86c25cc 100644 --- a/modules_k/usrloc/doc/usrloc_admin.xml +++ b/modules_k/usrloc/doc/usrloc_admin.xml @@ -823,15 +823,6 @@ modparam("usrloc", "timer_procs", 4) </example> </section> - </section> - - <section> - <title>Functions</title> - <para> - There are no exported functions that could be used in scripts. - </para> - </section> - <section id="xavp_contact"> <title><varname>xavp_contact</varname> (string)</title> <para> @@ -853,6 +844,14 @@ modparam("usrloc", "xavp_contact", "ulattrs") </example> </section> + </section> + + <section> + <title>Functions</title> + <para> + There are no exported functions that could be used in scripts. + </para> + </section> <section> <title>MI Commands</title>

1 0

git:master: core: added a fuction that adds an xavp with an xavp value
by Daniel-Constantin Mierla 28 Dec '12

28 Dec '12

Module: sip-router Branch: master Commit: aea4043106b7b3e44529385293616b7af640c892 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aea4043… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 28 19:21:28 2012 +0100 core: added a fuction that adds an xavp with an xavp value --- xavp.c | 32 ++++++++++++++++++++++++++++++++ xavp.h | 1 + 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/xavp.c b/xavp.c index f04ac90..9b36562 100644 --- a/xavp.c +++ b/xavp.c @@ -183,6 +183,38 @@ sr_xavp_t *xavp_add_value(str *name, sr_xval_t *val, sr_xavp_t **list) return avp; } +sr_xavp_t *xavp_add_xavp_value(str *rname, str *name, sr_xval_t *val, sr_xavp_t **list) +{ + sr_xavp_t *ravp=0; + sr_xavp_t *cavp=0; + sr_xval_t rval; + + cavp = xavp_new_value(name, val); + if (cavp==NULL) + return NULL; + + memset(&rval, 0, sizeof(sr_xval_t)); + rval.type = SR_XTYPE_XAVP; + rval.v.xavp = cavp; + + ravp = xavp_new_value(rname, &rval); + if (ravp==NULL) { + xavp_destroy_list(&cavp); + return NULL; + } + + /* Prepend new value to the list */ + if(list) { + ravp->next = *list; + *list = ravp; + } else { + ravp->next = *_xavp_list_crt; + *_xavp_list_crt = ravp; + } + + return ravp; +} + sr_xavp_t *xavp_set_value(str *name, int idx, sr_xval_t *val, sr_xavp_t **list) { sr_xavp_t *avp; diff --git a/xavp.h b/xavp.h index 0ffce2a..b581c08 100644 --- a/xavp.h +++ b/xavp.h @@ -81,6 +81,7 @@ void avpx_free(sr_xavp_t *xa); int xavp_add(sr_xavp_t *xavp, sr_xavp_t **list); int xavp_add_last(sr_xavp_t *xavp, sr_xavp_t **list); sr_xavp_t *xavp_add_value(str *name, sr_xval_t *val, sr_xavp_t **list); +sr_xavp_t *xavp_add_xavp_value(str *rname, str *name, sr_xval_t *val, sr_xavp_t **list); sr_xavp_t *xavp_set_value(str *name, int idx, sr_xval_t *val, sr_xavp_t **list); sr_xavp_t *xavp_get(str *name, sr_xavp_t *start); sr_xavp_t *xavp_get_by_index(str *name, int idx, sr_xavp_t **start);

1 0

git:master: lib/srdb1: added location_attrs table
by Daniel-Constantin Mierla 28 Dec '12

28 Dec '12

Module: sip-router Branch: master Commit: 060734a2acf96333ffaef8207812cc27bc127c76 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=060734a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 28 14:55:35 2012 +0100 lib/srdb1: added location_attrs table - store per contact attributes --- lib/srdb1/schema/kamailio-usrloc.xml | 1 + lib/srdb1/schema/location_attrs.xml | 101 ++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 0 deletions(-) diff --git a/lib/srdb1/schema/kamailio-usrloc.xml b/lib/srdb1/schema/kamailio-usrloc.xml index f0fb41d..a86418f 100644 --- a/lib/srdb1/schema/kamailio-usrloc.xml +++ b/lib/srdb1/schema/kamailio-usrloc.xml @@ -9,4 +9,5 @@ <database xmlns:xi="http://www.w3.org/2001/XInclude"> <name>User location</name> <xi:include href="location.xml"/> + <xi:include href="location_attrs.xml"/> </database> diff --git a/lib/srdb1/schema/location_attrs.xml b/lib/srdb1/schema/location_attrs.xml new file mode 100644 index 0000000..491fce2 --- /dev/null +++ b/lib/srdb1/schema/location_attrs.xml @@ -0,0 +1,101 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE table PUBLIC "-//kamailio.org//DTD DBSchema V1.1//EN" + "http://kamailio.org/pub/kamailio/dbschema/dtd/1.1/dbschema.dtd" [ + +<!ENTITY % entities SYSTEM "entities.xml"> +%entities; + +]> + +<table id="location" xmlns:db="http://docbook.org/ns/docbook"> + <name>location_attrs</name> + <version>1</version> + <type db="mysql">&MYSQL_TABLE_TYPE;</type> + <description> + <db:para>Persistent user location attributes for the usrloc module. More information can be found at: &KAMAILIO_MOD_DOC;usrloc.html + </db:para> + </description> + + <column id="id"> + <name>id</name> + <type>unsigned int</type> + <size>&table_id_len;</size> + <autoincrement/> + <primary/> + <type db="dbtext">int,auto</type> + <description>unique ID</description> + </column> + + <column id="ruid"> + <name>ruid</name> + <type>string</type> + <size>64</size> + <default/> + <description>Record internal unique id</description> + <natural/> + </column> + + <column id="username"> + <name>&USERCOL;</name> + <type>string</type> + <size>&user_len;</size> + <default/> + <description>Username / phone number </description> + <natural/> + </column> + + <column id="domain"> + <name>domain</name> + <type>string</type> + <size>&domain_len;</size> + <null/> + <default><null/></default> + <description>Domain name</description> + <natural/> + </column> + + <column> + <name>aname</name> + <type>string</type> + <size>64</size> + <default/> + <description>Attribute name.</description> + </column> + + <column> + <name>atype</name> + <type>int</type> + <size>11</size> + <default>0</default> + <description>Attribute type.</description> + </column> + + <column> + <name>avalue</name> + <type>string</type> + <size>255</size> + <default/> + <description>Attribute value.</description> + </column> + + <column id="last_modified"> + <name>last_modified</name> + <type>datetime</type> + <default>&DEFAULT_DATETIME;</default> + <default db="oracle">to_date('&DEFAULT_DATETIME;','yyyy-mm-dd hh24:mi:ss')</default> + <description>Date and time when this entry was last modified.</description> + </column> + + <index> + <name>account_record_idx</name> + <colref linkend="username"/> + <colref linkend="domain"/> + <colref linkend="ruid"/> + </index> + <index> + <name>last_modified_idx</name> + <colref linkend="last_modified"/> + </index> + + +</table>

1 0

git:master: kamctl: regenerated database creation scripts
by Daniel-Constantin Mierla 28 Dec '12

28 Dec '12

Module: sip-router Branch: master Commit: f636e215089a9b14daa113d93025831e827192b5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f636e21… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 28 19:18:09 2012 +0100 kamctl: regenerated database creation scripts - target on location_attrs table - affected xhttp_pi and sca --- utils/kamctl/db_berkeley/kamailio/location_attrs | 12 +++++ utils/kamctl/db_sqlite/sca-create.sql | 4 +- utils/kamctl/db_sqlite/usrloc-create.sql | 15 ++++++ utils/kamctl/dbtext/kamailio/location_attrs | 2 + utils/kamctl/mysql/sca-create.sql | 4 +- utils/kamctl/mysql/usrloc-create.sql | 15 ++++++ utils/kamctl/oracle/sca-create.sql | 2 +- utils/kamctl/oracle/usrloc-create.sql | 23 ++++++++++ utils/kamctl/postgres/sca-create.sql | 4 +- utils/kamctl/postgres/usrloc-create.sql | 15 ++++++ utils/kamctl/xhttp_pi/pi_framework.xml | 52 +++++++++++++++++----- utils/kamctl/xhttp_pi/usrloc-mod | 17 +++++++ utils/kamctl/xhttp_pi/usrloc-table | 13 +++++ 13 files changed, 160 insertions(+), 18 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=f63…

1 0

parallel forking with websocket
by Ramaseshi reddy kolli 28 Dec '12

28 Dec '12

Hi, I have enabled websocket support in kamailio and registered with test123 one SIP end point and test123 Websocket client. Now i am trying to call from another test456 sip end point to test123 then call some times comes to both end points and some times does not come one end point. I appreciate any help in this issue. Thanks in advance. Thanks Ram

2 4

git:pd/outbound: modules_k/path: only add "; ob" parameter when it is the the first hop
by Peter Dunkley 28 Dec '12

28 Dec '12

Module: sip-router Branch: pd/outbound Commit: 8f0ab9130af20ed1709b03fff8e831695cbdc64f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8f0ab91… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Dec 28 08:03:50 2012 +0000 modules_k/path: only add ";ob" parameter when it is the the first hop --- modules_k/path/path.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/modules_k/path/path.c b/modules_k/path/path.c index 2362066..b702ba4 100644 --- a/modules_k/path/path.c +++ b/modules_k/path/path.c @@ -199,6 +199,7 @@ int add_path(struct sip_msg* _msg, char* _a, char* _b) str user = {0,0}; int ret; path_param_t param = PATH_PARAM_NONE; + struct via_body *via; if (path_obb.use_outbound != NULL && path_obb.use_outbound(_msg)) { @@ -206,7 +207,11 @@ int add_path(struct sip_msg* _msg, char* _a, char* _b) LM_ERR("encoding outbound flow token\n"); return -1; } - param = PATH_PARAM_OB; + + /* Only include ;ob parameter if this is the first-hop (that + means only one Via:) */ + if (parse_via_header(_msg, 2, &via) < 0) + param = PATH_PARAM_OB; } ret = prepend_path(_msg, &user, param);

1 0

Outbound: Flow Timer, tcp_connection_timeout, and WebSocket pings
by Peter Dunkley 28 Dec '12

28 Dec '12

Hi, I just wanted to raise this to see if anyone can see any flaw/problem in my thought processes. When using outbound it is mandatory to have some form of SIP keep-alive between the UA and the edge proxy. However, in the case where SIP over WebSocket is used the WebSocket transport has its own ping/pong keepalive mechanism. So to my mind, SIP keep-alives are optional when WebSocket is in use? In my last email I asked about the flow timer and said that I thought it should be set in conjunction with the tcp_connection_lifetime value, but when WebSocket is in use I believe: * tcp_connection_lifetime on the edge proxy should be slightly larger than * websocket:keepalive_timeout on the edge proxy, which should be slightly larger than * the flow timer value the registrar sets in 2xx responses to REGISTERs Regards, Peter -- Peter Dunkley Technical Director Crocodile RCS Ltd

2 2

Outbound: double Record-Route
by Peter Dunkley 28 Dec '12

28 Dec '12

Hi, In Kamailio we have the concept of double Record-Route to enable us to indicate when Kamailio must gateway between transports and networks. In outbound the flow token is recommended to include an indication of the transport the connection uses and the local address for the connection. To me this means that double Record-Route is not required for outbound because the Record-Route-URI will indicate the route "out" of the proxy and the flow token indicates the route "into" the proxy. In fact, I think double-RR should be explicitly disabled when outbound is in use, and that outbound could be "forced" for non-client connections as an alternative to double-RR. Does that make sense? Regards, Peter -- Peter Dunkley Technical Director Crocodile RCS Ltd

1 0

path module and advertised_address
by Peter Dunkley 28 Dec '12

28 Dec '12

Hi, Can anyone familiar with the path module tell me if it uses the advertised_address for an interface when adding the Path: header? Regards, Peter -- Peter Dunkley Technical Director Crocodile RCS Ltd

1 0

git:pd/outbound: Merge branch 'master' into outbound
by Peter Dunkley 26 Dec '12

26 Dec '12

Module: sip-router Branch: pd/outbound Commit: 7fce787c316de12fd3294ca2a70d79d71ff2ad1b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7fce787… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Dec 26 14:25:44 2012 +0000 Merge branch 'master' into outbound * master: core: check for IP in no_naptr_srv_sip_resolvehost() core: try all srv protocols when not already set registrar(k): restore the location contact xavp upon lookup usrloc(k): option to store xavp per contact core: extended xavp api registrar(k): use only pre-existing branches in lookup_branches() p_usrloc: clean memory in case of malloc error Revert "Changing to kamcmd" kamcmd changes Changing to kamcmd kamcmd Updating docs Change "sercmd" to "kamcmd" in module documentation files - README kamctl Fix typo that causes the "trusted" help to be printed twice and "address" zero times kamctl Change "sercmd" to "kamcmd" in help texts Fixing compiler warnings ---

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
44
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2012