sr-dev September 2015

sr-dev@lists.kamailio.org

37 participants
387 discussions

git:4.3:71e7e92a: 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: 4.3 Commit: 71e7e92aeed8acb058e4064a1369f52bd612479f URL: https://github.com/kamailio/kamailio/commit/71e7e92aeed8acb058e4064a1369f52… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-22T16:32:29+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 (cherry picked from commit d36734d658cd0bcfc8357c7e85ca32da0612aaee) --- Modified: tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/71e7e92aeed8acb058e4064a1369f52… Patch: https://github.com/kamailio/kamailio/commit/71e7e92aeed8acb058e4064a1369f52… --- 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:master:82f74a57: domain: proper memset of the hash tables used by domain at init time
by Daniel-Constantin Mierla 22 Sep '15

22 Sep '15

Module: kamailio Branch: master Commit: 82f74a57229e46e9b9302a6b4caebed6860c47ed URL: https://github.com/kamailio/kamailio/commit/82f74a57229e46e9b9302a6b4caebed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-22T23:05:27+02:00 domain: proper memset of the hash tables used by domain at init time - discovered on a report by Juha Heinanen --- Modified: modules/domain/domain_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/82f74a57229e46e9b9302a6b4caebed… Patch: https://github.com/kamailio/kamailio/commit/82f74a57229e46e9b9302a6b4caebed… --- diff --git a/modules/domain/domain_mod.c b/modules/domain/domain_mod.c index 2f204d1..45697fd 100644 --- a/modules/domain/domain_mod.c +++ b/modules/domain/domain_mod.c @@ -210,9 +210,9 @@ static int mod_init(void) goto error; } memset(hash_table_1, 0, sizeof(struct domain_list *) * - DOM_HASH_SIZE + 1); + (DOM_HASH_SIZE + 1)); memset(hash_table_2, 0, sizeof(struct domain_list *) * - DOM_HASH_SIZE + 1); + (DOM_HASH_SIZE + 1)); *hash_table = hash_table_1; /* Allocate and initialize locks */

1 0

git:master:f3eb697a: tsilo: fixed some wrong white spacing identation
by Daniel-Constantin Mierla 22 Sep '15

22 Sep '15

Module: kamailio Branch: master Commit: f3eb697a23f3e97b4eca1a1010a050dcafd35729 URL: https://github.com/kamailio/kamailio/commit/f3eb697a23f3e97b4eca1a1010a050d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-22T16:33:40+02:00 tsilo: fixed some wrong white spacing identation --- Modified: modules/tsilo/ts_append.c --- Diff: https://github.com/kamailio/kamailio/commit/f3eb697a23f3e97b4eca1a1010a050d… Patch: https://github.com/kamailio/kamailio/commit/f3eb697a23f3e97b4eca1a1010a050d… --- diff --git a/modules/tsilo/ts_append.c b/modules/tsilo/ts_append.c index ba4b4c4..7c43534 100644 --- a/modules/tsilo/ts_append.c +++ b/modules/tsilo/ts_append.c @@ -50,9 +50,9 @@ int ts_append(struct sip_msg* msg, str *ruri, char *table) { if (res != 0) { LM_ERR("failed to retrieve record for %.*s\n", ruri->len, ruri->s); - unlock_entry_by_ruri(ruri); - return -1; - } + unlock_entry_by_ruri(ruri); + return -1; + } ptr = _r->transactions;

1 0

git:master:94358dc1: tsilo: update the readme
by Daniel-Constantin Mierla 22 Sep '15

22 Sep '15

Module: kamailio Branch: master Commit: 94358dc13371863e1546fd78662b40b24b0ba981 URL: https://github.com/kamailio/kamailio/commit/94358dc13371863e1546fd78662b40b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-22T16:33:40+02:00 tsilo: update the readme --- Modified: modules/tsilo/README --- Diff: https://github.com/kamailio/kamailio/commit/94358dc13371863e1546fd78662b40b… Patch: https://github.com/kamailio/kamailio/commit/94358dc13371863e1546fd78662b40b… --- diff --git a/modules/tsilo/README b/modules/tsilo/README index e9b20ce..4af5bcc 100644 --- a/modules/tsilo/README +++ b/modules/tsilo/README @@ -31,7 +31,7 @@ Federico Cabiddu 4.1. ts_store([uri]) 4.2. ts_append(domain, ruri) - 4.3. ts_append_to(tindex, tlabel, domain) + 4.3. ts_append_to(tindex, tlabel, domain, [uri]) 5. Exported RPC Functions @@ -71,7 +71,7 @@ Chapter 1. Admin Guide 4.1. ts_store([uri]) 4.2. ts_append(domain, ruri) - 4.3. ts_append_to(tindex, tlabel, domain) + 4.3. ts_append_to(tindex, tlabel, domain, [uri]) 5. Exported RPC Functions @@ -143,7 +143,7 @@ modparam("tsilo", "hash_size", 1024) 4.1. ts_store([uri]) 4.2. ts_append(domain, ruri) - 4.3. ts_append_to(tindex, tlabel, domain) + 4.3. ts_append_to(tindex, tlabel, domain, [uri]) 4.1. ts_store([uri]) @@ -186,7 +186,7 @@ if (is_method("REGISTER")) { } ... -4.3. ts_append_to(tindex, tlabel, domain) +4.3. ts_append_to(tindex, tlabel, domain, [uri]) The method add branches to the transaction identified by tindex and tlabel, performing a contacts lookup on the table specified by the @@ -200,6 +200,7 @@ if (is_method("REGISTER")) { pseudo-variable. * domain - Name of table that should be used for looking up new contacts for r-uri. + * uri (optiona) - uri for which to do lookup for new destinations. This function can be used from REQUEST_ROUTE, FAILURE_ROUTE.

