sr-dev December 2010

sr-dev@lists.kamailio.org

16 participants
114 discussions

git:alexh/3.1/xavp: core: Set loglevel of pv_xavp_print to INFO

by Alex Hermann

Module: sip-router Branch: alexh/3.1/xavp Commit: d51710a95b033dee783a92e22cff19fd35a2b823 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d51710a… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Mon Dec 20 23:40:31 2010 +0100 core: Set loglevel of pv_xavp_print to INFO If the function is used in a script, the user will probaly want to see the result without flooding the logs with debugging info. This change makes the behaviour consistent with avp_print(). --- xavp.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/xavp.c b/xavp.c index 6b19d40..e724f95 100644 --- a/xavp.c +++ b/xavp.c @@ -467,42 +467,42 @@ void xavp_print_list(sr_xavp_t **head) avp = *head; else avp=*_xavp_list_crt; - LM_DBG("+++++ XAVP list: %p\n", avp); + LM_INFO("+++++ XAVP list: %p\n", avp); while(avp) { - LM_DBG(" *** XAVP name: %s\n", avp->name.s); - LM_DBG(" XAVP id: %u\n", avp->id); - LM_DBG(" XAVP value type: %d\n", avp->val.type); + LM_INFO(" *** XAVP name: %s\n", avp->name.s); + LM_INFO(" XAVP id: %u\n", avp->id); + LM_INFO(" XAVP value type: %d\n", avp->val.type); switch(avp->val.type) { case SR_XTYPE_NULL: - LM_DBG(" XAVP value: <null>\n"); + LM_INFO(" XAVP value: <null>\n"); break; case SR_XTYPE_INT: - LM_DBG(" XAVP value: %d\n", avp->val.v.i); + LM_INFO(" XAVP value: %d\n", avp->val.v.i); break; case SR_XTYPE_STR: - LM_DBG(" XAVP value: %s\n", avp->val.v.s.s); + LM_INFO(" XAVP value: %s\n", avp->val.v.s.s); break; case SR_XTYPE_TIME: - LM_DBG(" XAVP value: %lu\n", avp->val.v.t); + LM_INFO(" XAVP value: %lu\n", avp->val.v.t); break; case SR_XTYPE_LONG: - LM_DBG(" XAVP value: %ld\n", avp->val.v.l); + LM_INFO(" XAVP value: %ld\n", avp->val.v.l); break; case SR_XTYPE_LLONG: - LM_DBG(" XAVP value: %lld\n", avp->val.v.ll); + LM_INFO(" XAVP value: %lld\n", avp->val.v.ll); break; case SR_XTYPE_XAVP: - LM_DBG(" XAVP value: <xavp:%p>\n", avp->val.v.xavp); + LM_INFO(" XAVP value: <xavp:%p>\n", avp->val.v.xavp); xavp_print_list(&avp->val.v.xavp); break; case SR_XTYPE_DATA: - LM_DBG(" XAVP value: <data:%p>\n", avp->val.v.data); + LM_INFO(" XAVP value: <data:%p>\n", avp->val.v.data); break; } avp = avp->next; } - LM_DBG("----- XAVP list\n"); + LM_INFO("----- XAVP list\n"); } #endif

13 years, 11 months

git:alexh/3.1/xavp: modules_k/sqlops: Add xavp support to sqlops

by Alex Hermann

