sr-dev November 2010

sr-dev@lists.kamailio.org

17 participants
108 discussions

[tracker] Comment added: [regression] avp_print() does not print anything
by sip-router 26 Nov '10

26 Nov '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#104 - [regression] avp_print() does not print anything User who did this - Daniel-Constantin Mierla (miconda) ---------- Should be fixed now. Starting with v3.0, there are couple of avp lists, the one used by Kamailio-style avps in From URI list and in this case it was From User list. Thanks. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=104#comment136 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:3.1: avpops: use proper avp list for avp_print()
by Daniel-Constantin Mierla 26 Nov '10

26 Nov '10

Module: sip-router Branch: 3.1 Commit: e7bc980b2d42a5f2a26111978e6c3bc21198d2ef URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e7bc980… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Nov 26 13:07:08 2010 +0100 avpops: use proper avp list for avp_print() - reported by Alex Hermann - FS#104 (cherry picked from commit d8803270678b730a7f7352c90f475188fca50c2c) --- modules/avpops/avpops_impl.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/avpops/avpops_impl.c b/modules/avpops/avpops_impl.c index 38edc44..bf1e822 100644 --- a/modules/avpops/avpops_impl.c +++ b/modules/avpops/avpops_impl.c @@ -687,7 +687,7 @@ int ops_dbstore_avps (struct sip_msg* msg, struct fis_param *sp, } } else { /* avp name is unknown -> go through all list */ - avp_list = get_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER); + avp_list = get_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI); avp = avp_list; for ( ; avp ; avp=avp->next ) @@ -784,7 +784,7 @@ int ops_delete_avp(struct sip_msg* msg, struct fis_param *ap) } else { /* avp name is not given - we have just flags */ /* -> go through all list */ - avp_list = get_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER); + avp_list = get_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI); avp = avp_list; for ( ; avp ; avp=avp_next ) @@ -1320,7 +1320,7 @@ int ops_print_avp(void) str *name; /* go through all list */ - avp_list = get_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER); + avp_list = get_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI); avp = avp_list; for ( ; avp ; avp=avp->next)

1 0

git:3.1: permissions(k): changed params from PVAR to SPVE type
by Daniel-Constantin Mierla 26 Nov '10

26 Nov '10

