sr-dev

sr-dev@lists.kamailio.org

16 participants
45378 discussions

git:master: modules_k/sqlops: Add xavp support to sqlops
by Alex Hermann 11 Mar '11

11 Mar '11

Module: sip-router Branch: master Commit: f2e79b33754fdbe627f01b26a4ed7a0c878914a8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f2e79b3… 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..57ac3ab 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_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"); +... +</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 + /** * */

1 0

git:master: core: Enable xavp's by default
by Alex Hermann 11 Mar '11

11 Mar '11

Module: sip-router Branch: master Commit: bcd4c3fef321978297890f81d6620fd741cb9a6d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bcd4c3f… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Mon Dec 20 19:03:29 2010 +0100 core: Enable xavp's by default --- Makefile.defs | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index dfad205..90d3c09 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -658,6 +658,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 \

1 0

git:master: modules_k/permissions: allow_trusted(): Return number of matched entries.
by Alex Hermann 11 Mar '11

11 Mar '11

Module: sip-router Branch: master Commit: b93c81421f53b6cc1620a01dc8937d92daac1be9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b93c814… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Mon Mar 7 14:36:27 2011 +0100 modules_k/permissions: allow_trusted(): Return number of matched entries. --- modules_k/permissions/hash.c | 12 +++++++----- modules_k/permissions/trusted.c | 15 ++++++++------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/modules_k/permissions/hash.c b/modules_k/permissions/hash.c index c24b94b..1261227 100644 --- a/modules_k/permissions/hash.c +++ b/modules_k/permissions/hash.c @@ -199,6 +199,7 @@ int hash_table_insert(struct trusted_list** table, char* src_ip, * Check if an entry exists in hash table that has given src_ip and protocol * value and pattern that matches to From URI. If an entry exists and tag_avp * has been defined, tag of the entry is added as a value to tag_avp. + * Returns number of matches or -1 if none matched. */ int match_hash_table(struct trusted_list** table, struct sip_msg* msg, char *src_ip_c_str, int proto) @@ -209,7 +210,7 @@ int match_hash_table(struct trusted_list** table, struct sip_msg* msg, struct trusted_list *np; str src_ip; int_str val; - int rc = -1; + int count = 0; src_ip.s = src_ip_c_str; src_ip.len = strlen(src_ip.s); @@ -245,13 +246,14 @@ int match_hash_table(struct trusted_list** table, struct sip_msg* msg, LM_ERR("setting of tag_avp failed\n"); return -1; } - rc = 1; - } else { - return 1; } + count++; } } - return rc; + if (!count) + return -1; + else + return count; } diff --git a/modules_k/permissions/trusted.c b/modules_k/permissions/trusted.c index 62fba29..32e1313 100644 --- a/modules_k/permissions/trusted.c +++ b/modules_k/permissions/trusted.c @@ -328,8 +328,8 @@ static inline int match_proto(const char *proto_string, int proto_int) } /* - * Matches from uri against patterns returned from database. Returns 1 when - * first pattern matches and -1 if none of the patterns match. + * Matches from uri against patterns returned from database. Returns number + * of matches or -1 if none of the patterns match. */ static int match_res(struct sip_msg* msg, int proto, db1_res_t* _r) { @@ -340,7 +340,7 @@ static int match_res(struct sip_msg* msg, int proto, db1_res_t* _r) db_val_t* val; regex_t preg; int_str tag_avp, avp_val; - int rc = -1; + int count = 0; if (parse_from_header(msg) < 0) return -1; uri = get_from(msg)->uri; @@ -383,13 +383,14 @@ static int match_res(struct sip_msg* msg, int proto, db1_res_t* _r) LM_ERR("failed to set of tag_avp failed\n"); return -1; } - rc = 1; - } else { - return 1; } + count++; } } - return rc; + if (!count) + return -1; + else + return count; }

1 0

git:master: modules_k/permisisons: allow_trusted(): Add tags from all matching entries to the peer_tag_avp instead of just the first match .
by Alex Hermann 11 Mar '11

