Diff
Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (17094 => 17095)
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 2010-03-25 00:24:45 UTC (rev 17094)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 2010-03-25 00:27:20 UTC (rev 17095)
@@ -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(sofia_profile_t *profile, const char *key, sofia_gateway_t *gateway);
+switch_status_t sofia_reg_add_gateway(const char *profile_name, 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)
Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (17094 => 17095)
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2010-03-25 00:24:45 UTC (rev 17094)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2010-03-25 00:27:20 UTC (rev 17095)
@@ -2023,9 +2023,9 @@
gateway->freq = 3600;
}
-
- sofia_reg_add_gateway(profile, gateway->name, gateway);
-
+ gateway->next = profile->gateways;
+ profile->gateways = gateway;
+ sofia_reg_add_gateway(profile->name, gateway->name, gateway);
}
skip:
Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (17094 => 17095)
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2010-03-25 00:24:45 UTC (rev 17094)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2010-03-25 00:27:20 UTC (rev 17095)
@@ -4529,10 +4529,6 @@
"create index ssd_contact_str on sip_shared_appearance_dialogs (contact_str)",
"create index ssd_call_id on sip_shared_appearance_dialogs (call_id)",
"create index ssd_expires on sip_shared_appearance_dialogs (expires)",
- "create index sr_1 on sip_recovery (runtime_uuid)",
- "create index sr_2 on sip_recovery (profile_name)",
- "create index sr_3 on sip_recovery (hostname)",
- "create index sr_4 on sip_recovery (uuid)",
NULL
};
@@ -4751,12 +4747,6 @@
switch_core_db_exec(db, "create index if not exists sa_nonce on sip_authentication (nonce)", NULL, NULL, NULL);
switch_core_db_exec(db, "create index if not exists sa_hostname on sip_authentication (hostname)", NULL, NULL, NULL);
-
- switch_core_db_exec(db, "create index sr_1 on sip_recovery (runtime_uuid)", NULL, NULL, NULL);
- switch_core_db_exec(db, "create index sr_2 on sip_recovery (profile_name)", NULL, NULL, NULL);
- switch_core_db_exec(db, "create index sr_3 on sip_recovery (hostname)", NULL, NULL, NULL);
- switch_core_db_exec(db, "create index sr_4 on sip_recovery (uuid)", NULL, NULL, NULL);
-
}
if (odbc_dbh) {
Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (17094 => 17095)
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c 2010-03-25 00:24:45 UTC (rev 17094)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c 2010-03-25 00:27:20 UTC (rev 17095)
@@ -109,7 +109,6 @@
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) {
@@ -121,7 +120,6 @@
}
}
- switch_mutex_unlock(mod_sofia_globals.hash_mutex);
}
void sofia_sub_check_gateway(sofia_profile_t *profile, time_t now)
@@ -133,7 +131,6 @@
*/
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;
@@ -220,7 +217,6 @@
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)
@@ -229,7 +225,6 @@
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) {
@@ -408,7 +403,6 @@
sofia_reg_fire_custom_gateway_state_event(gateway_ptr, 0, NULL);
}
}
- switch_mutex_unlock(mod_sofia_globals.hash_mutex);
}
@@ -2425,20 +2419,15 @@
#endif
}
-switch_status_t sofia_reg_add_gateway(sofia_profile_t *profile, const char *key, sofia_gateway_t *gateway)
+switch_status_t sofia_reg_add_gateway(const char *profile_name, 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);
}