From 80b9db179b5991b34766f825fa2f9558d29c2325 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Thu, 25 Mar 2010 00:24:45 +0000 Subject: [PATCH] re-apply reformatted reverted patch git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@17094 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/mod/endpoints/mod_sofia/mod_sofia.h | 2 +- src/mod/endpoints/mod_sofia/sofia.c | 6 +++--- src/mod/endpoints/mod_sofia/sofia_glue.c | 10 ++++++++++ src/mod/endpoints/mod_sofia/sofia_reg.c | 15 +++++++++++++-- 4 files changed, 27 insertions(+), 6 deletions(-) diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.h b/src/mod/endpoints/mod_sofia/mod_sofia.h index bead4d3fb8..9d10bbdd30 100644 --- a/src/mod/endpoints/mod_sofia/mod_sofia.h +++ b/src/mod/endpoints/mod_sofia/mod_sofia.h @@ -842,7 +842,7 @@ sofia_profile_t *sofia_glue_find_profile__(const char *file, const char *func, i #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) diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c index 528c31db12..df3da21156 100644 --- a/src/mod/endpoints/mod_sofia/sofia.c +++ b/src/mod/endpoints/mod_sofia/sofia.c @@ -2023,9 +2023,9 @@ static void parse_gateways(sofia_profile_t *profile, switch_xml_t gateways_tag) 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: diff --git a/src/mod/endpoints/mod_sofia/sofia_glue.c b/src/mod/endpoints/mod_sofia/sofia_glue.c index baa605a06c..8b9fcd323f 100644 --- a/src/mod/endpoints/mod_sofia/sofia_glue.c +++ b/src/mod/endpoints/mod_sofia/sofia_glue.c @@ -4529,6 +4529,10 @@ int sofia_glue_init_sql(sofia_profile_t *profile) "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 }; @@ -4747,6 +4751,12 @@ int sofia_glue_init_sql(sofia_profile_t *profile) 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) { diff --git a/src/mod/endpoints/mod_sofia/sofia_reg.c b/src/mod/endpoints/mod_sofia/sofia_reg.c index d9bfb0627b..2f903d14b4 100644 --- a/src/mod/endpoints/mod_sofia/sofia_reg.c +++ b/src/mod/endpoints/mod_sofia/sofia_reg.c @@ -109,6 +109,7 @@ static void sofia_reg_fire_custom_gateway_state_event(sofia_gateway_t *gateway, 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 @@ void sofia_reg_unregister(sofia_profile_t *profile) } } + switch_mutex_unlock(mod_sofia_globals.hash_mutex); } void sofia_sub_check_gateway(sofia_profile_t *profile, time_t now) @@ -131,6 +133,7 @@ void sofia_sub_check_gateway(sofia_profile_t *profile, time_t now) */ 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 @@ void sofia_sub_check_gateway(sofia_profile_t *profile, time_t now) 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 @@ void sofia_reg_check_gateway(sofia_profile_t *profile, time_t now) 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 @@ void sofia_reg_check_gateway(sofia_profile_t *profile, time_t now) sofia_reg_fire_custom_gateway_state_event(gateway_ptr, 0, NULL); } } + switch_mutex_unlock(mod_sofia_globals.hash_mutex); } @@ -2419,15 +2425,20 @@ void sofia_reg_release_gateway__(const char *file, const char *func, int line, s #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); }