Merge branch 'master' of ssh://git.sip-router.org/sip-router

* 'master' of ssh://git.sip-router.org/sip-router:
  mangler(s): fixed missing var. definitions
  test: fix test 13, avp name for domain
  core: add openser database URL for compatibility, used with OPENSER_MOD_INTERFACE
  test: fix ctl and dbctl script path after import

config.h

@@ -197,11 +197,17 @@
 /* maximum path length */
 #define PATH_MAX_GUESS	1024
 
-#define DEFAULT_DB_URL "mysql://ser:heslo@localhost/ser"
-#define DEFAULT_DB_URL_LEN (sizeof(DEFAULT_DB_URL) - 1)
-
-#define DEFAULT_RODB_URL "mysql://serro:47serro11@localhost/ser"
-#define DEFAULT_RODB_URL_LEN (sizeof(DEFAULT_RODB_URL) - 1)
+#ifdef OPENSER_MOD_INTERFACE
+	#define DEFAULT_DB_URL "mysql://openser:openserrw@localhost/openser"
+	#define DEFAULT_DB_URL_LEN (sizeof(DEFAULT_DB_URL) - 1)
+	#define DEFAULT_RODB_URL "mysql://openserro:openserro@localhost/openser"
+	#define DEFAULT_RODB_URL_LEN (sizeof(DEFAULT_RODB_URL) - 1)
+#else
+	#define DEFAULT_DB_URL "mysql://ser:heslo@localhost/ser"
+	#define DEFAULT_DB_URL_LEN (sizeof(DEFAULT_DB_URL) - 1)
+	#define DEFAULT_RODB_URL "mysql://serro:47serro11@localhost/ser"
+	#define DEFAULT_RODB_URL_LEN (sizeof(DEFAULT_RODB_URL) - 1)
+#endif
 
 /* table holding versions of other ser tables */
 #define VERSION_TABLE "version"

modules_s/mangler/sdp_mangler.c

@@ -50,6 +50,10 @@
 #include "../../ut.h"
 #include "../../parser/msg_parser.h"	/* struct sip_msg */
 
+regex_t *portExpression;
+regex_t *ipExpression;
+
+
 
 int
 sdp_mangle_port (struct sip_msg *msg, char *offset, char *unused)

test/unit/13.cfg

@@ -18,8 +18,8 @@ route{
 		return;
 	};
 	cr_user_carrier("$fU", "$fd", "$avp(s:11)");
-	$avp(domain)="start";
-	if (!cr_route("$avp(carrier)", "$avp(s:10)", "$rU", "$rU", "call_id", "$avp(s:12)")) {
+	$avp(s:10)="start";
+	if (!cr_route("$avp(s:11)", "$avp(s:10)", "$rU", "$rU", "call_id", "$avp(s:12)")) {
 		xlog("L_ERR", "cr_route failed\n");
 		exit;
 	}

test/unit/include/common

@@ -2,7 +2,7 @@
 DB_ALL_MOD="acc|alias_db|auth_db|avpops|dialog|dialplan|dispatcher|domain|domainpolicy|group|imc|lcr|msilo|siptrace|speeddial|uri_db|usrloc|permissions|pdt|userblacklist"
 # root directory relative to tests
 SR_DIR="../.."
-CTL_DIR="$SR_DIR/scripts"
+CTL_DIR="$SR_DIR/tools"
 CTLRC="$CTL_DIR/kamctlrc"
 CTL="$CTL_DIR/kamctl"
 DBCTL="$CTL_DIR/kamdbctl"