11 Mar '11

Module: sip-router Branch: master Commit: b6525fad3de205ab4504d669002acb8f6309f9a1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b6525fa… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Fri Mar 4 17:22:20 2011 +0100 modules_k/permisisons: allow_trusted(): Add tags from all matching entries to the peer_tag_avp instead of just the first match. --- modules_k/permissions/hash.c | 51 ++++++++++++++------------ modules_k/permissions/trusted.c | 75 ++++++++++++++++++++------------------- 2 files changed, 65 insertions(+), 61 deletions(-) diff --git a/modules_k/permissions/hash.c b/modules_k/permissions/hash.c index b9bfa68..c24b94b 100644 --- a/modules_k/permissions/hash.c +++ b/modules_k/permissions/hash.c @@ -209,6 +209,7 @@ int match_hash_table(struct trusted_list** table, struct sip_msg* msg, struct trusted_list *np; str src_ip; int_str val; + int rc = -1; src_ip.s = src_ip_c_str; src_ip.len = strlen(src_ip.s); @@ -223,32 +224,34 @@ int match_hash_table(struct trusted_list** table, struct sip_msg* msg, uri_string[uri.len] = (char)0; for (np = table[perm_hash(src_ip)]; np != NULL; np = np->next) { - if ((np->src_ip.len == src_ip.len) && - (strncmp(np->src_ip.s, src_ip.s, src_ip.len) == 0) && - ((np->proto == PROTO_NONE) || (np->proto == proto))) { - if (!(np->pattern)) goto found; - if (regcomp(&preg, np->pattern, REG_NOSUB)) { - LM_ERR("invalid regular expression\n"); - return -1; - } - if (regexec(&preg, uri_string, 0, (regmatch_t *)0, 0)) { - regfree(&preg); - } else { - regfree(&preg); - goto found; + if ((np->src_ip.len == src_ip.len) && + (strncmp(np->src_ip.s, src_ip.s, src_ip.len) == 0) && + ((np->proto == PROTO_NONE) || (np->proto == proto))) { + if (np->pattern) { + if (regcomp(&preg, np->pattern, REG_NOSUB)) { + LM_ERR("invalid regular expression\n"); + continue; + } + if (regexec(&preg, uri_string, 0, (regmatch_t *)0, 0)) { + regfree(&preg); + continue; + } + regfree(&preg); + } + /* Found a match */ + if (tag_avp.n && np->tag.s) { + val.s = np->tag; + if (add_avp(tag_avp_type|AVP_VAL_STR, tag_avp, val) != 0) { + LM_ERR("setting of tag_avp failed\n"); + return -1; + } + rc = 1; + } else { + return 1; + } } - } - } - return -1; -found: - if (tag_avp.n && np->tag.s) { - val.s = np->tag; - if (add_avp(tag_avp_type|AVP_VAL_STR, tag_avp, val) != 0) { - LM_ERR("setting of tag_avp failed\n"); - return -1; - } } - return 1; + return rc; } diff --git a/modules_k/permissions/trusted.c b/modules_k/permissions/trusted.c index 1f8a106..62fba29 100644 --- a/modules_k/permissions/trusted.c +++ b/modules_k/permissions/trusted.c @@ -329,17 +329,18 @@ static inline int match_proto(const char *proto_string, int proto_int) /* * Matches from uri against patterns returned from database. Returns 1 when - * first pattern matches and 0 if none of the patterns match. + * first pattern matches and -1 if none of the patterns match. */ static int match_res(struct sip_msg* msg, int proto, db1_res_t* _r) { - int i, tag_avp_type; + int i, tag_avp_type; str uri; char uri_string[MAX_URI_SIZE+1]; db_row_t* row; db_val_t* val; regex_t preg; int_str tag_avp, avp_val; + int rc = -1; if (parse_from_header(msg) < 0) return -1; uri = get_from(msg)->uri; @@ -349,46 +350,46 @@ static int match_res(struct sip_msg* msg, int proto, db1_res_t* _r) } memcpy(uri_string, uri.s, uri.len); uri_string[uri.len] = (char)0; + get_tag_avp(&tag_avp, &tag_avp_type); row = RES_ROWS(_r); - + for(i = 0; i < RES_ROW_N(_r); i++) { - val = ROW_VALUES(row + i); - if ((ROW_N(row + i) == 3) && - (VAL_TYPE(val) == DB1_STRING) && !VAL_NULL(val) && - match_proto(VAL_STRING(val), proto) && - (VAL_NULL(val + 1) || - ((VAL_TYPE(val + 1) == DB1_STRING) && !VAL_NULL(val + 1))) && - (VAL_NULL(val + 2) || - ((VAL_TYPE(val + 2) == DB1_STRING) && !VAL_NULL(val + 2)))) - { - if (VAL_NULL(val + 1)) goto found; - if (regcomp(&preg, (char *)VAL_STRING(val + 1), REG_NOSUB)) { - LM_ERR("invalid regular expression\n"); - continue; - } - if (regexec(&preg, uri_string, 0, (regmatch_t *)0, 0)) { - regfree(&preg); - continue; - } else { - regfree(&preg); - goto found; + val = ROW_VALUES(row + i); + if ((ROW_N(row + i) == 3) && + (VAL_TYPE(val) == DB1_STRING) && !VAL_NULL(val) && + match_proto(VAL_STRING(val), proto) && + (VAL_NULL(val + 1) || + ((VAL_TYPE(val + 1) == DB1_STRING) && !VAL_NULL(val + 1))) && + (VAL_NULL(val + 2) || + ((VAL_TYPE(val + 2) == DB1_STRING) && !VAL_NULL(val + 2)))) + { + if (!VAL_NULL(val + 1)) { + if (regcomp(&preg, (char *)VAL_STRING(val + 1), REG_NOSUB)) { + LM_ERR("invalid regular expression\n"); + continue; + } + if (regexec(&preg, uri_string, 0, (regmatch_t *)0, 0)) { + regfree(&preg); + continue; + } + regfree(&preg); + } + /* Found a match */ + if (tag_avp.n && !VAL_NULL(val + 2)) { + avp_val.s.s = (char *)VAL_STRING(val + 2); + avp_val.s.len = strlen(avp_val.s.s); + if (add_avp(tag_avp_type|AVP_VAL_STR, tag_avp, avp_val) != 0) { + LM_ERR("failed to set of tag_avp failed\n"); + return -1; + } + rc = 1; + } else { + return 1; + } } - } - } - return -1; - -found: - get_tag_avp(&tag_avp, &tag_avp_type); - if (tag_avp.n && !VAL_NULL(val + 2)) { - avp_val.s.s = (char *)VAL_STRING(val + 2); - avp_val.s.len = strlen(avp_val.s.s); - if (add_avp(tag_avp_type|AVP_VAL_STR, tag_avp, avp_val) != 0) { - LM_ERR("failed to set of tag_avp failed\n"); - return -1; - } } - return 1; + return rc; }

1 0

git:master: modules_k/permissions: allow_trusted(): Make the multiple matches feature configurable, defaulting to single match .
by Alex Hermann 11 Mar '11

11 Mar '11

Module: sip-router Branch: master Commit: bbb082d582b0ae20c366128cf57a1f03ef594ff4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bbb082d… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Tue Mar 8 11:59:01 2011 +0100 modules_k/permissions: allow_trusted(): Make the multiple matches feature configurable, defaulting to single match. --- modules_k/permissions/doc/permissions_admin.xml | 21 +++++++++++++++++++++ modules_k/permissions/hash.c | 5 +++++ modules_k/permissions/permissions.c | 2 ++ modules_k/permissions/permissions.h | 2 ++ modules_k/permissions/trusted.c | 2 ++ 5 files changed, 32 insertions(+), 0 deletions(-) diff --git a/modules_k/permissions/doc/permissions_admin.xml b/modules_k/permissions/doc/permissions_admin.xml index 0470224..b29f2c7 100644 --- a/modules_k/permissions/doc/permissions_admin.xml +++ b/modules_k/permissions/doc/permissions_admin.xml @@ -672,6 +672,27 @@ modparam("permissions", "peer_tag_avp", "$avp(i:707)") </programlisting> </example> </section> + <section> + <title><varname>peer_tag_mode</varname> (integer)</title> + <para> + Tag mode for allow_trusted(). 0 sets only the tag of the + first match. 1 adds the tags of all matches to the avp. In addition + the return value of allow_trusted() is the number of matches. + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>peer_tag_mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("permissions", "peer_tag_mode", "1") +... +</programlisting> + </example> + </section> </section> <section> diff --git a/modules_k/permissions/hash.c b/modules_k/permissions/hash.c index 1261227..9675f4c 100644 --- a/modules_k/permissions/hash.c +++ b/modules_k/permissions/hash.c @@ -40,6 +40,9 @@ static int tag_avp_type; static int_str tag_avp; +extern int peer_tag_mode; + + /* * Parse and set tag AVP specs @@ -247,6 +250,8 @@ int match_hash_table(struct trusted_list** table, struct sip_msg* msg, return -1; } } + if (!peer_tag_mode) + return 1; count++; } } diff --git a/modules_k/permissions/permissions.c b/modules_k/permissions/permissions.c index 5beb016..609b1c1 100644 --- a/modules_k/permissions/permissions.c +++ b/modules_k/permissions/permissions.c @@ -68,6 +68,7 @@ str proto_col = str_init("proto"); /* Name of protocol column */ str from_col = str_init("from_pattern"); /* Name of from pattern column */ str tag_col = str_init("tag"); /* Name of tag column */ str tag_avp_param = {NULL, 0}; /* Peer tag AVP spec */ +int peer_tag_mode = 0; /* Add tags form all mathcing peers to avp */ /* for allow_address function */ str address_table = str_init("address"); /* Name of address table */ @@ -159,6 +160,7 @@ static param_export_t params[] = { {"from_col", STR_PARAM, &from_col.s }, {"tag_col", STR_PARAM, &tag_col.s }, {"peer_tag_avp", STR_PARAM, &tag_avp_param.s }, + {"peer_tag_mode", INT_PARAM, &peer_tag_mode }, {"address_table", STR_PARAM, &address_table.s }, {"grp_col", STR_PARAM, &grp_col.s }, {"ip_addr_col", STR_PARAM, &ip_addr_col.s }, diff --git a/modules_k/permissions/permissions.h b/modules_k/permissions/permissions.h index ef3d899..0e4d110 100644 --- a/modules_k/permissions/permissions.h +++ b/modules_k/permissions/permissions.h @@ -61,6 +61,8 @@ extern str grp_col; /* Name of address group column */ extern str ip_addr_col; /* Name of ip address column */ extern str mask_col; /* Name of mask column */ extern str port_col; /* Name of port column */ +extern int peer_tag_mode; /* Matching mode */ + typedef struct int_or_pvar { unsigned int i; diff --git a/modules_k/permissions/trusted.c b/modules_k/permissions/trusted.c index 32e1313..67d0a04 100644 --- a/modules_k/permissions/trusted.c +++ b/modules_k/permissions/trusted.c @@ -384,6 +384,8 @@ static int match_res(struct sip_msg* msg, int proto, db1_res_t* _r) return -1; } } + if (!peer_tag_mode) + return 1; count++; } }

