sr-dev January 2012

sr-dev@lists.kamailio.org

25 participants
166 discussions

New feature: embedded MSRP relay
by Daniel-Constantin Mierla 18 Jan '12

18 Jan '12

Hello, a new module is now on development branch, named msrp, offering an embedded MSRP relay. Message Session Relay Protocol is specified by IETF ( core and relay part in RFC4975 and RFC4976), one of typical use cases is Instant Messaging sessions negotiated via INVITE-200ok-ACK, a different approach than SIP MESSAGE request. There is no external dependency, the transport layer from core is reused to manage TCP/TLS connections used for MSRP. A MSRP relay is pretty much an independent node, thus you can run Kamailio just to deal with MSRP traffic. But there is no problem to run Kamailio to handle SIP and MSRP traffic in the same instance, same or different sockets (it is working even when SIP/MSRP are sent over the same connection or different connections to same port). I couldn't find a reliable and trustable open source SIP phone to test with it so far (hints are welcome), the module was tested with network tools and chaining Kamailio instances. Help with testing and feedback is very appreciated -- I can provide guidelines to adjust the config file to fit tester's needs, just contact me off list or via IRC channel. For the moment, the relation (user,session) management is done in the config, using htable module for example (see the README), it may be added inside the module for the future to make it easier overall, although is less than 10 lines of config -- this is mainly for extra security reasons, to check if the session id matches the connection that was opened when the session was created, otherwise the user authentication functionality is done reusing existing functions from auth module. Another benefit is performances, storing local socket and connection IP/port saves some time to lookup the connection. Building MSRP relay on top of SIP server was done first for the benefit of reusing the transport layer from the core for IPv4/IPv6 and TCP/TLS, which is mature, scalable and offers asynchronous communication. Besides that, you have most of the config tools to route SIP requests available for routing MSRP (authentication, authorization, IP checking, accounting, a.s.o.). I made a news post with more details: * http://www.kamailio.org/w/2012/01/new-module-embedded-msrp-relay/ The readme of the new module is available at: * http://kamailio.org/docs/modules/devel/modules/msrp.html Cheers, Daniel -- Daniel-Constantin Mierla -- http://www.asipto.com http://linkedin.com/in/miconda -- http://twitter.com/miconda

3 4

git:master: rtimer: use faked msg from lib to get a src IP address
by Daniel-Constantin Mierla 18 Jan '12

18 Jan '12

