Project "FreeSWITCH Source" received a push.

committer: Raymond Chandler
comments: 
Merge branch 'master' of fs-git:freeswitch

committer: Anthony Minessale
comments: 
add multiple-registrations flag to the core similar to mod_sofia

diff --git a/conf/autoload_configs/switch.conf.xml b/conf/autoload_configs/switch.conf.xml
index 95c4333..4f72c6a 100644
--- a/conf/autoload_configs/switch.conf.xml
+++ b/conf/autoload_configs/switch.conf.xml
@@ -98,7 +98,9 @@
     <!-- <param name="core-db-name" value="/dev/shm/core.db" /> -->
     <!-- The system will create all the db schemas automatically, set this to false to avoid this behaviour-->
     <!--<param name="auto-create-schemas" value="true"/>-->
-	 <!-- <param name="core-dbtype" value="MSSQL"/> -->
+    <!-- <param name="core-dbtype" value="MSSQL"/> -->
+    <!-- Allow multiple registrations to the same account in the central registration table -->
+    <!-- <param name="multiple-registrations" value="true"/> -->
   </settings>
 
 </configuration>

committer: Anthony Minessale
comments: 
add multiple-registrations flag to the core similar to mod_sofia

diff --git a/src/include/private/switch_core_pvt.h b/src/include/private/switch_core_pvt.h
index f8c6a79..ab0777e 100644
--- a/src/include/private/switch_core_pvt.h
+++ b/src/include/private/switch_core_pvt.h
@@ -248,6 +248,7 @@ struct switch_runtime {
 	int max_sql_buffer_len;
 	switch_dbtype_t odbc_dbtype;
 	char hostname[256];
+	int multiple_registrations;
 };
 
 extern struct switch_runtime runtime;
diff --git a/src/switch_core.c b/src/switch_core.c
index 66731b6..5479229 100644
--- a/src/switch_core.c
+++ b/src/switch_core.c
@@ -1549,6 +1549,8 @@ static void switch_load_core_config(const char *file)
 					if (tmp > -1 && tmp < 11) {
 						switch_core_session_ctl(SCSC_DEBUG_LEVEL, &tmp);
 					}
+				} else if (!strcasecmp(var, "multiple-registrations")) {
+					runtime.multiple_registrations = switch_true(val);
 				} else if (!strcasecmp(var, "sql-buffer-len")) {
 					int tmp = atoi(val);
 
diff --git a/src/switch_core_sqldb.c b/src/switch_core_sqldb.c
index f135e95..1274213 100644
--- a/src/switch_core_sqldb.c
+++ b/src/switch_core_sqldb.c
@@ -1653,7 +1653,14 @@ SWITCH_DECLARE(switch_status_t) switch_core_add_registration(const char *user, c
 		return SWITCH_STATUS_FALSE;
 	}
 
-	sql = switch_mprintf("delete from registrations where hostname='%q' and (url='%q' or token='%q')", switch_core_get_hostname(), url, switch_str_nil(token));
+	if (runtime.multiple_registrations) {
+		sql = switch_mprintf("delete from registrations where hostname='%q' and (url='%q' or token='%q')", 
+							 switch_core_get_hostname(), url, switch_str_nil(token));
+	} else {
+		sql = switch_mprintf("delete from registrations where reg_user='%q' and realm='%q' and hostname='%q'", 
+							 user, realm, switch_core_get_hostname());
+	}
+
 	switch_cache_db_execute_sql(dbh, sql, NULL);
 	free(sql);
 

committer: Anthony Minessale
comments: 
put transport in the request uri on outbound registers if register_transport is set and proxy does not already contain a transport param

diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index 825d1bf..e9d2cad 100644
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -2148,8 +2148,13 @@ static void parse_gateways(sofia_profile_t *profile, switch_xml_t gateways_tag)
 			if (!zstr(from_domain)) {
 				gateway->from_domain = switch_core_strdup(gateway->pool, from_domain);
 			}
+			
+			if (!zstr(register_transport) && !switch_stristr("transport=", proxy)) {
+				gateway->register_url = switch_core_sprintf(gateway->pool, "sip:%s;transport=%s", proxy, register_transport);
+			} else {
+				gateway->register_url = switch_core_sprintf(gateway->pool, "sip:%s", proxy);
+			}
 
-			gateway->register_url = switch_core_sprintf(gateway->pool, "sip:%s", proxy);
 			gateway->register_from = switch_core_sprintf(gateway->pool, "<sip:%s@%s;transport=%s>",
 														 from_user, !zstr(from_domain) ? from_domain : proxy, register_transport);