sr-dev January 2012

sr-dev@lists.kamailio.org

25 participants
166 discussions

git:master: modules_k/rls: Removed unnecessary subscription and external_hash arguments from send_notifies ()
by Peter Dunkley 24 Jan '12

24 Jan '12

Module: sip-router Branch: master Commit: cace2ad053da72f608c4434c027f5b6b069c1281 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cace2ad… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Tue Jan 24 17:38:50 2012 +0000 modules_k/rls: Removed unnecessary subscription and external_hash arguments from send_notifies() - These were not used, or rather, not used in any sensible way in send_notifies() - Fix by Andrew Miller @ Crocodile RCS --- modules_k/rls/resource_notify.c | 227 +++++++++++++++++---------------------- 1 files changed, 99 insertions(+), 128 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=cac…

1 0

git:master: modules_k/rls: Fixed some DB handling stuff
by Peter Dunkley 24 Jan '12

24 Jan '12

Module: sip-router Branch: master Commit: f968ac71db55e7ac05ce72d624dfc075eeb7254f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f968ac7… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Tue Jan 24 17:23:47 2012 +0000 modules_k/rls: Fixed some DB handling stuff - Removed the (unnecessary) rls_db2 connection - Close the XCAP database connection in destroy() --- modules_k/rls/rls.c | 67 +++++++------------------------- modules_k/rls/rls_db.c | 98 ++++++++++++++++++++++++------------------------ 2 files changed, 64 insertions(+), 101 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=f96…

1 0

Re: [sr-dev] git:master: test/udp_flood.c moved to utils.protoshoot
by Henning Westerholt 24 Jan '12

24 Jan '12

On Tuesday 24 January 2012, Daniel-Constantine Mierla wrote: > I haven't checked ncat capabilities to see equivalences, this tool was in > test directory (Andrei wrote iirc) and I use it quite a lot for doing > various tests. > > One thing coming in my mind now, this tool supports sending over SCTP, does > ncat as well? Hi Daniel, ah, i was not aware of ncat as well, only nc. ;-) I think at least in the available versions nc or ncat does not support SCTP. But they are some patches available, e.g.: http://seclists.org/nmap-dev/2009/q2/609 and some more, i think. Viele Grüße/ best regards, Henning Westerholt

1 0

Re: [sr-dev] git:master: test/udp_flood.c moved to utils.protoshoot
by Henning Westerholt 24 Jan '12

24 Jan '12

On Monday 23 January 2012, Daniel-Constantin Mierla wrote: > test/udp_flood.c moved to utils.protoshoot > > - tool for sending file content over network > - useful to re/send SIP messages stored in files Hello Daniel, interesting tool. :-) How does it releate to e.g. netcat? Does it provide more than: cat $file | nc -u $target 5060 Viele Grüße/ best regards, Henning Westerholt

1 0

Re: [sr-dev] git:master: test/udp_flood.c moved to utils.protoshoot
by Daniel-Constantine Mierla 24 Jan '12

24 Jan '12

Hello, I haven't checked ncat capabilities to see equivalences, this tool was in test directory (Andrei wrote iirc) and I use it quite a lot for doing various tests. One thing coming in my mind now, this tool supports sending over SCTP, does ncat as well? Cheers, Daniel On Jan 24, 2012, at 12:50 PM, Henning Westerholt <henning.westerholt(a)1und1.de> wrote: > On Monday 23 January 2012, Daniel-Constantin Mierla wrote: >> test/udp_flood.c moved to utils.protoshoot >> >> - tool for sending file content over network >> - useful to re/send SIP messages stored in files > > Hello Daniel, > > interesting, how does it release to e.g. netcat? E.g. > > cat $file | nc -u $target 5060 > > Viele Grüße/ best regards, > > Henning Westerholt

1 0

LCR: defunct_gw() is dangerous
by Iñaki Baz Castillo 24 Jan '12

24 Jan '12