Module: sip-router Branch: master Commit: 6c829c1794fb79fbce213238e88346522f584fcf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6c829c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 18 10:19:18 2012 +0100 rtimer: use faked msg from lib to get a src IP address - reported by Uri Shacked --- modules_k/rtimer/Makefile | 3 ++ modules_k/rtimer/rtimer_mod.c | 44 +++++++++++++--------------------------- 2 files changed, 17 insertions(+), 30 deletions(-) diff --git a/modules_k/rtimer/Makefile b/modules_k/rtimer/Makefile index 8a0b3be..bb3d573 100644 --- a/modules_k/rtimer/Makefile +++ b/modules_k/rtimer/Makefile @@ -12,4 +12,7 @@ LIBS= DEFS+=-DOPENSER_MOD_INTERFACE +SERLIBPATH=../../lib +SER_LIBS+=$(SERLIBPATH)/kcore/kcore + include ../../Makefile.modules diff --git a/modules_k/rtimer/rtimer_mod.c b/modules_k/rtimer/rtimer_mod.c index 97719d7..03a002d 100644 --- a/modules_k/rtimer/rtimer_mod.c +++ b/modules_k/rtimer/rtimer_mod.c @@ -40,6 +40,7 @@ #include "../../timer_proc.h" #include "../../script_cb.h" #include "../../parser/parse_param.h" +#include "../../lib/kcore/faked_msg.h" MODULE_VERSION @@ -96,11 +97,6 @@ struct module_exports exports= { }; -#define STM_SIP_MSG "OPTIONS sip:you@kamailio.org SIP/2.0\r\nVia: SIP/2.0/UDP 127.0.0.1\r\nFrom: <you(a)kamailio.org>;tag=123\r\nTo: <you(a)kamailio.org>\r\nCall-ID: 123\r\nCSeq: 1 OPTIONS\r\nContent-Length: 0\r\n\r\n" -#define STM_SIP_MSG_LEN (sizeof(STM_SIP_MSG)-1) -static char _stm_sip_buf[STM_SIP_MSG_LEN+1]; -static struct sip_msg _stm_msg; -static unsigned int _stm_msg_no = 1; /** * init module function */ @@ -110,6 +106,14 @@ static int mod_init(void) if(_stm_list==NULL) return 0; + /* init faked sip msg */ + if(faked_msg_init()<0) + { + LM_ERR("failed to init timer local sip msg\n"); + return -1; + } + + /* register timers */ it = _stm_list; while(it) { @@ -126,24 +130,6 @@ static int mod_init(void) it = it->next; } - /* init faked sip msg */ - memcpy(_stm_sip_buf, STM_SIP_MSG, STM_SIP_MSG_LEN); - _stm_sip_buf[STM_SIP_MSG_LEN] = '\0'; - - memset(&_stm_msg, 0, sizeof(struct sip_msg)); - - _stm_msg.buf=_stm_sip_buf; - _stm_msg.len=STM_SIP_MSG_LEN; - - _stm_msg.set_global_address=default_global_address; - _stm_msg.set_global_port=default_global_port; - - if (parse_msg(_stm_msg.buf, _stm_msg.len, &_stm_msg)!=0) - { - LM_ERR("parse_msg failed\n"); - return -1; - } - return 0; } @@ -188,7 +174,7 @@ void stm_timer_exec(unsigned int ticks, void *param) { stm_timer_t *it; stm_route_t *rt; - + sip_msg_t *fmsg; if(param==NULL) return; @@ -198,14 +184,12 @@ void stm_timer_exec(unsigned int ticks, void *param) for(rt=it->rt; rt; rt=rt->next) { - /* update local parameters */ - _stm_msg.id=_stm_msg_no++; - clear_branches(); - if (exec_pre_script_cb(&_stm_msg, REQUEST_CB_TYPE)==0 ) + fmsg = faked_msg_next(); + if (exec_pre_script_cb(fmsg, REQUEST_CB_TYPE)==0 ) continue; /* drop the request */ set_route_type(REQUEST_ROUTE); - run_top_route(main_rt.rlist[rt->route], &_stm_msg, 0); - exec_post_script_cb(&_stm_msg, REQUEST_CB_TYPE); + run_top_route(main_rt.rlist[rt->route], fmsg, 0); + exec_post_script_cb(fmsg, REQUEST_CB_TYPE); } }

1 0

git:master: Fixed compile warnings - casts from void at memory allocation
by Anca Vamanu 17 Jan '12

17 Jan '12

Module: sip-router Branch: master Commit: 13fb8f05cadae84fc2f3479edd873d0bb0a09a60 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=13fb8f0… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Tue Jan 17 11:02:50 2012 +0200 Fixed compile warnings - casts from void at memory allocation --- clist.h | 10 +++++----- str_hash.h | 2 +- ut.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/clist.h b/clist.h index c96a93e..124a83c 100644 --- a/clist.h +++ b/clist.h @@ -41,8 +41,8 @@ /*! \brief circular list */ #define clist_init(c, next, prev) \ do{ \ - (c)->next=(void*)(c); \ - (c)->prev=(void*)(c); \ + (c)->next=(struct str_hash_entry*)(void*)(c); \ + (c)->prev=(struct str_hash_entry*)(void*)(c); \ } while(0) @@ -57,7 +57,7 @@ */ #define clist_insert_sublist(head, s, e, next, prev) \ do{ \ - (s)->prev=(void*)(head); \ + (s)->prev=(struct str_hash_entry*)(void*)(head); \ (e)->next=(head)->next; \ (e)->next->prev=(e); \ (head)->next=s; \ @@ -91,8 +91,8 @@ * instead! */ #define clist_rm_sublist(s, e, next, prev) \ do{\ - (s)->prev->next=(e)->next; \ - (e)->next->prev=(s)->prev ; \ + (s)->prev->next=(struct str_hash_entry*)(e)->next; \ + (e)->next->prev=(struct str_hash_entry*)(s)->prev ; \ }while(0) diff --git a/str_hash.h b/str_hash.h index 1de9748..62423f1 100644 --- a/str_hash.h +++ b/str_hash.h @@ -66,7 +66,7 @@ struct str_hash_table{ /* returns 0 on success, <0 on failure */ inline static int str_hash_alloc(struct str_hash_table* ht, int size) { - ht->table=pkg_malloc(sizeof(struct str_hash_head)*size); + ht->table=(struct str_hash_head*)pkg_malloc(sizeof(struct str_hash_head)*size); if (ht->table==0) return -1; ht->size=size; diff --git a/ut.h b/ut.h index eaec93f..d7d09e6 100644 --- a/ut.h +++ b/ut.h @@ -695,7 +695,7 @@ static inline int str2sint(str* _s, int* _r) */ static inline int shm_str_dup(str* dst, const str* src) { - dst->s = shm_malloc(src->len); + dst->s = (char*)shm_malloc(src->len); if (!dst->s) { SHM_MEM_ERROR; return -1; @@ -717,7 +717,7 @@ static inline int shm_str_dup(str* dst, const str* src) */ static inline int pkg_str_dup(str* dst, const str* src) { - dst->s = pkg_malloc(src->len); + dst->s = (char*)pkg_malloc(src->len); if (dst->s==NULL) { PKG_MEM_ERROR;