Module: sip-router Branch: 3.1 Commit: 6d0fa20ec53c361600c84d5322c54a402256fb75 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6d0fa20… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Nov 25 22:25:01 2010 +0100 permissions(k): changed params from PVAR to SPVE type - type of fixup params for allow_trusted() updated from PVAR to SPVE - PVAR can be non-zero terminated string - SPVE accepts also static string or combination of PVs - adapted patch submitted by Alex Hermann for crash related to static protocol value, FS#102 (cherry picked from commit 18e67ca2d125f87b85c00eb74b057b9c010a8a26) --- modules_k/permissions/permissions.c | 4 +- modules_k/permissions/trusted.c | 77 +++++++++++++++++------------------ 2 files changed, 39 insertions(+), 42 deletions(-) diff --git a/modules_k/permissions/permissions.c b/modules_k/permissions/permissions.c index 4d41817..5beb016 100644 --- a/modules_k/permissions/permissions.c +++ b/modules_k/permissions/permissions.c @@ -129,8 +129,8 @@ static cmd_export_t cmds[] = { REQUEST_ROUTE | FAILURE_ROUTE}, {"allow_trusted", (cmd_function)allow_trusted_0, 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE}, - {"allow_trusted", (cmd_function)allow_trusted_2, 2, fixup_pvar_pvar, - fixup_free_pvar_pvar, REQUEST_ROUTE | FAILURE_ROUTE}, + {"allow_trusted", (cmd_function)allow_trusted_2, 2, fixup_spve_spve, + fixup_free_spve_spve, REQUEST_ROUTE | FAILURE_ROUTE}, {"allow_uri", (cmd_function)allow_uri, 2, double_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE|LOCAL_ROUTE}, {"allow_address", (cmd_function)allow_address, 3, fixup_igp_pvar_pvar, diff --git a/modules_k/permissions/trusted.c b/modules_k/permissions/trusted.c index 77545ad..33cae33 100644 --- a/modules_k/permissions/trusted.c +++ b/modules_k/permissions/trusted.c @@ -35,6 +35,7 @@ #include "../../config.h" #include "../../lib/srdb1/db.h" #include "../../ip_addr.h" +#include "../../mod_fix.h" #include "../../mem/shm_mem.h" #include "../../parser/msg_parser.h" #include "../../parser/parse_from.h" @@ -462,51 +463,47 @@ int allow_trusted_0(struct sip_msg* _msg, char* str1, char* str2) */ int allow_trusted_2(struct sip_msg* _msg, char* _src_ip_sp, char* _proto_sp) { - pv_spec_t *src_ip_sp, *proto_sp; - pv_value_t pv_val; - char *src_ip, *proto; + str src_ip, proto; int proto_int; - src_ip_sp = (pv_spec_t *)_src_ip_sp; - proto_sp = (pv_spec_t *)_proto_sp; - - if (src_ip_sp && (pv_get_spec_value(_msg, src_ip_sp, &pv_val) == 0)) { - if (pv_val.flags & PV_VAL_STR) { - src_ip = pv_val.rs.s; - } else { - LM_ERR("src_ip pvar value is not string\n"); - return -1; - } - } else { - LM_ERR("src_ip pvar does not exist or has no value\n"); - return -1; + if (_src_ip_sp==NULL + || (fixup_get_svalue(_msg, (gparam_p)_src_ip_sp, &src_ip) != 0)) { + LM_ERR("src_ip param does not exist or has no value\n"); + return -1; } - if (proto_sp && (pv_get_spec_value(_msg, proto_sp, &pv_val) == 0)) { - if (pv_val.flags & PV_VAL_STR) { - strlower(&(pv_val.rs)); - proto = pv_val.rs.s; - } else { - LM_ERR("proto pvar value is not string\n"); - return -1; - } - } else { - LM_ERR("proto pvar does not exist or has no value\n"); - return -1; + if (_proto_sp==NULL + || (fixup_get_svalue(_msg, (gparam_p)_proto_sp, &proto) != 0)) { + LM_ERR("proto param does not exist or has no value\n"); + return -1; } - - if (strcmp(proto, "udp") == 0) { - proto_int = PROTO_UDP; - } else if (strcmp(proto, "tcp") == 0) { - proto_int = PROTO_TCP; - } else if (strcmp(proto, "tls") == 0) { - proto_int = PROTO_TLS; - } else if (strcmp(proto, "sctp") == 0) { - proto_int = PROTO_SCTP; - } else { - LM_ERR("unknown protocol %s\n", proto); - return -1; + if(proto.len!=3 && proto.len!=4) + goto error; + + switch(proto.s[0]) { + case 'u': case 'U': + if (proto.len==3 && strncasecmp(proto.s, "udp", 3) == 0) { + proto_int = PROTO_UDP; + } else goto error; + break; + case 't': case 'T': + if (proto.len==3 && strncasecmp(proto.s, "tcp", 3) == 0) { + proto_int = PROTO_TCP; + } else if (proto.len==3 && strncasecmp(proto.s, "tls", 3) == 0) { + proto_int = PROTO_TLS; + } else goto error; + break; + case 's': case 'S': + if (proto.len==4 && strncasecmp(proto.s, "sctp", 4) == 0) { + proto_int = PROTO_SCTP; + } else goto error; + break; + default: + goto error; } - return allow_trusted(_msg, src_ip, proto_int); + return allow_trusted(_msg, src_ip.s, proto_int); +error: + LM_ERR("unknown protocol %.*s\n", proto.len, proto.s); + return -1; }

1 0

git:3.1: topoh: enhaced description of mask_ip parameter
by Daniel-Constantin Mierla 26 Nov '10

26 Nov '10