Module: sip-router Branch: alexh/3.1/xavp Commit: b01c6a7ea86ef3c85652da198ba5405e049c988b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b01c6a7… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Tue Dec 21 10:06:29 2010 +0100 modules_k/sqlops: Add xavp support to sqlops Introduce a new function sql_xquery that stores the result in an xavp. --- modules_k/sqlops/doc/sqlops_admin.xml | 54 ++++++++++++++ modules_k/sqlops/sql_api.c | 130 +++++++++++++++++++++++++++++++++ modules_k/sqlops/sql_api.h | 4 + modules_k/sqlops/sqlops.c | 56 ++++++++++++++ 4 files changed, 244 insertions(+), 0 deletions(-) diff --git a/modules_k/sqlops/doc/sqlops_admin.xml b/modules_k/sqlops/doc/sqlops_admin.xml index 0c0a444..24a6d8c 100644 --- a/modules_k/sqlops/doc/sqlops_admin.xml +++ b/modules_k/sqlops/doc/sqlops_admin.xml @@ -60,6 +60,14 @@ times. </para> </listitem> + <listitem> + <para> + <emphasis>alternatively, results can be stored in xavps. Columns are + accessed by their names, rows by xavp index. Xavp's are automatically + available during the transactions lifetime and don't need to be + destroyed manually. + </para> + </listitem> </itemizedlist> </section> @@ -192,6 +200,52 @@ sql_result_free("ra"); </section> <section> <title> + <function moreinfo="none">sql_xquery(connection, query, result)</function> + </title> + <para> + Make a SQL query using 'connection' and store data in 'result' xavp. + </para> + <itemizedlist> + <listitem> + <para> + <emphasis>connection</emphasis> - the name of the connection + to be used for query (defined via the <quote>sqlcon</quote> parameter). + </para> + </listitem> + <listitem> + <para> + <emphasis>query</emphasis> - SQL query string or pseudo-variables containing SQL query. + </para> + </listitem> + <listitem> + <para> + <emphasis>result</emphasis> - string name to identify the + result xavp. Each row will be added to this xavp, each column can + be accessed by its name. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, + ONREPLY_ROUTE, BRANCH_ROUTE. + </para> + <example> + <title><function>sql_xquery()</function> usage</title> + <programlisting format="linespecific"> +... +modparam("sqlops","sqlcon","ca=>&exampledb;") +... +sql_xquery("ca", "select * from domain", "ra"); + xlog("first domain: $xavp(ra=>domain) with id: $xavp(ra=>domain_id)\n"); + pv_unset("$xavp(ra)"); + xlog("second domain: $xavp(ra=>domain) with id: $xavp(ra=>domain_id)\n"); + +... +</programlisting> + </example> + </section> + <section> + <title> <function moreinfo="none">sql_result_free(result)</function> </title> <para> diff --git a/modules_k/sqlops/sql_api.c b/modules_k/sqlops/sql_api.c index 5b69108..7f77d37 100644 --- a/modules_k/sqlops/sql_api.c +++ b/modules_k/sqlops/sql_api.c @@ -32,6 +32,9 @@ #include "../../dprint.h" #include "../../lib/kcore/hash_func.h" #include "../../ut.h" +#ifdef WITH_XAVP +#include "../../xavp.h" +#endif #include "sql_api.h" @@ -345,6 +348,133 @@ error: return -1; } +#ifdef WITH_XAVP +int sql_do_xquery(struct sip_msg *msg, sql_con_t *con, pv_elem_t *query, + pv_elem_t *res) +{ + db1_res_t* db_res = NULL; + sr_xavp_t *row = NULL; + sr_xval_t val; + int i, j; + str sq, xavp; + + if(msg==NULL || query==NULL) + { + LM_ERR("bad parameters\n"); + return -1; + } + if(pv_printf_s(msg, query, &sq)!=0) + { + LM_ERR("cannot print the sql query\n"); + return -1; + } + if(con->dbf.raw_query(con->dbh, &sq, &db_res)!=0) + { + LM_ERR("cannot do the query\n"); + return -1; + } + + if(db_res==NULL || RES_ROW_N(db_res)<=0 || RES_COL_N(db_res)<=0) + { + LM_DBG("no result after query\n"); + con->dbf.free_result(con->dbh, db_res); + return 2; + } + + if(pv_printf_s(msg, res, &xavp)!=0) + { + LM_ERR("cannot print the result parameter\n"); + return -1; + } + + for(i=RES_ROW_N(db_res)-1; i>=0; i--) + { + row = NULL; + for(j=RES_COL_N(db_res)-1; j>=0; j--) + { + if(RES_ROWS(db_res)[i].values[j].nul) + { + val.type = SR_XTYPE_NULL; + } else + { + switch(RES_ROWS(db_res)[i].values[j].type) + { + case DB1_STRING: + val.type = SR_XTYPE_STR; + sq.s= + (char*)RES_ROWS(db_res)[i].values[j].val.string_val; + sq.len=strlen(sq.s); + break; + case DB1_STR: + val.type = SR_XTYPE_STR; + sq.len= + RES_ROWS(db_res)[i].values[j].val.str_val.len; + sq.s= + (char*)RES_ROWS(db_res)[i].values[j].val.str_val.s; + break; + case DB1_BLOB: + val.type = SR_XTYPE_STR; + sq.len= + RES_ROWS(db_res)[i].values[j].val.blob_val.len; + sq.s= + (char*)RES_ROWS(db_res)[i].values[j].val.blob_val.s; + break; + case DB1_INT: + val.type = SR_XTYPE_INT; + val.v.i + = (int)RES_ROWS(db_res)[i].values[j].val.int_val; + break; + case DB1_DATETIME: + val.type = SR_XTYPE_INT; + val.v.i + = (int)RES_ROWS(db_res)[i].values[j].val.time_val; + break; + case DB1_BITMAP: + val.type = SR_XTYPE_INT; + val.v.i + = (int)RES_ROWS(db_res)[i].values[j].val.bitmap_val; + break; + default: + val.type = SR_XTYPE_NULL; + } + if(val.type == SR_XTYPE_STR) + { + if(sq.len==0) + { + val.v.s = _sql_empty_str; + } else { + val.v.s.s = (char*)pkg_malloc(sq.len*sizeof(char)); + if(val.v.s.s == NULL) + { + LM_ERR("no more memory\n"); + goto error; + } + memcpy(val.v.s.s, sq.s, sq.len); + val.v.s.len = sq.len; + } + } + } + /* Add column to current row, under the column's name */ + LM_DBG("Adding column: %.*s\n", RES_NAMES(db_res)[j]->len, RES_NAMES(db_res)[j]->s); + xavp_add_value(RES_NAMES(db_res)[j], &val, &row); + } + /* Add row to result xavp */ + val.type = SR_XTYPE_XAVP; + val.v.xavp = row; + LM_DBG("Adding row\n"); + xavp_add_value(&xavp, &val, NULL); + } + + con->dbf.free_result(con->dbh, db_res); + return 1; + +error: + con->dbf.free_result(con->dbh, db_res); + return -1; + +} +#endif + int sql_parse_param(char *val) { str name; diff --git a/modules_k/sqlops/sql_api.h b/modules_k/sqlops/sql_api.h index 1b19526..1b4eb20 100644 --- a/modules_k/sqlops/sql_api.h +++ b/modules_k/sqlops/sql_api.h @@ -72,6 +72,10 @@ void sql_destroy(void); int sql_connect(void); int sql_do_query(struct sip_msg *msg, sql_con_t *con, pv_elem_t *query, sql_result_t *res); +#ifdef WITH_XAVP +int sql_do_xquery(struct sip_msg *msg, sql_con_t *con, pv_elem_t *query, + pv_elem_t *res); +#endif sql_con_t* sql_get_connection(str *name); sql_result_t* sql_get_result(str *name); diff --git a/modules_k/sqlops/sqlops.c b/modules_k/sqlops/sqlops.c index a9fa054..18293ff 100644 --- a/modules_k/sqlops/sqlops.c +++ b/modules_k/sqlops/sqlops.c @@ -58,11 +58,17 @@ MODULE_VERSION /** module functions */ static int sql_query(struct sip_msg*, char*, char*, char*); +#ifdef WITH_XAVP +static int sql_xquery(struct sip_msg *msg, char *dbl, char *query, char *res); +#endif static int sql_rfree(struct sip_msg*, char*, char*); static int child_init(int rank); static void destroy(void); static int fixup_sql_query(void** param, int param_no); +#ifdef WITH_XAVP +static int fixup_sql_xquery(void** param, int param_no); +#endif static int fixup_sql_rfree(void** param, int param_no); static int sql_param(modparam_t type, void* val); @@ -77,6 +83,11 @@ static cmd_export_t cmds[]={ {"sql_query", (cmd_function)sql_query, 3, fixup_sql_query, 0, REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE | LOCAL_ROUTE}, +#ifdef WITH_XAVP + {"sql_xquery", (cmd_function)sql_xquery, 3, fixup_sql_xquery, 0, + REQUEST_ROUTE | FAILURE_ROUTE | + ONREPLY_ROUTE | BRANCH_ROUTE | LOCAL_ROUTE}, +#endif {"sql_result_free", (cmd_function)sql_rfree, 1, fixup_sql_rfree, 0, REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE | LOCAL_ROUTE}, @@ -137,6 +148,14 @@ static int sql_query(struct sip_msg *msg, char *dbl, char *query, char *res) (sql_result_t*)res); } +#ifdef WITH_XAVP +static int sql_xquery(struct sip_msg *msg, char *dbl, char *query, char *res) +{ + return sql_do_xquery(msg, (sql_con_t*)dbl, (pv_elem_t*)query, + (pv_elem_t*)res); +} +#endif + static int sql_rfree(struct sip_msg *msg, char *res, char *s2) { sql_reset_result((sql_result_t*)res); @@ -180,6 +199,43 @@ static int fixup_sql_query(void** param, int param_no) return 0; } +#ifdef WITH_XAVP +static int fixup_sql_xquery(void** param, int param_no) +{ + sql_con_t *con = NULL; + pv_elem_t *pv = NULL; + str s; + + s.s = (char*)(*param); + s.len = strlen(s.s); + + if (param_no==1) { + con = sql_get_connection(&s); + if(con==NULL) + { + LM_ERR("invalid connection [%s]\n", s.s); + return E_UNSPEC; + } + *param = (void*)con; + } else if (param_no==2) { + if(pv_parse_format(&s, &pv)<0) + { + LM_ERR("invalid query string [%s]\n", s.s); + return E_UNSPEC; + } + *param = (void*)pv; + } else if (param_no==3) { + if(pv_parse_format(&s, &pv)<0) + { + LM_ERR("invalid result [%s]\n", s.s); + return E_UNSPEC; + } + *param = (void*)pv; + } + return 0; +} +#endif + static int fixup_sql_rfree(void** param, int param_no) { sql_result_t *res = NULL;

