sr-dev March 2011

sr-dev@lists.kamailio.org

25 participants
194 discussions

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

by Alex Hermann

Module: sip-router Branch: alexh/master Commit: a1d2cedabf37e17e1d71839225c9652eef61b6eb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a1d2ced… 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 --- modules_k/sqlops/doc/sqlops_admin.xml | 72 ++++++++++++++++++- modules_k/sqlops/sql_api.c | 131 +++++++++++++++++++++++++++++++++ modules_k/sqlops/sql_api.h | 4 + modules_k/sqlops/sqlops.c | 61 +++++++++++++++ 4 files changed, 267 insertions(+), 1 deletions(-) diff --git a/modules_k/sqlops/doc/sqlops_admin.xml b/modules_k/sqlops/doc/sqlops_admin.xml index 997a457..ddb28df 100644 --- a/modules_k/sqlops/doc/sqlops_admin.xml +++ b/modules_k/sqlops/doc/sqlops_admin.xml @@ -60,6 +60,13 @@ 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 available + during the transactions lifetime and don't need to be destroyed manually. + </para> + </listitem> </itemizedlist> </section> @@ -213,6 +220,48 @@ sql_result_free("ra"); </programlisting> </example> </section> + <title> + <function moreinfo="none">sql_query(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"); +... +</programlisting> + </example> + </section> <section> <title> <function moreinfo="none">sql_result_free(result)</function> @@ -306,7 +355,28 @@ if($dbr(ra=>rows)>0) } sql_result_free("ra"); ... - </programlisting> + + +... +if (sql_xquery("ca", "select * from domain", "ra") == 1) +{ +# non-destructive iteration + $var(i) = 0; + while($xavp(ra[$var(i)]) != $null) + { + xlog("[id, domain] = [$xavp(ra[$var(i)]=>id), $xavp(ra[$var(i)]=>domain)]\n"); + $var(i) = $var(i) + 1; + } + +# destructive iteration + while($xavp(ra) != $null) + { + xlog("[id, domain] = [$xavp(ra=>id), $xavp(ra=>domain)]\n"); + pv_unset("$xavp(ra)"); + } +} +... + </programlisting> </example> </section> </section> diff --git a/modules_k/sqlops/sql_api.c b/modules_k/sqlops/sql_api.c index 5bf6920..0dc97e0 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" @@ -341,6 +344,134 @@ 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 sv, xavp; + + if(msg==NULL || query==NULL || res==NULL) + { + LM_ERR("bad parameters\n"); + return -1; + } + if(pv_printf_s(msg, query, &sv)!=0) + { + LM_ERR("cannot print the sql query\n"); + return -1; + } + + if(pv_printf_s(msg, res, &xavp)!=0) + { + LM_ERR("cannot print the result parameter\n"); + return -1; + } + + if(con->dbf.raw_query(con->dbh, &sv, &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; + } + + 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; + sv.s= + (char*)RES_ROWS(db_res)[i].values[j].val.string_val; + sv.len=strlen(sv.s); + break; + case DB1_STR: + val.type = SR_XTYPE_STR; + sv.len= + RES_ROWS(db_res)[i].values[j].val.str_val.len; + sv.s= + (char*)RES_ROWS(db_res)[i].values[j].val.str_val.s; + break; + case DB1_BLOB: + val.type = SR_XTYPE_STR; + sv.len= + RES_ROWS(db_res)[i].values[j].val.blob_val.len; + sv.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(sv.len==0) + { + val.v.s = _sql_empty_str; + } else { + val.v.s.s = (char*)pkg_malloc(sv.len*sizeof(char)); + if(val.v.s.s == NULL) + { + LM_ERR("no more memory\n"); + goto error; + } + memcpy(val.v.s.s, sv.s, sv.len); + val.v.s.len = sv.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 b5543d5..ce00672 100644 --- a/modules_k/sqlops/sql_api.h +++ b/modules_k/sqlops/sql_api.h @@ -73,6 +73,10 @@ void sql_destroy(void); int sql_connect(void); int sql_do_query(sql_con_t *con, str *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 5242f88..a03b7b5 100644 --- a/modules_k/sqlops/sqlops.c +++ b/modules_k/sqlops/sqlops.c @@ -60,11 +60,17 @@ static int bind_sqlops(sqlops_api_t* api); /** 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_con_param(modparam_t type, void* val); @@ -80,6 +86,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}, @@ -181,6 +192,16 @@ static int sql_query(struct sip_msg *msg, char *dbl, char *query, char *res) return sql_do_query((sql_con_t*)dbl, &sq, (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, query, (pv_elem_t*)res); +} +#endif + /** * */ @@ -230,6 +251,46 @@ 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 + /** * */

