[sr-dev] git:master: core: fixup updates for cfg compat mode removal

[Daniel-Constantin Mierla]

Module: sip-router
Branch: master
Commit: 8d53f26b931ef7836c31f178021a039b09f04d2c
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8d53f26b931ef7836c31f178021a039b09f04d2c

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date:   Sat Apr 17 13:59:30 2010 +0200

core: fixup updates for cfg compat mode removal

- default compat mode becomes the only mode
- affected is #!SER if anyone was using it - now means that a script
  variable like $xyz is attepted to be resolved first as PV and if not
  found the is checked as AVP

---

 sr_module.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/sr_module.c b/sr_module.c
index b0c6c20..dabbda9 100644
--- a/sr_module.c
+++ b/sr_module.c
@@ -1275,12 +1275,11 @@ int fix_param_types(int types, void** param)
 int fixup_var_str_12(void** param, int param_no)
 {
 	int ret;
-	if ((sr_cfg_compat!=SR_COMPAT_SER) &&
-		((ret = fix_param(FPARAM_PVS, param)) <= 0)) return ret;
+	if ((ret = fix_param(FPARAM_PVS, param)) <= 0) return ret;
 	if ((ret = fix_param(FPARAM_AVP, param)) <= 0) return ret;
 	if ((ret = fix_param(FPARAM_SELECT, param)) <= 0) return ret;
 	if ((ret = fix_param(FPARAM_STR, param)) <= 0) return ret;
-	ERR("Error while fixing parameter, AVP, SELECT, and str conversions"
+	ERR("Error while fixing parameter, PV, AVP, SELECT, and str conversions"
 			" failed\n");
 	return -1;
 }
@@ -1312,12 +1311,11 @@ int fixup_var_str_2(void** param, int param_no)
 int fixup_var_int_12(void** param, int param_no)
 {
 	int ret;
-	if ((sr_cfg_compat!=SR_COMPAT_SER) &&
-		((ret = fix_param(FPARAM_PVS, param)) <= 0)) return ret;
+	if ((ret = fix_param(FPARAM_PVS, param)) <= 0) return ret;
 	if ((ret = fix_param(FPARAM_AVP, param)) <= 0) return ret;
 	if ((ret = fix_param(FPARAM_SELECT, param)) <= 0) return ret;
 	if ((ret = fix_param(FPARAM_INT, param)) <= 0) return ret;
-	ERR("Error while fixing parameter, AVP, SELECT, and int conversions"
+	ERR("Error while fixing parameter, PV, AVP, SELECT, and int conversions"
 			" failed\n");
 	return -1;
 }