Hi, I would like to share some experience using LCR under Kamailio 3.X in which there is no longer OPTIONS-based gateways monitorization. Now, the way to dissable a gateway is by calling defunct_gw() in a failure_route block (i.e. when there is no response for a request and fr_timer fires). So it's based on a single request processing. This is dangerous and I will put a real example: An ugly client sends us a request with a malformed P-Asserted-Identity as follows: P-Asserted-Identity(sip(a)domain.com Note that it's an *invalid* header. But Kamailio "allows" it and the request arrives to the GW. But the GW drops the request due to the malformed header so it sends NO reply at all. Then timeout occurs in the client transaction and failure_route block is called in which I call to defunct_gw(). Conclusion: an attacker could dissable my gws just by sending a simple malformed request. I strongly miss the monitorization feature in the old LCR module. And ever worse, I could make my own monitorization client by sending OPTIONS to all the gateways, but LCR module does not include a simple MI command to enable/dissable a gw so, what should I do? re-populate all the LCR tables and invoke LCR reload() MI command every time I detect a gw is offline/online? Regards. -- Iñaki Baz Castillo <ibc(a)aliax.net>

4 27

git:master: test/udp_flood.c moved to utils.protoshoot
by Daniel-Constantin Mierla 23 Jan '12

23 Jan '12

Module: sip-router Branch: master Commit: 537302076746d2818abaf704e271cc47d4135d5a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5373020… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jan 23 08:38:52 2012 +0100 test/udp_flood.c moved to utils.protoshoot - tool for sending file content over network - useful to re/send SIP messages stored in files --- utils/protoshoot/Makefile | 13 +++++++++++++ utils/protoshoot/README | 6 ++++++ test/udp_flood.c => utils/protoshoot/protoshoot.c | 0 3 files changed, 19 insertions(+), 0 deletions(-) diff --git a/utils/protoshoot/Makefile b/utils/protoshoot/Makefile new file mode 100644 index 0000000..1adba1f --- /dev/null +++ b/utils/protoshoot/Makefile @@ -0,0 +1,13 @@ +# + +include ../../Makefile.defs + +auto_gen= +NAME=protoshoot + +include ../../Makefile.sources + +include ../../Makefile.rules + +modules: + diff --git a/utils/protoshoot/README b/utils/protoshoot/README new file mode 100644 index 0000000..f02bc36 --- /dev/null +++ b/utils/protoshoot/README @@ -0,0 +1,6 @@ +PROTOSHOOT +========== + +Command line tool to send data on network. Data is loaded from a file. + +See 'protoshoot -h' for options. diff --git a/test/udp_flood.c b/utils/protoshoot/protoshoot.c similarity index 100% rename from test/udp_flood.c rename to utils/protoshoot/protoshoot.c

1 0

git:master: utils/protoshoot: set default values for addr, port and count
by Daniel-Constantin Mierla 23 Jan '12

23 Jan '12

Module: sip-router Branch: master Commit: 8c41c5f0f0786b9ef948e2b271d676f88c2e7172 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8c41c5f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jan 23 22:37:45 2012 +0100 utils/protoshoot: set default values for addr, port and count - respectively 127.0.0.1, 5060, 1 --- utils/protoshoot/protoshoot.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/protoshoot/protoshoot.c b/utils/protoshoot/protoshoot.c index fa6ba4c..577ee9a 100644 --- a/utils/protoshoot/protoshoot.c +++ b/utils/protoshoot/protoshoot.c @@ -51,7 +51,7 @@ static char *id="$Id$"; -static char *version="udp_flood 0.2"; +static char *version="protoflood 0.3"; static char* help_msg="\ Usage: udp_flood -f file -d address -p port -c count [-v]\n\ Options:\n\ @@ -106,11 +106,11 @@ int main (int argc, char** argv) int err; /* init */ - count=0; + count=1; verbose=0; fname=0; - dst=0; - port=0; + dst="127.0.0.1"; + port=5060; usec=0; throttle=0; random_sleep=0;

1 0

git:master: modules/ db_cassandra Added support for queries without condition
by Anca Vamanu 23 Jan '12

23 Jan '12

