sr-dev January 2013

sr-dev@lists.kamailio.org

46 participants
325 discussions

git:master: db_cassandra: Improved documentation and config file example
by Anca Vamanu 09 Jan '13

09 Jan '13

Module: sip-router Branch: master Commit: b7fde2349a28e22cd9e02412d914d07ee8654f79 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b7fde23… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Wed Jan 9 14:19:06 2013 +0200 db_cassandra: Improved documentation and config file example --- modules/db_cassandra/README | 41 ++++++++++++++---- modules/db_cassandra/dbcassa_base.cpp | 2 +- modules/db_cassandra/doc/db_cassandra_admin.xml | 51 +++++++++++++++++++---- modules/db_cassandra/kamailio_cassa.cfg | 2 +- 4 files changed, 76 insertions(+), 20 deletions(-) diff --git a/modules/db_cassandra/README b/modules/db_cassandra/README index d9b955b..5ba9e4b 100644 --- a/modules/db_cassandra/README +++ b/modules/db_cassandra/README @@ -207,7 +207,8 @@ default_validation_class='UTF8Type' and key_validation_class='UTF8Type'; * Third row: the columns that form the secondary key separated by space. - Bellow you can see the schema for the location table: + Bellow you can see the schema for the location table (when use_domain + not set): ... callid(string) cflags(int) contact(string) cseq(int) expires(timestamp) flags @@ -219,10 +220,23 @@ eg_id(int) ... Observe first that the row key is the username and the secondary index - is the contact. We have also defined a timestamp column - expires. In - this example, both the row key and the secondary index are defined by - only one column, but they can be formed out of more columns. You can - list them separated by space. + is the contact. We have also defined a timestamp column - expires. + + If you need to use the domain part of the AOR also (you have set + use_domain parameter for usrloc in the script), you should include the + domain column in the list of columns and in the primary key. The schema + will then look like this: + ... + callid(string) cflags(int) contact(string) cseq(int) domain(string) expires(t +imestamp) flags(int) last_modified(int) methods(int) path(string) q(double) rece +ived(string) socket(string) user_agent(string) username(string) ruid(string) ins +tance(string) reg_id(int) + username domain + contact + ... + + Notice that a key (primary or secondary) can be composed from more + columns, in which case you have to specify them separated by space. To understand why the schema looks like this, we must first see which queries are performed on the location table. (The 'callid' condition @@ -239,16 +253,25 @@ eg_id(int) secondary keys. The timestamp column that leaves the Cassandra cluster to deal with - deleting expired record can be used only with a modification to the - usrloc module that replaces the update performed at re-registration - with an insert operation (so that all columns are updated). This - behavior can be enabled by setting a parameter in the usrloc module + deleting the expired records. For this to work right we needed to + modify a bit the behavior of usrloc module and replace update sql query + performed at re-registration with an insert sql query (so that all + columns are updated and the new timestamp is set for all columns). This + behavior is enabled by setting a parameter in the usrloc module db_update_as_insert: ... modparam("usrloc", "db_update_as_insert", 1) ... + Also you should disable in usrloc module the timer routine that checks + for expired records. You can do this by setting the timer interval to + 0. timer_interval: + + ... + modparam("usrloc", "timer_interval", 0) + ... + The alternative would have been to define an index on the expire column and run a external job to periodically delete the expired records. However, obviously, this would be more costly. diff --git a/modules/db_cassandra/dbcassa_base.cpp b/modules/db_cassandra/dbcassa_base.cpp index dfbf58f..e9d3a32 100644 --- a/modules/db_cassandra/dbcassa_base.cpp +++ b/modules/db_cassandra/dbcassa_base.cpp @@ -359,7 +359,7 @@ int cassa_constr_key( const db_key_t* _k, const db_val_t* _v, break; } if(j == _n) { - LM_ERR("The key column with name [%.*s] not found in values\n", key_array[i]->name.len, key_array[i]->name.s); + LM_DBG("The key column with name [%.*s] not found in values\n", key_array[i]->name.len, key_array[i]->name.s); break; } pk= dbval_to_string(_v[j], pk); diff --git a/modules/db_cassandra/doc/db_cassandra_admin.xml b/modules/db_cassandra/doc/db_cassandra_admin.xml index c0b3f86..0a05914 100644 --- a/modules/db_cassandra/doc/db_cassandra_admin.xml +++ b/modules/db_cassandra/doc/db_cassandra_admin.xml @@ -227,7 +227,8 @@ default_validation_class='UTF8Type' and key_validation_class='UTF8Type'; </itemizedlist> </para> <para> - Bellow you can see the schema for the <emphasis>location</emphasis> table: + Bellow you can see the schema for the <emphasis>location</emphasis> + table (when use_domain not set): </para> <para> </para> @@ -241,13 +242,30 @@ default_validation_class='UTF8Type' and key_validation_class='UTF8Type'; </programlisting> <para> - Observe first that the <emphasis>row key is the username</emphasis> and the <emphasis>secondary index is the contact</emphasis>. + Observe first that the <emphasis>row key is the username</emphasis> and + the <emphasis>secondary index is the contact</emphasis>. We have also defined a timestamp column - <emphasis>expires</emphasis>. - In this example, both the row key and the secondary index are defined by only one column, - but they can be formed out of more columns. You can list them separated by space. </para> <para> + If you need to use the domain part of the AOR also (you have set use_domain + parameter for usrloc in the script), you should include the domain column in + the list of columns and in the primary key. The schema will then look like this: + </para> + +<programlisting format="linespecific"> + ... + callid(string) cflags(int) contact(string) cseq(int) domain(string) <emphasis>expires(timestamp)</emphasis> flags(int) last_modified(int) methods(int) path(string) q(double) received(string) socket(string) user_agent(string) username(string) ruid(string) instance(string) reg_id(int) + <emphasis>username domain</emphasis> + <emphasis>contact</emphasis> + ... +</programlisting> + + <para> + Notice that a key (primary or secondary) can be composed from more columns, + in which case you have to specify them separated by space. + </para> + <para> To understand why the schema looks like this, we must first see which queries are performed on the location table. (The 'callid' condition was ignored as it doesn't really have a well defined role in the SIP RFC). @@ -281,11 +299,11 @@ default_validation_class='UTF8Type' and key_validation_class='UTF8Type'; </listitem> </itemizedlist> <para> - The timestamp column that leaves the Cassandra cluster to deal with deleting expired - record can be used only with a modification to the usrloc module that replaces the - update performed at re-registration with an insert operation (so that all columns - are updated). - This behavior can be enabled by setting a parameter in the usrloc module + The timestamp column that leaves the Cassandra cluster to deal with deleting the expired + records. For this to work right we needed to modify a bit the behavior of usrloc module and + replace update sql query performed at re-registration with an insert sql query (so that all + columns are updated and the new timestamp is set for all columns). + This behavior is enabled by setting a parameter in the usrloc module <emphasis>db_update_as_insert</emphasis>: </para> <para> @@ -298,6 +316,21 @@ default_validation_class='UTF8Type' and key_validation_class='UTF8Type'; </programlisting> <para> + Also you should disable in usrloc module the timer routine that checks for expired records. + You can do this by setting the timer interval to 0. + <emphasis>timer_interval</emphasis>: + </para> + <para> + </para> + +<programlisting format="linespecific"> + ... + modparam("usrloc", "timer_interval", 0) + ... +</programlisting> + + + <para> The alternative would have been to define an index on the expire column and run a external job to periodically delete the expired records. However, obviously, this would be more costly. diff --git a/modules/db_cassandra/kamailio_cassa.cfg b/modules/db_cassandra/kamailio_cassa.cfg index 69bad70..d0b97e4 100644 --- a/modules/db_cassandra/kamailio_cassa.cfg +++ b/modules/db_cassandra/kamailio_cassa.cfg @@ -313,6 +313,7 @@ modparam("acc", "db_extra", modparam("usrloc", "db_url", DBURL) modparam("usrloc", "db_mode", 3) modparam("usrloc", "db_update_as_insert", 1) +modparam("usrloc", "timer_interval", 0) #modparam("usrloc", "use_domain", MULTIDOMAIN) @@ -323,7 +324,6 @@ modparam("auth_db", "calculate_ha1", yes) modparam("auth_db", "password_column", "password") modparam("auth_db", "load_credentials", "") #modparam("auth_db", "use_domain", MULTIDOMAIN) -modparam("auth_db", "use_domain", 1) # ----- permissions params ----- #!ifdef WITH_IPAUTH

2 2

git:master: db_cassandra: updated documentation
by Anca Vamanu 09 Jan '13

09 Jan '13

Module: sip-router Branch: master Commit: ff18475e9fd3c6d4da4ca2e85c045fc761eb48e5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ff18475… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Wed Jan 9 15:44:38 2013 +0200 db_cassandra: updated documentation - added URLs for Thrift library and Cassandra --- modules/db_cassandra/README | 7 +++++-- modules/db_cassandra/doc/db_cassandra_admin.xml | 9 +++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/modules/db_cassandra/README b/modules/db_cassandra/README index 5ba9e4b..97df44e 100644 --- a/modules/db_cassandra/README +++ b/modules/db_cassandra/README @@ -142,9 +142,12 @@ default_validation_class='UTF8Type' and key_validation_class='UTF8Type'; The following libraries or applications must be installed before running SIP Router with this module loaded: - * Thrift library version 0.6.1 . + * Thrift library (tested with version 0.6.1 and version 0.7.0). You + can download it from http://archive.apache.org/dist/thrift . - The implementation was tested with Cassandra version 1.0.1 . + The implementation was tested with Cassandra version 1.0.1 and version + 1.1.6. I used the sourced from DataStax Community Edition + (http://www.datastax.com/download/community). 3. Parameters diff --git a/modules/db_cassandra/doc/db_cassandra_admin.xml b/modules/db_cassandra/doc/db_cassandra_admin.xml index 0a05914..d52c907 100644 --- a/modules/db_cassandra/doc/db_cassandra_admin.xml +++ b/modules/db_cassandra/doc/db_cassandra_admin.xml @@ -122,12 +122,17 @@ default_validation_class='UTF8Type' and key_validation_class='UTF8Type'; <itemizedlist> <listitem> <para> - <emphasis>Thrift library</emphasis> version 0.6.1 . + <emphasis>Thrift library</emphasis> + (tested with version 0.6.1 and version 0.7.0). + You can download it from http://archive.apache.org/dist/thrift . </para> </listitem> </itemizedlist> </para> - <para> The implementation was tested with Cassandra version 1.0.1 .</para> + <para> The implementation was tested with Cassandra version 1.0.1 + and version 1.1.6. I used the sourced from DataStax Community + Edition (http://www.datastax.com/download/community). + </para> </section> </section>

1 0

DB Cassandra location table missing domain column?
by Peter Dunkley 09 Jan '13

09 Jan '13

Hi, I've been looking at experimenting with the Cassandra module, but I have noticed that the domain column seems to be missing from the location table. Is this an oversight, or have I misunderstood something? Regards, Peter -- Peter Dunkley Technical Director Crocodile RCS Ltd

2 2

No DB Cassandra file for the domain table
by Peter Dunkley 09 Jan '13

09 Jan '13

Hello, The README for the Cassandra module says it was tested with the domain module, but there is no file for this in utils/kamctl/dbcassandra. Should there be one? What should the row key and secondary key for the domain module be? Thanks, Peter -- Peter Dunkley Technical Director Crocodile RCS Ltd

2 2

Avoiding notification: Merge branch 'master' of ...
by Daniel-Constantin Mierla 09 Jan '13

09 Jan '13

Hello, to avoid getting extra commit notification as "Merge branch 'master' of ...", do next command before pushing commits to remote repository: git pull --ff --rebase origin master The notification results when someone else committed in between the moment you pulled last time the repository and the push. A rebase will make all notification clean. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

4 3

git:master: dbcassandra Added schema files for domain module
by Anca Vamanu 09 Jan '13

09 Jan '13

Module: sip-router Branch: master Commit: b2e1fdd5df2e52d1393ebe592869e54fb6ee734f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b2e1fdd… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Wed Jan 9 12:52:13 2013 +0200 dbcassandra Added schema files for domain module --- utils/kamctl/dbcassandra/openser/domain | 2 ++ utils/kamctl/dbcassandra/openser/domain_attrs | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/utils/kamctl/dbcassandra/openser/domain b/utils/kamctl/dbcassandra/openser/domain new file mode 100644 index 0000000..09af264 --- /dev/null +++ b/utils/kamctl/dbcassandra/openser/domain @@ -0,0 +1,2 @@ +domain(string) did(string) last_modified(int) +domain diff --git a/utils/kamctl/dbcassandra/openser/domain_attrs b/utils/kamctl/dbcassandra/openser/domain_attrs new file mode 100644 index 0000000..d47b1f7 --- /dev/null +++ b/utils/kamctl/dbcassandra/openser/domain_attrs @@ -0,0 +1,2 @@ +did(string) name(string) type(int) value(string) last_modified(int) +did name value

1 0

renaming to kamailio in perl and snmpstats modules
by Daniel-Constantin Mierla 09 Jan '13

09 Jan '13

Hello, I'm writing to see if anyone has some spare time to take care of renaming from openser to kamailio in perl and snmpstats modules. I assume is more like search and replace, but has to be carefully done to be coherent and not break stuff there, so it might be a bit more than a sed command. The IANA enterprise number in MIBs is already the one for kamailio.org Thanks, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

2 2

git:master: dialog: add contact header in REFER for dlg_bridge()
by Daniel-Constantin Mierla 09 Jan '13

09 Jan '13

Module: sip-router Branch: master Commit: 644902198d7727d8c283109d84de36babf5544ad URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6449021… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 8 22:34:00 2013 +0100 dialog: add contact header in REFER for dlg_bridge() - some UAs reject the REFER if there is no contact header --- modules_k/dialog/dialog.c | 7 ++++++ modules_k/dialog/dlg_transfer.c | 46 ++++++++++++++++++++++++++++++++++---- modules_k/dialog/dlg_transfer.h | 2 + 3 files changed, 50 insertions(+), 5 deletions(-) diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c index 13fa807..cd7dec6 100644 --- a/modules_k/dialog/dialog.c +++ b/modules_k/dialog/dialog.c @@ -112,6 +112,8 @@ int dlg_event_rt[DLG_EVENTRT_MAX]; str dlg_bridge_controller = {"sip:controller@kamailio.org", 27}; +str dlg_bridge_contact = {"sip:controller@kamailio.org:5060", 32}; + str ruri_pvar_param = {"$ru", 3}; pv_elem_t * ruri_param_model = NULL; @@ -269,6 +271,7 @@ static param_export_t mod_params[]={ { "profiles_with_value", STR_PARAM, &profiles_wv_s }, { "profiles_no_value", STR_PARAM, &profiles_nv_s }, { "bridge_controller", STR_PARAM, &dlg_bridge_controller.s }, + { "bridge_contact", PARAM_STR, &dlg_bridge_contact }, { "ruri_pvar", STR_PARAM, &ruri_pvar_param.s }, { "initial_cbs_inscript", INT_PARAM, &initial_cbs_inscript }, { "send_bye", INT_PARAM, &dlg_send_bye }, @@ -469,6 +472,9 @@ static int mod_init(void) if(faked_msg_init()<0) return -1; + if(dlg_bridge_init_hdrs()<0) + return -1; + if (timeout_spec.s) timeout_spec.len = strlen(timeout_spec.s); @@ -744,6 +750,7 @@ static void mod_destroy(void) dialog_update_db(0, 0); destroy_dlg_db(); } + dlg_bridge_destroy_hdrs(); /* no DB interaction from now on */ dlg_db_mode = DB_MODE_NONE; destroy_dlg_table(); diff --git a/modules_k/dialog/dlg_transfer.c b/modules_k/dialog/dlg_transfer.c index a0c35cf..25d9e8d 100644 --- a/modules_k/dialog/dlg_transfer.c +++ b/modules_k/dialog/dlg_transfer.c @@ -40,10 +40,47 @@ #define DLG_HOLD_SDP "v=0\r\no=kamailio-bridge 0 0 IN IP4 0.0.0.0\r\ns=kamailio\r\nc=IN IP4 0.0.0.0\r\nt=0 0\r\nm=audio 9 RTP/AVP 8 0\r\na=rtpmap:8 PCMA/8000\r\na=rtpmap:0 PCMU/8000\r\n" #define DLG_HOLD_SDP_LEN (sizeof(DLG_HOLD_SDP)-1) +/* #define DLG_HOLD_CT_HDR "Contact: <sip:kamailio.org:5060>\r\nContent-Type: application/sdp\r\n" #define DLG_HOLD_CT_HDR_LEN (sizeof(DLG_HOLD_CT_HDR)-1) +*/ extern str dlg_bridge_controller; +extern str dlg_bridge_contact; + +static char *dlg_bridge_hdrs_buf = NULL; +static str dlg_bridge_inv_hdrs = {0}; +static str dlg_bridge_ref_hdrs = {0}; + +int dlg_bridge_init_hdrs(void) +{ + if(dlg_bridge_hdrs_buf!=NULL) + return 0; + dlg_bridge_hdrs_buf = (char*)pkg_malloc((dlg_bridge_contact.len + 46) + * sizeof(char)); + if(dlg_bridge_hdrs_buf==NULL) { + LM_ERR("no more pkg memory\n"); + return -1; + } + strncpy(dlg_bridge_hdrs_buf, + "Contact: <", 10); + strncpy(dlg_bridge_hdrs_buf + 10, + dlg_bridge_contact.s, dlg_bridge_contact.len); + strncpy(dlg_bridge_hdrs_buf + 10 + dlg_bridge_contact.len, + ">\r\nContent-Type: application/sdp\r\n", 34); + dlg_bridge_hdrs_buf[dlg_bridge_contact.len+44] = '\0'; + dlg_bridge_inv_hdrs.s = dlg_bridge_hdrs_buf; + dlg_bridge_inv_hdrs.len = dlg_bridge_contact.len + 44; + dlg_bridge_ref_hdrs.s = dlg_bridge_hdrs_buf; + dlg_bridge_ref_hdrs.len = dlg_bridge_contact.len + 13; + return 0; +} + +void dlg_bridge_destroy_hdrs(void) +{ + if(dlg_bridge_hdrs_buf!=NULL) + pkg_free(dlg_bridge_hdrs_buf); +} void dlg_transfer_ctx_free(dlg_transfer_ctx_t *dtc) { @@ -145,7 +182,7 @@ static int dlg_refer_callee(dlg_transfer_ctx_t *dtc) } hdrs.len = 23 + 2*CRLF_LEN + dlg_bridge_controller.len - + dtc->to.len; + + dtc->to.len + dlg_bridge_ref_hdrs.len; LM_DBG("sending REFER [%d] <%.*s>\n", hdrs.len, dtc->to.len, dtc->to.s); hdrs.s = (char*)pkg_malloc(hdrs.len*sizeof(char)); if(hdrs.s == NULL) @@ -158,6 +195,8 @@ static int dlg_refer_callee(dlg_transfer_ctx_t *dtc) dtc->to.len); memcpy(hdrs.s+23+dlg_bridge_controller.len+CRLF_LEN+dtc->to.len, CRLF, CRLF_LEN); + memcpy(hdrs.s+23+dlg_bridge_controller.len+CRLF_LEN+dtc->to.len+CRLF_LEN, + dlg_bridge_controller.s, dlg_bridge_controller.len); memset(&uac_r, '\0', sizeof(uac_req_t)); set_uac_req(&uac_r, &met, &hdrs, NULL, dialog_info, TMCB_LOCAL_COMPLETED, @@ -278,7 +317,6 @@ int dlg_bridge(str *from, str *to, str *op) int ret; str s_method = {"INVITE", 6}; str s_body; - str s_hdrs; uac_req_t uac_r; dtc = (dlg_transfer_ctx_t*)shm_malloc(sizeof(dlg_transfer_ctx_t)); @@ -314,12 +352,10 @@ int dlg_bridge(str *from, str *to, str *op) dtc->to.len, dtc->to.s); s_body.s = DLG_HOLD_SDP; s_body.len = DLG_HOLD_SDP_LEN; - s_hdrs.s = DLG_HOLD_CT_HDR; - s_hdrs.len = DLG_HOLD_CT_HDR_LEN; memset(&uac_r, '\0', sizeof(uac_req_t)); uac_r.method = &s_method; - uac_r.headers = &s_hdrs; + uac_r.headers = &dlg_bridge_inv_hdrs; uac_r.body = &s_body; uac_r.cb_flags = TMCB_LOCAL_COMPLETED; uac_r.cb = dlg_bridge_tm_callback; diff --git a/modules_k/dialog/dlg_transfer.h b/modules_k/dialog/dlg_transfer.h index 3845e7c..ef05eeb 100644 --- a/modules_k/dialog/dlg_transfer.h +++ b/modules_k/dialog/dlg_transfer.h @@ -34,5 +34,7 @@ typedef struct _dlg_transfer_ctx { int dlg_bridge(str *from, str *to, str *op); int dlg_transfer(struct dlg_cell *dlg, str *to, int side); +int dlg_bridge_init_hdrs(void); +void dlg_bridge_destroy_hdrs(void); #endif

1 0

git:master: dialog(k): bridge contact address can be set via parameter
by Daniel-Constantin Mierla 09 Jan '13

09 Jan '13

Module: sip-router Branch: master Commit: 3b9de69fcc60bf918413a8b79fb475067c1852b3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3b9de69… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 8 22:38:35 2013 +0100 dialog(k): bridge contact address can be set via parameter --- modules_k/dialog/README | 345 +++++++++++++++++---------------- modules_k/dialog/doc/dialog_admin.xml | 20 ++ 2 files changed, 200 insertions(+), 165 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=3b9…

1 0

git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router
by Jason Penton 09 Jan '13

09 Jan '13

Module: sip-router Branch: master Commit: 0574a4833122a6f4c0b70e84dfbe7bb2f0f821ce URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0574a48… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Wed Jan 9 11:18:48 2013 +0200 Merge branch 'master' of ssh://git.sip-router.org/sip-router ---

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
33
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 2013