1 0

git:master:9c78d7da: tsilo: documented optional uri parameter for ts_append_to()
by Daniel-Constantin Mierla 22 Sep '15

22 Sep '15

Module: kamailio Branch: master Commit: 9c78d7da369dbce0b28d5ea54a55601b790fc9ca URL: https://github.com/kamailio/kamailio/commit/9c78d7da369dbce0b28d5ea54a55601… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-22T16:33:40+02:00 tsilo: documented optional uri parameter for ts_append_to() --- Modified: modules/tsilo/doc/tsilo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9c78d7da369dbce0b28d5ea54a55601… Patch: https://github.com/kamailio/kamailio/commit/9c78d7da369dbce0b28d5ea54a55601… --- diff --git a/modules/tsilo/doc/tsilo_admin.xml b/modules/tsilo/doc/tsilo_admin.xml index c173043..43f4bac 100644 --- a/modules/tsilo/doc/tsilo_admin.xml +++ b/modules/tsilo/doc/tsilo_admin.xml @@ -168,7 +168,7 @@ if (is_method("REGISTER")) { </example> </section> <section> - <title><function moreinfo="none">ts_append_to(tindex, tlabel, domain)</function></title> + <title><function moreinfo="none">ts_append_to(tindex, tlabel, domain, [uri])</function></title> <para> The method add branches to the transaction identified by tindex and tlabel, performing a contacts lookup on the table specified by the domain parameter. @@ -182,7 +182,7 @@ if (is_method("REGISTER")) { Can be an integer or a pseudo-variable. </para> </listitem> - <listitem> + <listitem> <para> <emphasis>tlabel</emphasis> - internal label of transaction. Can be an integer or a pseudo-variable. @@ -194,6 +194,12 @@ if (is_method("REGISTER")) { up new contacts for r-uri. </para> </listitem> + <listitem> + <para> + <emphasis>uri</emphasis> (optiona) - uri for which to do lookup for new + destinations. + </para> + </listitem> </itemizedlist> <para> This function can be used from REQUEST_ROUTE, FAILURE_ROUTE.

1 0

git:master:ffbef418: tsilo: pass uri parameter to registrar lookup_to_dset()
by Daniel-Constantin Mierla 22 Sep '15

22 Sep '15

