sr-dev March 2011

sr-dev@lists.kamailio.org

25 participants
194 discussions

git:master: kex: documentation updated with the new functions

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 037336540926ef5b354a024aacacf55b005b577a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0373365… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Mar 7 17:11:53 2011 +0100 kex: documentation updated with the new functions - documented setdebug(level) and resetdebug() --- modules_k/kex/README | 38 +++++++++++++++++++++++++++++++ modules_k/kex/doc/kex_admin.xml | 47 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 0 deletions(-) diff --git a/modules_k/kex/README b/modules_k/kex/README index f81977a..ea973c6 100644 --- a/modules_k/kex/README +++ b/modules_k/kex/README @@ -38,6 +38,8 @@ Daniel-Constantin Mierla 3.10. isdsturiset() 3.11. pv_printf(var, str) 3.12. is_myself(uri) + 3.13. setdebug(level) + 3.14. resetdebug() 4. Exported MI Functions @@ -66,6 +68,8 @@ Daniel-Constantin Mierla 1.10. >isdsturiset usage 1.11. >pv_printf usage 1.12. >is_myself usage + 1.13. setdebug usage + 1.14. >resetdebug usage Chapter 1. Admin Guide @@ -91,6 +95,8 @@ Chapter 1. Admin Guide 3.10. isdsturiset() 3.11. pv_printf(var, str) 3.12. is_myself(uri) + 3.13. setdebug(level) + 3.14. resetdebug() 4. Exported MI Functions @@ -141,6 +147,8 @@ Chapter 1. Admin Guide 3.10. isdsturiset() 3.11. pv_printf(var, str) 3.12. is_myself(uri) + 3.13. setdebug(level) + 3.14. resetdebug() 3.1. setsflag(flag) @@ -351,6 +359,36 @@ if(is_myself("$fu")) { } ... +3.13. setdebug(level) + + Set the debug log level per process. + + Meaning of the parameters is as follows: + * level - the debug log level to be set. Can be integer or + pseudo-variable with integer value. + + This function can be used from ANY_ROUTE. + + Example 1.13. setdebug usage +... +setdebug("1"); +... +$var(level) = 2; +setdebug("$var(level)"); +... + +3.14. resetdebug() + + Reset the local debug log level back to the value of core parameter + 'debug'. + + This function can be used from ANY_ROUTE. + + Example 1.14. >resetdebug usage +... +resetdebug(); +... + 4. Exported MI Functions 4.1. arg diff --git a/modules_k/kex/doc/kex_admin.xml b/modules_k/kex/doc/kex_admin.xml index 6c65586..2be6267 100644 --- a/modules_k/kex/doc/kex_admin.xml +++ b/modules_k/kex/doc/kex_admin.xml @@ -407,6 +407,53 @@ if(is_myself("$fu")) { </programlisting> </example> </section> + <section> + <title><function moreinfo="none">setdebug(level)</function></title> + <para> + Set the debug log level per process. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>level</emphasis> - the debug log level to + be set. Can be integer or pseudo-variable with integer value. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>setdebug</function> usage</title> + <programlisting format="linespecific"> +... +setdebug("1"); +... +$var(level) = 2; +setdebug("$var(level)"); +... +</programlisting> + </example> + </section> + <section> + <title><function moreinfo="none">resetdebug()</function></title> + <para> + Reset the local debug log level back to the value of core parameter + 'debug'. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>>resetdebug</function> usage</title> + <programlisting format="linespecific"> +... +resetdebug(); +... +</programlisting> + </example> + </section> </section> <section>

13 years, 9 months

git:master: kex: two new functions to control local debug level

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: a57d5982e0966b7e21478b0bfb377e0bc93e3097 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a57d598… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Mar 7 17:10:08 2011 +0100 kex: two new functions to control local debug level - setdebug(level) - can change the debug level per process - resetdebug() - set back the debug level to the global parameter 'debug' - useful to troubleshoot parts of config file by increasing debug level for a specific process, just for a set of actions --- modules_k/kex/kex_mod.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/modules_k/kex/kex_mod.c b/modules_k/kex/kex_mod.c index c6b55b4..5a6d845 100644 --- a/modules_k/kex/kex_mod.c +++ b/modules_k/kex/kex_mod.c @@ -46,6 +46,8 @@ MODULE_VERSION /** module functions */ int w_is_myself(struct sip_msg *msg, char *uri, str *s2); +int w_setdebug(struct sip_msg *msg, char *level, str *s2); +int w_resetdebug(struct sip_msg *msg, char *uri, str *s2); static int mod_init(void); static int child_init(int rank); @@ -86,6 +88,10 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE }, {"is_myself", (cmd_function)w_is_myself, 1, fixup_spve_null, 0, ANY_ROUTE }, + {"setdebug", (cmd_function)w_setdebug, 1, fixup_igp_null, + 0, ANY_ROUTE }, + {"resetdebug", (cmd_function)w_resetdebug, 0, 0, + 0, ANY_ROUTE }, {0,0,0,0,0,0} }; @@ -182,3 +188,20 @@ int w_is_myself(struct sip_msg *msg, char *uri, str *s2) return 1; } +int w_setdebug(struct sip_msg *msg, char *level, str *s2) +{ + int lval=0; + if(fixup_get_ivalue(msg, (gparam_p)level, &lval)!=0) + { + LM_ERR("no debug level value\n"); + return -1; + } + set_local_debug_level(lval); + return 1; +} + +int w_resetdebug(struct sip_msg *msg, char *uri, str *s2) +{ + reset_local_debug_level(); + return 1; +}