Module: sip-router Branch: 3.1 Commit: a81e06ed46ad688d42f2079673aef8b191cf1e1a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a81e06e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Nov 26 10:00:42 2010 +0100 topoh: enhaced description of mask_ip parameter (cherry picked from commit 4fe783a09d6af1a2c16659f961b9097a021805d8) --- modules/topoh/README | 7 ++++--- modules/topoh/doc/topoh_admin.xml | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/topoh/README b/modules/topoh/README index 2940d5e..0ed980f 100644 --- a/modules/topoh/README +++ b/modules/topoh/README @@ -10,7 +10,7 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> - Copyright � 2009 FhG FOKUS + Copyright © 2009 FhG FOKUS __________________________________________________________________ Table of Contents @@ -132,8 +132,9 @@ modparam("topoh", "mask_key", "some secret here") 3.2. mask_ip (str) IP address to be used in masked headers to build valid SIP URIs. Can be - any IP address, does not affect routing when used on the main SIP - server. + any IP address, even a private-space IP address (e.g., 192.168.1.1), + but must not be SIP server's local IP address. It is not used at all + for SIP routing. Default value is "10.1.1.10". diff --git a/modules/topoh/doc/topoh_admin.xml b/modules/topoh/doc/topoh_admin.xml index 9f8673d..d028437 100644 --- a/modules/topoh/doc/topoh_admin.xml +++ b/modules/topoh/doc/topoh_admin.xml @@ -89,8 +89,9 @@ modparam("topoh", "mask_key", "some secret here") <title><varname>mask_ip</varname> (str)</title> <para> IP address to be used in masked headers to build valid - SIP URIs. Can be any IP address, does not affect routing - when used on the main SIP server. + SIP URIs. Can be any IP address, even a private-space IP address + (e.g., 192.168.1.1), but must not be SIP server's local IP address. + It is not used at all for SIP routing. </para> <para> <emphasis>

1 0

git:3.1: topoh: more verbose err reporting during init
by Daniel-Constantin Mierla 26 Nov '10

26 Nov '10

Module: sip-router Branch: 3.1 Commit: c9576754926602aa09f5e464a5278c41b608779c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c957675… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Nov 26 09:54:04 2010 +0100 topoh: more verbose err reporting during init - check also if mask ip != local ip - should prevent the crashes when mask ip == local ip (cherry picked from commit 11ea0c4de66e40bfa1ba03a351f7ec6bc5f0fbfc) --- modules/topoh/topoh_mod.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/modules/topoh/topoh_mod.c b/modules/topoh/topoh_mod.c index a1f3fd2..87a8a13 100644 --- a/modules/topoh/topoh_mod.c +++ b/modules/topoh/topoh_mod.c @@ -42,6 +42,7 @@ #include "../../events.h" #include "../../dprint.h" #include "../../ut.h" +#include "../../forward.h" #include "../../parser/msg_parser.h" #include "../../parser/parse_to.h" #include "../../parser/parse_from.h" @@ -110,6 +111,16 @@ static int mod_init(void) { th_cookie_name.len = strlen(th_cookie_name.s); th_ip.len = strlen(th_ip.s); + if(th_ip.len<=0) + { + LM_ERR("mask IP parameter is invalid\n"); + goto error; + } + if(check_self(&th_ip, 0, 0)==1) + { + LM_ERR("mask IP must be different than SIP server local IP\n"); + goto error; + } th_uparam_name.len = strlen(th_uparam_name.s); th_uparam_prefix.len = strlen(th_uparam_prefix.s); th_vparam_name.len = strlen(th_vparam_name.s); @@ -121,18 +132,25 @@ static int mod_init(void) + th_vparam_prefix.len; th_via_prefix.s = (char*)pkg_malloc(th_via_prefix.len+1); if(th_via_prefix.s==NULL) + { + LM_ERR("via prefix parameter is invalid\n"); goto error; + } /* 'sip:' + ip + ';' + param + '=' + prefix (+ '\0') */ th_uri_prefix.len = 4 + th_ip.len + 1 + th_uparam_name.len + 1 + th_uparam_prefix.len; th_uri_prefix.s = (char*)pkg_malloc(th_uri_prefix.len+1); if(th_uri_prefix.s==NULL) + { + LM_ERR("uri prefix parameter is invalid\n"); goto error; + } /* build via prefix */ memcpy(th_via_prefix.s, "SIP/2.0/UDP ", 12); memcpy(th_via_prefix.s+12, th_ip.s, th_ip.len); th_via_prefix.s[12+th_ip.len] = ';'; - memcpy(th_via_prefix.s+12+th_ip.len+1, th_vparam_name.s, th_vparam_name.len); + memcpy(th_via_prefix.s+12+th_ip.len+1, th_vparam_name.s, + th_vparam_name.len); th_via_prefix.s[12+th_ip.len+1+th_vparam_name.len] = '='; memcpy(th_via_prefix.s+12+th_ip.len+1+th_vparam_name.len+1, th_vparam_prefix.s, th_vparam_prefix.len);