13 years, 11 months

git:alexh/3.1/xavp: Makefile: Enable xavp's

by Alex Hermann

Module: sip-router Branch: alexh/3.1/xavp Commit: bc4a193528986c3b0813f757aba23e3cf501cc01 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bc4a193… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Mon Dec 20 19:03:29 2010 +0100 Makefile: Enable xavp's By default, xavp's are disabled in the Makefile, enable them now. --- Makefile.defs | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 1ceb63b..13d1e00 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -656,6 +656,7 @@ C_DEFS= $(extra_defs) \ -DUSE_DNS_FAILOVER \ -DUSE_DST_BLACKLIST \ -DUSE_NAPTR \ + -DWITH_XAVP \ #-DUSE_DNS_CACHE_STATS \ #-DUSE_DST_BLACKLIST_STATS \ #-DDNS_WATCHDOG_SUPPORT \

13 years, 11 months

git:3.1: db_text(k): add lcr tables def files

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 553190896abed932a42b5fe1ad8e012f5bdad467 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5531908… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Dec 27 13:54:55 2010 +0100 db_text(k): add lcr tables def files (cherry picked from commit 175acb78028b6f7eb3a06dc306f097e98d72be40) --- utils/kamctl/dbtext/kamailio/lcr_gw | 2 ++ utils/kamctl/dbtext/kamailio/lcr_rule | 2 ++ utils/kamctl/dbtext/kamailio/lcr_rule_target | 2 ++ 3 files changed, 6 insertions(+), 0 deletions(-) diff --git a/utils/kamctl/dbtext/kamailio/lcr_gw b/utils/kamctl/dbtext/kamailio/lcr_gw new file mode 100644 index 0000000..71f1fb9 --- /dev/null +++ b/utils/kamctl/dbtext/kamailio/lcr_gw @@ -0,0 +1,2 @@ +id(int,auto) lcr_id(int) gw_name(string,null) ip_addr(string,null) hostname(string,null) port(int,null) params(string,null) uri_scheme(int,null) transport(int,null) strip(int,null) tag(string,null) flags(int) defunct(int,null) +lcr_gw:1 diff --git a/utils/kamctl/dbtext/kamailio/lcr_rule b/utils/kamctl/dbtext/kamailio/lcr_rule new file mode 100644 index 0000000..483ce58 --- /dev/null +++ b/utils/kamctl/dbtext/kamailio/lcr_rule @@ -0,0 +1,2 @@ +id(int,auto) lcr_id(int) prefix(string,null) from_uri(string,null) stopper(int) enabled(int) +lcr_rule:1 diff --git a/utils/kamctl/dbtext/kamailio/lcr_rule_target b/utils/kamctl/dbtext/kamailio/lcr_rule_target new file mode 100644 index 0000000..d72e6f0 --- /dev/null +++ b/utils/kamctl/dbtext/kamailio/lcr_rule_target @@ -0,0 +1,2 @@ +id(int,auto) lcr_id(int) rule_id(int) gw_id(int) priority(int) weight(int) +lcr_rule_target:1

