]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
add network_ip to these tests so if the field is empty drop and rebuild the table
authorBrian West <brian@freeswitch.org>
Fri, 10 Jul 2009 16:32:48 +0000 (16:32 +0000)
committerBrian West <brian@freeswitch.org>
Fri, 10 Jul 2009 16:32:48 +0000 (16:32 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@14198 d0543943-73ff-0310-b7d9-9358b9ac24b2

src/mod/endpoints/mod_sofia/sofia_glue.c

index 12c1d432df1cc4d4fb26da91eb804f1f31189fe6..3439d34e387c243009d36d12f34c8e1953d888c0 100644 (file)
@@ -3713,7 +3713,8 @@ int sofia_glue_init_sql(sofia_profile_t *profile)
                }
                free(test_sql);
 
-               test_sql = switch_mprintf("delete from sip_shared_appearance_subscriptions where contact_str='' or hostname='%q'", mod_sofia_globals.hostname);
+               test_sql = switch_mprintf("delete from sip_shared_appearance_subscriptions where contact_str='' or hostname='%q' and network_ip!='-1'",
+                                                                 mod_sofia_globals.hostname);
                if (switch_odbc_handle_exec(profile->master_odbc, test_sql, NULL) != SWITCH_ODBC_SUCCESS) {
                        switch_odbc_handle_exec(profile->master_odbc, "DROP TABLE sip_shared_appearance_subscriptions", NULL);
                        switch_odbc_handle_exec(profile->master_odbc, shared_appearance_sql, NULL);
@@ -3721,7 +3722,8 @@ int sofia_glue_init_sql(sofia_profile_t *profile)
                free(test_sql);
 
 
-               test_sql = switch_mprintf("delete from sip_shared_appearance_dialogs where contact_str='' or hostname='%q'", mod_sofia_globals.hostname);
+               test_sql = switch_mprintf("delete from sip_shared_appearance_dialogs where contact_str='' or hostname='%q' and network_ip!='-1'",
+                                                                 mod_sofia_globals.hostname);
                if (switch_odbc_handle_exec(profile->master_odbc, test_sql, NULL) != SWITCH_ODBC_SUCCESS) {
                        switch_odbc_handle_exec(profile->master_odbc, "DROP TABLE sip_shared_appearance_dialogs", NULL);
                        switch_odbc_handle_exec(profile->master_odbc, shared_appearance_dialogs_sql, NULL);
@@ -3749,10 +3751,10 @@ int sofia_glue_init_sql(sofia_profile_t *profile)
                switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_registrations", reg_sql);
                free(test_sql);
 
-               test_sql = switch_mprintf("delete from sip_subscriptions where hostname='%q'", mod_sofia_globals.hostname);
+               test_sql = switch_mprintf("delete from sip_subscriptions where hostname='%q' and network_ip!='-1'", mod_sofia_globals.hostname);
                switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_subscriptions", sub_sql);
                free(test_sql);
-               
+
                test_sql = switch_mprintf("delete from sip_dialogs where hostname='%q'", mod_sofia_globals.hostname);
                switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_dialogs", dialog_sql);
                free(test_sql);
@@ -3766,7 +3768,8 @@ int sofia_glue_init_sql(sofia_profile_t *profile)
                free(test_sql);
 
                
-               test_sql = switch_mprintf("delete from sip_shared_appearance_subscriptions where contact_str = '' or hostname='%q'", mod_sofia_globals.hostname);
+               test_sql = switch_mprintf("delete from sip_shared_appearance_subscriptions where contact_str = '' or hostname='%q' and network_ip!='-1'",
+                                                                 mod_sofia_globals.hostname);
                switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_shared_appearance_subscriptions", shared_appearance_sql);
                free(test_sql);