13 years, 9 months

git:master: core: support to set debug level per process from cfg

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 0d2716bcafed9e6d3d9b920bc5137b1d726a891c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0d2716b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Mar 7 17:08:15 2011 +0100 core: support to set debug level per process from cfg - this is the part in the core dprinting system - getting the debug level is a warapper around fetching the local debug if it is set, otherwise returns the value of global parameter 'debug' - by default per process debug log level is not set --- dprint.c | 36 ++++++++++++++++++++++++++++++++++++ dprint.h | 11 ++++++++--- 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/dprint.c b/dprint.c index de6cb48..324d511 100644 --- a/dprint.c +++ b/dprint.c @@ -104,3 +104,39 @@ int log_facility_fixup(void *handle, str *gname, str *name, void **val) *val = (void *)(long)i; return 0; } + + +/** + * per process debug log level (local) + */ + +/* value for unset local log level */ +#define UNSET_LOCAL_DEBUG_LEVEL -255 + +/* the local debug log level */ +static int _local_debug_level = UNSET_LOCAL_DEBUG_LEVEL; + +/** + * @brief return the log level - the local one if it set, + * otherwise the global value + */ +int get_debug_level(void) { + return (_local_debug_level != UNSET_LOCAL_DEBUG_LEVEL) ? + _local_debug_level : cfg_get(core, core_cfg, debug); +} + +/** + * @brief set the local debug log level + */ +void set_local_debug_level(int level) +{ + _local_debug_level = level; +} + +/** + * @brief reset the local debug log level + */ +void reset_local_debug_level(void) +{ + _local_debug_level = UNSET_LOCAL_DEBUG_LEVEL; +} diff --git a/dprint.h b/dprint.h index c3f2b27..31ba4a2 100644 --- a/dprint.h +++ b/dprint.h @@ -118,7 +118,12 @@ struct log_level_info { int syslog_level; }; -#define is_printable(level) (cfg_get(core, core_cfg, debug)>=(level)) +/** @brief per process debug level handling */ +int get_debug_level(void); +void set_local_debug_level(int level); +void reset_local_debug_level(void); + +#define is_printable(level) (get_debug_level()>=(level)) extern struct log_level_info log_level_info[]; extern char *log_name; @@ -167,7 +172,7 @@ int log_facility_fixup(void *handle, str *gname, str *name, void **val); # ifdef __SUNPRO_C # define LOG_(facility, level, prefix, fmt, ...) \ do { \ - if (unlikely(cfg_get(core, core_cfg, debug) >= (level) && \ + if (unlikely(get_debuglevel() >= (level) && \ DPRINT_NON_CRIT)) { \ DPRINT_CRIT_ENTER; \ if (likely(((level) >= L_ALERT) && ((level) <= L_DBG))){ \ @@ -229,7 +234,7 @@ int log_facility_fixup(void *handle, str *gname, str *name, void **val); # else /* ! __SUNPRO_C */ # define LOG_(facility, level, prefix, fmt, args...) \ do { \ - if (cfg_get(core, core_cfg, debug) >= (level) && \ + if (get_debug_level() >= (level) && \ DPRINT_NON_CRIT) { \ DPRINT_CRIT_ENTER; \ if (likely(((level) >= L_ALERT) && ((level) <= L_DBG))){ \

13 years, 9 months

git:master: kamailio.cfg: revert mistakenly addtion of corelog

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: cef41576d87418aa47e7522da27bf7b4c8c72430 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cef4157… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Mar 7 13:57:04 2011 +0100 kamailio.cfg: revert mistakenly addtion of corelog - the new corelog global parameter was added and mistakenly committed to kamailio.cfg with its default value --- etc/kamailio.cfg | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 85f54e0..5e6d9f7 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -123,7 +123,6 @@ log_stderror=no memdbg=5 memlog=5 -corelog=-2 log_facility=LOG_LOCAL0