1 0

git:master: avpops: use proper avp list for avp_print()
by Daniel-Constantin Mierla 26 Nov '10

26 Nov '10

Module: sip-router Branch: master Commit: d8803270678b730a7f7352c90f475188fca50c2c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d880327… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Nov 26 13:07:08 2010 +0100 avpops: use proper avp list for avp_print() - reported by Alex Hermann - FS#104 --- modules/avpops/avpops_impl.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/avpops/avpops_impl.c b/modules/avpops/avpops_impl.c index 38edc44..bf1e822 100644 --- a/modules/avpops/avpops_impl.c +++ b/modules/avpops/avpops_impl.c @@ -687,7 +687,7 @@ int ops_dbstore_avps (struct sip_msg* msg, struct fis_param *sp, } } else { /* avp name is unknown -> go through all list */ - avp_list = get_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER); + avp_list = get_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI); avp = avp_list; for ( ; avp ; avp=avp->next ) @@ -784,7 +784,7 @@ int ops_delete_avp(struct sip_msg* msg, struct fis_param *ap) } else { /* avp name is not given - we have just flags */ /* -> go through all list */ - avp_list = get_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER); + avp_list = get_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI); avp = avp_list; for ( ; avp ; avp=avp_next ) @@ -1320,7 +1320,7 @@ int ops_print_avp(void) str *name; /* go through all list */ - avp_list = get_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER); + avp_list = get_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI); avp = avp_list; for ( ; avp ; avp=avp->next)

1 0

git:master: sanity: export inter-module API
by Daniel-Constantin Mierla 26 Nov '10

26 Nov '10

