sr-dev August 2012

sr-dev@lists.kamailio.org

30 participants
170 discussions

git:3.3: modules/db_postgres: libpq requires null terminated string, but Kamailio internal str type is not (necessarily) null-terminated
by Peter Dunkley 21 Aug '12

21 Aug '12

Module: sip-router Branch: 3.3 Commit: fb51d3815292c27245b26d1f4a4f6c9b190f9200 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fb51d38… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Aug 21 15:19:51 2012 +0100 modules/db_postgres: libpq requires null terminated string, but Kamailio internal str type is not (necessarily) null-terminated - Found and fixed by Paul Pankhurst @ Crocodile RCS (cherry picked from commit f20713462410211370e762abb463f0ceafd36d8d) --- modules/db_postgres/km_dbase.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/modules/db_postgres/km_dbase.c b/modules/db_postgres/km_dbase.c index d2be696..6c21b05 100644 --- a/modules/db_postgres/km_dbase.c +++ b/modules/db_postgres/km_dbase.c @@ -163,6 +163,7 @@ void db_postgres_close(db1_con_t* _h) */ static int db_postgres_submit_query(const db1_con_t* _con, const str* _s) { + char *s=NULL; int i, retries; ExecStatusType pqresult; @@ -199,17 +200,29 @@ static int db_postgres_submit_query(const db1_con_t* _con, const str* _s) else retries = pg_retries; + s = pkg_malloc((_s->len+1)*sizeof(char)); + if (s==NULL) + { + LM_ERR("%p db_postgres_submit_query Out of Memory: Query: %.*s\n", _con, _s->len, _s->s); + return -1; + } + + memcpy( s, _s->s, _s->len ); + s[_s->len] = '\0'; + for(i = 0; i <= retries; i++) { /* free any previous query that is laying about */ db_postgres_free_query(_con); /* exec the query */ - if (PQsendQuery(CON_CONNECTION(_con), _s->s)) { + + if (PQsendQuery(CON_CONNECTION(_con), s)) { pqresult = PQresultStatus(CON_RESULT(_con)); if((pqresult!=PGRES_FATAL_ERROR) || (PQstatus(CON_CONNECTION(_con))==CONNECTION_OK)) { LM_DBG("sending query ok: %p (%d) - [%.*s]\n", _con, pqresult, _s->len, _s->s); + pkg_free(s); return 0; } LM_WARN("postgres result check failed with code %d (%s)\n", @@ -226,6 +239,7 @@ static int db_postgres_submit_query(const db1_con_t* _con, const str* _s) } LM_ERR("%p PQsendQuery Error: %s Query: %.*s\n", _con, PQerrorMessage(CON_CONNECTION(_con)), _s->len, _s->s); + pkg_free(s); return -1; }

1 0

git:3.3: modules_k/pua: transaction not ended before calling send_publish() from TM call-back
by Peter Dunkley 21 Aug '12

21 Aug '12

Module: sip-router Branch: 3.3 Commit: 9de930d083af681fc85fc4cee90dfadbbaadb89c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9de930d… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Aug 21 15:21:03 2012 +0100 modules_k/pua: transaction not ended before calling send_publish() from TM call-back - Found by Hugh Waite @ Crocodile RCS and fixed by Peter Dunkley @ Crocodile RCS (cherry picked from commit b9e77beaee850303ffa736cb4043d21a1806fa4f) --- modules_k/pua/send_publish.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/modules_k/pua/send_publish.c b/modules_k/pua/send_publish.c index 3bc8702..97935c1 100644 --- a/modules_k/pua/send_publish.c +++ b/modules_k/pua/send_publish.c @@ -207,6 +207,7 @@ void publ_cback_func(struct cell *t, int type, struct tmcb_params *ps) db1_res_t *res=NULL; ua_pres_t dbpres; str pres_uri={0,0}, watcher_uri={0,0}, extra_headers={0,0}; + int end_transaction = 1; memset(&dbpres, 0, sizeof(dbpres)); dbpres.pres_uri = &pres_uri; @@ -275,6 +276,17 @@ void publ_cback_func(struct cell *t, int type, struct tmcb_params *ps) publ.extra_headers= hentity->extra_headers; publ.cb_param= hentity->cb_param; + if (dbmode == PUA_DB_ONLY && pua_dbf.end_transaction) + { + if (pua_dbf.end_transaction(pua_db) < 0) + { + LM_ERR("in end_transaction\n"); + goto error; + } + } + + end_transaction = 0; + if(send_publish(&publ)< 0) { LM_ERR("when trying to send PUBLISH\n"); @@ -432,7 +444,7 @@ done: if (res) free_results_puadb(res); - if (dbmode == PUA_DB_ONLY && pua_dbf.end_transaction) + if (dbmode == PUA_DB_ONLY && pua_dbf.end_transaction && end_transaction) { if (pua_dbf.end_transaction(pua_db) < 0) {

1 0

git:3.3: modules_k/rls: Some incorrect pkg_free() calls in DB only code
by Peter Dunkley 21 Aug '12

21 Aug '12

Module: sip-router Branch: 3.3 Commit: aae4e4537eefa525d03874aaf165048a09d1febf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aae4e45… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Aug 21 15:21:54 2012 +0100 modules_k/rls: Some incorrect pkg_free() calls in DB only code - Found and fixed by Hugh Waite @ Crocodile RCS (cherry picked from commit 9b77e69de0953f9f6f48d4c1cf06f7e593469912) --- modules_k/rls/rls_db.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/modules_k/rls/rls_db.c b/modules_k/rls/rls_db.c index 052a0e7..97ac7d6 100644 --- a/modules_k/rls/rls_db.c +++ b/modules_k/rls/rls_db.c @@ -798,6 +798,13 @@ int get_dialog_subscribe_rlsdb(subs_t *subs) r_version = VAL_INT(&values[version_col]); r_record_route = (char *)VAL_STRING(&values[rroute_col]); + if ( r_remote_cseq >= subs->remote_cseq) + { + LM_DBG("stored cseq= %d\n", r_remote_cseq); + rls_dbf.free_result(rls_db, result); + return(401); /*stale cseq code */ + } + if(strlen(r_pres_uri) > 0) { subs->pres_uri.s = @@ -805,7 +812,6 @@ int get_dialog_subscribe_rlsdb(subs_t *subs) if(subs->pres_uri.s==NULL) { LM_ERR( "Out of Memory\n" ); - pkg_free(subs->pres_uri.s); rls_dbf.free_result(rls_db, result); return(-1); } @@ -814,13 +820,6 @@ int get_dialog_subscribe_rlsdb(subs_t *subs) subs->pres_uri.len= strlen(r_pres_uri); } - if ( r_remote_cseq >= subs->remote_cseq) - { - LM_DBG("stored cseq= %d\n", r_remote_cseq); - rls_dbf.free_result(rls_db, result); - return(401); /*stale cseq code */ - } - if(strlen(r_record_route) > 0) { subs->record_route.s = @@ -828,7 +827,6 @@ int get_dialog_subscribe_rlsdb(subs_t *subs) if(subs->record_route.s==NULL) { LM_ERR( "Out of Memory\n" ); - pkg_free(subs->record_route.s); rls_dbf.free_result(rls_db, result); return(-1); }

1 0

git:master: modules/db_postgres: libpq requires null terminated string, but Kamailio internal str type is not (necessarily) null-terminated
by Peter Dunkley 21 Aug '12

21 Aug '12

Module: sip-router Branch: master Commit: f20713462410211370e762abb463f0ceafd36d8d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f207134… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Aug 21 15:19:51 2012 +0100 modules/db_postgres: libpq requires null terminated string, but Kamailio internal str type is not (necessarily) null-terminated - Found and fixed by Paul Pankhurst @ Crocodile RCS --- modules/db_postgres/km_dbase.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/modules/db_postgres/km_dbase.c b/modules/db_postgres/km_dbase.c index d2be696..6c21b05 100644 --- a/modules/db_postgres/km_dbase.c +++ b/modules/db_postgres/km_dbase.c @@ -163,6 +163,7 @@ void db_postgres_close(db1_con_t* _h) */ static int db_postgres_submit_query(const db1_con_t* _con, const str* _s) { + char *s=NULL; int i, retries; ExecStatusType pqresult; @@ -199,17 +200,29 @@ static int db_postgres_submit_query(const db1_con_t* _con, const str* _s) else retries = pg_retries; + s = pkg_malloc((_s->len+1)*sizeof(char)); + if (s==NULL) + { + LM_ERR("%p db_postgres_submit_query Out of Memory: Query: %.*s\n", _con, _s->len, _s->s); + return -1; + } + + memcpy( s, _s->s, _s->len ); + s[_s->len] = '\0'; + for(i = 0; i <= retries; i++) { /* free any previous query that is laying about */ db_postgres_free_query(_con); /* exec the query */ - if (PQsendQuery(CON_CONNECTION(_con), _s->s)) { + + if (PQsendQuery(CON_CONNECTION(_con), s)) { pqresult = PQresultStatus(CON_RESULT(_con)); if((pqresult!=PGRES_FATAL_ERROR) || (PQstatus(CON_CONNECTION(_con))==CONNECTION_OK)) { LM_DBG("sending query ok: %p (%d) - [%.*s]\n", _con, pqresult, _s->len, _s->s); + pkg_free(s); return 0; } LM_WARN("postgres result check failed with code %d (%s)\n", @@ -226,6 +239,7 @@ static int db_postgres_submit_query(const db1_con_t* _con, const str* _s) } LM_ERR("%p PQsendQuery Error: %s Query: %.*s\n", _con, PQerrorMessage(CON_CONNECTION(_con)), _s->len, _s->s); + pkg_free(s); return -1; }

1 0

git:master: modules_k/rls: Some incorrect pkg_free() calls in DB only code
by Peter Dunkley 21 Aug '12

21 Aug '12

Module: sip-router Branch: master Commit: 9b77e69de0953f9f6f48d4c1cf06f7e593469912 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9b77e69… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Aug 21 15:21:54 2012 +0100 modules_k/rls: Some incorrect pkg_free() calls in DB only code - Found and fixed by Hugh Waite @ Crocodile RCS --- modules_k/rls/rls_db.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/modules_k/rls/rls_db.c b/modules_k/rls/rls_db.c index 052a0e7..97ac7d6 100644 --- a/modules_k/rls/rls_db.c +++ b/modules_k/rls/rls_db.c @@ -798,6 +798,13 @@ int get_dialog_subscribe_rlsdb(subs_t *subs) r_version = VAL_INT(&values[version_col]); r_record_route = (char *)VAL_STRING(&values[rroute_col]); + if ( r_remote_cseq >= subs->remote_cseq) + { + LM_DBG("stored cseq= %d\n", r_remote_cseq); + rls_dbf.free_result(rls_db, result); + return(401); /*stale cseq code */ + } + if(strlen(r_pres_uri) > 0) { subs->pres_uri.s = @@ -805,7 +812,6 @@ int get_dialog_subscribe_rlsdb(subs_t *subs) if(subs->pres_uri.s==NULL) { LM_ERR( "Out of Memory\n" ); - pkg_free(subs->pres_uri.s); rls_dbf.free_result(rls_db, result); return(-1); } @@ -814,13 +820,6 @@ int get_dialog_subscribe_rlsdb(subs_t *subs) subs->pres_uri.len= strlen(r_pres_uri); } - if ( r_remote_cseq >= subs->remote_cseq) - { - LM_DBG("stored cseq= %d\n", r_remote_cseq); - rls_dbf.free_result(rls_db, result); - return(401); /*stale cseq code */ - } - if(strlen(r_record_route) > 0) { subs->record_route.s = @@ -828,7 +827,6 @@ int get_dialog_subscribe_rlsdb(subs_t *subs) if(subs->record_route.s==NULL) { LM_ERR( "Out of Memory\n" ); - pkg_free(subs->record_route.s); rls_dbf.free_result(rls_db, result); return(-1); }

1 0

git:master: modules_k/pua: transaction not ended before calling send_publish() from TM call-back
by Peter Dunkley 21 Aug '12

21 Aug '12

Module: sip-router Branch: master Commit: b9e77beaee850303ffa736cb4043d21a1806fa4f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b9e77be… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Aug 21 15:21:03 2012 +0100 modules_k/pua: transaction not ended before calling send_publish() from TM call-back - Found by Hugh Waite @ Crocodile RCS and fixed by Peter Dunkley @ Crocodile RCS --- modules_k/pua/send_publish.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/modules_k/pua/send_publish.c b/modules_k/pua/send_publish.c index 3bc8702..97935c1 100644 --- a/modules_k/pua/send_publish.c +++ b/modules_k/pua/send_publish.c @@ -207,6 +207,7 @@ void publ_cback_func(struct cell *t, int type, struct tmcb_params *ps) db1_res_t *res=NULL; ua_pres_t dbpres; str pres_uri={0,0}, watcher_uri={0,0}, extra_headers={0,0}; + int end_transaction = 1; memset(&dbpres, 0, sizeof(dbpres)); dbpres.pres_uri = &pres_uri; @@ -275,6 +276,17 @@ void publ_cback_func(struct cell *t, int type, struct tmcb_params *ps) publ.extra_headers= hentity->extra_headers; publ.cb_param= hentity->cb_param; + if (dbmode == PUA_DB_ONLY && pua_dbf.end_transaction) + { + if (pua_dbf.end_transaction(pua_db) < 0) + { + LM_ERR("in end_transaction\n"); + goto error; + } + } + + end_transaction = 0; + if(send_publish(&publ)< 0) { LM_ERR("when trying to send PUBLISH\n"); @@ -432,7 +444,7 @@ done: if (res) free_results_puadb(res); - if (dbmode == PUA_DB_ONLY && pua_dbf.end_transaction) + if (dbmode == PUA_DB_ONLY && pua_dbf.end_transaction && end_transaction) { if (pua_dbf.end_transaction(pua_db) < 0) {

1 0

new feature: option to remove contacts based on sip nat keepalives
by Daniel-Constantin Mierla 21 Aug '12

21 Aug '12

Hello, over the weekend I committed the code that allows to remove contacts from location table if the device does not respond to several attempts of SIP nat keepalives (usually OPTIONS requests). The feature works only for SIP over UDP, being the only transport for which nathelper module sends keepalives (or sip ping requests as written in some docs). Also, the lack of keepalive reply is tracked only for location records stored in memory (so it does not work with db only mode for usrloc). This is because the keepalives are sent stateless, not using tm module, to avoid overloading of timers and shared memory when dealing with large subscriber base -- therefore the implementation is very lightweight in using resources, targeting of course scalability. Detection of replies for keepalives is done based on from tag which carries the internal unique id of the location contact (which is available from v3.3). In order to enable this feature you have to set the keepalive_timeout parameter of nathelper module -- that's the only addition you have to add to a config that sends SIP nat keepalives. Internally, the modules store the timestamp of the last SIP keepalive reply (nathelper detects the right reply and calls usrloc API for storing the timestamp in contact structure in memory). http://kamailio.org/docs/modules/devel/modules_k/nathelper.html#id2535244 Before sending a new keepalive to a contact, it is checking if the last keepalive reply is older than keepalive_timeout value and if yes, will lower the expires to 10 seconds (if the expires is higher). There is no special handling of keepalive reply codes, all of them will update the last keepalive timestamp. This feature should be useful in mobile networks, to avoid stacking lot of invalid contacts which could result in lot of branches causing many retransmissions. There is plant to go for tcp/tls as well and detect when the connection is down, but looks like no spare time in the near future. However, right now using set_forward_no_connect() will avoid trying to create new connections for natted uses whose registration connection is down. Testing and feedback will be welcome. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio Advanced Training, Seattle, USA, Sep 23-26, 2012 - http://asipto.com/u/katu Kamailio Practical Workshop, Netherlands, Sep 10-12, 2012 - http://asipto.com/u/kpw

4 3

git:3.1: mem: safety check for f_malloc to avoind inserting two times free fragments
by Anca Vamanu 20 Aug '12

20 Aug '12

Module: sip-router Branch: 3.1 Commit: 1db591ed633a101a150f9b66bf6556329590dc64 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1db591e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Mon Apr 2 09:50:17 2012 +0200 mem: safety check for f_malloc to avoind inserting two times free fragments (cherry picked from commit fbf65a9405e9d1618a94a1e4c23390b8575445b8) --- mem/f_malloc.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/mem/f_malloc.c b/mem/f_malloc.c index 6fa88c3..54cbb34 100644 --- a/mem/f_malloc.c +++ b/mem/f_malloc.c @@ -440,6 +440,11 @@ void fm_free(struct fm_block* qm, void* p) MDBG("fm_free: freeing block alloc'ed from %s: %s(%ld)\n", f->file, f->func, f->line); #endif + if(unlikely(f->u.nxt_free!=NULL)) { + LM_INFO("freeing a free fragment (%p/%p) - ignore\n", + f, p); + return; + } size=f->size; #if defined(DBG_F_MALLOC) || defined(MALLOC_STATS) qm->used-=size;

1 0

git:master: nathelper(k): hanlde sip ping replies
by Daniel-Constantin Mierla 20 Aug '12

20 Aug '12

Module: sip-router Branch: master Commit: a308226ced8b9807ee91f8e24c72d778e5a62e86 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a308226… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Aug 19 12:56:24 2012 +0200 nathelper(k): hanlde sip ping replies - new parameter 'keepalive_timeout' to detect if a contact does not reply to sip ping requests - default is 0 (feature disabled) - it should be few times more than natping_interval --- modules_k/nathelper/nathelper.c | 123 +++++++++++++++++++++++++++++++++++++- modules_k/nathelper/sip_pinger.h | 2 +- 2 files changed, 123 insertions(+), 2 deletions(-) diff --git a/modules_k/nathelper/nathelper.c b/modules_k/nathelper/nathelper.c index e5bfc89..c27d073 100644 --- a/modules_k/nathelper/nathelper.c +++ b/modules_k/nathelper/nathelper.c @@ -203,6 +203,7 @@ #include "../../parser/parse_to.h" #include "../../parser/parse_uri.h" #include "../../parser/parser_f.h" +#include "../../parser/parse_methods.h" #include "../../parser/sdp/sdp.h" #include "../../resolve.h" #include "../../timer.h" @@ -295,6 +296,7 @@ static int fix_nated_register_f(struct sip_msg *, char *, char *); static int fixup_fix_nated_register(void** param, int param_no); static int fixup_fix_sdp(void** param, int param_no); static int add_rcv_param_f(struct sip_msg *, char *, char *); +static int nh_sip_reply_received(sip_msg_t *msg); static void nh_timer(unsigned int, void *); static int mod_init(void); @@ -345,6 +347,8 @@ static char *natping_socket = 0; static int raw_sock = -1; static unsigned int raw_ip = 0; static unsigned short raw_port = 0; +static int nh_keepalive_timeout = 0; +static request_method_t sipping_method_id = 0; /*0-> disabled, 1 ->enabled*/ @@ -403,6 +407,8 @@ static param_export_t params[] = { {"sipping_bflag", INT_PARAM, &sipping_flag }, {"natping_processes", INT_PARAM, &natping_processes }, {"natping_socket", STR_PARAM, &natping_socket }, + {"keepalive_timeout", INT_PARAM, &nh_keepalive_timeout }, + {0, 0, 0} }; @@ -422,7 +428,7 @@ struct module_exports exports = { mod_pvs, /* exported pseudo-variables */ 0, /* extra processes */ mod_init, - 0, /* reply processing */ + nh_sip_reply_received, /* reply processing */ mod_destroy, /* destroy function */ child_init }; @@ -646,7 +652,16 @@ mod_init(void) LM_ERR("SIP ping enabled, but SIP ping method is empty!\n"); return -1; } + if(nh_keepalive_timeout>0 && ul.set_keepalive_timeout!=NULL) { + ul.set_keepalive_timeout(nh_keepalive_timeout); + } + sipping_method.len = strlen(sipping_method.s); + if(parse_method_name(&sipping_method, &sipping_method_id) < 0) { + LM_ERR("invalid SIP ping method [%.*s]!\n", sipping_method.len, + sipping_method.s); + return -1; + } sipping_from.len = strlen(sipping_from.s); exports.response_f = sipping_rpl_filter; init_sip_ping(); @@ -2000,3 +2015,109 @@ fix_nated_register_f(struct sip_msg* msg, char* str1, char* str2) return 1; } + +/** + * handle SIP replies + */ +static int nh_sip_reply_received(sip_msg_t *msg) +{ + to_body_t *fb; + str ruid; + str ah; + unsigned int aorhash; + char *p; + + if(nh_keepalive_timeout<=0) + return 1; + if(msg->cseq==NULL && ((parse_headers(msg, HDR_CSEQ_F, 0)==-1) + || (msg->cseq==NULL))) + { + LM_ERR("no CSEQ header\n"); + goto done; + } + if(sipping_method_id!=METHOD_UNDEF && sipping_method_id!=METHOD_OTHER) + { + if(get_cseq(msg)->method_id!=sipping_method_id) + goto done; + } else { + if(sipping_method_id==METHOD_OTHER) + { + if(get_cseq(msg)->method.len!=sipping_method.len) + goto done; + if(strncmp(get_cseq(msg)->method.s, sipping_method.s, + sipping_method.len)!=0) + goto done; + } else { + goto done; + } + } + /* there must be no second via */ + if ( ! (parse_headers(msg, HDR_VIA2_F, 0)==-1 + || (msg->via2==0) || (msg->via2->error!=PARSE_OK)) ) + goto done; + + /* from uri check */ + if((parse_from_header(msg))<0) + { + LM_ERR("cannot parse From header\n"); + goto done; + } + + fb = get_from(msg); + if(fb->uri.len!=sipping_from.len + || strncmp(fb->uri.s, sipping_from.s, sipping_from.len)!=0) + goto done; + + /* from-tag is: ruid-aorhash-counter */ + if(fb->tag_value.len<=0) + goto done; + + LM_DBG("checking nathelper keepalive reply [%.*s]\n", fb->tag_value.len, + fb->tag_value.s); + + /* skip counter */ + p = q_memrchr(fb->tag_value.s, '-', fb->tag_value.len); + if(p==NULL) { + LM_DBG("from tag format mismatch [%.*s]\n", fb->tag_value.len, + fb->tag_value.s); + goto done; + } + /* aor hash */ + ah.len = p - fb->tag_value.s; + aorhash = 0; + p = q_memrchr(fb->tag_value.s, '-', ah.len); + if(p==NULL) { + LM_DBG("from tag format mismatch [%.*s]!\n", fb->tag_value.len, + fb->tag_value.s); + goto done; + } + ah.s = p + 1; + ah.len = fb->tag_value.s + ah.len - ah.s; + + LM_DBG("aor hash string is [%.*s] (%d)\n", ah.len, ah.s, ah.len); + + if(ah.len<=0 || reverse_hex2int(ah.s, ah.len, &aorhash)<0) + { + LM_DBG("cannot get aor hash in [%.*s]\n", fb->tag_value.len, + fb->tag_value.s); + goto done; + } + LM_DBG("aor hash is [%u] string [%.*s]\n", aorhash, ah.len, ah.s); + + ruid.s = fb->tag_value.s; + ruid.len = ah.s - ruid.s - 1; + + if(ruid.len<=0) + { + LM_DBG("cannot get ruid in [%.*s]\n", fb->tag_value.len, + fb->tag_value.s); + goto done; + } + + LM_DBG("reply for keepalive of [%.*s:%u]\n", ruid.len, ruid.s, aorhash); + + ul.refresh_keepalive(aorhash, &ruid); +done: + /* let the core handle further the reply */ + return 1; +} diff --git a/modules_k/nathelper/sip_pinger.h b/modules_k/nathelper/sip_pinger.h index c6098b3..dce4bd8 100644 --- a/modules_k/nathelper/sip_pinger.h +++ b/modules_k/nathelper/sip_pinger.h @@ -129,7 +129,7 @@ static inline char* build_sipping(str *curi, struct socket_info* s, str *path, 1 + s->port_no_str.len + s_len(";branch=0") + (path->len ? (s_len(CRLF"Route: ") + path->len) : 0) + s_len(CRLF"From: ") + sipping_from.len + s_len(";tag=") + - sipping_from.len + 1 + 8 + 1 + 8 + + ruid->len + 1 + 8 + 1 + 8 + s_len(CRLF"To: ") + curi->len + s_len(CRLF"Call-ID: ") + sipping_callid.len + 1 + 8 + 1 + 8 + 1 + s->address_str.len +

2 3

git:master: usrloc(k): keep time of the last keepalive for natted UDP contacts
by Daniel-Constantin Mierla 20 Aug '12

20 Aug '12

Module: sip-router Branch: master Commit: 36845cc575f36a62d88b0e10826c04d63edbd536 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=36845cc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Aug 19 13:01:36 2012 +0200 usrloc(k): keep time of the last keepalive for natted UDP contacts - new field in the contact structure to keep the timestamp when that conctact was refreshed by keepalive or registration update - it is taken in cosideration to remove contacts that don't reply to nat ping requests, so it works only together with nathelper module - when an UDP contact is not resposive for an interval of time, the contact is set to expire is 10 seconds. This process takes place in the function that fetches the list of contacts for nat pinging - last_modified and last_keepalive are exported to mi and rpc list commands --- modules_k/usrloc/dlist.c | 71 +++++++++++++++++++++++++++++++++++++++++++ modules_k/usrloc/ucontact.c | 2 + modules_k/usrloc/ul_mi.c | 15 +++++++++ modules_k/usrloc/ul_mod.c | 1 + modules_k/usrloc/ul_mod.h | 7 ++++ modules_k/usrloc/ul_rpc.c | 16 ++++++++++ modules_k/usrloc/usrloc.c | 20 +++++++++--- modules_k/usrloc/usrloc.h | 10 ++++++ 8 files changed, 137 insertions(+), 5 deletions(-) diff --git a/modules_k/usrloc/dlist.c b/modules_k/usrloc/dlist.c index 2f55ce7..3cc520d 100644 --- a/modules_k/usrloc/dlist.c +++ b/modules_k/usrloc/dlist.c @@ -307,6 +307,12 @@ static inline int get_all_mem_ucontacts(void *buf, int len, unsigned int flags, int i = 0; cp = buf; shortage = 0; + time_t tnow = 0; + + + if(ul_keepalive_timeout>0) + tnow = time(NULL); + /* Reserve space for terminating 0000 */ len -= sizeof(c->c.len); @@ -333,6 +339,22 @@ static inline int get_all_mem_ucontacts(void *buf, int len, unsigned int flags, */ if ((c->cflags & flags) != flags) continue; + + if(ul_keepalive_timeout>0 && c->last_keepalive>0) + { + if((c->cflags & nat_bflag) != 0 && c->sock!=NULL + && c->sock->proto==PROTO_UDP) + { + if(c->last_keepalive+ul_keepalive_timeout < tnow) + { + /* set contact as expired in 10s */ + if(c->expires > tnow + 10) + c->expires = tnow + 10; + continue; + } + } + } + if (c->received.s) { needed = (int)(sizeof(c->received.len) + c->received.len @@ -457,6 +479,55 @@ int get_all_ucontacts(void *buf, int len, unsigned int flags, +/** + * + */ +int ul_refresh_keepalive(unsigned int _aorhash, str *_ruid) +{ + dlist_t *p; + urecord_t *r; + ucontact_t *c; + int i; + + /* todo: get location domain via param */ + + for (p = root; p != NULL; p = p->next) + { + i = _aorhash&(p->d->size-1); + lock_ulslot(p->d, i); + if(p->d->table[i].n<=0) + { + unlock_ulslot(p->d, i); + continue; + } + for (r = p->d->table[i].first; r != NULL; r = r->next) + { + if(r->aorhash==_aorhash) + { + for (c = r->contacts; c != NULL; c = c->next) + { + if (c->c.len <= 0 || c->ruid.len<=0) + continue; + if(c->ruid.len==_ruid->len + && !memcmp(c->ruid.s, _ruid->s, _ruid->len)) + { + /* found */ + c->last_keepalive = time(NULL); + LM_DBG("updated keepalive for [%.*s:%u] to %u\n", + _ruid->len, _ruid->s, _aorhash, + (unsigned int)c->last_keepalive); + unlock_ulslot(p->d, i); + return 0; + } + } + } + } + unlock_ulslot(p->d, i); + } + + return 0; +} + /*! * \brief Create a new domain structure * \return 0 if everything went OK, otherwise value < 0 is returned diff --git a/modules_k/usrloc/ucontact.c b/modules_k/usrloc/ucontact.c index ac76e9b..dba66be 100644 --- a/modules_k/usrloc/ucontact.c +++ b/modules_k/usrloc/ucontact.c @@ -96,6 +96,7 @@ ucontact_t* new_ucontact(str* _dom, str* _aor, str* _contact, ucontact_info_t* _ c->methods = _ci->methods; c->reg_id = _ci->reg_id; c->last_modified = _ci->last_modified; + c->last_keepalive = _ci->last_modified; return c; error: @@ -250,6 +251,7 @@ int mem_update_ucontact(ucontact_t* _c, ucontact_info_t* _ci) _c->cseq = _ci->cseq; _c->methods = _ci->methods; _c->last_modified = _ci->last_modified; + _c->last_keepalive = _ci->last_modified; _c->flags = _ci->flags; _c->cflags = _ci->cflags; diff --git a/modules_k/usrloc/ul_mi.c b/modules_k/usrloc/ul_mi.c index ca7c71a..66c85ca 100644 --- a/modules_k/usrloc/ul_mi.c +++ b/modules_k/usrloc/ul_mi.c @@ -259,6 +259,21 @@ static inline int mi_add_aor_node(struct mi_node *parent, urecord_t* r, time_t t node = add_mi_node_child( cnode, MI_DUP_VALUE, "Reg-Id", 6, p, len); if (node==0) return -1; + + /* last keepalive */ + p = int2str((unsigned long)c->last_keepalive, &len); + node = add_mi_node_child( cnode, MI_DUP_VALUE, "Last-Keepalive", + 14, p, len); + if (node==0) + return -1; + + /* last modified */ + p = int2str((unsigned long)c->last_modified, &len); + node = add_mi_node_child( cnode, MI_DUP_VALUE, "Last-Modified", + 13, p, len); + if (node==0) + return -1; + } /* for */ return 0; diff --git a/modules_k/usrloc/ul_mod.c b/modules_k/usrloc/ul_mod.c index a6e7ebd..7b6af79 100644 --- a/modules_k/usrloc/ul_mod.c +++ b/modules_k/usrloc/ul_mod.c @@ -108,6 +108,7 @@ extern int ul_locks_no; int ul_db_update_as_insert = 0; int ul_timer_procs = 0; int ul_db_check_update = 0; +int ul_keepalive_timeout = 0; /* sruid to get internal uid for mi/rpc commands */ sruid_t _ul_sruid; diff --git a/modules_k/usrloc/ul_mod.h b/modules_k/usrloc/ul_mod.h index 30b8885..e10b2c8 100644 --- a/modules_k/usrloc/ul_mod.h +++ b/modules_k/usrloc/ul_mod.h @@ -74,6 +74,13 @@ extern int ul_fetch_rows; extern int ul_hash_size; extern int ul_db_update_as_insert; extern int ul_db_check_update; +extern int ul_keepalive_timeout; + +/*! nat branch flag */ +extern unsigned int nat_bflag; +/*! flag to protect against wrong initialization */ +extern unsigned int init_flag; + extern db1_con_t* ul_dbh; /* Database connection handle */ extern db_func_t ul_dbf; diff --git a/modules_k/usrloc/ul_rpc.c b/modules_k/usrloc/ul_rpc.c index 49cae17..38c1a61 100644 --- a/modules_k/usrloc/ul_rpc.c +++ b/modules_k/usrloc/ul_rpc.c @@ -287,6 +287,22 @@ static void ul_rpc_dump(rpc_t* rpc, void* ctx) "Internal error adding reg_id"); return; } + if(rpc->struct_add(vh, "d", + "Last-Keepalive", (int)c->last_keepalive)<0) + { + unlock_ulslot( dom, i); + rpc->fault(ctx, 500, + "Internal error adding reg_id"); + return; + } + if(rpc->struct_add(vh, "d", + "Last-Modified", (int)c->last_modified)<0) + { + unlock_ulslot( dom, i); + rpc->fault(ctx, 500, + "Internal error adding reg_id"); + return; + } } } diff --git a/modules_k/usrloc/usrloc.c b/modules_k/usrloc/usrloc.c index 8c3408f..ba0ec1a 100644 --- a/modules_k/usrloc/usrloc.c +++ b/modules_k/usrloc/usrloc.c @@ -41,11 +41,6 @@ #include "../../sr_module.h" #include "ul_mod.h" -/*! nat branch flag */ -extern unsigned int nat_bflag; -/*! flag to protect against wrong initialization */ -extern unsigned int init_flag; - /*! * \brief usrloc module API export bind function @@ -83,9 +78,24 @@ int bind_usrloc(usrloc_api_t* api) api->get_urecord_by_ruid = get_urecord_by_ruid; api->get_ucontact_by_instance = get_ucontact_by_instance; + api->set_keepalive_timeout = ul_set_keepalive_timeout; + api->refresh_keepalive = ul_refresh_keepalive; + api->use_domain = use_domain; api->db_mode = db_mode; api->nat_flag = nat_bflag; return 0; } + +/** + * + */ +int ul_set_keepalive_timeout(int _to) +{ + int oto; + + oto = ul_keepalive_timeout; + ul_keepalive_timeout = _to; + return oto; +} diff --git a/modules_k/usrloc/usrloc.h b/modules_k/usrloc/usrloc.h index bfd225a..214ac92 100644 --- a/modules_k/usrloc/usrloc.h +++ b/modules_k/usrloc/usrloc.h @@ -83,6 +83,7 @@ typedef struct ucontact { str user_agent; /*!< User-Agent header field */ struct socket_info *sock; /*!< received socket */ time_t last_modified; /*!< When the record was last modified */ + time_t last_keepalive; /*!< last keepalive timestamp */ unsigned int methods; /*!< Supported methods */ str instance; /*!< SIP instance value - gruu */ unsigned int reg_id; /*!< reg-id parameters */ @@ -170,6 +171,12 @@ typedef int (*get_udomain_t)(const char* _n, udomain_t** _d); typedef unsigned int (*ul_get_aorhash_t)(str *_aor); unsigned int ul_get_aorhash(str *_aor); +typedef int (*ul_set_keepalive_timeout_t)(int _to); +int ul_set_keepalive_timeout(int _to); + +typedef int (*ul_refresh_keepalive_t)(unsigned int _aorhash, str *_ruid); +int ul_refresh_keepalive(unsigned int _aorhash, str *_ruid); + /*! usrloc API export structure */ typedef struct usrloc_api { int use_domain; /*! use_domain module parameter */ @@ -198,6 +205,9 @@ typedef struct usrloc_api { register_ulcb_t register_ulcb; ul_get_aorhash_t get_aorhash; + + ul_set_keepalive_timeout_t set_keepalive_timeout; + ul_refresh_keepalive_t refresh_keepalive; } usrloc_api_t;

2 1

← Newer
1
2
3
4
5
6
7
8
9
...
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 August 2012