3 4

git:master: clist.h Rever last changes
by Anca Vamanu 17 Jan '12

17 Jan '12

Module: sip-router Branch: master Commit: 5b2134e3d78c4874263e20581cafad9fb44391ab URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5b2134e… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Tue Jan 17 16:23:17 2012 +0200 clist.h Rever last changes Wrong casts --- clist.h | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/clist.h b/clist.h index 124a83c..c96a93e 100644 --- a/clist.h +++ b/clist.h @@ -41,8 +41,8 @@ /*! \brief circular list */ #define clist_init(c, next, prev) \ do{ \ - (c)->next=(struct str_hash_entry*)(void*)(c); \ - (c)->prev=(struct str_hash_entry*)(void*)(c); \ + (c)->next=(void*)(c); \ + (c)->prev=(void*)(c); \ } while(0) @@ -57,7 +57,7 @@ */ #define clist_insert_sublist(head, s, e, next, prev) \ do{ \ - (s)->prev=(struct str_hash_entry*)(void*)(head); \ + (s)->prev=(void*)(head); \ (e)->next=(head)->next; \ (e)->next->prev=(e); \ (head)->next=s; \ @@ -91,8 +91,8 @@ * instead! */ #define clist_rm_sublist(s, e, next, prev) \ do{\ - (s)->prev->next=(struct str_hash_entry*)(e)->next; \ - (e)->next->prev=(struct str_hash_entry*)(s)->prev ; \ + (s)->prev->next=(e)->next; \ + (e)->next->prev=(s)->prev ; \ }while(0)

1 0

new developer: Anca Vamanu
by Henning Westerholt 17 Jan '12

17 Jan '12

Hello all, I'm happy to announce a new developer for the project: Anca Vamanu. Welcome to the development team! Anca joined 1&1 last year and worked since then on several internal modules and also many important bug fixes for our kamailio server setup. She is a experienced C and C++ developer and contributed in the past a lot to OpenSER and other VoIP projects. One interesting work she just finished and that we also like to contribute to the community is a db_cassandra module, providing access to this NoSQL database [1] from kamailio. She will take over the maintenance of this module and also work on improving other parts of the server. Best regards, Henning [1] http://cassandra.apache.org/ -- Henning Westerholt - Head of IT Operations Internet Access & Communications 1&1 Internet AG, Brauerstraße 48, 76135 Karlsruhe, Germany

4 3

git:master: modules/usrloc Added module parameter to work with db_cassandra
by Anca Vamanu 17 Jan '12

17 Jan '12