1 0

git:master: modules_k/pv: Add new transformations to create prefixes
by Alex Hermann 11 Mar '11

11 Mar '11

Module: sip-router Branch: master Commit: f68c308ebb8c9c0a182f92901076aee44230dae7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f68c308… 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,

1 0

git:master: dialog(k): Fix indention in spiral detection example code (docs ).
by Timo Reimann 10 Mar '11

10 Mar '11

Module: sip-router Branch: master Commit: acca0fad60183745d8b9317f11326bfa601c5b02 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=acca0fa… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Thu Mar 10 20:13:41 2011 +0100 dialog(k): Fix indention in spiral detection example code (docs). --- modules_k/dialog/doc/dialog_admin.xml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules_k/dialog/doc/dialog_admin.xml b/modules_k/dialog/doc/dialog_admin.xml index aaed79e..9305b73 100644 --- a/modules_k/dialog/doc/dialog_admin.xml +++ b/modules_k/dialog/doc/dialog_admin.xml @@ -341,9 +341,9 @@ modparam("dialog", "dlg_match_mode", 1) <example> <title>Set <varname>detect_spirals</varname> parameter</title> <programlisting format="linespecific"> - ... - modparam("dialog", "detect_spirals", 1) - ... +... +modparam("dialog", "detect_spirals", 1) +... </programlisting> </example> </section>