Module: sip-router Branch: master Commit: e9b9c8f7ccdfe4824b58e252ef157dcfbf4c9738 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e9b9c8f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Nov 26 12:39:07 2010 +0100 sanity: export inter-module API - sanity functions can be used from inside other modules (e.g., topoh can use it now before getting to config file execution) --- modules/sanity/api.h | 68 ++++++++++++++++++++++++ modules/sanity/mod_sanity.c | 123 ++++++++++++++++++++++++++++-------------- 2 files changed, 150 insertions(+), 41 deletions(-) diff --git a/modules/sanity/api.h b/modules/sanity/api.h new file mode 100644 index 0000000..0386bd8 --- /dev/null +++ b/modules/sanity/api.h @@ -0,0 +1,68 @@ +/* + * $Id$ + * + * Sanity Checks Module + * + * Copyright (C) 2006 iptelorg GbmH + * + * This file is part of ser, a free SIP server. + * + * ser is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * For a license to use the ser software under conditions + * other than those described here, or to purchase support for this + * software, please contact iptel.org by e-mail at the following addresses: + * info(a)iptel.org + * + * ser is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#ifndef _SANITY_API_H_ +#define _SANITY_API_H_ + +#include "../../parser/msg_parser.h" + +typedef int (*sanity_check_f)(struct sip_msg* msg, int msg_checks, + int uri_checks); +typedef int (*sanity_check_defaults_f)(struct sip_msg* msg); + +typedef struct sanity_api { + sanity_check_f check; + sanity_check_defaults_f check_defaults; +} sanity_api_t; + +typedef int (*bind_sanity_f)(sanity_api_t* api); + +/** + * @brief Load the Sanity API + */ +static inline int sanity_load_api(sanity_api_t *api) +{ + bind_sanity_f bindsanity; + + bindsanity = (bind_sanity_f)find_export("bind_sanity", 0, 0); + if(bindsanity == 0) { + LM_ERR("cannot find bind_sanity\n"); + return -1; + } + if(bindsanity(api)<0) + { + LM_ERR("cannot bind sanity api\n"); + return -1; + } + return 0; +} + + +#endif /* _SANITY_API_H_ */ diff --git a/modules/sanity/mod_sanity.c b/modules/sanity/mod_sanity.c index ffe888f..fee6890 100644 --- a/modules/sanity/mod_sanity.c +++ b/modules/sanity/mod_sanity.c @@ -30,6 +30,7 @@ #include "mod_sanity.h" #include "sanity.h" +#include "api.h" #include "../../sr_module.h" #include "../../ut.h" #include "../../error.h" @@ -40,8 +41,8 @@ MODULE_VERSION str pr_str = STR_STATIC_INIT(PROXY_REQUIRE_DEF); -int default_checks = SANITY_DEFAULT_CHECKS; -int uri_checks = SANITY_DEFAULT_URI_CHECKS; +int default_msg_checks = SANITY_DEFAULT_CHECKS; +int default_uri_checks = SANITY_DEFAULT_URI_CHECKS; int _sanity_drop = 1; strl* proxyrequire_list = NULL; @@ -50,18 +51,20 @@ sl_api_t slb; static int mod_init(void); static int sanity_fixup(void** param, int param_no); -static int sanity_check(struct sip_msg* _msg, char* _foo, char* _bar); +static int w_sanity_check(struct sip_msg* _msg, char* _foo, char* _bar); +static int bind_sanity(sanity_api_t* api); /* * Exported functions */ static cmd_export_t cmds[] = { - {"sanity_check", (cmd_function)sanity_check, 0, 0, + {"sanity_check", (cmd_function)w_sanity_check, 0, 0, REQUEST_ROUTE}, - {"sanity_check", (cmd_function)sanity_check, 1, sanity_fixup, + {"sanity_check", (cmd_function)w_sanity_check, 1, sanity_fixup, REQUEST_ROUTE}, - {"sanity_check", (cmd_function)sanity_check, 2, sanity_fixup, + {"sanity_check", (cmd_function)w_sanity_check, 2, sanity_fixup, REQUEST_ROUTE}, + {"bind_sanity", (cmd_function)bind_sanity, 0, 0, 0}, {0, 0, 0, 0} }; @@ -69,8 +72,8 @@ static cmd_export_t cmds[] = { * Exported parameters */ static param_export_t params[] = { - {"default_checks", PARAM_INT, &default_checks }, - {"uri_checks", PARAM_INT, &uri_checks }, + {"default_checks", PARAM_INT, &default_msg_checks }, + {"uri_checks", PARAM_INT, &default_uri_checks }, {"proxy_require", PARAM_STR, &pr_str }, {"autodrop", PARAM_INT, &_sanity_drop }, {0, 0, 0} @@ -151,79 +154,117 @@ static int sanity_fixup(void** param, int param_no) { return 0; } -static int sanity_check(struct sip_msg* _msg, char* _number, char* _arg) { - int ret, check, arg; - - if (_number == NULL) { - check = default_checks; - } - else { - check = (int)(long)_number; - } - if (_arg == NULL) { - arg = uri_checks; - } - else { - arg = (int)(long)_arg; - } +/** + * perform SIP message sanity check + * @param _msg - SIP message structure + * @param msg_checks - bitmask of sanity tests to perform over message + * @param uri_checks - bitmask of sanity tests to perform over uri + * @return -1 on error, 0 on tests failure, 1 on success + */ +int sanity_check(struct sip_msg* _msg, int msg_checks, int uri_checks) +{ + int ret; - ret = 1; - if (SANITY_RURI_SIP_VERSION & check && + ret = SANITY_CHECK_PASSED; + if (SANITY_RURI_SIP_VERSION & msg_checks && (ret = check_ruri_sip_version(_msg)) != SANITY_CHECK_PASSED) { goto done; } - if (SANITY_RURI_SCHEME & check && + if (SANITY_RURI_SCHEME & msg_checks && (ret = check_ruri_scheme(_msg)) != SANITY_CHECK_PASSED) { goto done; } - if (SANITY_REQUIRED_HEADERS & check && + if (SANITY_REQUIRED_HEADERS & msg_checks && (ret = check_required_headers(_msg)) != SANITY_CHECK_PASSED) { goto done; } - if (SANITY_VIA_SIP_VERSION & check && + if (SANITY_VIA_SIP_VERSION & msg_checks && (ret = check_via_sip_version(_msg)) != SANITY_CHECK_PASSED) { goto done; } - if (SANITY_VIA_PROTOCOL & check && + if (SANITY_VIA_PROTOCOL & msg_checks && (ret = check_via_protocol(_msg)) != SANITY_CHECK_PASSED) { goto done; } - if (SANITY_CSEQ_METHOD & check && + if (SANITY_CSEQ_METHOD & msg_checks && (ret = check_cseq_method(_msg)) != SANITY_CHECK_PASSED) { goto done; } - if (SANITY_CSEQ_VALUE & check && + if (SANITY_CSEQ_VALUE & msg_checks && (ret = check_cseq_value(_msg)) != SANITY_CHECK_PASSED) { goto done; } - if (SANITY_CL & check && + if (SANITY_CL & msg_checks && (ret = check_cl(_msg)) != SANITY_CHECK_PASSED) { goto done; } - if (SANITY_EXPIRES_VALUE & check && + if (SANITY_EXPIRES_VALUE & msg_checks && (ret = check_expires_value(_msg)) != SANITY_CHECK_PASSED) { goto done; } - if (SANITY_PROXY_REQUIRE & check && + if (SANITY_PROXY_REQUIRE & msg_checks && (ret = check_proxy_require(_msg)) != SANITY_CHECK_PASSED) { goto done; } - if (SANITY_PARSE_URIS & check && - (ret = check_parse_uris(_msg, arg)) != SANITY_CHECK_PASSED) { + if (SANITY_PARSE_URIS & msg_checks && + (ret = check_parse_uris(_msg, uri_checks)) != SANITY_CHECK_PASSED) { goto done; } - if (SANITY_CHECK_DIGEST & check && - (ret = check_digest(_msg, arg)) != SANITY_CHECK_PASSED) { + if (SANITY_CHECK_DIGEST & msg_checks && + (ret = check_digest(_msg, uri_checks)) != SANITY_CHECK_PASSED) { goto done; } done: + return ret; +} + +/** + * do default checks + */ +int sanity_check_defaults(struct sip_msg* msg) +{ + return sanity_check(msg, default_msg_checks, default_uri_checks); +} + +/** + * wrapper for sanity_check() to be used from config file + */ +static int w_sanity_check(struct sip_msg* _msg, char* _number, char* _arg) { + int ret, check, arg; + + if (_number == NULL) { + check = default_msg_checks; + } + else { + check = (int)(long)_number; + } + if (_arg == NULL) { + arg = default_uri_checks; + } + else { + arg = (int)(long)_arg; + } + ret = sanity_check(_msg, check, arg); + + DBG("sanity checks result: %d\n", ret); if(_sanity_drop!=0) return ret; return (ret==SANITY_CHECK_FAILED)?-1:ret; +} - DBG("all sanity checks passed\n"); - /* nobody complained so everything is fine */ - return 1; +/** + * load sanity module API + */ +static int bind_sanity(sanity_api_t* api) +{ + if (!api) { + ERR("Invalid parameter value\n"); + return -1; + } + api->check = sanity_check; + api->check_defaults = sanity_check_defaults; + + return 0; }