13 years, 8 months

git:alexh/master: core: Set loglevel of pv_xavp_print to INFO so it matches avp_print() behaviour.

by Alex Hermann

Module: sip-router Branch: alexh/master Commit: 4e163e08fe602228aca514df787964f2c4e2caf8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4e163e0… 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 so it matches avp_print() behaviour. --- xavp.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/xavp.c b/xavp.c index a008afd..622c058 100644 --- a/xavp.c +++ b/xavp.c @@ -468,43 +468,43 @@ void xavp_print_list_content(sr_xavp_t **head, int level) start = *head; else start=*_xavp_list_crt; - LM_DBG("+++++ start XAVP list: %p (level=%d)\n", start, level); + LM_INFO("+++++ start XAVP list: %p (level=%d)\n", start, level); avp = start; 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_content(&avp->val.v.xavp, level+1); 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("----- end XAVP list: %p (level=%d)\n", start, level); + LM_INFO("----- end XAVP list: %p (level=%d)\n", start, level); } void xavp_print_list(sr_xavp_t **head)

13 years, 8 months

git:alexh/master: modules_k/pv: Make startup time available in a pseudovariable $Tb (boottime).

by Alex Hermann

Module: sip-router Branch: alexh/master Commit: 697e9181b8b4cf0bc7d648db637ce843700ba654 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=697e918… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Mon Jan 10 15:41:42 2011 +0100 modules_k/pv: Make startup time available in a pseudovariable $Tb (boottime). --- modules_k/pv/pv.c | 3 +++ modules_k/pv/pv_time.c | 9 +++++++++ modules_k/pv/pv_time.h | 2 ++ 3 files changed, 14 insertions(+), 0 deletions(-) diff --git a/modules_k/pv/pv.c b/modules_k/pv/pv.c index 77898cf..8009be7 100644 --- a/modules_k/pv/pv.c +++ b/modules_k/pv/pv.c @@ -364,6 +364,9 @@ static pv_export_t mod_pvs[] = { {{"true", (sizeof("true")-1)}, /* */ PVT_OTHER, pv_get_true, 0, 0, 0, 0, 0}, + {{"Tb", (sizeof("Tb")-1)}, /* */ + PVT_OTHER, pv_get_timeb, 0, + 0, 0, 0, 0}, {{"Tf", (sizeof("Tf")-1)}, /* */ PVT_CONTEXT, pv_get_timef, 0, 0, 0, 0, 0}, diff --git a/modules_k/pv/pv_time.c b/modules_k/pv/pv_time.c index 72ce234..72f1134 100644 --- a/modules_k/pv/pv_time.c +++ b/modules_k/pv/pv_time.c @@ -30,6 +30,7 @@ #include <sys/time.h> #include "../../dprint.h" +#include "../../globals.h" #include "../../pvar.h" #include "pv_time.h" @@ -254,6 +255,14 @@ int pv_get_timef(struct sip_msg *msg, pv_param_t *param, return pv_get_strintval(msg, param, res, &s, (int)t); } +int pv_get_timeb(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + if(msg==NULL) + return -1; + return pv_get_uintval(msg, param, res, (unsigned int)up_since); +} + static struct timeval _timeval_ts; static unsigned int _timeval_msg_id = 0; static char _timeval_ts_buf[32]; diff --git a/modules_k/pv/pv_time.h b/modules_k/pv/pv_time.h index d1ab6a9..cb7be93 100644 --- a/modules_k/pv/pv_time.h +++ b/modules_k/pv/pv_time.h @@ -40,6 +40,8 @@ int pv_get_times(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); int pv_get_timef(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_timeb(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); int pv_parse_timeval_name(pv_spec_p sp, str *in); int pv_get_timeval(struct sip_msg *msg, pv_param_t *param,

13 years, 8 months

git:alexh/master: modules_k/pv: Add new transformations to create prefixes

by Alex Hermann

Module: sip-router Branch: alexh/master Commit: 62e40ee24766f30bc2d2662d8d02476281963156 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=62e40ee… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Mon Dec 20 16:49:07 2010 +0100 modules_k/pv: Add new transformations to create prefixes s.prefixes creates a string with prefixes separated by comma's s.prefixes.quoted creates a string of quoted prefixes spearated by comma's Both take a parameter to specify the max prefix length. If zero, then return upto the whole string. Examples: "1234"{s.prefixes,0} => 1,12,123,1234 "123456"{s.prefixes,4} => 1,12,123,1234 "123456"{s.prefixes.quot,4} => '1','12','123','1234' --- modules_k/pv/pv_trans.c | 79 +++++++++++++++++++++++++++++++++++++++++++++- modules_k/pv/pv_trans.h | 2 +- 2 files changed, 78 insertions(+), 3 deletions(-) diff --git a/modules_k/pv/pv_trans.c b/modules_k/pv/pv_trans.c index e568ddb..35c7fe2 100644 --- a/modules_k/pv/pv_trans.c +++ b/modules_k/pv/pv_trans.c @@ -67,7 +67,7 @@ static char _tr_buffer[TR_BUFFER_SIZE]; int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, pv_value_t *val) { - int i, j; + int i, j, max; char *p, *s; str st; pv_value_t v; @@ -452,6 +452,50 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, val->rs.len -= i; break; + case TR_S_PREFIXES: + case TR_S_PREFIXES_QUOT: + if(!(val->flags&PV_VAL_STR)) + val->rs.s = int2str(val->ri, &val->rs.len); + + /* Set maximum prefix length */ + max = val->rs.len; + if(tp!=NULL) { + if(tp->type==TR_PARAM_NUMBER) { + if (tp->v.n > 0 && tp->v.n < max) + max = tp->v.n; + } else { + if(pv_get_spec_value(msg, (pv_spec_p)tp->v.data, &v)!=0 + || (!(v.flags&PV_VAL_INT))) + { + LM_ERR("prefixes cannot get max\n"); + return -1; + } + if (v.ri > 0 && v.ri < max) + max = v.ri; + } + } + + if(max * (max/2 + (subtype==TR_S_PREFIXES_QUOT ? 1 : 3)) > TR_BUFFER_SIZE-1) { + LM_ERR("prefixes buffer too short\n"); + return -1; + } + + j = 0; + for (i=1; i <= max; i++) { + if (subtype==TR_S_PREFIXES_QUOT) + _tr_buffer[j++] = '\''; + memcpy(&(_tr_buffer[j]), val->rs.s, i); + j += i; + if (subtype==TR_S_PREFIXES_QUOT) + _tr_buffer[j++] = '\''; + _tr_buffer[j++] = ','; + } + memset(val, 0, sizeof(pv_value_t)); + val->flags = PV_VAL_STR; + val->rs.s = _tr_buffer; + val->rs.len = j-1; + break; + default: LM_ERR("unknown subtype %d\n", subtype); @@ -1236,6 +1280,38 @@ char* tr_parse_string(str* in, trans_t *t) } else if(name.len==14 && strncasecmp(name.s, "unescape.param", 14)==0) { t->subtype = TR_S_UNESCAPEPARAM; goto done; + } else if(name.len==8 && strncasecmp(name.s, "prefixes", 8)==0) { + t->subtype = TR_S_PREFIXES; + if(*p!=TR_PARAM_MARKER) + goto done; + p++; + _tr_parse_nparam(p, p0, tp, spec, n, sign, in, s); + t->params = tp; + tp = 0; + while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; + if(*p!=TR_RBRACKET) + { + LM_ERR("invalid prefixes transformation: %.*s!!\n", + in->len, in->s); + goto error; + } + goto done; + } else if(name.len==15 && strncasecmp(name.s, "prefixes.quoted", 15)==0) { + t->subtype = TR_S_PREFIXES_QUOT; + if(*p!=TR_PARAM_MARKER) + goto done; + p++; + _tr_parse_nparam(p, p0, tp, spec, n, sign, in, s); + t->params = tp; + tp = 0; + while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; + if(*p!=TR_RBRACKET) + { + LM_ERR("invalid prefixes transformation: %.*s!!\n", + in->len, in->s); + goto error; + } + goto done; } else if(name.len==6 && strncasecmp(name.s, "substr", 6)==0) { t->subtype = TR_S_SUBSTR; if(*p!=TR_PARAM_MARKER) @@ -1706,4 +1782,3 @@ done: t->name = name; return p; } - diff --git a/modules_k/pv/pv_trans.h b/modules_k/pv/pv_trans.h index acd81db..1e601d8 100644 --- a/modules_k/pv/pv_trans.h +++ b/modules_k/pv/pv_trans.h @@ -39,7 +39,7 @@ enum _tr_s_subtype { TR_S_SELECT, TR_S_ENCODEHEXA, TR_S_DECODEHEXA, TR_S_ESCAPECOMMON, TR_S_UNESCAPECOMMON, TR_S_ESCAPEUSER, TR_S_UNESCAPEUSER, TR_S_ESCAPEPARAM, TR_S_UNESCAPEPARAM, TR_S_TOLOWER, TR_S_TOUPPER, - TR_S_STRIP, TR_S_STRIPTAIL + TR_S_STRIP, TR_S_STRIPTAIL, TR_S_PREFIXES, TR_S_PREFIXES_QUOT }; enum _tr_uri_subtype { TR_URI_NONE=0, TR_URI_USER, TR_URI_HOST, TR_URI_PASSWD, TR_URI_PORT,

13 years, 8 months

git:master: makefile: store the flavour in tarball

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: dd15ae96c06c1e39f42894238cff74efff3563fa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dd15ae9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Mar 7 11:59:45 2011 +0100 makefile: store the flavour in tarball - Makefile.vars is auto-generated to store the flavour when creating the tarball - Makefile.vars is stored inside the tarball - do 'make maintainer-clean' or 'make clean-makefile-vars' to remove it - allow to build the packaged flavour even when 'make FLAVOUR=... cfg' is forgotten - suggested by Olle E. Johansson --- Makefile | 11 +++++++++-- Makefile.defs | 2 ++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3997a38..44db945 100644 --- a/Makefile +++ b/Makefile @@ -772,12 +772,16 @@ utils: dbg: sip-router gdb -command debug.gdb +.PHONY: makefile_vars makefile-vars +makefile_vars makefile-vars: + echo "FLAVOUR?=$(FLAVOUR)" > Makefile.vars + .PHONY: tar .PHONY: dist dist: tar -tar: $(auto_gen_keep) +tar: makefile_vars $(auto_gen_keep) $(TAR) -C .. \ --exclude=$(notdir $(CURDIR))/test* \ --exclude=$(notdir $(CURDIR))/tmp* \ @@ -1143,7 +1147,7 @@ maintainer-clean: modules=$(modules_all) proper realclean distclean maintainer-clean: clean_cfg # on maintainer clean, remove also the configured module list -maintainer-clean: clean_modules_cfg +maintainer-clean: clean_modules_cfg clean_makefile_vars .PHONY: proper-all realclean-all distclean-all proper-all realclean-all distclean-all: cmodules=$(all_modules_lst) @@ -1158,6 +1162,9 @@ clean_cfg clean-cfg: clean_modules_cfg clean-modules-cfg: rm -f modules.lst +.PHONY: clean_makefile_vars clean-makefile-vars + rm -f Makefile.vars + .PHONY: dbschema dbschema: -@echo "Build database schemas" diff --git a/Makefile.defs b/Makefile.defs index 008316c..dfad205 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -117,6 +117,8 @@ ifeq ($(quiet),verbose) $(info normal Makefile.defs exec) endif # verbose +-include Makefile.vars + # usage: $(call set_if_empty,VAR,value) set_if_empty=$(if $($(1)),,$(eval override $(1)=$(2)))

13 years, 8 months

modules_k/dialog: no referencing to current dialog possible when using dlg_manage()

by Timo Reimann

Hi, with respect to this thread on SR-Users http://lists.sip-router.org/pipermail/sr-users/2011-March/067696.html asking why set_dlg_profile() doesn't work in failure_route, I figured out that the problem is related to dlg_manage() usage. Conceptually, tracking dialogs on-demand via that function and using the dialog flag should work equally well. However, the dialog creation process differs regarding the parameters passed to dlg_new_dialog() (located in dlg_handlers.c and called by both approaches) whose signature is int dlg_new_dialog(struct sip_msg *msg, struct cell *t) When using dlg_manage(), a NULL pointer is passed instead of an existing transaction cell. The pointer is subsequently passed to two tm module callback registrations where one for the callback type TMCB_MAX is meant as a "temporary workaround of missing dialog_ctx field" as noted by Daniel in commit f6a66b42. However, that very registration call is bound to a check that the transaction exists, i.e., parameter t is not NULL: http://git.sip-router.org/cgi-bin/gitweb.cgi?p=sip-router;a=blob;f=modules_… Consequently, no callback of type TMCB_MAX will be carried out for dialogs generated from dlg_manage(). This poses to be a problem for a bunch of dialog profiling-related exported functions as well as is_known_dlg() since they rely on the get_current_dialog() function. For non-REQUEST routes, that function accesses the current dialog by means of iterating through all of the current transaction's callbacks looking for one of type TMCB_MAX that was previously registered in dlg_create_dialog(). However, as that registration never occurs in case of dlg_manage()-based tracking for reasons lined out above, the set of mentioned, exported functions cannot work. Refer to http://git.sip-router.org/cgi-bin/gitweb.cgi?p=sip-router;a=blob;f=modules_… to see how get_current_dialog() does it. So how do we fix this? My idea is to simply remove the not-NULL-check against the transaction t prior to callback registration. If the transaction doesn't exists, the tm module makes sure that it will be created lazily. This is how the first callback registration for types TMCB_RESPONSE_READY and TMCB_RESPONSE_FWDED in dlg_create_dialog() already works, apparently with no issues. I also did a quick, simple test with the check left out that proved to work fine. As this looks like a fix to a work-around, however, I'd like to ask for some feedback first. Thanks and cheers, --Timo

13 years, 8 months

git:kamailio_3.0: dialog(k): Register dlg_tmcb_dummy in dialog_new_dlg() even when

by Timo Reimann

Module: sip-router Branch: kamailio_3.0 Commit: 76a81da0c28c1f1cdccb2fd3344bfb2cfddc8fbe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=76a81da… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Mon Mar 7 09:57:33 2011 +0100 dialog(k): Register dlg_tmcb_dummy in dialog_new_dlg() even when given transaction t is not available. - Let tm's registration function deal with creating a transaction lazily. - Facilitates using dialogs (e.g., profiling) created on demand with dlg_manage(). (cherry picked from commit 00d2d6b98739327a6eaaeeafa50023cf0c47b0f3) --- modules_k/dialog/dlg_handlers.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index 5e5e3c5..9bedc60 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -629,12 +629,10 @@ int dlg_new_dialog(struct sip_msg *msg, struct cell *t) if (_dlg_ctx.to_bye!=0) dlg->dflags |= DLG_FLAG_TOBYE; - if (t) { - if ( d_tmb.register_tmcb( msg, t, TMCB_MAX, - dlg_tmcb_dummy, (void*)dlg, 0)<0 ) { - LM_ERR("failed cache in T the shortcut to dlg\n"); - goto error; - } + if ( d_tmb.register_tmcb( msg, t, TMCB_MAX, + dlg_tmcb_dummy, (void*)dlg, 0)<0 ) { + LM_ERR("failed cache in T the shortcut to dlg\n"); + goto error; } #if 0 t->dialog_ctx = (void*) dlg;

13 years, 8 months

git:sr_3.0: dialog(k): Register dlg_tmcb_dummy in dialog_new_dlg() even when

by Timo Reimann

Module: sip-router Branch: sr_3.0 Commit: 00d56078199b4bc96d2f13fdfa19a2ddeb168669 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=00d5607… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Mon Mar 7 09:57:33 2011 +0100 dialog(k): Register dlg_tmcb_dummy in dialog_new_dlg() even when given transaction t is not available. - Let tm's registration function deal with creating a transaction lazily. - Facilitates using dialogs (e.g., profiling) created on demand with dlg_manage(). (cherry picked from commit 00d2d6b98739327a6eaaeeafa50023cf0c47b0f3) --- modules_k/dialog/dlg_handlers.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index 5e5e3c5..9bedc60 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -629,12 +629,10 @@ int dlg_new_dialog(struct sip_msg *msg, struct cell *t) if (_dlg_ctx.to_bye!=0) dlg->dflags |= DLG_FLAG_TOBYE; - if (t) { - if ( d_tmb.register_tmcb( msg, t, TMCB_MAX, - dlg_tmcb_dummy, (void*)dlg, 0)<0 ) { - LM_ERR("failed cache in T the shortcut to dlg\n"); - goto error; - } + if ( d_tmb.register_tmcb( msg, t, TMCB_MAX, + dlg_tmcb_dummy, (void*)dlg, 0)<0 ) { + LM_ERR("failed cache in T the shortcut to dlg\n"); + goto error; } #if 0 t->dialog_ctx = (void*) dlg;

13 years, 8 months

git:3.1: dialog(k): Register dlg_tmcb_dummy in dialog_new_dlg() even when

by Timo Reimann

Module: sip-router Branch: 3.1 Commit: cd88482b84f4411febdda5ad785f29876373ac34 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cd88482… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Mon Mar 7 09:57:33 2011 +0100 dialog(k): Register dlg_tmcb_dummy in dialog_new_dlg() even when given transaction t is not available. - Let tm's registration function deal with creating a transaction lazily. - Facilitates using dialogs (e.g., profiling) created on demand with dlg_manage(). (cherry picked from commit 00d2d6b98739327a6eaaeeafa50023cf0c47b0f3) --- modules_k/dialog/dlg_handlers.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index a118a91..193f16a 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -716,12 +716,10 @@ int dlg_new_dialog(struct sip_msg *msg, struct cell *t) if (_dlg_ctx.to_bye!=0) dlg->dflags |= DLG_FLAG_TOBYE; - if (t) { - if ( d_tmb.register_tmcb( msg, t, TMCB_MAX, - dlg_tmcb_dummy, (void*)dlg, 0)<0 ) { - LM_ERR("failed cache in T the shortcut to dlg\n"); - goto error; - } + if ( d_tmb.register_tmcb( msg, t, TMCB_MAX, + dlg_tmcb_dummy, (void*)dlg, 0)<0 ) { + LM_ERR("failed cache in T the shortcut to dlg\n"); + goto error; } #if 0 t->dialog_ctx = (void*) dlg;

13 years, 8 months

git:master: dialog(k): Register dlg_tmcb_dummy in dialog_new_dlg() even when

by Timo Reimann

Module: sip-router Branch: master Commit: 00d2d6b98739327a6eaaeeafa50023cf0c47b0f3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=00d2d6b… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Mon Mar 7 09:57:33 2011 +0100 dialog(k): Register dlg_tmcb_dummy in dialog_new_dlg() even when given transaction t is not available. - Let tm's registration function deal with creating a transaction lazily. - Facilitates using dialogs (e.g., profiling) created on demand with dlg_manage(). --- modules_k/dialog/dlg_handlers.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index a118a91..193f16a 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -716,12 +716,10 @@ int dlg_new_dialog(struct sip_msg *msg, struct cell *t) if (_dlg_ctx.to_bye!=0) dlg->dflags |= DLG_FLAG_TOBYE; - if (t) { - if ( d_tmb.register_tmcb( msg, t, TMCB_MAX, - dlg_tmcb_dummy, (void*)dlg, 0)<0 ) { - LM_ERR("failed cache in T the shortcut to dlg\n"); - goto error; - } + if ( d_tmb.register_tmcb( msg, t, TMCB_MAX, + dlg_tmcb_dummy, (void*)dlg, 0)<0 ) { + LM_ERR("failed cache in T the shortcut to dlg\n"); + goto error; } #if 0 t->dialog_ctx = (void*) dlg;

13 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2011