Module: sip-router Branch: master Commit: 13464e8d055363e820522e566c24cde043d2e00f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=13464e8… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Mon Jan 23 18:43:21 2012 +0200 modules/db_cassandra Added support for queries without condition Now it is possible to fetch all rows in a table. Tested with domain module. --- modules/db_cassandra/README | 2 +- modules/db_cassandra/dbcassa_base.cpp | 96 +++++++++++++++-------- modules/db_cassandra/doc/db_cassandra_admin.xml | 2 +- 3 files changed, 66 insertions(+), 34 deletions(-) diff --git a/modules/db_cassandra/README b/modules/db_cassandra/README index c4bf97b..be27201 100644 --- a/modules/db_cassandra/README +++ b/modules/db_cassandra/README @@ -84,7 +84,7 @@ Chapter 1. Admin Guide Router servers, with more proxies and registration servers accessing the same location database. This was actually the main use case we had in mind when implementing this module. Please NOTE that it has only - been tested with the usrloc and auth_db modules. + been tested with the usrloc, auth_db and domain modules. You can find a configuration file example for this usage in the module - kamailio_cassa.cfg. diff --git a/modules/db_cassandra/dbcassa_base.cpp b/modules/db_cassandra/dbcassa_base.cpp index aa93474..bd7f057 100644 --- a/modules/db_cassandra/dbcassa_base.cpp +++ b/modules/db_cassandra/dbcassa_base.cpp @@ -427,36 +427,39 @@ dbcassa_column_p cassa_search_col(dbcassa_table_p tbc, db_key_t col_name) return 0; } -typedef std::auto_ptr<std::vector<oac::ColumnOrSuperColumn> > ColumnVecPtr; +typedef std::vector<oac::ColumnOrSuperColumn> ColumnVec; +typedef std::auto_ptr<ColumnVec> ColumnVecPtr; ColumnVecPtr cassa_translate_query(const db1_con_t* _h, const db_key_t* _k, - const db_val_t* _v, const db_key_t* _c, int _n, int _nc) + const db_val_t* _v, const db_key_t* _c, int _n, int _nc, int* ret_rows_no) { char row_key[cassa_max_key_len]; char sec_key[cassa_max_key_len]; - int key_len, seckey_len = 0; + int key_len=0, seckey_len = 0; int no_kc, no_sec_kc; dbcassa_table_p tbc; /** Lock table schema and construct primary and secondary key **/ - tbc = dbcassa_db_get_table(&CON_CASSA(_h)->db_name, CON_TABLE(_h)); - if(!tbc) { - LM_ERR("table %.*s does not exist!\n", CON_TABLE(_h)->len, CON_TABLE(_h)->s); - return ColumnVecPtr(NULL); - } - cassa_constr_key(_k, _v, _n, tbc->key_len, tbc->key, &no_kc, row_key); + if(_k) { + tbc = dbcassa_db_get_table(&CON_CASSA(_h)->db_name, CON_TABLE(_h)); + if(!tbc) { + LM_ERR("table %.*s does not exist!\n", CON_TABLE(_h)->len, CON_TABLE(_h)->s); + return ColumnVecPtr(NULL); + } + cassa_constr_key(_k, _v, _n, tbc->key_len, tbc->key, &no_kc, row_key); - if(no_kc != tbc->key_len) {/* was not able to construct the whole key */ - LM_ERR("Query not supported - key not provided\n"); - dbcassa_lock_release(tbc); - return ColumnVecPtr(NULL); - } - key_len = tbc->key_len; + if(no_kc != tbc->key_len) {/* was not able to construct the whole key */ + LM_ERR("Query not supported - key not provided\n"); + dbcassa_lock_release(tbc); + return ColumnVecPtr(NULL); + } + key_len = tbc->key_len; - cassa_constr_key(_k, _v, _n, tbc->seckey_len, tbc->sec_key, &no_sec_kc, sec_key); - seckey_len = tbc->seckey_len; + cassa_constr_key(_k, _v, _n, tbc->seckey_len, tbc->sec_key, &no_sec_kc, sec_key); + seckey_len = tbc->seckey_len; - dbcassa_lock_release(tbc); + dbcassa_lock_release(tbc); + } try { oac::SlicePredicate sp; @@ -514,7 +517,42 @@ ColumnVecPtr cassa_translate_query(const db1_con_t* _h, const db_key_t* _k, do { if(CON_CASSA(_h)->con) { try { - CON_CASSA(_h)->con->get_slice(*cassa_result, row_key, cparent, sp, oac::ConsistencyLevel::ONE); + + if(_k) { + CON_CASSA(_h)->con->get_slice(*cassa_result, row_key, cparent, sp, oac::ConsistencyLevel::ONE); + *ret_rows_no = 1; + } else { + oac::KeyRange keyRange; + keyRange.start_key = ""; + keyRange.start_key = ""; + std::vector<oac::KeySlice> key_slice_vect; + keyRange.__isset.start_key = 1; + keyRange.__isset.end_key = 1; + ColumnVec::iterator it = cassa_result->begin(); + + /* get in a loop 100 records at a time */ + int rows_no =0; + while(1) { + CON_CASSA(_h)->con->get_range_slices(key_slice_vect, cparent, sp, keyRange, oac::ConsistencyLevel::ONE); + /* construct cassa_result */ + LM_DBG("Retuned %d key slices\n", key_slice_vect.size()); + for(unsigned int i = 0; i< key_slice_vect.size(); i++) { + if(key_slice_vect[i].columns.size()==0) { + continue; + } + cassa_result->insert(it, key_slice_vect[i].columns.begin(), key_slice_vect[i].columns.end()); + it = cassa_result->begin(); + row_slices[rows_no][0] = cassa_result->size(); + row_slices[rows_no][1] = 0; + rows_no++; + } + if(key_slice_vect.size() < (unsigned int)keyRange.count) + break; + } + + *ret_rows_no = rows_no; + } + return cassa_result; } catch (const att::TTransportException &tx) { LM_ERR("Failed to query: %s\n", tx.what()); @@ -571,7 +609,7 @@ int db_cassa_query(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op, /** Construct and send the query to Cassandra Cluster **/ - cassa_result = cassa_translate_query(_h, _k, _v, _c, _n, _nc); + cassa_result = cassa_translate_query(_h, _k, _v, _c, _n, _nc, &rows_no); if(cassa_result.get() == NULL) { LM_ERR("Failed to query Cassandra cluster\n"); @@ -626,6 +664,7 @@ int db_cassa_query(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op, LM_DBG("RES_NAMES(%p)[%d]=[%.*s]\n", RES_NAMES(db_res)[col], col, RES_NAMES(db_res)[col]->len, RES_NAMES(db_res)[col]->s); } + /* TODO if all columns asked - take from table schema */ seckey_len = tbc->seckey_len; dbcassa_lock_release(tbc); @@ -636,16 +675,11 @@ int db_cassa_query(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op, } /* Initialize the row_slices vector for the case with one column and no secondary key */ - row_slices[0][0]= cassa_result->size(); - row_slices[0][1]= 0; - - if(seckey_len) { /* if the table has a secondary key defined */ -/* if the secondary key was computed */ -/* if (no_sec_kc == seckey_len) { - rows_no = 1; - row_slices[0][1] = strlen(sec_key) + 1; - } - else */ { + if(rows_no == 1) { + row_slices[0][0]= cassa_result->size(); + row_slices[0][1]= 0; + + if(seckey_len) { /* if the table has a secondary key defined */ /* pass through the result once to see how many rows there are */ rows_no = cassa_result_separate_rows(*cassa_result); if(rows_no < 0) { @@ -654,8 +688,6 @@ int db_cassa_query(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op, } } } - else - rows_no = 1; RES_ROW_N(db_res) = rows_no; diff --git a/modules/db_cassandra/doc/db_cassandra_admin.xml b/modules/db_cassandra/doc/db_cassandra_admin.xml index f6566b8..1a59500 100644 --- a/modules/db_cassandra/doc/db_cassandra_admin.xml +++ b/modules/db_cassandra/doc/db_cassandra_admin.xml @@ -40,7 +40,7 @@ servers, with more proxies and registration servers accessing the same location database. This was actually the main use case we had in mind when implementing this module. Please NOTE that it has only been tested with the - <emphasis>usrloc</emphasis> and <emphasis>auth_db</emphasis> modules. + <emphasis>usrloc</emphasis>, <emphasis>auth_db</emphasis> and <emphasis>domain</emphasis> modules. </para> <para> You can find a configuration file example for this usage in the module - kamailio_cassa.cfg.

1 0

Commit 6aaba8e96fc87e1938b7abfdb5964714e4adfa3c messed up with license statement in atomic_alpha.h
by Andrey 23 Jan '12

23 Jan '12

Hi, The commit 6aaba8e96fc87e1938b7abfdb5964714e4adfa3c messed up a little with the license in atomic/atomic_alpha.h The attached patch is intended to fix this. More details on the original commit: """ URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6aaba8e… Author: Henning Westerholt <henning.westerholt at 1und1.de> Committer: Henning Westerholt <henning.westerholt at 1und1.de> Date: Thu Jun 23 23:39:01 2011 +0200 doxygen: convert existing docs to use proper doxygen structures and groups, small cleanups """ -- Andrey Mazo.

2 2

← Newer
1
...
5
6
7
8
9
10
11
...
17
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 2012