13 years, 11 months

git:master: db_text(k): add lcr tables def files

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 175acb78028b6f7eb3a06dc306f097e98d72be40 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=175acb7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Dec 27 13:54:55 2010 +0100 db_text(k): add lcr tables def files --- utils/kamctl/dbtext/kamailio/lcr_gw | 2 ++ utils/kamctl/dbtext/kamailio/lcr_rule | 2 ++ utils/kamctl/dbtext/kamailio/lcr_rule_target | 2 ++ 3 files changed, 6 insertions(+), 0 deletions(-) diff --git a/utils/kamctl/dbtext/kamailio/lcr_gw b/utils/kamctl/dbtext/kamailio/lcr_gw new file mode 100644 index 0000000..71f1fb9 --- /dev/null +++ b/utils/kamctl/dbtext/kamailio/lcr_gw @@ -0,0 +1,2 @@ +id(int,auto) lcr_id(int) gw_name(string,null) ip_addr(string,null) hostname(string,null) port(int,null) params(string,null) uri_scheme(int,null) transport(int,null) strip(int,null) tag(string,null) flags(int) defunct(int,null) +lcr_gw:1 diff --git a/utils/kamctl/dbtext/kamailio/lcr_rule b/utils/kamctl/dbtext/kamailio/lcr_rule new file mode 100644 index 0000000..483ce58 --- /dev/null +++ b/utils/kamctl/dbtext/kamailio/lcr_rule @@ -0,0 +1,2 @@ +id(int,auto) lcr_id(int) prefix(string,null) from_uri(string,null) stopper(int) enabled(int) +lcr_rule:1 diff --git a/utils/kamctl/dbtext/kamailio/lcr_rule_target b/utils/kamctl/dbtext/kamailio/lcr_rule_target new file mode 100644 index 0000000..d72e6f0 --- /dev/null +++ b/utils/kamctl/dbtext/kamailio/lcr_rule_target @@ -0,0 +1,2 @@ +id(int,auto) lcr_id(int) rule_id(int) gw_id(int) priority(int) weight(int) +lcr_rule_target:1

