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

Merge branch 'master' of ssh://git.freeswitch.org/freeswitch

This commit is contained in:
Stefan Knoblich 2010-11-01 20:39:47 +01:00
parent cc1e83397b 7ac78ac21a
commit 454c238e58
5 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bootstrap.sh
View File

@ -148,7 +148,7 @@ if [ "x$libtoolize" = "x" ]; then
exit 1
fi
if [ ! -x "$libtoolize" ]; then
echo "$libtoolize does not exist or ist not executable"
echo "$libtoolize does not exist or is not executable"
exit 1
fi

11
src/mod/applications/mod_commands/mod_commands.c
View File

@ -3483,6 +3483,12 @@ SWITCH_STANDARD_API(show_function)
char hostname[256] = "";
gethostname(hostname, sizeof(hostname));
if (!(cflags & SCF_USE_SQL)) {
stream->write_function(stream, "-ERR SQL DISABLED NO DATA AVAILABLE!\n");
return SWITCH_STATUS_SUCCESS;
}
if (switch_core_db_handle(&db) != SWITCH_STATUS_SUCCESS) {
stream->write_function(stream, "%s", "-ERR Databse Error!\n");
return SWITCH_STATUS_SUCCESS;
@ -3515,11 +3521,6 @@ SWITCH_STANDARD_API(show_function)
holder.print_title = 1;
if (!(cflags & SCF_USE_SQL) && command && !strcasecmp(command, "channels")) {
stream->write_function(stream, "-ERR SQL DISABLED NO CHANNEL DATA AVAILABLE!\n");
goto end;
}
/* If you change the field qty or order of any of these select */
/* statements, you must also change show_callback and friends to match! */
if (!command) {

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

@ -392,11 +392,6 @@ void sofia_glue_set_local_sdp(private_object_t *tech_pvt, const char *ip, uint32
}
}
if (!tech_pvt->rm_encoding && (b_sdp = switch_channel_get_variable(tech_pvt->channel, SWITCH_B_SDP_VARIABLE))) {
sofia_glue_sdp_map(b_sdp, &map, &ptmap);
}
if (fmtp_out_var) {
fmtp_out = fmtp_out_var;
}
@ -435,6 +430,10 @@ void sofia_glue_set_local_sdp(private_object_t *tech_pvt, const char *ip, uint32
return;
}
if (!tech_pvt->rm_encoding && (b_sdp = switch_channel_get_variable(tech_pvt->channel, SWITCH_B_SDP_VARIABLE))) {
sofia_glue_sdp_map(b_sdp, &map, &ptmap);
}
if (!sr) {
if ((var_val = switch_channel_get_variable(tech_pvt->channel, "media_audio_mode"))) {
sr = var_val;

5
src/switch_console.c
View File

@ -238,9 +238,14 @@ SWITCH_DECLARE(char *) switch_console_expand_alias(char *cmd, char *arg)
char *sql = NULL;
char *exp = NULL;
switch_cache_db_handle_t *db = NULL;
switch_core_flag_t cflags = switch_core_flags();
int full = 0;
if (!(cflags & SCF_USE_SQL)) {
return NULL;
}
if (switch_core_db_handle(&db) != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Database Error\n");
return NULL;

5
src/switch_core_sqldb.c
View File

@ -1590,6 +1590,8 @@ switch_status_t switch_core_sqldb_start(switch_memory_pool_t *pool, switch_bool_
top:
if (!sql_manager.manage) goto skip;
/* Activate SQL database */
if (switch_core_db_handle(&dbh) != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening DB!\n");
@ -1707,6 +1709,7 @@ switch_status_t switch_core_sqldb_start(switch_memory_pool_t *pool, switch_bool_
switch_cache_db_execute_sql(dbh, "create index channels1 on channels(hostname)", NULL);
switch_cache_db_execute_sql(dbh, "create index calls1 on calls(hostname)", NULL);
skip:
if (sql_manager.manage) {
if (switch_event_bind_removable("core_db", SWITCH_EVENT_ALL, SWITCH_EVENT_SUBCLASS_ANY,
@ -1729,7 +1732,7 @@ switch_status_t switch_core_sqldb_start(switch_memory_pool_t *pool, switch_bool_
switch_yield(10000);
}
switch_cache_db_release_db_handle(&dbh);
if (sql_manager.manage) switch_cache_db_release_db_handle(&dbh);
return SWITCH_STATUS_SUCCESS;
}