kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

tolerate MySuckWELL ODBC limitation FSCORE-487 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15465 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2009-11-13 23:15:15 +00:00
parent 77a2346071
commit c69bdbb4b3
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/switch_utils.h
View File

@ -75,7 +75,7 @@ SWITCH_DECLARE(int) switch_isxdigit(int c);
\return true value if the string is NULL or zero length
*/
static inline int zstr(const char *s) {
return (!s || *(s) == '\0');
return !s || *s == '\0';
}
#define switch_strlen_zero(x) zstr(x)

8
src/mod/endpoints/mod_sofia/sofia.c
View File

@ -915,9 +915,7 @@ void *SWITCH_THREAD_FUNC sofia_profile_worker_thread_run(switch_thread_t *thread
switch_mutex_lock(profile->ireg_mutex);
sprintf(sqlbuf, "begin;\n");
sofia_glue_actually_execute_sql(profile, sqlbuf, NULL);
sofia_glue_actually_execute_sql(profile, "begin;\n", NULL);
while (switch_queue_trypop(profile->sql_queue, &pop) == SWITCH_STATUS_SUCCESS && pop) {
char *sql = (char *) pop;
@ -943,9 +941,7 @@ void *SWITCH_THREAD_FUNC sofia_profile_worker_thread_run(switch_thread_t *thread
//printf("TRANS:\n%s\n", sqlbuf);
sofia_glue_actually_execute_sql(profile, sqlbuf, NULL);
sprintf(sqlbuf, "commit;\n");
sofia_glue_actually_execute_sql(profile, sqlbuf, NULL);
sofia_glue_actually_execute_sql(profile, "commit;\n", NULL);
switch_mutex_unlock(profile->ireg_mutex);

17
src/mod/endpoints/mod_sofia/sofia_glue.c
View File

@ -3793,7 +3793,22 @@ int sofia_glue_init_sql(sofia_profile_t *profile)
switch_odbc_handle_exec(odbc_dbh, "DROP TABLE sip_registrations", NULL);
switch_odbc_handle_exec(odbc_dbh, reg_sql, NULL);
}
free(test_sql);
if (sofia_test_pflag(profile, PFLAG_SQL_IN_TRANS)) {
char *test2 = switch_mprintf("%s;%s", test_sql, test_sql);
if (switch_odbc_handle_exec(odbc_dbh, test2, NULL) != SWITCH_ODBC_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "GREAT SCOTT!!! Cannot execute batched statements!\n"
"If you are using mysql, make sure you are using MYODBC 3.51.18 or higher and enable FLAG_MULTI_STATEMENTS\n");
sofia_clear_pflag(profile, PFLAG_SQL_IN_TRANS);
}
free(test2);
}
free(test_sql);
test_sql = switch_mprintf("delete from sip_subscriptions where hostname='%q' and network_ip like '%%' and network_port like '%%'",