13 years, 11 months

compiler warnings

by Juha Heinanen

latest master gave these kind of compiler warnings that do not look good to me. -- juha core_stats.c: In function ‘sts_update_core_stats’: core_stats.c:136: warning: cast from pointer to integer of different size CC (cc) [M kex.so] flags.o CC (cc) [M kex.so] kex_mod.o CC (cc) [M kex.so] km_core.o CC (cc) [M kex.so] mi_core.o CC (cc) [M kex.so] pkg_stats.o pkg_stats.c: In function ‘pkg_proc_update_used’: pkg_stats.c:128: warning: cast from pointer to integer of different size pkg_stats.c: In function ‘pkg_proc_update_real_used’: pkg_stats.c:141: warning: cast from pointer to integer of different size

13 years, 12 months

git:master: kex: get rid of 64b warnings in pkg stats updates

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: b8ceb2733682d576d95b98df06328559743c2a69 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b8ceb27… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Dec 23 11:23:36 2010 +0100 kex: get rid of 64b warnings in pkg stats updates --- modules_k/kex/pkg_stats.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/kex/pkg_stats.c b/modules_k/kex/pkg_stats.c index 2a04e3d..0ae0569 100644 --- a/modules_k/kex/pkg_stats.c +++ b/modules_k/kex/pkg_stats.c @@ -125,7 +125,7 @@ static int pkg_proc_update_used(void *data) return -1; if(process_no>=_pkg_proc_stats_no) return -1; - _pkg_proc_stats_list[process_no].used = (unsigned int)data; + _pkg_proc_stats_list[process_no].used = (unsigned int)(long)data; return 0; } @@ -138,7 +138,7 @@ static int pkg_proc_update_real_used(void *data) return -1; if(process_no>=_pkg_proc_stats_no) return -1; - _pkg_proc_stats_list[process_no].real_used = (unsigned int)data; + _pkg_proc_stats_list[process_no].real_used = (unsigned int)(long)data; _pkg_proc_stats_list[process_no].available = pkg_available(); return 0; }