13 years, 9 months

git:master: core: several error messages printed to corelog level

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: b198224d607e88808ce60a1f316215cfc7d75f36 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b198224… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Mar 7 13:55:10 2011 +0100 core: several error messages printed to corelog level - instead of static level L_ERR use now the global config option corelog - corelog value can be updated at runtime without restart via RPC commands --- parser/msg_parser.c | 2 +- receive.c | 3 ++- tcp_read.c | 6 ++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/parser/msg_parser.c b/parser/msg_parser.c index f65cf85..01bb40e 100644 --- a/parser/msg_parser.c +++ b/parser/msg_parser.c @@ -710,7 +710,7 @@ int parse_msg(char* buf, unsigned int len, struct sip_msg* msg) error: /* more debugging, msg->orig is/should be null terminated*/ - LOG(L_ERR, "ERROR: parse_msg: message=<%.*s>\n", + LOG(cfg_get(core, core_cfg, corelog), "ERROR: parse_msg: message=<%.*s>\n", (int)msg->len, ZSW(msg->buf)); return -1; } diff --git a/receive.c b/receive.c index 7f49fdc..183d03b 100644 --- a/receive.c +++ b/receive.c @@ -139,7 +139,8 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) msg->set_global_port=default_global_port; if (parse_msg(buf,len, msg)!=0){ - LOG(L_ERR, "ERROR: receive_msg: parse_msg failed\n"); + LOG(cfg_get(core, core_cfg, corelog), + "ERROR: receive_msg: parse_msg failed\n"); goto error02; } DBG("After parse_msg...\n"); diff --git a/tcp_read.c b/tcp_read.c index 1fe5a91..be67f9a 100644 --- a/tcp_read.c +++ b/tcp_read.c @@ -266,7 +266,8 @@ again: break; } } - LOG(L_ERR, "error reading: %s (%d)\n", strerror(errno), errno); + LOG(cfg_get(core, core_cfg, corelog), + "error reading: %s (%d)\n", strerror(errno), errno); return -1; } }else if (unlikely((bytes_read==0) || @@ -879,7 +880,8 @@ again: req->start); #endif if (unlikely(bytes==-1)){ - LOG(L_ERR, "ERROR: tcp_read_req: error reading \n"); + LOG(cfg_get(core, core_cfg, corelog), + "ERROR: tcp_read_req: error reading \n"); resp=CONN_ERROR; goto end_req; }

13 years, 9 months

git:master: core: new global parameter corelog

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 7e2e4ff44945483fac3725cb7fcb5d2f3adc2d0d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7e2e4ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Mar 7 13:42:38 2011 +0100 core: new global parameter corelog - control the log level for non-critical core error messages - e.g., useful to disable messages such as: - tcp connection reset by peer - error parsing received message for garbage (non-sip/html/...) --- cfg.lex | 2 ++ cfg.y | 3 +++ cfg_core.c | 5 ++++- cfg_core.h | 1 + etc/kamailio.cfg | 1 + 5 files changed, 11 insertions(+), 1 deletions(-) diff --git a/cfg.lex b/cfg.lex index 07c7b90..d8586db 100644 --- a/cfg.lex +++ b/cfg.lex @@ -386,6 +386,7 @@ SYN_BRANCH syn_branch MEMLOG "memlog"|"mem_log" MEMDBG "memdbg"|"mem_dbg" MEMSUM "mem_summary" +CORELOG "corelog"|"core_log" SIP_WARNING sip_warning SERVER_SIGNATURE server_signature SERVER_HEADER server_header @@ -747,6 +748,7 @@ SUBST subst <INITIAL>{MEMLOG} { count(); yylval.strval=yytext; return MEMLOG; } <INITIAL>{MEMDBG} { count(); yylval.strval=yytext; return MEMDBG; } <INITIAL>{MEMSUM} { count(); yylval.strval=yytext; return MEMSUM; } +<INITIAL>{CORELOG} { count(); yylval.strval=yytext; return CORELOG; } <INITIAL>{SIP_WARNING} { count(); yylval.strval=yytext; return SIP_WARNING; } <INITIAL>{USER} { count(); yylval.strval=yytext; return USER; } <INITIAL>{GROUP} { count(); yylval.strval=yytext; return GROUP; } diff --git a/cfg.y b/cfg.y index 92d8b69..dde4040 100644 --- a/cfg.y +++ b/cfg.y @@ -434,6 +434,7 @@ extern char *finame; %token MEMLOG %token MEMDBG %token MEMSUM +%token CORELOG %token SIP_WARNING %token SERVER_SIGNATURE %token SERVER_HEADER @@ -918,6 +919,8 @@ assign_stm: | MEMDBG EQUAL error { yyerror("int value expected"); } | MEMSUM EQUAL intno { default_core_cfg.mem_summary=$3; } | MEMSUM EQUAL error { yyerror("int value expected"); } + | CORELOG EQUAL intno { default_core_cfg.corelog=$3; } + | CORELOG EQUAL error { yyerror("int value expected"); } | SIP_WARNING EQUAL NUMBER { sip_warning=$3; } | SIP_WARNING EQUAL error { yyerror("boolean value expected"); } | USER EQUAL STRING { diff --git a/cfg_core.c b/cfg_core.c index 77db37f..03605ee 100644 --- a/cfg_core.c +++ b/cfg_core.c @@ -119,8 +119,9 @@ struct cfg_group_core default_core_cfg = { -1, /**< udp4_raw_ttl (auto detect by default) */ 0, /*!< force_rport */ L_DBG, /*!< memlog */ - 3 /*!< mem_summary -flags: 0 off, 1 pkg_status, 2 shm_status, + 3, /*!< mem_summary -flags: 0 off, 1 pkg_status, 2 shm_status, 4 pkg_sums, 8 shm_sums */ + L_ERR /*!< corelog */ }; void *core_cfg = &default_core_cfg; @@ -307,5 +308,7 @@ cfg_def_t core_cfg_def[] = { " 2 - dump all the shm used blocks (status)," " 4 - summary of pkg used blocks," " 8 - summary of shm used blocks" }, + {"corelog", CFG_VAR_INT|CFG_ATOMIC, 0, 0, 0, 0, + "log level for non-critical core error messages"}, {0, 0, 0, 0, 0, 0} }; diff --git a/cfg_core.h b/cfg_core.h index 45bd3d1..25f69ae 100644 --- a/cfg_core.h +++ b/cfg_core.h @@ -108,6 +108,7 @@ struct cfg_group_core { int force_rport; /*!< if set rport will always be forced*/ int memlog; /*!< log level for memory status/summary info */ int mem_summary; /*!< display memory status/summary info on exit */ + int corelog; /*!< log level for non-critcal core error messages */ }; extern struct cfg_group_core default_core_cfg; diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 5e6d9f7..85f54e0 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -123,6 +123,7 @@ log_stderror=no memdbg=5 memlog=5 +corelog=-2 log_facility=LOG_LOCAL0

13 years, 9 months

re-SUBSCRIBE and Record-Route

by marius zbihlei

Hello, This is based on the topic http://lists.sip-router.org/pipermail/sr-users/2011-March/067702.html Long story short, re-SUBSCRIBEs are considered coming from a strict-router proxy (because of RURI which is the same as initial SUBSCRIBE) and this messes up everything. As Klaus Darilion suggested, one way would be to check if the RURI does contain the lr parameter. The lack of it would mean that the request didn't came from a strict router, but instead from another entity (either CPE or loose-router). The following patch achieves this. I have tested it and it works as expected giving the scenario. If anyone is against this, please tell me now as I will probably push it to upstream in the following days. Cheers Marius

13 years, 9 months

git:alexh/master: core: Enable xavp's by default

by Alex Hermann

Module: sip-router Branch: alexh/master Commit: 4742f57f9a2ae8685578f5e2c5d83e5a64e89a96 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4742f57… 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 008316c..4d28b22 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -656,6 +656,7 @@ C_DEFS= $(extra_defs) \ -DUSE_DNS_FAILOVER \ -DUSE_DST_BLACKLIST \ -DUSE_NAPTR \ + -DWITH_XAVP \ #-DUSE_DNS_CACHE_STATS \ #-DUSE_DST_BLACKLIST_STATS \ #-DDNS_WATCHDOG_SUPPORT \

13 years, 9 months

git:alexh/master: modules_k/permissions: allow_trusted(): Return number of matched entries.

by Alex Hermann

Module: sip-router Branch: alexh/master Commit: 11da29e549ff2dd04f3d94b5aa2667df8b6cb9e6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=11da29e… 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; }

13 years, 9 months

git:alexh/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

Module: sip-router Branch: alexh/master Commit: 2013ba31e09d4233f274d482dd4f60948a4ce56f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2013ba3… 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; }

13 years, 9 months

← Newer
1
...
13
14
15
16
17
18
19
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2011