sr-dev January 2014

sr-dev@lists.kamailio.org

27 participants
210 discussions

git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router
by Richard Good 29 Jan '14

29 Jan '14

Module: sip-router Branch: master Commit: 5b21e976eee13579a309a5626ff8d676fd1ccdc0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5b21e97… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Wed Jan 29 09:05:01 2014 +0200 Merge branch 'master' of ssh://git.sip-router.org/sip-router ---

1 1

git:master: modules/rls: Edit to cater for changed presence API
by Richard Good 29 Jan '14

29 Jan '14

Module: sip-router Branch: master Commit: 039c0c9f926c6f755211b5392f1ae4040a56d5ad URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=039c0c9… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Wed Jan 29 09:03:26 2014 +0200 modules/rls: Edit to cater for changed presence API Presence API has changed - delete_shtable now takes subs_t pointer instead of str to_tag to compare full dialog tag set --- modules/rls/notify.c | 2 +- modules/rls/rls.c | 2 +- modules/rls/rls_db.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/rls/notify.c b/modules/rls/notify.c index eb6a0e1..782a041 100644 --- a/modules/rls/notify.c +++ b/modules/rls/notify.c @@ -958,7 +958,7 @@ void rls_notify_callback( struct cell *t, int type, struct tmcb_params *ps) /* delete from cache table */ hash_code= core_hash(&subs.callid, &subs.to_tag , hash_size); - if(pres_delete_shtable(rls_table,hash_code, subs.to_tag)< 0) + if(pres_delete_shtable(rls_table,hash_code, &subs)< 0) { LM_ERR("record not found in hash table\n"); } diff --git a/modules/rls/rls.c b/modules/rls/rls.c index 453b43e..0b9ccfa 100644 --- a/modules/rls/rls.c +++ b/modules/rls/rls.c @@ -119,7 +119,7 @@ extern void rls_destroy_shtable(shtable_t htable, int hash_size); extern int rls_insert_shtable(shtable_t htable,unsigned int hash_code, subs_t* subs); extern subs_t* rls_search_shtable(shtable_t htable,str callid,str to_tag, str from_tag,unsigned int hash_code); -extern int rls_delete_shtable(shtable_t htable,unsigned int hash_code,str to_tag); +extern int rls_delete_shtable(shtable_t htable,unsigned int hash_code, subs_t* subs); extern int rls_update_shtable(shtable_t htable,unsigned int hash_code, subs_t* subs, int type); extern void rls_update_db_subs_timer(db1_con_t *db,db_func_t dbf, shtable_t hash_table, diff --git a/modules/rls/rls_db.c b/modules/rls/rls_db.c index 86303ad..d978a82 100644 --- a/modules/rls/rls_db.c +++ b/modules/rls/rls_db.c @@ -85,7 +85,7 @@ subs_t* rls_search_shtable(shtable_t htable,str callid,str to_tag, /******************************************************************************/ -int rls_delete_shtable(shtable_t htable,unsigned int hash_code,str to_tag) +int rls_delete_shtable(shtable_t htable,unsigned int hash_code, subs_t* subs) { LM_ERR( "rls_delete_shtable shouldn't be called in RLS_DB_ONLY mode\n" ); return(-1);

1 0

git:master: modules/presence: Changed delete_shtable function to check dialog's full tag set
by Richard Good 29 Jan '14

29 Jan '14

Module: sip-router Branch: master Commit: 74d73953327ad7702922b27ba37c71e3283659c3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=74d7395… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Wed Jan 29 09:00:37 2014 +0200 modules/presence: Changed delete_shtable function to check dialog's full tag set Changed delete_shtable to take subs_t pointer as parameter to compare dialog's full tag set before deleting This changes presence API and delete_shtable is exported function - only effected module is rls --- modules/presence/hash.c | 10 +++++++--- modules/presence/hash.h | 4 ++-- modules/presence/subscribe.c | 10 +++++++++- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/modules/presence/hash.c b/modules/presence/hash.c index de7f08f..026fe1b 100644 --- a/modules/presence/hash.c +++ b/modules/presence/hash.c @@ -275,7 +275,7 @@ int insert_shtable(shtable_t htable,unsigned int hash_code, subs_t* subs) return 0; } -int delete_shtable(shtable_t htable,unsigned int hash_code,str to_tag) +int delete_shtable(shtable_t htable,unsigned int hash_code,subs_t* subs) { subs_t* s= NULL, *ps= NULL; int found= -1; @@ -287,8 +287,12 @@ int delete_shtable(shtable_t htable,unsigned int hash_code,str to_tag) while(s) { - if(s->to_tag.len== to_tag.len && - strncmp(s->to_tag.s, to_tag.s, to_tag.len)== 0) + if(s->callid.len==subs->callid.len && + strncmp(s->callid.s, subs->callid.s, subs->callid.len)==0 && + s->to_tag.len== subs->to_tag.len && + strncmp(s->to_tag.s, subs->to_tag.s, subs->to_tag.len)==0 && + s->from_tag.len== subs->from_tag.len && + strncmp(s->from_tag.s, subs->from_tag.s, subs->from_tag.len)== 0) { found= s->local_cseq +1; ps->next= s->next; diff --git a/modules/presence/hash.h b/modules/presence/hash.h index 7c7010d..4bcbefb 100644 --- a/modules/presence/hash.h +++ b/modules/presence/hash.h @@ -78,7 +78,7 @@ struct subscription* search_shtable(shtable_t htable, str callid,str to_tag,str int insert_shtable(shtable_t htable, unsigned int hash_code, struct subscription* subs); -int delete_shtable(shtable_t htable, unsigned int hash_code, str to_tag); +int delete_shtable(shtable_t htable, unsigned int hash_code, struct subscription* subs); int update_shtable(shtable_t htable, unsigned int hash_code, struct subscription* subs, int type); @@ -99,7 +99,7 @@ typedef int (*insert_shtable_t)(shtable_t htable, unsigned int hash_code, struct subscription* subs); typedef int (*delete_shtable_t)(shtable_t htable, unsigned int hash_code, - str to_tag); + struct subscription* subs); typedef int (*update_shtable_t)(shtable_t htable, unsigned int hash_code, struct subscription* subs, int type); diff --git a/modules/presence/subscribe.c b/modules/presence/subscribe.c index aff55f3..0a18eff 100644 --- a/modules/presence/subscribe.c +++ b/modules/presence/subscribe.c @@ -456,11 +456,19 @@ int update_subs_db(subs_t* subs, int type) void delete_subs(str* pres_uri, str* ev_name, str* to_tag, str* from_tag, str* callid) { + subs_t subs; + memset(&subs, 0, sizeof(subs_t)); + + subs.pres_uri = *pres_uri; + subs.from_tag = *from_tag; + subs.to_tag = *to_tag; + subs.callid = *callid; + /* delete record from hash table also if not in dbonly mode */ if(subs_dbmode != DB_ONLY) { unsigned int hash_code= core_hash(pres_uri, ev_name, shtable_size); - if(delete_shtable(subs_htable, hash_code, *to_tag) < 0) + if(delete_shtable(subs_htable, hash_code, &subs) < 0) LM_ERR("Failed to delete subscription from memory\n"); }

1 0

kamailio 4.1.1 can't find msilo module
by Peter Villeneuve 28 Jan '14

28 Jan '14

Hi, I recently installed kamailio 4.1.1 on debian wheezy (i386) to test and play with. I managed to get it up and running, but now when trying to use the msilo module kamailio won't start and says it can't find it. My modules appear to be correctly installed in /usr/lib/i386-linux-gnu/kamailio/modules I can see them all in there, including msilo.so. I have correctly setup kamailio.cfg with mpath="/usr/lib/i386-linux-gnu/kamailio/modules/" All the other modules load fine, but when I add 'loadmodule "msilo.so"' and then do a restart, kamailio throws a bunch of errors: Not starting Kamailio SIP server: invalid configuration file! ... failed! failed! 0(27760) ERROR: <core> [modparam.c:163]: set_mod_param_regex(): set_mod_param_regex: No module matching <msilo> found 0(27760) : <core> [cfg.y:3411]: yyerror_at(): parse error in config file /etc/kamailio/kamailio-local.cfg, line 3, column 75: Can't set module parameter 0(27760) ERROR: <core> I don't understand why Kamailio can't seem to find and load the msilo module. It is in the /usr/lib/i386-linux-gnu/kamailio/modules directory and has the same permissions as the other modules which it correctly loads. Any ideas of what's wrong? Thanks

4 8

git:master: core: avoid warning of using bitwise operator with boolean result
by Daniel-Constantin Mierla 28 Jan '14

28 Jan '14

Module: sip-router Branch: master Commit: cfb815e440804c2870126c1c098362d5a117f97c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cfb815e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 28 18:54:50 2014 +0100 core: avoid warning of using bitwise operator with boolean result - on a report generated by cppcheck sent by David Binderman --- tcp_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tcp_main.c b/tcp_main.c index 0c5a333..6444074 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -4404,7 +4404,7 @@ static ticks_t tcpconn_main_timeout(ticks_t t, struct timer_ln* tl, void* data) c->wbuf_q.queued); tcp_async=cfg_get(tcp, tcp_cfg, async); - if (likely(TICKS_LT(t, c->timeout) && ( !tcp_async | _wbufq_empty(c) | + if (likely(TICKS_LT(t, c->timeout) && ( !tcp_async || _wbufq_empty(c) || TICKS_LT(t, c->wbuf_q.wr_timeout)) )){ if (unlikely(tcp_async && _wbufq_non_empty(c))) return (ticks_t)MIN_unsigned(c->timeout-t, c->wbuf_q.wr_timeout-t);

1 0

git:master: core/parse_methods: removed duplicate check for same characters
by Daniel-Constantin Mierla 28 Jan '14

28 Jan '14

Module: sip-router Branch: master Commit: 935f06eb8c34fe5fe82588cdd5b4af2f68c51466 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=935f06e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 28 18:47:42 2014 +0100 core/parse_methods: removed duplicate check for same characters - on a report generated by cppcheck sent by David Binderman --- parser/parse_methods.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/parser/parse_methods.c b/parser/parse_methods.c index ab8a36b..8be1c28 100644 --- a/parser/parse_methods.c +++ b/parser/parse_methods.c @@ -40,7 +40,7 @@ static int token_char(char _c) (_c >= 48 && _c <= 57) || /* digits */ (_c == '-') || (_c == '.') || (_c == '!') || (_c == '%') || (_c == '*') || (_c == '_') || (_c == '+') || (_c == '`') || - (_c == '\'') || (_c == '~') || (_c == '+') || (_c == '`'); + (_c == '\'') || (_c == '~'); }

1 0

git:master: xhttp: check first the possition limits then access the data
by Daniel-Constantin Mierla 28 Jan '14

28 Jan '14

Module: sip-router Branch: master Commit: 79bfabdc2ae35a5b280c6a23ff611a005dac333c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=79bfabd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 28 18:43:13 2014 +0100 xhttp: check first the possition limits then access the data - in the eval function for the transformation - on a report generated by cppcheck sent by David Binderman --- modules/xhttp/xhttp_trans.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/xhttp/xhttp_trans.c b/modules/xhttp/xhttp_trans.c index 36c5888..159b5f7 100644 --- a/modules/xhttp/xhttp_trans.c +++ b/modules/xhttp/xhttp_trans.c @@ -65,7 +65,7 @@ int xhttp_tr_eval_xhttpurl(struct sip_msg *msg, tr_param_t *tp, int subtype, _httpurl_str.len = val->rs.len; memcpy(_httpurl_str.s, val->rs.s, val->rs.len); - while (val->rs.s[pos] != '?' && pos < val->rs.len) pos++; + while (pos < val->rs.len && val->rs.s[pos] != '?') pos++; _httpurl_querystring_pos = (pos >= val->rs.len) ? 0 : pos + 1; }

1 0

git:master: db_postgres: fixed condition checking the parameter for db uri parsing
by Daniel-Constantin Mierla 28 Jan '14

28 Jan '14

Module: sip-router Branch: master Commit: 480b6d4dfc954fbbb8afb9dbbbf17b80dcdf71ce URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=480b6d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 28 18:39:19 2014 +0100 db_postgres: fixed condition checking the parameter for db uri parsing - on a report generated by cppcheck sent by David Binderman --- modules/db_postgres/pg_uri.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/db_postgres/pg_uri.c b/modules/db_postgres/pg_uri.c index 61accdc..0980d70 100644 --- a/modules/db_postgres/pg_uri.c +++ b/modules/db_postgres/pg_uri.c @@ -118,7 +118,7 @@ static int parse_postgres_uri(struct pg_uri* res, str* uri) prev_token = 0; - if (!res || !res) { + if (!res || !uri) { goto err; }

1 0

git:master: db_mysql: fixed condition checking the parameter for db uri parsing
by Daniel-Constantin Mierla 28 Jan '14

28 Jan '14

Module: sip-router Branch: master Commit: c0b2e567b2a27d5d29ede39409d6299f7d375d87 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c0b2e56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 28 18:36:21 2014 +0100 db_mysql: fixed condition checking the parameter for db uri parsing - on a report generated by cppcheck sent by David Binderman --- modules/db_mysql/my_uri.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/db_mysql/my_uri.c b/modules/db_mysql/my_uri.c index 9a4357d..b4c5a51 100644 --- a/modules/db_mysql/my_uri.c +++ b/modules/db_mysql/my_uri.c @@ -113,7 +113,7 @@ static int parse_mysql_uri(struct my_uri* res, str* uri) prev_token = 0; - if (!res || !res) { + if (!res || !uri) { goto err; }

1 0

git:master: db_cluster: fix caseness in testing the connection flags for reading
by Daniel-Constantin Mierla 28 Jan '14

28 Jan '14

Module: sip-router Branch: master Commit: 88a1a1b25b5228ef2e34ee01e0dd5d4e4f6ffe20 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=88a1a1b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 28 18:30:30 2014 +0100 db_cluster: fix caseness in testing the connection flags for reading - on a report generated by cppcheck sent by David Binderman --- modules/db_cluster/dbcl_data.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/db_cluster/dbcl_data.c b/modules/db_cluster/dbcl_data.c index 5ef3b63..ca821bc 100644 --- a/modules/db_cluster/dbcl_data.c +++ b/modules/db_cluster/dbcl_data.c @@ -249,7 +249,7 @@ int dbcl_cls_set_connections(dbcl_cls_t *cls, str *cons) goto error; } i = s.s[0] - '0'; - if(s.s[1]!='s' && s.s[1]!='S' && s.s[1]!='r' && s.s[1]!='r') + if(s.s[1]!='s' && s.s[1]!='S' && s.s[1]!='r' && s.s[1]!='R') { LM_ERR("invalid parameter [%.*s] for connection id [%.*s]\n", pit->body.len, pit->body.s, @@ -277,7 +277,7 @@ int dbcl_cls_set_connections(dbcl_cls_t *cls, str *cons) goto error; } i = s.s[2] - '0'; - if(s.s[3]!='s' && s.s[3]!='S' && s.s[3]!='r' && s.s[3]!='r' + if(s.s[3]!='s' && s.s[3]!='S' && s.s[3]!='r' && s.s[3]!='R' && s.s[3]!='p' && s.s[3]!='P') { LM_ERR("invalid parameter [%.*s] for connection id [%.*s]\n",

1 0

← Newer
1
2
3
4
5
6
7
...
21
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 2014