1 0

git:carstenbock/ims: - Updated Typo in the docs (thanks Klaus)
by Carsten Bock 10 Mar '11

10 Mar '11

Module: sip-router Branch: carstenbock/ims Commit: 5479620417f017109985ee10d485a0da85588d81 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5479620… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Thu Mar 10 14:11:11 2011 +0100 - Updated Typo in the docs (thanks Klaus) - added a note about reg_avp behaviour. --- modules_k/registrar/doc/registrar_admin.xml | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/modules_k/registrar/doc/registrar_admin.xml b/modules_k/registrar/doc/registrar_admin.xml index 13947d1..b809338 100644 --- a/modules_k/registrar/doc/registrar_admin.xml +++ b/modules_k/registrar/doc/registrar_admin.xml @@ -660,10 +660,13 @@ modparam("registrar", "reg_avp", "$avp(i:2)") The function processes a REGISTER message. It can add, remove or modify usrloc records depending on Contact and Expires HFs in the REGISTER message. On success and when called from the REQUEST_ROUTE, - 200 OK will be returned listing all contacts that are currently in + 200 OK will be returned listing all contacts that are currently in usrloc. On an error, error message will be send with a short description in reason phrase. </para> + <para> + This function will save the AVP's for this contact. + </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> <listitem> @@ -715,6 +718,9 @@ save("location"); Same as <function>save()</function> but it accepts a set of flags for controlling its behaviour. </para> + <para> + This function will save the AVP's for this contact. + </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> <listitem> @@ -776,6 +782,9 @@ save("location","0x01"); the message (depending on append_branches parameter value). </para> <para> + This function will restore the AVP's for this contact. + </para> + <para> If the method_filtering option is enabled, the lookup function will return only the contacts that support the method of the processed request. @@ -837,7 +846,10 @@ switch ($retcode) { The function returns true if the AOR in the Request-URI is registered, false otherwise. The function does not modify the message being processed, it neither rewrites the Request-URI if a - contact is found not append branches. + contact is found nor appends branches. + </para> + <para> + This function will restore the AVP's for this contact. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> @@ -873,7 +885,10 @@ if (registered("location")) { registered, false otherwise. The function does not modify the message being processed, it neither rewrites the Request-URI if a - contact is found not append branches. + contact is found nor appends branches. + </para> + <para> + This function will restore the AVP's for this contact. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist>

1 0

git:carstenbock/ims: - Add avps to the ucontact_info structure
by Carsten Bock 10 Mar '11

10 Mar '11

Module: sip-router Branch: carstenbock/ims Commit: 2dbadcadd64c3b434d1119ed37b35d677e5feb58 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2dbadca… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Thu Mar 10 11:50:32 2011 +0100 - Add avps to the ucontact_info structure --- modules_k/usrloc/ucontact.c | 8 ++++++++ modules_k/usrloc/ucontact.h | 6 ++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/modules_k/usrloc/ucontact.c b/modules_k/usrloc/ucontact.c index ec177c7..c8f9a1b 100644 --- a/modules_k/usrloc/ucontact.c +++ b/modules_k/usrloc/ucontact.c @@ -47,6 +47,7 @@ #include "urecord.h" #include "ucontact.h" #include "reg_avps_db.h" +#include "../../parser/parse_uri.h" /*! * \brief Create a new contact structure @@ -68,11 +69,17 @@ ucontact_t* new_ucontact(str* _dom, str* _aor, str* _contact, ucontact_info_t* _ memset(c, 0, sizeof(ucontact_t)); if (shm_str_dup( &c->c, _contact) < 0) goto error; + if (parse_uri(c->c.s, c->c.len, &c->parsed_c) < 0) + LM_ERR("Error while parsing Contact URI\n"); + if (shm_str_dup( &c->callid, _ci->callid) < 0) goto error; if (shm_str_dup( &c->user_agent, _ci->user_agent) < 0) goto error; if (_ci->received.s && _ci->received.len) { if (shm_str_dup( &c->received, &_ci->received) < 0) goto error; + if (parse_uri(c->received.s, c->received.len, &c->parsed_received) < 0) + LM_ERR("Error while parsing Contact URI\n"); + } if (_ci->path && _ci->path->len) { if (shm_str_dup( &c->path, _ci->path) < 0) goto error; @@ -89,6 +96,7 @@ ucontact_t* new_ucontact(str* _dom, str* _aor, str* _contact, ucontact_info_t* _ c->cflags = _ci->cflags; c->methods = _ci->methods; c->last_modified = _ci->last_modified; + c->avps = _ci->avps; return c; error: diff --git a/modules_k/usrloc/ucontact.h b/modules_k/usrloc/ucontact.h index 0269719..75f7207 100644 --- a/modules_k/usrloc/ucontact.h +++ b/modules_k/usrloc/ucontact.h @@ -41,6 +41,7 @@ #include "../../qvalue.h" #include "../../str.h" #include "../../usr_avp.h" +#include "../../parser/msg_parser.h" /*! @@ -66,7 +67,11 @@ typedef struct ucontact { str* domain; /*!< Pointer to domain name (NULL terminated) */ str* aor; /*!< Pointer to the AOR string in record structure*/ str c; /*!< Contact address */ + struct sip_uri parsed_c; + /*!< Parsed Contact-address */ str received; /*!< IP+port+protocol we received the REGISTER from */ + struct sip_uri parsed_received; + /*!< received socket */ str path; /*!< Path header */ time_t expires; /*!< Expires parameter */ qvalue_t q; /*!< q parameter */ @@ -99,6 +104,7 @@ typedef struct ucontact_info { struct socket_info *sock; /*!< socket informations */ unsigned int methods; /*!< supported methods */ time_t last_modified; /*!< last modified */ + avp_t *avps; } ucontact_info_t; /*! \brief ancient time used for marking the contacts forced to expired */

1 0

git:carstenbock/ims: - added support for storing and retrieving AVPs together with a contact.
by Carsten Bock 10 Mar '11

10 Mar '11

Module: sip-router Branch: carstenbock/ims Commit: 41833c83c04e8c7892f6125c8fd384dc7b25d66c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=41833c8… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Thu Mar 10 13:11:42 2011 +0100 - added support for storing and retrieving AVPs together with a contact. --- modules_k/registrar/doc/registrar.xml | 12 +++ modules_k/registrar/doc/registrar_admin.xml | 24 ++++++ modules_k/registrar/lookup.c | 70 ++++++++++++++++++ modules_k/registrar/reg_mod.c | 47 ++++++++++++ modules_k/registrar/reg_mod.h | 2 +- modules_k/registrar/save.c | 104 +++++++++++++++++++++++++++ modules_k/usrloc/doc/usrloc.xml | 11 +++ 7 files changed, 269 insertions(+), 1 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=418…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev