sr-dev March 2011

sr-dev@lists.kamailio.org

25 participants
195 discussions

git:3.1: INSTALL: updates to reflect flavour switching
by Daniel-Constantin Mierla 12 Mar '11

12 Mar '11

Module: sip-router Branch: 3.1 Commit: 2b23fe5e555e6a0e9a14141b683307626a6bc24b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2b23fe5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 12 22:50:28 2010 +0200 INSTALL: updates to reflect flavour switching (cherry picked from commit 77d7e32549b46bb3a3c7d796e46cf08c0359b730) --- INSTALL | 344 ++++++++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 222 insertions(+), 122 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=2b2…

1 0

SF.net SVN: openser:[6054] branches/1.5/modules/dialog
by Timo Reimann 11 Mar '11

11 Mar '11

Revision: 6054 http://openser.svn.sourceforge.net/openser/?rev=6054&view=rev Author: timoreimann Date: 2011-03-11 18:18:26 +0000 (Fri, 11 Mar 2011) Log Message: ----------- modules/dialog: Refer to external match mode variable instead of using local copy. - Fixes a bug that would render w_dlg_manage()'s backup-override-and-restore logic of the seq_match_mode variable for the call to dlg_onroute() useless as the units dialog.c and dlg_handlers.c maintained individual variables each. Backport from git commit b2426b0c2008809f984073e37a270dcab9a7d8c5 Modified Paths: -------------- branches/1.5/modules/dialog/dialog.c branches/1.5/modules/dialog/dlg_handlers.c branches/1.5/modules/dialog/dlg_handlers.h This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

git:3.1: modules_k/dialog: Refer to external match mode variable instead of
by Timo Reimann 11 Mar '11

11 Mar '11

Module: sip-router Branch: 3.1 Commit: cd64c41785f52a48dfd568bb7cca2a8f5b6d4399 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cd64c41… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Fri Mar 11 14:55:03 2011 +0100 modules_k/dialog: Refer to external match mode variable instead of using local copy. - Fixes a bug that would render w_dlg_manage()'s backup-override-and-restore logic of the seq_match_mode variable for the call to dlg_onroute() useless as the units dialog.c and dlg_handlers.c maintained individual variables each. (cherry picked from commit b2426b0c2008809f984073e37a270dcab9a7d8c5) --- modules_k/dialog/dialog.c | 4 ++-- modules_k/dialog/dlg_handlers.c | 7 ++----- modules_k/dialog/dlg_handlers.h | 3 +-- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c index 9d875b7..3d536a1 100644 --- a/modules_k/dialog/dialog.c +++ b/modules_k/dialog/dialog.c @@ -85,12 +85,12 @@ static char* rr_param = "did"; static int dlg_flag = -1; static str timeout_spec = {NULL, 0}; static int default_timeout = 60 * 60 * 12; /* 12 hours */ -static int seq_match_mode = SEQ_MATCH_STRICT_ID; static char* profiles_wv_s = NULL; static char* profiles_nv_s = NULL; str dlg_extra_hdrs = {NULL,0}; static int db_fetch_rows = 200; +int seq_match_mode = SEQ_MATCH_STRICT_ID; str dlg_bridge_controller = {"sip:controller@kamailio.org", 27}; str ruri_pvar_param = {"$ru", 3}; @@ -551,7 +551,7 @@ static int mod_init(void) /* init handlers */ init_dlg_handlers( rr_param, dlg_flag, - timeout_spec.s?&timeout_avp:0, default_timeout, seq_match_mode); + timeout_spec.s?&timeout_avp:0, default_timeout); /* init timer */ if (init_dlg_timer(dlg_ontimeout)!=0) { diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index 193f16a..d5c4cb9 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -82,8 +82,8 @@ static str rr_param; /*!< record-route parameter for matching */ static int dlg_flag; /*!< flag for dialog tracking */ static pv_spec_t *timeout_avp; /*!< AVP for timeout setting */ static int default_timeout; /*!< default dialog timeout */ -static int seq_match_mode; /*!< dlg_match mode */ static int shutdown_done = 0; /*!< 1 when destroy_dlg_handlers was called */ +extern int seq_match_mode; /*!< dlg_match mode */ extern int detect_spirals; extern struct rr_binds d_rrb; /*!< binding to record-routing module */ @@ -113,11 +113,9 @@ static unsigned int CURR_DLG_ID = 0xffffffff; /*!< current dialog id */ * \param dlg_flag_p dialog flag * \param timeout_avp_p AVP for timeout setting * \param default_timeout_p default timeout - * \param seq_match_mode_p matching mode */ void init_dlg_handlers(char *rr_param_p, int dlg_flag_p, - pv_spec_t *timeout_avp_p ,int default_timeout_p, - int seq_match_mode_p) + pv_spec_t *timeout_avp_p ,int default_timeout_p) { rr_param.s = rr_param_p; rr_param.len = strlen(rr_param.s); @@ -126,7 +124,6 @@ void init_dlg_handlers(char *rr_param_p, int dlg_flag_p, timeout_avp = timeout_avp_p; default_timeout = default_timeout_p; - seq_match_mode = seq_match_mode_p; } diff --git a/modules_k/dialog/dlg_handlers.h b/modules_k/dialog/dlg_handlers.h index 277db0b..bbb9a2a 100644 --- a/modules_k/dialog/dlg_handlers.h +++ b/modules_k/dialog/dlg_handlers.h @@ -60,8 +60,7 @@ * \param seq_match_mode_p matching mode */ void init_dlg_handlers(char *rr_param, int dlg_flag, - pv_spec_t *timeout_avp, int default_timeout, - int seq_match_mode); + pv_spec_t *timeout_avp, int default_timeout); /*!