Module: kamailio Branch: master Commit: ffbef4181f6632401715a250af26cce4696c3c46 URL: https://github.com/kamailio/kamailio/commit/ffbef4181f6632401715a250af26cce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-22T16:33:40+02:00 tsilo: pass uri parameter to registrar lookup_to_dset() - ts_append_to() can take uri 4th parameter --- Modified: modules/tsilo/ts_append.c Modified: modules/tsilo/ts_append.h Modified: modules/tsilo/tsilo.c --- Diff: https://github.com/kamailio/kamailio/commit/ffbef4181f6632401715a250af26cce… Patch: https://github.com/kamailio/kamailio/commit/ffbef4181f6632401715a250af26cce… --- diff --git a/modules/tsilo/ts_append.c b/modules/tsilo/ts_append.c index 1295f03..ba4b4c4 100644 --- a/modules/tsilo/ts_append.c +++ b/modules/tsilo/ts_append.c @@ -59,7 +59,7 @@ int ts_append(struct sip_msg* msg, str *ruri, char *table) { while(ptr) { LM_DBG("transaction %u:%u found for %.*s, going to append branches\n",ptr->tindex, ptr->tlabel, ruri->len, ruri->s); - appended = ts_append_to(msg, ptr->tindex, ptr->tlabel, table); + appended = ts_append_to(msg, ptr->tindex, ptr->tlabel, table, ruri); if (appended > 0) update_stat(added_branches, appended); ptr = ptr->next; @@ -70,7 +70,7 @@ int ts_append(struct sip_msg* msg, str *ruri, char *table) { return 1; } -int ts_append_to(struct sip_msg* msg, int tindex, int tlabel, char *table) { +int ts_append_to(struct sip_msg* msg, int tindex, int tlabel, char *table, str *uri) { struct cell *t; struct sip_msg *orig_msg; int ret; @@ -84,7 +84,11 @@ int ts_append_to(struct sip_msg* msg, int tindex, int tlabel, char *table) { orig_msg = t->uas.request; - ret = _regapi.lookup_to_dset(orig_msg, table, NULL); + if(uri==NULL || uri->s==NULL || uri->len<=0) { + ret = _regapi.lookup_to_dset(orig_msg, table, NULL); + } else { + ret = _regapi.lookup_to_dset(orig_msg, table, uri); + } if(ret != 1) { LM_DBG("transaction %u:%u: error updating dset (%d)\n", tindex, tlabel, ret); return -1; diff --git a/modules/tsilo/ts_append.h b/modules/tsilo/ts_append.h index 093449c..56f9120 100644 --- a/modules/tsilo/ts_append.h +++ b/modules/tsilo/ts_append.h @@ -23,6 +23,6 @@ #define _TS_APPEND_H 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); +int ts_append_to(struct sip_msg* msg, int tindex, int tlabel, char *table, str *uri); #endif diff --git a/modules/tsilo/tsilo.c b/modules/tsilo/tsilo.c index f9bcfa9..fe475c6 100644 --- a/modules/tsilo/tsilo.c +++ b/modules/tsilo/tsilo.c @@ -61,6 +61,7 @@ static int mod_init(void); static void destroy(void); static int w_ts_append_to(struct sip_msg* msg, char *idx, char *lbl, char *d); +static int w_ts_append_to2(struct sip_msg* msg, char *idx, char *lbl, char *d, char *ruri); static int fixup_ts_append_to(void** param, int param_no); static int w_ts_append(struct sip_msg* _msg, char *_table, char *_ruri); static int fixup_ts_append(void** param, int param_no); @@ -77,6 +78,8 @@ extern stat_var *added_branches; static cmd_export_t cmds[]={ {"ts_append_to", (cmd_function)w_ts_append_to, 3, fixup_ts_append_to, 0, REQUEST_ROUTE | FAILURE_ROUTE }, + {"ts_append_to", (cmd_function)w_ts_append_to, 4, + fixup_ts_append_to, 0, REQUEST_ROUTE | FAILURE_ROUTE }, {"ts_append", (cmd_function)w_ts_append, 2, fixup_ts_append, 0, REQUEST_ROUTE | FAILURE_ROUTE }, {"ts_store", (cmd_function)w_ts_store, 0, @@ -226,6 +229,10 @@ static int fixup_ts_append_to(void** param, int param_no) return -1; } } + + if (param_no==4) { + return fixup_spve_null(param, 1); + } return 0; } @@ -276,7 +283,34 @@ static int w_ts_append_to(struct sip_msg* msg, char *idx, char *lbl, char *table return -1; } - return ts_append_to(msg, tindex, tlabel, table); + return ts_append_to(msg, tindex, tlabel, table, 0); +} + +/** + * + */ +static int w_ts_append_to2(struct sip_msg* msg, char *idx, char *lbl, char *table, char *ruri) +{ + unsigned int tindex; + unsigned int tlabel; + str suri; + + if(fixup_get_ivalue(msg, (gparam_p)idx, (int*)&tindex)<0) { + LM_ERR("cannot get transaction index\n"); + return -1; + } + + if(fixup_get_ivalue(msg, (gparam_p)lbl, (int*)&tlabel)<0) { + LM_ERR("cannot get transaction label\n"); + return -1; + } + + if(fixup_get_svalue(msg, (gparam_t*)ruri, &suri)!=0) { + LM_ERR("failed to conert r-uri parameter\n"); + return -1; + } + + return ts_append_to(msg, tindex, tlabel, table, &suri); } /**

1 0

git:master:6bdddb99: tsilo: don't force destination protocol on branches added by t_append_branches
by Federico Cabiddu 22 Sep '15

22 Sep '15

Module: kamailio Branch: master Commit: 6bdddb99d7bca42897b2c0f96a87c49b97efd8ac URL: https://github.com/kamailio/kamailio/commit/6bdddb99d7bca42897b2c0f96a87c49… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2015-09-22T15:53:28+02:00 tsilo: don't force destination protocol on branches added by t_append_branches --- Modified: modules/tm/t_append_branches.c --- Diff: https://github.com/kamailio/kamailio/commit/6bdddb99d7bca42897b2c0f96a87c49… Patch: https://github.com/kamailio/kamailio/commit/6bdddb99d7bca42897b2c0f96a87c49… --- diff --git a/modules/tm/t_append_branches.c b/modules/tm/t_append_branches.c index 1344a5d..19782a7 100644 --- a/modules/tm/t_append_branches.c +++ b/modules/tm/t_append_branches.c @@ -128,7 +128,7 @@ int t_append_branches(void) { new_branch=add_uac( t, orig_msg, &current_uri, (dst_uri.len) ? (&dst_uri) : &current_uri, &path, 0, si, orig_msg->fwd_send_flags, - orig_msg->rcv.proto, (dst_uri.len)?-1:UAC_SKIP_BR_DST_F, &instance, + PROTO_NONE, (dst_uri.len)?-1:UAC_SKIP_BR_DST_F, &instance, &ruid, &location_ua); LM_DBG("added branch [%.*s] with ruid [%.*s]\n", current_uri.len, current_uri.s, ruid.len, ruid.s);

1 1

git:4.2:de64dbef: tsilo: don't force destination protocol on branches added by t_append_branches
by Federico Cabiddu 22 Sep '15

22 Sep '15

Module: kamailio Branch: 4.2 Commit: de64dbefeb04889bd0d2477918e3c84abb203d74 URL: https://github.com/kamailio/kamailio/commit/de64dbefeb04889bd0d2477918e3c84… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2015-09-22T16:19:22+02:00 tsilo: don't force destination protocol on branches added by t_append_branches (cherry picked from commit 6bdddb99d7bca42897b2c0f96a87c49b97efd8ac) --- Modified: modules/tm/t_append_branches.c --- Diff: https://github.com/kamailio/kamailio/commit/de64dbefeb04889bd0d2477918e3c84… Patch: https://github.com/kamailio/kamailio/commit/de64dbefeb04889bd0d2477918e3c84… --- diff --git a/modules/tm/t_append_branches.c b/modules/tm/t_append_branches.c index 19d0d34..053a69b 100644 --- a/modules/tm/t_append_branches.c +++ b/modules/tm/t_append_branches.c @@ -131,7 +131,7 @@ int t_append_branches(void) { new_branch=add_uac( t, orig_msg, &current_uri, (dst_uri.len) ? (&dst_uri) : &current_uri, &path, 0, si, orig_msg->fwd_send_flags, - orig_msg->rcv.proto, (dst_uri.len)?-1:UAC_SKIP_BR_DST_F, &instance, + PROTO_NONE, (dst_uri.len)?-1:UAC_SKIP_BR_DST_F, &instance, &ruid, &location_ua); LM_DBG("added branch [%.*s] with ruid [%.*s]\n", current_uri.len, current_uri.s, ruid.len, ruid.s);

1 0

git:4.3:9b1b8a70: tsilo: don't force destination protocol on branches added by t_append_branches
by Federico Cabiddu 22 Sep '15

22 Sep '15

Module: kamailio Branch: 4.3 Commit: 9b1b8a70aaac447624c4633c169dde3b84542b66 URL: https://github.com/kamailio/kamailio/commit/9b1b8a70aaac447624c4633c169dde3… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2015-09-22T16:19:03+02:00 tsilo: don't force destination protocol on branches added by t_append_branches (cherry picked from commit 6bdddb99d7bca42897b2c0f96a87c49b97efd8ac) --- Modified: modules/tm/t_append_branches.c --- Diff: https://github.com/kamailio/kamailio/commit/9b1b8a70aaac447624c4633c169dde3… Patch: https://github.com/kamailio/kamailio/commit/9b1b8a70aaac447624c4633c169dde3… --- diff --git a/modules/tm/t_append_branches.c b/modules/tm/t_append_branches.c index d32ac1a..2c296fb 100644 --- a/modules/tm/t_append_branches.c +++ b/modules/tm/t_append_branches.c @@ -128,7 +128,7 @@ int t_append_branches(void) { new_branch=add_uac( t, orig_msg, &current_uri, (dst_uri.len) ? (&dst_uri) : &current_uri, &path, 0, si, orig_msg->fwd_send_flags, - orig_msg->rcv.proto, (dst_uri.len)?-1:UAC_SKIP_BR_DST_F, &instance, + PROTO_NONE, (dst_uri.len)?-1:UAC_SKIP_BR_DST_F, &instance, &ruid, &location_ua); LM_DBG("added branch [%.*s] with ruid [%.*s]\n", current_uri.len, current_uri.s, ruid.len, ruid.s);

1 0

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

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