Module: sip-router Branch: master Commit: d66b99030debbca3f52cc57c82bedc99e823e51c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d66b990… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Tue Jan 17 11:09:11 2012 +0200 modules/usrloc Added module parameter to work with db_cassandra New module parameter db_update_as_insert. If set to 1 it will replace update operations with insert operations as required by the db_cassandra module. --- modules_k/usrloc/README | 17 ++++++++++ modules_k/usrloc/doc/usrloc_admin.xml | 22 +++++++++++++ modules_k/usrloc/ucontact.c | 9 +++++- modules_k/usrloc/ul_mod.c | 53 +++++++++++++++++--------------- modules_k/usrloc/ul_mod.h | 1 + modules_k/usrloc/urecord.c | 7 ++++- 6 files changed, 82 insertions(+), 27 deletions(-) diff --git a/modules_k/usrloc/README b/modules_k/usrloc/README index abd7ef1..de6c441 100644 --- a/modules_k/usrloc/README +++ b/modules_k/usrloc/README @@ -61,6 +61,7 @@ Bogdan-Andrei Iancu 3.23. fetch_rows (integer) 3.24. hash_size (integer) 3.25. preload (string) + 3.26. db_update_as_insert (string) 4. Functions 5. MI Commands @@ -130,6 +131,7 @@ Bogdan-Andrei Iancu 1.23. Set fetch_rows parameter 1.24. Set hash_size parameter 1.25. Set preload parameter + 1.26. Set db_update_as_insert parameter Chapter 1. Admin Guide @@ -171,6 +173,7 @@ Chapter 1. Admin Guide 3.23. fetch_rows (integer) 3.24. hash_size (integer) 3.25. preload (string) + 3.26. db_update_as_insert (string) 4. Functions 5. MI Commands @@ -272,6 +275,7 @@ Chapter 1. Admin Guide 3.23. fetch_rows (integer) 3.24. hash_size (integer) 3.25. preload (string) + 3.26. db_update_as_insert (string) 3.1. nat_bflag (integer) @@ -616,6 +620,19 @@ modparam("usrloc", "hash_size", 10) modparam("usrloc", "preload", "location") ... +3.26. db_update_as_insert (string) + + Set this parameter if you want to do INSERT DB operations instead of + UPDATE DB operations. It is recommended to set this parameter if you + use Cassandra as a DB backend. + + Default value is “0”. + + Example 1.26. Set db_update_as_insert parameter +... +modparam("usrloc", "db_update_as_insert", 1) +... + 4. Functions There are no exported functions that could be used in scripts. diff --git a/modules_k/usrloc/doc/usrloc_admin.xml b/modules_k/usrloc/doc/usrloc_admin.xml index 7edf15b..2a6f640 100644 --- a/modules_k/usrloc/doc/usrloc_admin.xml +++ b/modules_k/usrloc/doc/usrloc_admin.xml @@ -713,6 +713,28 @@ modparam("usrloc", "preload", "location") </example> </section> + <section id="db_update_as_insert"> + <title><varname>db_update_as_insert</varname> (string)</title> + <para> + Set this parameter if you want to do INSERT DB operations + instead of UPDATE DB operations. It is recommended to set this parameter + if you use Cassandra as a DB backend. + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>db_update_as_insert</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "db_update_as_insert", 1) +... +</programlisting> + </example> + </section> + </section> <section> diff --git a/modules_k/usrloc/ucontact.c b/modules_k/usrloc/ucontact.c index 5e88a95..8e25d3f 100644 --- a/modules_k/usrloc/ucontact.c +++ b/modules_k/usrloc/ucontact.c @@ -792,6 +792,8 @@ static inline void update_contact_pos(struct urecord* _r, ucontact_t* _c) */ int update_ucontact(struct urecord* _r, ucontact_t* _c, ucontact_info_t* _ci) { + int res; + /* we have to update memory in any case, but database directly * only in db_mode 1 */ if (mem_update_ucontact( _c, _ci) < 0) { @@ -812,7 +814,12 @@ int update_ucontact(struct urecord* _r, ucontact_t* _c, ucontact_info_t* _ci) st_update_ucontact(_c); if (db_mode == WRITE_THROUGH || db_mode==DB_ONLY) { - if (db_update_ucontact(_c) < 0) { + if (ul_db_update_as_insert) + res = db_insert_ucontact(_c); + else + res = db_update_ucontact(_c); + + if (res < 0) { LM_ERR("failed to update database\n"); return -1; } else { diff --git a/modules_k/usrloc/ul_mod.c b/modules_k/usrloc/ul_mod.c index 17526f9..20fa67b 100644 --- a/modules_k/usrloc/ul_mod.c +++ b/modules_k/usrloc/ul_mod.c @@ -99,6 +99,8 @@ static int ul_preload_param(modparam_t type, void* val); extern int bind_usrloc(usrloc_api_t* api); extern int ul_locks_no; +int ul_db_update_as_insert = 0; + /* * Module parameters and their default values */ @@ -149,31 +151,32 @@ static cmd_export_t cmds[] = { * Exported parameters */ static param_export_t params[] = { - {"user_column", STR_PARAM, &user_col.s }, - {"domain_column", STR_PARAM, &domain_col.s }, - {"contact_column", STR_PARAM, &contact_col.s }, - {"expires_column", STR_PARAM, &expires_col.s }, - {"q_column", STR_PARAM, &q_col.s }, - {"callid_column", STR_PARAM, &callid_col.s }, - {"cseq_column", STR_PARAM, &cseq_col.s }, - {"flags_column", STR_PARAM, &flags_col.s }, - {"cflags_column", STR_PARAM, &cflags_col.s }, - {"db_url", STR_PARAM, &db_url.s }, - {"timer_interval", INT_PARAM, &timer_interval }, - {"db_mode", INT_PARAM, &db_mode }, - {"use_domain", INT_PARAM, &use_domain }, - {"desc_time_order", INT_PARAM, &desc_time_order }, - {"user_agent_column", STR_PARAM, &user_agent_col.s}, - {"received_column", STR_PARAM, &received_col.s }, - {"path_column", STR_PARAM, &path_col.s }, - {"socket_column", STR_PARAM, &sock_col.s }, - {"methods_column", STR_PARAM, &methods_col.s }, - {"matching_mode", INT_PARAM, &matching_mode }, - {"cseq_delay", INT_PARAM, &cseq_delay }, - {"fetch_rows", INT_PARAM, &ul_fetch_rows }, - {"hash_size", INT_PARAM, &ul_hash_size }, - {"nat_bflag", INT_PARAM, &nat_bflag }, - {"preload", STR_PARAM|USE_FUNC_PARAM, (void*)ul_preload_param}, + {"user_column", STR_PARAM, &user_col.s }, + {"domain_column", STR_PARAM, &domain_col.s }, + {"contact_column", STR_PARAM, &contact_col.s }, + {"expires_column", STR_PARAM, &expires_col.s }, + {"q_column", STR_PARAM, &q_col.s }, + {"callid_column", STR_PARAM, &callid_col.s }, + {"cseq_column", STR_PARAM, &cseq_col.s }, + {"flags_column", STR_PARAM, &flags_col.s }, + {"cflags_column", STR_PARAM, &cflags_col.s }, + {"db_url", STR_PARAM, &db_url.s }, + {"timer_interval", INT_PARAM, &timer_interval }, + {"db_mode", INT_PARAM, &db_mode }, + {"use_domain", INT_PARAM, &use_domain }, + {"desc_time_order", INT_PARAM, &desc_time_order }, + {"user_agent_column", STR_PARAM, &user_agent_col.s}, + {"received_column", STR_PARAM, &received_col.s }, + {"path_column", STR_PARAM, &path_col.s }, + {"socket_column", STR_PARAM, &sock_col.s }, + {"methods_column", STR_PARAM, &methods_col.s }, + {"matching_mode", INT_PARAM, &matching_mode }, + {"cseq_delay", INT_PARAM, &cseq_delay }, + {"fetch_rows", INT_PARAM, &ul_fetch_rows }, + {"hash_size", INT_PARAM, &ul_hash_size }, + {"nat_bflag", INT_PARAM, &nat_bflag }, + {"preload", STR_PARAM|USE_FUNC_PARAM, (void*)ul_preload_param}, + {"db_update_as_insert", INT_PARAM, &ul_db_update_as_insert}, {0, 0, 0} }; diff --git a/modules_k/usrloc/ul_mod.h b/modules_k/usrloc/ul_mod.h index 6ed97ca..85e4715 100644 --- a/modules_k/usrloc/ul_mod.h +++ b/modules_k/usrloc/ul_mod.h @@ -69,6 +69,7 @@ extern int desc_time_order; extern int cseq_delay; extern int ul_fetch_rows; extern int ul_hash_size; +extern int ul_db_update_as_insert; extern db1_con_t* ul_dbh; /* Database connection handle */ extern db_func_t ul_dbf; diff --git a/modules_k/usrloc/urecord.c b/modules_k/usrloc/urecord.c index 270d17f..accd0b6 100644 --- a/modules_k/usrloc/urecord.c +++ b/modules_k/usrloc/urecord.c @@ -311,6 +311,7 @@ static inline void wb_timer(urecord_t* _r) ucontact_t* ptr, *t; cstate_t old_state; int op; + int res; ptr = _r->contacts; @@ -354,7 +355,11 @@ static inline void wb_timer(urecord_t* _r) break; case 2: /* update */ - if (db_update_ucontact(ptr) < 0) { + if (ul_db_update_as_insert) + res = db_insert_ucontact(ptr); + else + res = db_update_ucontact(ptr); + if (res < 0) { LM_ERR("updating contact in db failed\n"); ptr->state = old_state; }

1 0

git:master: Makefile: excluded db_cassandra from default compiled modules
by Anca Vamanu 17 Jan '12

17 Jan '12

Module: sip-router Branch: master Commit: 9c74038a3e462b63b64eb6aad23bd07b177a6340 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9c74038… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Tue Jan 17 11:28:35 2012 +0200 Makefile: excluded db_cassandra from default compiled modules --- Makefile | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0a59f95..bb017d9 100644 --- a/Makefile +++ b/Makefile @@ -196,6 +196,9 @@ module_group_stable=cpl-c dbtext jabber osp sms pdb # not have dependencies module_group_experimental=tls oracle iptrtpproxy ndb_redis async +# For cassandra +module_group_cassandra_driver=db_cassandra +module_group_cassandra=$(module_group_cassandra_driver) $(module_group_db) ### Kamailio specific groups ### @@ -300,10 +303,10 @@ else exclude_modules?= cpl mangler postgres jabber mysql cpl-c \ auth_radius misc_radius avp_radius uri_radius \ acc_radius pa rls presence_b2b xcap xmlrpc\ - osp tls oracle \ + osp tls oracle cassandra \ unixsock dbg print_lib auth_identity ldap \ db_berkeley db_mysql db_postgres db_oracle \ - db_sqlite db_unixodbc memcached mi_xmlrpc \ + db_sqlite db_unixodbc db_cassandra memcached mi_xmlrpc \ perl perlvdb purple \ snmpstats xmpp \ carrierroute peering \

1 0

git:master: modules/ db_cassandra Added new module DB interface for Cassandra backend
by Anca Vamanu 17 Jan '12

17 Jan '12

Module: sip-router Branch: master Commit: c0a922014e1e648a07ee64177dca2108fca5b774 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c0a9220… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Tue Jan 17 10:47:20 2012 +0200 modules/db_cassandra Added new module DB interface for Cassandra backend The module implements a database driver and can be used by other modules to perform database operations instead of db_mysql, for example. It has some limitations in the conditions on which the queries are performed, so it does not suite every application. The module has been tested with auth_db and usrloc modules and it is very suited for implementing a distributed location service. Read more about it in the README file. --- modules/db_cassandra/Cassandra.cpp |11061 +++++++++++++++++++++++ modules/db_cassandra/Cassandra.h | 4093 +++++++++ modules/db_cassandra/Makefile | 44 + modules/db_cassandra/README | 227 + modules/db_cassandra/cassandra_constants.cpp | 18 + modules/db_cassandra/cassandra_constants.h | 24 + modules/db_cassandra/cassandra_types.cpp | 3250 +++++++ modules/db_cassandra/cassandra_types.h | 1520 ++++ modules/db_cassandra/db_cassandra.c | 150 + modules/db_cassandra/dbcassa_base.cpp | 1032 +++ modules/db_cassandra/dbcassa_base.h | 95 + modules/db_cassandra/dbcassa_table.c | 677 ++ modules/db_cassandra/dbcassa_table.h | 68 + modules/db_cassandra/doc/Makefile | 4 + modules/db_cassandra/doc/db_cassandra.xml | 34 + modules/db_cassandra/doc/db_cassandra_admin.xml | 279 + modules/db_cassandra/kamailio_cassa.cfg | 847 ++ 17 files changed, 23423 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=c0a…

1 0

git:master: Added schema files for db_cassandra module
by Anca Vamanu 17 Jan '12

17 Jan '12

Module: sip-router Branch: master Commit: 806db5e773e7d5289e68062cc9fbc61ad3637f19 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=806db5e… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Tue Jan 17 11:05:31 2012 +0200 Added schema files for db_cassandra module The schemas are for location, subscriber and version table. --- utils/kamctl/dbcassandra/openser/location | 3 +++ utils/kamctl/dbcassandra/openser/subscriber | 2 ++ utils/kamctl/dbcassandra/openser/version | 2 ++ 3 files changed, 7 insertions(+), 0 deletions(-) diff --git a/utils/kamctl/dbcassandra/openser/location b/utils/kamctl/dbcassandra/openser/location new file mode 100644 index 0000000..555aee3 --- /dev/null +++ b/utils/kamctl/dbcassandra/openser/location @@ -0,0 +1,3 @@ +callid(string) cflags(int) contact(string) cseq(int) expires(timestamp) flags(int) last_modified(int) methods(int) path(string) q(double) received(string) socket(string) user_agent(string) username(string) +username +contact diff --git a/utils/kamctl/dbcassandra/openser/subscriber b/utils/kamctl/dbcassandra/openser/subscriber new file mode 100644 index 0000000..08fc4b7 --- /dev/null +++ b/utils/kamctl/dbcassandra/openser/subscriber @@ -0,0 +1,2 @@ +username(string) domain(string) password(string) email_address(string) ha1(string) ha1b(string) rpid(string) +username domain diff --git a/utils/kamctl/dbcassandra/openser/version b/utils/kamctl/dbcassandra/openser/version new file mode 100644 index 0000000..582fcca --- /dev/null +++ b/utils/kamctl/dbcassandra/openser/version @@ -0,0 +1,2 @@ +table_name(string) table_version(int) +table_name

1 0

git:master: msrp: docs extended with more details about usage
by Daniel-Constantin Mierla 17 Jan '12

17 Jan '12

Module: sip-router Branch: master Commit: 0c95e9cd63b7e121e9f27f5f16efa9bd78bf5aec URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0c95e9c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 17 09:35:24 2012 +0100 msrp: docs extended with more details about usage --- modules/msrp/README | 74 ++++++++++++++++++++++++++++++- modules/msrp/doc/msrp_admin.xml | 91 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 161 insertions(+), 4 deletions(-) diff --git a/modules/msrp/README b/modules/msrp/README index d04692b..817ebfb 100644 --- a/modules/msrp/README +++ b/modules/msrp/README @@ -83,7 +83,7 @@ Chapter 1. Admin Guide 1. Overview - This module provides a MSRP routing engike, a.k.a. MSRP relay. MSRP + This module provides a MSRP routing engine, a.k.a. MSRP relay. MSRP (Message Session Relay Protocol) is defined by RFC4975, the extensions for a MSRP Relay being covered in RFC4976. @@ -105,6 +105,13 @@ Chapter 1. Admin Guide authentication, authorization to database connectors, security and DoS attacks protections. + Kamailio can handle SIP and MSRP traffic received on the same port, the + appropriate configuration file block being executed based on the type + of message. Therefore you can use Kamailio as a stand-alone MSRP relay + or have an instance handling both SIP and MSRP. Another option is to + configure Kamailio to listen on multiple ports, some of them being used + for SIP and others for MSRP. + 2. Dependencies 2.1. Kamailio Modules @@ -288,7 +295,66 @@ event_route[msrp:frame-in] { 7. Usage - Example routing block for MSRP frames. + When 'sipmsg' parameter is set to 1 (which is default), the module + builds internally a SIP request from the MSRP frame and gives it to the + config file interpreter, in this way all the functions that are valid + for SIP requests can be used safe in event_route[msrp:frame-in]. + + To build the SIP request, msrp module takes the first line and the + headers from a MSRP message and appends to a static buffer. Next two + examples show a MSRP frame and the resulted SIP request. +... +MSRP 6aef SEND +To-Path: msrps://a.example.org:9000/kjfjan;tcp \ + msrps://b.example.net:9000/aeiug;tcp \ + msrps://bob.example.net:8145/foo;tcp +From-Path: msrps://alice.example.org:7965/bar;tcp +Success-Report: yes +Byte-Range: 1-*/* +Message-ID: 87652 +Content-Type: text/plain + +Hi Bob, I'm about to send you a photo. +-------6aef$ +... +... +MSRP sip:a@127.0.0.1 SIP/2.0 +Via: SIP/2.0/UDP 127.0.0.1:9;branch=z9hG4bKa +From: <b(a)127.0.0.1>;tag=a +To: <a(a)127.0.0.1> +Call-ID: a +CSeq: 1 MSRP +Content-Length: 0 +MSRP-First-Line: MSRP 6aef SEND +To-Path: msrps://a.example.org:9000/kjfjan;tcp \ + msrps://b.example.net:9000/aeiug;tcp \ + msrps://bob.example.net:8145/foo;tcp +From-Path: msrps://alice.example.org:7965/bar;tcp +Success-Report: yes +Byte-Range: 1-*/* +Message-ID: 87652 +Content-Type: text/plain + +... + + Note that MSRP does not permit line folding. A "\" in the examples + shows a line continuation due to limitations in line length of this + document. Neither the backslash nor the extra CRLF is included in the + actual request or response. + + As it can be observed, the MSRP frame content starts with the body of + header 'MSRP-First-Line:'. Using a static content to get to a valid SIP + request is a perfect trade off for performances. + + Besides the option to access parts of MSRP frame via internally build + SIP message, msrp module exports a new pseudo-variable class $msrp(key) + which returns attributes from the MSRP frame. There is also a new + transformation, {msrpuri.key}, to get access to parts of a MSRP URI. + See the appropriate Wiki pages on the project's web site for full + details about new pseudo-variable and transformation classes. + + Next is an example of configuration file with the routing block for + MSRP frames. In this config, the SIP traffic is rejected. Example 1.9. Event Route ... @@ -332,6 +398,10 @@ request_route { exit; } +reply_route { + drop; +} + event_route[msrp:frame-in] { xdbg("============#[[$msrp(method)]]===========\n"); xdbg("============*[[$si:$sp]]\n"); diff --git a/modules/msrp/doc/msrp_admin.xml b/modules/msrp/doc/msrp_admin.xml index b10e1e3..1ac7039 100644 --- a/modules/msrp/doc/msrp_admin.xml +++ b/modules/msrp/doc/msrp_admin.xml @@ -16,7 +16,7 @@ <section> <title>Overview</title> <para> - This module provides a MSRP routing engike, a.k.a. MSRP relay. + This module provides a MSRP routing engine, a.k.a. MSRP relay. MSRP (Message Session Relay Protocol) is defined by RFC4975, the extensions for a MSRP Relay being covered in RFC4976. </para> @@ -41,6 +41,14 @@ authentication, authorization to database connectors, security and DoS attacks protections. </para> + <para> + &kamailio; can handle SIP and MSRP traffic received on the same port, + the appropriate configuration file block being executed based on the + type of message. Therefore you can use &kamailio; as a stand-alone + MSRP relay or have an instance handling both SIP and MSRP. Another + option is to configure &kamailio; to listen on multiple ports, some + of them being used for SIP and others for MSRP. + </para> </section> <section> @@ -321,7 +329,82 @@ event_route[msrp:frame-in] { <section> <title>Usage</title> <para> - Example routing block for MSRP frames. + When 'sipmsg' parameter is set to 1 (which is default), the module + builds internally a SIP request from the MSRP frame and gives it to + the config file interpreter, in this way all the functions that are + valid for SIP requests can be used safe in + event_route[msrp:frame-in]. + </para> + <para> + To build the SIP request, msrp module takes the first line and the + headers from a MSRP message and appends to a static buffer. Next + two examples show a MSRP frame and the resulted SIP request. + </para> + <programlisting format="linespecific"> +<![CDATA[ +... +MSRP 6aef SEND +To-Path: msrps://a.example.org:9000/kjfjan;tcp \ + msrps://b.example.net:9000/aeiug;tcp \ + msrps://bob.example.net:8145/foo;tcp +From-Path: msrps://alice.example.org:7965/bar;tcp +Success-Report: yes +Byte-Range: 1-*/* +Message-ID: 87652 +Content-Type: text/plain + +Hi Bob, I'm about to send you a photo. +-------6aef$ +... +]]> +</programlisting> + + <programlisting format="linespecific"> +<![CDATA[ +... +MSRP sip:a@127.0.0.1 SIP/2.0 +Via: SIP/2.0/UDP 127.0.0.1:9;branch=z9hG4bKa +From: <b(a)127.0.0.1>;tag=a +To: <a(a)127.0.0.1> +Call-ID: a +CSeq: 1 MSRP +Content-Length: 0 +MSRP-First-Line: MSRP 6aef SEND +To-Path: msrps://a.example.org:9000/kjfjan;tcp \ + msrps://b.example.net:9000/aeiug;tcp \ + msrps://bob.example.net:8145/foo;tcp +From-Path: msrps://alice.example.org:7965/bar;tcp +Success-Report: yes +Byte-Range: 1-*/* +Message-ID: 87652 +Content-Type: text/plain + +... +]]> +</programlisting> + <para> + Note that MSRP does not permit line folding. A "\" in the examples + shows a line continuation due to limitations in line length of this + document. Neither the backslash nor the extra CRLF is included in + the actual request or response. + </para> + <para> + As it can be observed, the MSRP frame content starts with the body + of header 'MSRP-First-Line:'. Using a static content to get to a + valid SIP request is a perfect trade off for performances. + </para> + <para> + Besides the option to access parts of MSRP frame via internally + build SIP message, msrp module exports a new pseudo-variable class + $msrp(key) which returns attributes from the MSRP frame. There is + also a new transformation, {msrpuri.key}, to get access to parts + of a MSRP URI. See the appropriate Wiki pages on the project's + web site for full details about new pseudo-variable and + transformation classes. + </para> + <para> + Next is an example of configuration file with the routing block + for MSRP frames. In this config, the SIP traffic is rejected. </para> <example> <title>Event Route</title> @@ -367,6 +450,10 @@ request_route { exit; } +reply_route { + drop; +} + event_route[msrp:frame-in] { xdbg("============#[[$msrp(method)]]===========\n"); xdbg("============*[[$si:$sp]]\n");

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
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