Revision

17092

Author

anthm

Date

2010-03-24 19:09:43 -0500 (Wed, 24 Mar 2010)

Log Message

prevent race in killgw followed by an immediate rescan with the same gateway name

Modified Paths

• freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h
• freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c
• freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c

Diff

--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h	2010-03-24 23:31:01 UTC (rev 17091)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h	2010-03-25 00:09:43 UTC (rev 17092)
@@ -842,7 +842,7 @@
 #define sofia_glue_profile_rdlock(x) sofia_glue_profile_rdlock__(__FILE__, __SWITCH_FUNC__, __LINE__, x)
 switch_status_t sofia_glue_profile_rdlock__(const char *file, const char *func, int line, sofia_profile_t *profile);
 
-switch_status_t sofia_reg_add_gateway(const char *profile_name, const char *key, sofia_gateway_t *gateway);
+switch_status_t sofia_reg_add_gateway(sofia_profile_t *profile, const char *key, sofia_gateway_t *gateway);
 sofia_gateway_t *sofia_reg_find_gateway__(const char *file, const char *func, int line, const char *key);
 #define sofia_reg_find_gateway(x) sofia_reg_find_gateway__(__FILE__, __SWITCH_FUNC__, __LINE__,  x)
 

--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c	2010-03-24 23:31:01 UTC (rev 17091)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c	2010-03-25 00:09:43 UTC (rev 17092)
@@ -2023,9 +2023,9 @@
 				gateway->freq = 3600;
 			}
 
-			gateway->next = profile->gateways;
-			profile->gateways = gateway;
-			sofia_reg_add_gateway(profile->name, gateway->name, gateway);
+
+			sofia_reg_add_gateway(profile, gateway->name, gateway);
+			
 		}
 
 	  skip:

--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c	2010-03-24 23:31:01 UTC (rev 17091)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c	2010-03-25 00:09:43 UTC (rev 17092)
@@ -109,6 +109,7 @@
 void sofia_reg_unregister(sofia_profile_t *profile)
 {
 	sofia_gateway_t *gateway_ptr;
+	switch_mutex_lock(mod_sofia_globals.hash_mutex);
 	for (gateway_ptr = profile->gateways; gateway_ptr; gateway_ptr = gateway_ptr->next) {
 
 		if (gateway_ptr->sofia_private) {
@@ -120,6 +121,7 @@
 		}
 
 	}
+	switch_mutex_unlock(mod_sofia_globals.hash_mutex);
 }
 
 void sofia_sub_check_gateway(sofia_profile_t *profile, time_t now)
@@ -131,6 +133,7 @@
 	 */
 	sofia_gateway_t *gateway_ptr;
 
+	switch_mutex_lock(mod_sofia_globals.hash_mutex);
 	for (gateway_ptr = profile->gateways; gateway_ptr; gateway_ptr = gateway_ptr->next) {
 		sofia_gateway_subscription_t *gw_sub_ptr;
 
@@ -217,6 +220,7 @@
 			switch_safe_free(user_via);
 		}
 	}
+	switch_mutex_unlock(mod_sofia_globals.hash_mutex);
 }
 
 void sofia_reg_check_gateway(sofia_profile_t *profile, time_t now)
@@ -225,6 +229,7 @@
 	switch_event_t *event;
 	char *pkey;
 
+	switch_mutex_lock(mod_sofia_globals.hash_mutex);
 	for (gateway_ptr = profile->gateways; gateway_ptr; gateway_ptr = gateway_ptr->next) {
 		if (gateway_ptr->deleted && gateway_ptr->state == REG_STATE_NOREG) {
 			if (last) {
@@ -403,6 +408,7 @@
 			sofia_reg_fire_custom_gateway_state_event(gateway_ptr, 0, NULL);
 		}
 	}
+	switch_mutex_unlock(mod_sofia_globals.hash_mutex);
 }
 
 
@@ -2419,15 +2425,20 @@
 #endif
 }
 
-switch_status_t sofia_reg_add_gateway(const char *profile_name, const char *key, sofia_gateway_t *gateway)
+switch_status_t sofia_reg_add_gateway(sofia_profile_t *profile, const char *key, sofia_gateway_t *gateway)
 {
 	switch_status_t status = SWITCH_STATUS_FALSE;
-	char *pkey = switch_mprintf("%s::%s", profile_name, key);
+	char *pkey = switch_mprintf("%s::%s", profile->name, key);
 
 	switch_mutex_lock(mod_sofia_globals.hash_mutex);
+
+	gateway->next = profile->gateways;
+	profile->gateways = gateway;
+	
 	if (!switch_core_hash_find(mod_sofia_globals.gateway_hash, key)) {
 		status = switch_core_hash_insert(mod_sofia_globals.gateway_hash, key, gateway);
 	}
+
 	if (!switch_core_hash_find(mod_sofia_globals.gateway_hash, pkey)) {
 		status = switch_core_hash_insert(mod_sofia_globals.gateway_hash, pkey, gateway);
 	}