1 0

[tracker] Comment added: [regression] avp_print() does not print anything
by sip-router 26 Nov '10

26 Nov '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#104 - [regression] avp_print() does not print anything User who did this - Alex Hermann (axlh) ---------- debug level was set to 3 during tests. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=104#comment135 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Assignee added: [regression] avp_print() does not print anything
by sip-router 26 Nov '10

26 Nov '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#104 - [regression] avp_print() does not print anything User who did this - Alex Hermann (axlh) http://sip-router.org/tracker/index.php?do=details&task_id=104 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Task opened: [regression] avp_print() does not print anything
by sip-router 26 Nov '10

26 Nov '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Alex Hermann (axlh) Attached to Project - sip-router Summary - [regression] avp_print() does not print anything Task Type - Bug Report Category - Modules kamailio Status - Assigned Assigned To - Daniel-Constantin Mierla Operating System - All Severity - Low Priority - Normal Reported Version - 3.1 Due in Version - Undecided Due Date - Undecided Details - I have multiple avp's assigned in the script, but calling avp_print() doesn't result in any output at all. According to docs and behavior in 1.5, all avp's should be printed. How to reproduce: <code> $avp(s:test) = "Test"; avp_print(); </code> More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=104 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

← Newer
1
2
3
4
5
6
7
...
11
Older →

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2010