1 0

git:master: modules_k/dialog: Refer to external match mode variable instead of
by Timo Reimann 11 Mar '11

11 Mar '11

Module: sip-router Branch: master Commit: b2426b0c2008809f984073e37a270dcab9a7d8c5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b2426b0… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Fri Mar 11 14:55:03 2011 +0100 modules_k/dialog: Refer to external match mode variable instead of using local copy. - Fixes a bug that would render w_dlg_manage()'s backup-override-and-restore logic of the seq_match_mode variable for the call to dlg_onroute() useless as the units dialog.c and dlg_handlers.c maintained individual variables each. --- modules_k/dialog/dialog.c | 4 ++-- modules_k/dialog/dlg_handlers.c | 7 ++----- modules_k/dialog/dlg_handlers.h | 3 +-- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c index 9d875b7..3d536a1 100644 --- a/modules_k/dialog/dialog.c +++ b/modules_k/dialog/dialog.c @@ -85,12 +85,12 @@ static char* rr_param = "did"; static int dlg_flag = -1; static str timeout_spec = {NULL, 0}; static int default_timeout = 60 * 60 * 12; /* 12 hours */ -static int seq_match_mode = SEQ_MATCH_STRICT_ID; static char* profiles_wv_s = NULL; static char* profiles_nv_s = NULL; str dlg_extra_hdrs = {NULL,0}; static int db_fetch_rows = 200; +int seq_match_mode = SEQ_MATCH_STRICT_ID; str dlg_bridge_controller = {"sip:controller@kamailio.org", 27}; str ruri_pvar_param = {"$ru", 3}; @@ -551,7 +551,7 @@ static int mod_init(void) /* init handlers */ init_dlg_handlers( rr_param, dlg_flag, - timeout_spec.s?&timeout_avp:0, default_timeout, seq_match_mode); + timeout_spec.s?&timeout_avp:0, default_timeout); /* init timer */ if (init_dlg_timer(dlg_ontimeout)!=0) { diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index 193f16a..d5c4cb9 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -82,8 +82,8 @@ static str rr_param; /*!< record-route parameter for matching */ static int dlg_flag; /*!< flag for dialog tracking */ static pv_spec_t *timeout_avp; /*!< AVP for timeout setting */ static int default_timeout; /*!< default dialog timeout */ -static int seq_match_mode; /*!< dlg_match mode */ static int shutdown_done = 0; /*!< 1 when destroy_dlg_handlers was called */ +extern int seq_match_mode; /*!< dlg_match mode */ extern int detect_spirals; extern struct rr_binds d_rrb; /*!< binding to record-routing module */ @@ -113,11 +113,9 @@ static unsigned int CURR_DLG_ID = 0xffffffff; /*!< current dialog id */ * \param dlg_flag_p dialog flag * \param timeout_avp_p AVP for timeout setting * \param default_timeout_p default timeout - * \param seq_match_mode_p matching mode */ void init_dlg_handlers(char *rr_param_p, int dlg_flag_p, - pv_spec_t *timeout_avp_p ,int default_timeout_p, - int seq_match_mode_p) + pv_spec_t *timeout_avp_p ,int default_timeout_p) { rr_param.s = rr_param_p; rr_param.len = strlen(rr_param.s); @@ -126,7 +124,6 @@ void init_dlg_handlers(char *rr_param_p, int dlg_flag_p, timeout_avp = timeout_avp_p; default_timeout = default_timeout_p; - seq_match_mode = seq_match_mode_p; } diff --git a/modules_k/dialog/dlg_handlers.h b/modules_k/dialog/dlg_handlers.h index 277db0b..bbb9a2a 100644 --- a/modules_k/dialog/dlg_handlers.h +++ b/modules_k/dialog/dlg_handlers.h @@ -60,8 +60,7 @@ * \param seq_match_mode_p matching mode */ void init_dlg_handlers(char *rr_param, int dlg_flag, - pv_spec_t *timeout_avp, int default_timeout, - int seq_match_mode); + pv_spec_t *timeout_avp, int default_timeout); /*!

1 0

git:alexh/master DELETED: 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: alexh/master DELETED Commit: 65c3448f2d74b803573d7cc79fbfc81961b40e7b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=65c3448… 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/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/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(): 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: 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/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

← Newer
1
...
9
10
11
12
13
14
15
...
20
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2011