sr-dev September 2015

sr-dev@lists.kamailio.org

37 participants
388 discussions

tsilo - t_append() uri
by Daniel-Constantin Mierla 22 Sep '15

22 Sep '15

Hello, tsilo is not using the uri parameter for looking up location for new destinations. It passes the uas request from transaction module to registrar lookup_to_dset() function, so the r-uri from that request is used. However, there is at least one scenario that makes tsilo not working properly: - invite comes in - lookup location finds a contact - request is forwarded with a new r-uri (the contact of the location record) -- t_relay() is used and trasaction created, r-uri stored for uas is contact header - a new registration comes and ts_append() is executed, failing to find contacts for r-uri in uas because the r-uri there can be anything pointing to the first device found in location Some solutions can be found by creating transaction earlier, but not easy to tackle always. I think it would be better to just pass the uri parameter from ts_append() to lookup_to_dset(). But I noticed that the uri can be just username if use_domain is 0, which makes things a little more complex, because registrar/usrloc expect full sip uri. The solution would be to 'force' always that the uri parameters for tsilo functions are full SIP uri, and let the code extract only username when use_domain is 0. If someone has only the username in config, it can simply put the uri parameter as "sip:username@localhost" -- domain will be ignored anyhow. Alternative, if the parameter is just username, built a temporary uri for it before passing to lookup_to_dset(). I find first solution a bit better because the parameter for tsilo functions is called uri and building an internal one can end up in some limitations if it is going to be something that requires tel: or sips: or parameters such as instance. Any comments/suggestions? Cheers, Daniel -- Daniel-Constantin Mierla http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Book: SIP Routing With Kamailio - http://www.asipto.com Kamailio Advanced Training, Sep 28-30, 2015, in Berlin - http://asipto.com/u/kat

2 5

git:master:d36734d6: core: tcp - reset connection write flag if io_watch_chg() for pollout fails
by Daniel-Constantin Mierla 22 Sep '15

22 Sep '15

Module: kamailio Branch: master Commit: d36734d658cd0bcfc8357c7e85ca32da0612aaee URL: https://github.com/kamailio/kamailio/commit/d36734d658cd0bcfc8357c7e85ca32d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-22T15:22:32+02:00 core: tcp - reset connection write flag if io_watch_chg() for pollout fails - it can loop otherwise in trying to see if write can be done --- Modified: tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/d36734d658cd0bcfc8357c7e85ca32d… Patch: https://github.com/kamailio/kamailio/commit/d36734d658cd0bcfc8357c7e85ca32d… --- diff --git a/tcp_main.c b/tcp_main.c index df778ba..578f7d2 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -4113,6 +4113,7 @@ inline static int handle_tcpconn_ev(struct tcp_connection* tcpconn, short ev, if (unlikely(io_watch_chg(&io_h, tcpconn->s, POLLOUT, fd_i)==-1)){ LM_ERR("io_watch_chg(2) failed: for %p, fd %d\n", tcpconn, tcpconn->s); + tcpconn->flags&=~F_CONN_WRITE_W; goto error; } }else

1 0

git:4.3:93875911: tsilo: print return error code by lookup_to_dset() in ts_append()
by Daniel-Constantin Mierla 22 Sep '15

22 Sep '15

Module: kamailio Branch: 4.3 Commit: 938759112e00bdac837c09e407480872ae1aff35 URL: https://github.com/kamailio/kamailio/commit/938759112e00bdac837c09e40748087… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-22T14:48:29+02:00 tsilo: print return error code by lookup_to_dset() in ts_append() - helps figuring out why it failed (cherry picked from commit 692c24ac7d6524cb2388534ee004d636c8b0c277) --- Modified: modules/tsilo/ts_append.c --- Diff: https://github.com/kamailio/kamailio/commit/938759112e00bdac837c09e40748087… Patch: https://github.com/kamailio/kamailio/commit/938759112e00bdac837c09e40748087… --- diff --git a/modules/tsilo/ts_append.c b/modules/tsilo/ts_append.c index b2a9a9a..3714b84 100644 --- a/modules/tsilo/ts_append.c +++ b/modules/tsilo/ts_append.c @@ -69,6 +69,7 @@ int ts_append(struct sip_msg* msg, str *ruri, char *table) { int ts_append_to(struct sip_msg* msg, int tindex, int tlabel, char *table) { struct cell *t; struct sip_msg *orig_msg; + int ret; if(_tmb.t_lookup_ident(&t, tindex, tlabel) < 0) { @@ -79,8 +80,9 @@ int ts_append_to(struct sip_msg* msg, int tindex, int tlabel, char *table) { orig_msg = t->uas.request; - if (_regapi.lookup_to_dset(orig_msg, table, NULL) != 1) { - LM_DBG("transaction %u:%u: error updating dset\n", tindex, tlabel); + ret = _regapi.lookup_to_dset(orig_msg, table, NULL); + if(ret != 1) { + LM_DBG("transaction %u:%u: error updating dset (%d)\n", tindex, tlabel, ret); return -1; }

1 0

git:4.3:8bdb3f95: Makefile.defs: memory manager set to q_malloc
by Daniel-Constantin Mierla 22 Sep '15

22 Sep '15

Module: kamailio Branch: 4.3 Commit: 8bdb3f95d3db79bea5f3d49e2c8b0fc090bb65dd URL: https://github.com/kamailio/kamailio/commit/8bdb3f95d3db79bea5f3d49e2c8b0fc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-22T14:07:47+02:00 Makefile.defs: memory manager set to q_malloc --- Modified: Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/8bdb3f95d3db79bea5f3d49e2c8b0fc… Patch: https://github.com/kamailio/kamailio/commit/8bdb3f95d3db79bea5f3d49e2c8b0fc… --- diff --git a/Makefile.defs b/Makefile.defs index 9d68c4b..8205bcd 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -103,7 +103,7 @@ EXTRAVERSION = # 0 - f_malloc (fast malloc) # 1 - q_malloc (quick malloc) # 2 - tlsf_malloc (O(1) malloc and free) -MEMMNG ?= 0 +MEMMNG ?= 1 # memory debugger switcher # 0 - off (no-debug mode) # 1 - on (debug mode)

1 0

git:4.3:2b8dc343: mem: f_malloc - safety init of nxt_free fields in first and last fragments
by Daniel-Constantin Mierla 22 Sep '15

22 Sep '15

Module: kamailio Branch: 4.3 Commit: 2b8dc34378812f9aea187c2cfe27021dd4f7113b URL: https://github.com/kamailio/kamailio/commit/2b8dc34378812f9aea187c2cfe27021… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-22T13:47:38+02:00 mem: f_malloc - safety init of nxt_free fields in first and last fragments (cherry picked from commit 66b9c4dc56e14cac8ffcb0f87d29be4858dafbd3) --- Modified: mem/f_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/2b8dc34378812f9aea187c2cfe27021… Patch: https://github.com/kamailio/kamailio/commit/2b8dc34378812f9aea187c2cfe27021… --- diff --git a/mem/f_malloc.c b/mem/f_malloc.c index 77dbd76..bb18191 100644 --- a/mem/f_malloc.c +++ b/mem/f_malloc.c @@ -367,9 +367,11 @@ struct fm_block* fm_malloc_init(char* address, unsigned long size, int type) /* init first fragment*/ qm->first_frag->size=size; qm->first_frag->prv_free=0; + qm->first_frag->u.nxt_free=0; /* init last fragment*/ qm->last_frag->size=0; qm->last_frag->prv_free=0; + qm->last_frag->u.nxt_free=0; #ifdef DBG_F_MALLOC qm->first_frag->check=ST_CHECK_PATTERN;

1 0

git:4.3:2070b215: mem: f_malloc - proper inserting of last free large fragment
by Daniel-Constantin Mierla 22 Sep '15

22 Sep '15

Module: kamailio Branch: 4.3 Commit: 2070b215872ce8d15375e9ccda8bb45b496ad44a URL: https://github.com/kamailio/kamailio/commit/2070b215872ce8d15375e9ccda8bb45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-22T13:47:30+02:00 mem: f_malloc - proper inserting of last free large fragment - reported by Juha Heinanen (cherry picked from commit b58a55da1a43f1b2d3b1f0b831fcb639c57a66b9) --- Modified: mem/f_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/2070b215872ce8d15375e9ccda8bb45… Patch: https://github.com/kamailio/kamailio/commit/2070b215872ce8d15375e9ccda8bb45… --- diff --git a/mem/f_malloc.c b/mem/f_malloc.c index 90fa9ca..77dbd76 100644 --- a/mem/f_malloc.c +++ b/mem/f_malloc.c @@ -211,27 +211,42 @@ static inline void fm_insert_free(struct fm_block* qm, struct fm_frag* frag) { struct fm_frag* f; int hash; + int after; hash=GET_HASH(frag->size); f=qm->free_hash[hash].first; if (frag->size > F_MALLOC_OPTIMIZE){ /* because of '<=' in GET_HASH, (different from 0.8.1[24] on purpose --andrei ) */ + after = 0; /* large fragments list -- add at a position ordered by size */ - for(; f && f->u.nxt_free!=qm->last_frag; f=f->u.nxt_free){ + for(; f; f=f->u.nxt_free){ if (frag->size <= f->size) break; + if(f->u.nxt_free==qm->last_frag) { + /*size greater than last frag in slot*/ + after = 1; + break; + } } - /*insert frag before f*/ - frag->u.nxt_free = f; if(f) { - frag->prv_free=f->prv_free; - if(f->prv_free) f->prv_free->u.nxt_free = frag; - if(qm->free_hash[hash].first==f) qm->free_hash[hash].first = frag; + if(after) { + /*insert frag after f*/ + frag->prv_free=f; + f->u.nxt_free=frag; + frag->u.nxt_free = qm->last_frag; + } else { + /*insert frag before f*/ + frag->u.nxt_free = f; + frag->prv_free=f->prv_free; + if(f->prv_free) f->prv_free->u.nxt_free = frag; + if(qm->free_hash[hash].first==f) qm->free_hash[hash].first = frag; + } } else { /* to be only one in slot */ qm->free_hash[hash].first = frag; frag->prv_free=0; + frag->u.nxt_free = qm->last_frag; } } else { /* fixed fragment size list -- add first */

1 0

git:master:ec45e952: domain: renamed local db_url variable to d_db_url
by Daniel-Constantin Mierla 22 Sep '15

22 Sep '15

Module: kamailio Branch: master Commit: ec45e952e453ae8f6b5a6598622f50d57e4470ef URL: https://github.com/kamailio/kamailio/commit/ec45e952e453ae8f6b5a6598622f50d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-22T12:50:09+02:00 domain: renamed local db_url variable to d_db_url - it is exported as extern and can conflict with other variables with same name --- Modified: modules/domain/domain.c Modified: modules/domain/domain_mod.c Modified: modules/domain/domain_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/ec45e952e453ae8f6b5a6598622f50d… Patch: https://github.com/kamailio/kamailio/commit/ec45e952e453ae8f6b5a6598622f50d… --- diff --git a/modules/domain/domain.c b/modules/domain/domain.c index 65b6aed..33ff994 100644 --- a/modules/domain/domain.c +++ b/modules/domain/domain.c @@ -314,7 +314,7 @@ int reload_tables ( void ) cols[2] = &type_col; cols[3] = &value_col; - if (domain_db_init(&db_url) < 0) { + if (domain_db_init(&d_db_url) < 0) { LM_ERR("unable to open database connection\n"); return -1; } diff --git a/modules/domain/domain_mod.c b/modules/domain/domain_mod.c index 81f3091..2f204d1 100644 --- a/modules/domain/domain_mod.c +++ b/modules/domain/domain_mod.c @@ -68,7 +68,7 @@ static int domain_init_rpc(void); /* * Module parameter variables */ -str db_url = str_init(DEFAULT_RODB_URL); +str d_db_url = str_init(DEFAULT_RODB_URL); str domain_table = str_init(DOMAIN_TABLE); /* Name of domain table */ str domain_attrs_table = str_init(DOMAIN_ATTRS_TABLE); str did_col = str_init(DID_COL); /* Name of domain id column */ @@ -112,7 +112,7 @@ static cmd_export_t cmds[] = { * Exported parameters */ static param_export_t params[] = { - {"db_url", PARAM_STR, &db_url }, + {"db_url", PARAM_STR, &d_db_url }, {"domain_table", PARAM_STR, &domain_table}, {"domain_attrs_table", PARAM_STR, &domain_attrs_table}, {"did_col", PARAM_STR, &did_col }, @@ -175,14 +175,14 @@ static int mod_init(void) } /* Bind database */ - if (domain_db_bind(&db_url)) { - LM_DBG("Usign db_url [%.*s]\n", db_url.len, db_url.s); + if (domain_db_bind(&d_db_url)) { + LM_DBG("Usign db_url [%.*s]\n", d_db_url.len, d_db_url.s); LM_ERR("no database module found. Have you configure thed \"db_url\" modparam properly?\n"); return -1; } /* Check table versions */ - if (domain_db_init(&db_url) < 0) { + if (domain_db_init(&d_db_url) < 0) { LM_ERR("unable to open database connection\n"); return -1; } diff --git a/modules/domain/domain_mod.h b/modules/domain/domain_mod.h index 4f7a9a9..4975b7e 100644 --- a/modules/domain/domain_mod.h +++ b/modules/domain/domain_mod.h @@ -69,7 +69,7 @@ typedef struct param_source { /* * Module parameters variables */ -extern str db_url; +extern str d_db_url; extern str domain_table; /* Domain table name */ extern str domain_attrs_table; /* Domain attributes table name */ extern str did_col; /* Domain id column name */

1 0

git:master:66b9c4dc: mem: f_malloc - safety init of nxt_free fields in first and last fragments
by Daniel-Constantin Mierla 21 Sep '15

21 Sep '15

Module: kamailio Branch: master Commit: 66b9c4dc56e14cac8ffcb0f87d29be4858dafbd3 URL: https://github.com/kamailio/kamailio/commit/66b9c4dc56e14cac8ffcb0f87d29be4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-21T21:10:47+02:00 mem: f_malloc - safety init of nxt_free fields in first and last fragments --- Modified: mem/f_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/66b9c4dc56e14cac8ffcb0f87d29be4… Patch: https://github.com/kamailio/kamailio/commit/66b9c4dc56e14cac8ffcb0f87d29be4… --- diff --git a/mem/f_malloc.c b/mem/f_malloc.c index 2221d54..e94703a 100644 --- a/mem/f_malloc.c +++ b/mem/f_malloc.c @@ -367,9 +367,11 @@ struct fm_block* fm_malloc_init(char* address, unsigned long size, int type) /* init first fragment*/ qm->first_frag->size=size; qm->first_frag->prv_free=0; + qm->first_frag->u.nxt_free=0; /* init last fragment*/ qm->last_frag->size=0; qm->last_frag->prv_free=0; + qm->last_frag->u.nxt_free=0; #ifdef DBG_F_MALLOC qm->first_frag->check=ST_CHECK_PATTERN;

1 0

git:master:692c24ac: tsilo: print return error code by lookup_to_dset() in ts_append()
by Daniel-Constantin Mierla 21 Sep '15

21 Sep '15

Module: kamailio Branch: master Commit: 692c24ac7d6524cb2388534ee004d636c8b0c277 URL: https://github.com/kamailio/kamailio/commit/692c24ac7d6524cb2388534ee004d63… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-21T18:20:24+02:00 tsilo: print return error code by lookup_to_dset() in ts_append() - helps figuring out why it failed --- Modified: modules/tsilo/ts_append.c --- Diff: https://github.com/kamailio/kamailio/commit/692c24ac7d6524cb2388534ee004d63… Patch: https://github.com/kamailio/kamailio/commit/692c24ac7d6524cb2388534ee004d63… --- diff --git a/modules/tsilo/ts_append.c b/modules/tsilo/ts_append.c index 0805cdd..1295f03 100644 --- a/modules/tsilo/ts_append.c +++ b/modules/tsilo/ts_append.c @@ -73,6 +73,7 @@ int ts_append(struct sip_msg* msg, str *ruri, char *table) { int ts_append_to(struct sip_msg* msg, int tindex, int tlabel, char *table) { struct cell *t; struct sip_msg *orig_msg; + int ret; if(_tmb.t_lookup_ident(&t, tindex, tlabel) < 0) { @@ -83,8 +84,9 @@ int ts_append_to(struct sip_msg* msg, int tindex, int tlabel, char *table) { orig_msg = t->uas.request; - if (_regapi.lookup_to_dset(orig_msg, table, NULL) != 1) { - LM_DBG("transaction %u:%u: error updating dset\n", tindex, tlabel); + ret = _regapi.lookup_to_dset(orig_msg, table, NULL); + if(ret != 1) { + LM_DBG("transaction %u:%u: error updating dset (%d)\n", tindex, tlabel, ret); return -1; }

1 0

git:master:b58a55da: mem: f_malloc - proper inserting of last free large fragment
by Daniel-Constantin Mierla 21 Sep '15

21 Sep '15

Module: kamailio Branch: master Commit: b58a55da1a43f1b2d3b1f0b831fcb639c57a66b9 URL: https://github.com/kamailio/kamailio/commit/b58a55da1a43f1b2d3b1f0b831fcb63… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-21T17:01:18+02:00 mem: f_malloc - proper inserting of last free large fragment - reported by Juha Heinanen --- Modified: mem/f_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/b58a55da1a43f1b2d3b1f0b831fcb63… Patch: https://github.com/kamailio/kamailio/commit/b58a55da1a43f1b2d3b1f0b831fcb63… --- diff --git a/mem/f_malloc.c b/mem/f_malloc.c index b0376eb..2221d54 100644 --- a/mem/f_malloc.c +++ b/mem/f_malloc.c @@ -211,27 +211,42 @@ static inline void fm_insert_free(struct fm_block* qm, struct fm_frag* frag) { struct fm_frag* f; int hash; + int after; hash=GET_HASH(frag->size); f=qm->free_hash[hash].first; if (frag->size > F_MALLOC_OPTIMIZE){ /* because of '<=' in GET_HASH, (different from 0.8.1[24] on purpose --andrei ) */ + after = 0; /* large fragments list -- add at a position ordered by size */ - for(; f && f->u.nxt_free!=qm->last_frag; f=f->u.nxt_free){ + for(; f; f=f->u.nxt_free){ if (frag->size <= f->size) break; + if(f->u.nxt_free==qm->last_frag) { + /*size greater than last frag in slot*/ + after = 1; + break; + } } - /*insert frag before f*/ - frag->u.nxt_free = f; if(f) { - frag->prv_free=f->prv_free; - if(f->prv_free) f->prv_free->u.nxt_free = frag; - if(qm->free_hash[hash].first==f) qm->free_hash[hash].first = frag; + if(after) { + /*insert frag after f*/ + frag->prv_free=f; + f->u.nxt_free=frag; + frag->u.nxt_free = qm->last_frag; + } else { + /*insert frag before f*/ + frag->u.nxt_free = f; + frag->prv_free=f->prv_free; + if(f->prv_free) f->prv_free->u.nxt_free = frag; + if(qm->free_hash[hash].first==f) qm->free_hash[hash].first = frag; + } } else { /* to be only one in slot */ qm->free_hash[hash].first = frag; frag->prv_free=0; + frag->u.nxt_free = qm->last_frag; } } else { /* fixed fragment size list -- add first */

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
39
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2015