13 years, 12 months

sr master dioes not compile anymore

by Juha Heinanen

i tried to compile sr master and it failed like this: CC (cc) [trunk-proxy] mem/f_malloc.o mem/f_malloc.c:59:23: error: ../evnets.h: No such file or directory is there typo in the file name? -- juha

13 years, 12 months

git:master: core: fix typo added with pkg stats

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 92d6b6c19800439864d27cb2ee4df0202c255cf0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=92d6b6c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Dec 23 09:42:01 2010 +0100 core: fix typo added with pkg stats - reported by Juha Heinanen --- mem/f_malloc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/mem/f_malloc.c b/mem/f_malloc.c index 17927f6..48cd8b1 100644 --- a/mem/f_malloc.c +++ b/mem/f_malloc.c @@ -56,7 +56,7 @@ #include "../bit_scan.h" #include "../cfg/cfg.h" /* memlog */ #ifdef MALLOC_STATS -#include "../evnets.h" +#include "../events.h" #endif

13 years, 12 months

[ openser-Feature Requests-1875757 ] Add "Reason" header as tm parameter for CANCEL when forking

by SourceForge.net

Feature Requests item #1875757, was opened at 2008-01-20 14:01 Message generated for change (Comment added) made by ibc_sf You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743023&aid=1875757&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: modules Group: None >Status: Closed >Resolution: Fixed Priority: 5 Private: No Submitted By: Iñaki Baz Castillo (ibc_sf) Assigned to: Nobody/Anonymous (nobody) Summary: Add "Reason" header as tm parameter for CANCEL when forking Initial Comment: Hi, according to RFC 3326 [1] (Reason Header): 3.1 Call Completed Elsewhere A proxy forks an INVITE request and one of the branches returns a 200 (OK). The forking proxy includes this status code in a Reason header field in the CANCEL request that it sends to the rest of the branches. Reason: SIP ;cause=200 ;text="Call completed elsewhere" With this behaviour, if an AoR is registered in two phones and one of them answers a call, that call will not appear as MISSED in the other phone (if the phone supports "Reason" headers). This could be implemented as new "tm" parameters: modparam("tm", "add_reason_200_flag", 26) modparam("tm", "add_reason_200_text", "Call completed elsewhere") modparam("tm", "add_reason_200_text_avp", "$avp(i:26)") The last parameter would be an AVP containing the text to send in CANCEL "Reason" header if the call has been replied with 200 in other branch. If not set, default value ("add_reason_200_text") would be used. To add "Reason" header, flag(26) should be set before transaction creation: lookup("location"); switch($rc) { case 1: setflag(26); # Add "Reason" header in CANCELLED branches. $avp(i:26)="Call answered in other phone"; t_relay(); exit; } [1] RFC 3326 - The Reason Header Field: http://www.faqs.org/rfcs/rfc3326.html ---------------------------------------------------------------------- >Comment By: Iñaki Baz Castillo (ibc_sf) Date: 2010-12-22 15:03 Message: Hi aregr, this feature is already implemented in Kamailio/SIp-Router 3.X. ---------------------------------------------------------------------- Comment By: aregr (aregr) Date: 2010-12-22 12:23 Message: This would be a very useful feature indeed for all those with forking setups. Also seems that we have a steady growing number of phone manufacturers supporting this feature as well. Who could fix this? -Should not be too difficult to implement? ---------------------------------------------------------------------- Comment By: Olle E. Johansson (oej) Date: 2008-06-30 22:09 Message: Logged In: YES user_id=7341 Originator: NO I added this to Asterisk a short while ago. I think it would be very useful in OpenSER too. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743023&aid=1875757&group_…

13 years, 12 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2010