- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r6277 - freeswitch/trunk/src
by Freeswitch SVN 15 Nov '07

15 Nov '07

Author: anthm Date: Thu Nov 15 12:24:53 2007 New Revision: 6277 Modified: freeswitch/trunk/src/switch_odbc.c Log: fix MODENDP-36 Modified: freeswitch/trunk/src/switch_odbc.c ============================================================================== --- freeswitch/trunk/src/switch_odbc.c (original) +++ freeswitch/trunk/src/switch_odbc.c Thu Nov 15 12:24:53 2007 @@ -97,9 +97,6 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Disconnectiong [%s]\n", handle->dsn); } } - //else { - //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "[%s] already disconnected\n", handle->dsn); - //} handle->state = SWITCH_ODBC_STATE_DOWN; @@ -163,17 +160,16 @@ } result = SQLGetInfo(handle->con, SQL_DRIVER_NAME, (SQLCHAR*)handle->odbc_driver, 255, &valueLength); - if ( result == SQL_SUCCESS || result == SQL_SUCCESS_WITH_INFO) - { + if ( result == SQL_SUCCESS || result == SQL_SUCCESS_WITH_INFO) { for (i = 0; i < valueLength; ++i) handle->odbc_driver[i] = (char)toupper(handle->odbc_driver[i]); } - //Firebird do not support "SELECT 1" - if (strstr(handle->odbc_driver, "FIREBIRD") != 0 || strstr(handle->odbc_driver, "FB32") != 0 || strstr(handle->odbc_driver, "FB64") != 0) + if (strstr(handle->odbc_driver, "FIREBIRD") != 0 || strstr(handle->odbc_driver, "FB32") != 0 || strstr(handle->odbc_driver, "FB64") != 0) { handle->is_firebird = TRUE; - else + } else { handle->is_firebird = FALSE; + } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connected to [%s]\n", handle->dsn); handle->state = SWITCH_ODBC_STATE_CONNECTED; @@ -190,20 +186,22 @@ switch_event_t *event; switch_odbc_status_t recon = 0; char *err_str = NULL; - SQLCHAR sql[255]; - - //Firebird do not support "SELECT 1" - sql[0] = 0; - if (handle->is_firebird) - strcpy((char*)sql, "select first 1 * from RDB$RELATIONS"); - else - strcpy((char*)sql, "select 1"); + SQLCHAR sql[255] = ""; + int max_tries = 120; + top: + if (!handle) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "No DB Handle\n"); goto done; } + if (handle->is_firebird) { + strcpy((char*)sql, "select first 1 * from RDB$RELATIONS"); + } else { + strcpy((char*)sql, "select 1"); + } + if (SQLAllocHandle(SQL_HANDLE_STMT, handle->con, &stmt) != SQL_SUCCESS) { goto error; } @@ -217,17 +215,18 @@ SQLRowCount(stmt, &m); ret = (int) m; + if (result < 0 || m < 0) { + goto error; + } + goto done; error: err_str = switch_odbc_handle_get_error(handle, stmt); + recon = switch_odbc_handle_connect(handle); - // No need to reconnect if we can get the string anyway. - if (err_str == 0) - { - recon = switch_odbc_handle_connect(handle); - err_str = switch_odbc_handle_get_error(handle, stmt); - } + + max_tries--; if (switch_event_create(&event, SWITCH_EVENT_TRAP) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Failure-Message", "The sql server is not responding for DSN %s [%s]", @@ -242,8 +241,21 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Additional-Info", "The connection could not be re-established"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "The connection could not be re-established\n"); } + if (!max_tries) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Additional-Info", "Giving up!"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Giving up!\n"); + } + switch_event_fire(&event); } + + if (!max_tries) { + goto done; + } + + switch_safe_free(err_str); + switch_yield(1000000); + goto top; done:

1 0

[commit] r6276 - freeswitch/trunk/src/mod/formats/mod_local_stream
by Freeswitch SVN 15 Nov '07

15 Nov '07

Author: anthm Date: Thu Nov 15 12:04:22 2007 New Revision: 6276 Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Log: tweak Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c (original) +++ freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Thu Nov 15 12:04:22 2007 @@ -97,7 +97,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "open directory: %s\n", source->location); switch_yield(1000000); - while((fname = switch_dir_next_file(source->dir_handle, file_buf, sizeof(file_buf)))) { + while(RUNNING && (fname = switch_dir_next_file(source->dir_handle, file_buf, sizeof(file_buf)))) { switch_size_t olen; uint8_t *abuf[SWITCH_RECOMMENDED_BUFFER_SIZE] = {0};

1 0

[commit] r6275 - in freeswitch/trunk/src/mod: applications/mod_limit applications/mod_voicemail endpoints/mod_dingaling endpoints/mod_sofia
by Freeswitch SVN 15 Nov '07

15 Nov '07

Author: anthm Date: Thu Nov 15 11:55:46 2007 New Revision: 6275 Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: fix MODENDP-35 Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Thu Nov 15 11:55:46 2007 @@ -202,14 +202,14 @@ var = (char *) switch_xml_attr_soft(param, "name"); val = (char *) switch_xml_attr_soft(param, "value"); - if (!strcasecmp(var, "odbc-dsn")) { + if (!strcasecmp(var, "odbc-dsn") && !switch_strlen_zero(val)) { #ifdef SWITCH_HAVE_ODBC globals.odbc_dsn = switch_core_strdup(globals.pool, val); if ((odbc_user = strchr(globals.odbc_dsn, ':'))) { *odbc_user++ = '\0'; - } - if ((odbc_pass = strchr(odbc_user, ':'))) { - *odbc_pass++ = '\0'; + if ((odbc_pass = strchr(odbc_user, ':'))) { + *odbc_pass++ = '\0'; + } } #else switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ODBC IS NOT AVAILABLE!\n"); Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Thu Nov 15 11:55:46 2007 @@ -416,14 +416,14 @@ } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "invalid attempts [%s] must be between 1 and 10000s\n", val); } - } else if (!strcasecmp(var, "odbc-dsn")) { + } else if (!strcasecmp(var, "odbc-dsn") && !switch_strlen_zero(val)) { #ifdef SWITCH_HAVE_ODBC odbc_dsn = switch_core_strdup(globals.pool, val); if ((odbc_user = strchr(odbc_dsn, ':'))) { *odbc_user++ = '\0'; - } - if ((odbc_pass = strchr(odbc_user, ':'))) { - *odbc_pass++ = '\0'; + if ((odbc_pass = strchr(odbc_user, ':'))) { + *odbc_pass++ = '\0'; + } } #else switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ODBC IS NOT AVAILABLE!\n"); Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Thu Nov 15 11:55:46 2007 @@ -1918,14 +1918,14 @@ profile->password = switch_core_strdup(module_pool, val); } else if (!strcasecmp(var, "avatar")) { profile->avatar = switch_core_strdup(module_pool, val); - } else if (!strcasecmp(var, "odbc-dsn")) { + } else if (!strcasecmp(var, "odbc-dsn") && !switch_strlen_zero(val)) { #ifdef SWITCH_HAVE_ODBC profile->odbc_dsn = switch_core_strdup(module_pool, val); if ((profile->odbc_user = strchr(profile->odbc_dsn, ':'))) { *profile->odbc_user++ = '\0'; - } - if ((profile->odbc_pass = strchr(profile->odbc_user, ':'))) { - *profile->odbc_pass++ = '\0'; + if ((profile->odbc_pass = strchr(profile->odbc_user, ':'))) { + *profile->odbc_pass++ = '\0'; + } } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Thu Nov 15 11:55:46 2007 @@ -1353,7 +1353,7 @@ cb.profile = profile; cb.stream = &mystream; - sql = switch_mprintf("select contact from sip_registrations where user='%q' and host='%q'", user, domain); + sql = switch_mprintf("select contact from sip_registrations where sip_user='%q' and sip_host='%q'", user, domain); assert(sql); sofia_glue_execute_sql_callback(profile, SWITCH_FALSE, profile->ireg_mutex, sql, contact_callback, &cb); switch_safe_free(sql); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Thu Nov 15 11:55:46 2007 @@ -167,7 +167,7 @@ user = sip->sip_to->a_url->url_user; host = sip->sip_to->a_url->url_host; - sql = switch_mprintf("delete from sip_registrations where user='%q' and host='%q'", user, host); + sql = switch_mprintf("delete from sip_registrations where sip_user='%q' and sip_host='%q'", user, host); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Deleting registration for %s@%s\n", user, host); sofia_glue_execute_sql(profile, SWITCH_TRUE, sql, NULL); switch_safe_free(sql); @@ -287,7 +287,7 @@ if (sofia_test_pflag(profile, PFLAG_MULTIREG)) { sql = switch_mprintf("delete from sip_registrations where call_id='%q'", call_id); } else { - sql = switch_mprintf("delete from sip_registrations where user='%q' and host='%q'", from_user, from_host); + sql = switch_mprintf("delete from sip_registrations where sip_user='%q' and sip_host='%q'", from_user, from_host); } switch_mutex_lock(profile->ireg_mutex); @@ -820,14 +820,14 @@ } else if (!strcasecmp(var, "use-rtp-timer") && switch_true(val)) { switch_set_flag(profile, TFLAG_TIMER); - } else if (!strcasecmp(var, "odbc-dsn")) { + } else if (!strcasecmp(var, "odbc-dsn") && !switch_strlen_zero(val)) { #ifdef SWITCH_HAVE_ODBC profile->odbc_dsn = switch_core_strdup(profile->pool, val); if ((profile->odbc_user = strchr(profile->odbc_dsn, ':'))) { *profile->odbc_user++ = '\0'; - } - if ((profile->odbc_pass = strchr(profile->odbc_user, ':'))) { - *profile->odbc_pass++ = '\0'; + if ((profile->odbc_pass = strchr(profile->odbc_user, ':'))) { + *profile->odbc_pass++ = '\0'; + } } #else Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Thu Nov 15 11:55:46 2007 @@ -1716,19 +1716,20 @@ char reg_sql[] = "CREATE TABLE sip_registrations (\n" " call_id VARCHAR(255),\n" - " user VARCHAR(255),\n" - " host VARCHAR(255),\n" + " sip_user VARCHAR(255),\n" + " sip_host VARCHAR(255),\n" " contact VARCHAR(1024),\n" " status VARCHAR(255),\n" " rpid VARCHAR(255),\n" - " expires INTEGER(8)" ");\n"; + " expires INTEGER" + ");\n"; char sub_sql[] = "CREATE TABLE sip_subscriptions (\n" " proto VARCHAR(255),\n" - " user VARCHAR(255),\n" - " host VARCHAR(255),\n" + " sip_user VARCHAR(255),\n" + " sip_host VARCHAR(255),\n" " sub_to_user VARCHAR(255),\n" " sub_to_host VARCHAR(255),\n" " event VARCHAR(255),\n" @@ -1736,13 +1737,14 @@ " call_id VARCHAR(255),\n" " full_from VARCHAR(255),\n" " full_via VARCHAR(255),\n" - " expires INTEGER(8)" ");\n"; + " expires INTEGER" + ");\n"; char auth_sql[] = "CREATE TABLE sip_authentication (\n" " nonce VARCHAR(255),\n" - " expires INTEGER(8)" + " expires INTEGER" ");\n"; #ifdef SWITCH_HAVE_ODBC @@ -1757,12 +1759,12 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Connected ODBC DSN: %s\n", profile->odbc_dsn); - if (switch_odbc_handle_exec(profile->master_odbc, "select call_id from sip_registrations", NULL) != SWITCH_ODBC_SUCCESS) { + if (switch_odbc_handle_exec(profile->master_odbc, "select sip_user from sip_registrations", NULL) != SWITCH_ODBC_SUCCESS) { switch_odbc_handle_exec(profile->master_odbc, "DROP TABLE sip_registrations", NULL); switch_odbc_handle_exec(profile->master_odbc, reg_sql, NULL); } - if (switch_odbc_handle_exec(profile->master_odbc, "delete from sip_subscriptions", NULL) != SWITCH_ODBC_SUCCESS) { + if (switch_odbc_handle_exec(profile->master_odbc, "delete from sip_subscriptions where sip_user != ''", NULL) != SWITCH_ODBC_SUCCESS) { switch_odbc_handle_exec(profile->master_odbc, "DROP TABLE sip_subscriptions", NULL); switch_odbc_handle_exec(profile->master_odbc, sub_sql, NULL); } @@ -1777,8 +1779,8 @@ return 0; } - switch_core_db_test_reactive(profile->master_db, "select call_id from sip_registrations", "DROP TABLE sip_registrations", reg_sql); - switch_core_db_test_reactive(profile->master_db, "delete from sip_subscriptions", "DROP TABLE sip_subscriptions", sub_sql); + switch_core_db_test_reactive(profile->master_db, "select sip_user from sip_registrations", "DROP TABLE sip_registrations", reg_sql); + switch_core_db_test_reactive(profile->master_db, "delete from sip_subscriptions where sip_user != ''", "DROP TABLE sip_subscriptions", sub_sql); switch_core_db_test_reactive(profile->master_db, "select * from sip_authentication", "DROP TABLE sip_authentication", auth_sql); #ifdef SWITCH_HAVE_ODBC Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Thu Nov 15 11:55:46 2007 @@ -136,7 +136,7 @@ { if (sofia_glue_execute_sql_callback(profile, SWITCH_FALSE, profile->ireg_mutex, - "select user,host,'Registered','unknown','' from sip_registrations", + "select sip_user,sip_host,'Registered','unknown','' from sip_registrations", sofia_presence_resub_callback, profile) != SWITCH_TRUE) { return; } @@ -364,7 +364,7 @@ } if (euser && host && - (sql = switch_mprintf("select user,host,status,rpid,'' from sip_registrations where user='%q' and host='%q'", + (sql = switch_mprintf("select user,host,status,rpid,'' from sip_registrations where sip_user='%q' and sip_host='%q'", euser, host)) && (profile = sofia_glue_find_profile(host))) { sofia_glue_execute_sql_callback(profile, @@ -846,7 +846,7 @@ switch_safe_free(sstr); - if ((sql = switch_mprintf("select * from sip_subscriptions where user='%q' and host='%q'", to_user, to_host, to_user, to_host))) { + if ((sql = switch_mprintf("select * from sip_subscriptions where sip_user='%q' and sip_host='%q'", to_user, to_host, to_user, to_host))) { sofia_glue_execute_sql_callback(profile, SWITCH_FALSE, profile->ireg_mutex, @@ -941,7 +941,7 @@ } if ((sql = - switch_mprintf("update sip_registrations set status='%q',rpid='%q' where user='%q' and host='%q'", + switch_mprintf("update sip_registrations set status='%q',rpid='%q' where sip_user='%q' and sip_host='%q'", note_txt, rpid, from_user, from_host))) { sofia_glue_execute_sql(profile, SWITCH_FALSE, sql, profile->ireg_mutex); switch_safe_free(sql); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Thu Nov 15 11:55:46 2007 @@ -269,9 +269,9 @@ cbt.len = len; if (host) { - snprintf(val, len, "select contact from sip_registrations where user='%s' and host='%s'", user, host); + snprintf(val, len, "select contact from sip_registrations where sip_user='%s' and sip_host='%s'", user, host); } else { - snprintf(val, len, "select contact from sip_registrations where user='%s'", user); + snprintf(val, len, "select contact from sip_registrations where sip_user='%s'", user); } @@ -483,7 +483,7 @@ if (sofia_test_pflag(profile, PFLAG_MULTIREG)) { sql = switch_mprintf("delete from sip_registrations where call_id='%q'", call_id); } else { - sql = switch_mprintf("delete from sip_registrations where user='%q' and host='%q'", to_user, to_host); + sql = switch_mprintf("delete from sip_registrations where sip_user='%q' and sip_host='%q'", to_user, to_host); } switch_mutex_lock(profile->ireg_mutex); sofia_glue_execute_sql(profile, SWITCH_FALSE, sql, NULL); @@ -536,7 +536,7 @@ if ((p = strchr(icontact + 4, ':'))) { *p = '\0'; } - if ((sql = switch_mprintf("delete from sip_subscriptions where user='%q' and host='%q' and contact like '%%%q%%'", to_user, to_host, icontact))) { + if ((sql = switch_mprintf("delete from sip_subscriptions where sip_user='%q' and sip_host='%q' and contact like '%%%q%%'", to_user, to_host, icontact))) { sofia_glue_execute_sql(profile, SWITCH_FALSE, sql, profile->ireg_mutex); switch_safe_free(sql); sql = NULL; @@ -549,13 +549,13 @@ } switch_safe_free(icontact); } else { - if ((sql = switch_mprintf("delete from sip_subscriptions where user='%q' and host='%q'", to_user, to_host))) { + if ((sql = switch_mprintf("delete from sip_subscriptions where sip_user='%q' and sip_host='%q'", to_user, to_host))) { sofia_glue_execute_sql(profile, SWITCH_FALSE, sql, profile->ireg_mutex); switch_safe_free(sql); sql = NULL; } - if ((sql = switch_mprintf("delete from sip_registrations where user='%q' and host='%q'", to_user, to_host))) { + if ((sql = switch_mprintf("delete from sip_registrations where sip_user='%q' and sip_host='%q'", to_user, to_host))) { sofia_glue_execute_sql(profile, SWITCH_FALSE, sql, profile->ireg_mutex); switch_safe_free(sql); sql = NULL;

1 0

[commit] r6274 - in freeswitch/trunk/src: . include mod/applications/mod_dptools mod/endpoints/mod_sofia
by Freeswitch SVN 15 Nov '07

15 Nov '07

Author: anthm Date: Thu Nov 15 11:22:18 2007 New Revision: 6274 Modified: freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c freeswitch/trunk/src/switch_utils.c freeswitch/trunk/src/switch_xml.cpp Log: fix uri nonsense and backwards stristr Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Thu Nov 15 11:22:18 2007 @@ -301,7 +301,7 @@ SWITCH_DECLARE(switch_bool_t) switch_is_number(const char *str); SWITCH_DECLARE(char *) switch_strip_spaces(const char *str); SWITCH_DECLARE(char *) switch_separate_paren_args(char *str); -SWITCH_DECLARE(const char *) switch_stristr(const char *str, const char *instr); +SWITCH_DECLARE(const char *) switch_stristr(const char *instr, const char *str); SWITCH_DECLARE(switch_bool_t) switch_is_lan_addr(const char *ip); SWITCH_DECLARE(char *) switch_replace_char(char *str, char from, char to, switch_bool_t dup); SWITCH_DECLARE(switch_bool_t) switch_ast2regex(char *pat, char *rbuf, size_t len); Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Thu Nov 15 11:22:18 2007 @@ -1337,7 +1337,7 @@ if the variable continue_on_fail is set it can be: 'true' to continue on all failures. 'false' to not continue. - A list of codes either names or numbers eg "user_busy,normal_temporary_failure" + A list of codes either names or numbers eg "user_busy,normal_temporary_failure,603" */ if (continue_on_fail) { const char *cause_str; @@ -1346,7 +1346,7 @@ cause_str = switch_channel_cause2str(cause); snprintf(cause_num, sizeof(cause_num), "%u", cause); - if (switch_true(continue_on_fail) || switch_stristr(cause_str, continue_on_fail) || strstr(cause_str, cause_num)) { + if (switch_true(continue_on_fail) || switch_stristr(cause_str, continue_on_fail) || strstr(cause_num, continue_on_fail)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Continue on fail [%s]: Cause: %s\n", continue_on_fail, cause_str); return; } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Thu Nov 15 11:22:18 2007 @@ -481,6 +481,7 @@ void sofia_presence_set_hash_key(char *hash_key, int32_t len, sip_t const *sip); void sofia_glue_sql_close(sofia_profile_t *profile); int sofia_glue_init_sql(sofia_profile_t *profile); +char *sofia_overcome_sip_uri_weakness(switch_core_session_t *session, const char *uri, const char *transport); switch_bool_t sofia_glue_execute_sql_callback(sofia_profile_t *profile, switch_bool_t master, switch_mutex_t *mutex, Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Thu Nov 15 11:22:18 2007 @@ -470,6 +470,34 @@ return SWITCH_STATUS_SUCCESS; } +char *sofia_overcome_sip_uri_weakness(switch_core_session_t *session, const char *uri, const char *transport) +{ + char *stripped = switch_core_session_strdup(session, uri); + char *new_uri = NULL; + + stripped = sofia_glue_get_url_from_contact(stripped, 0); + if (transport && strcasecmp(transport, "udp")) { + if (switch_stristr("port=", stripped)) { + new_uri = switch_core_session_sprintf(session, "<%s>", stripped); + } else { + if (strchr(stripped, ';')) { + new_uri = switch_core_session_sprintf(session, "<%s&transport=%s>", stripped, transport); + } else { + new_uri = switch_core_session_sprintf(session, "<%s;transport=%s>", stripped, transport); + } + } + } else { + char *p; + if ((p = strrchr(stripped, ';'))) { + *p = '\0'; + } + new_uri = stripped; + } + + return new_uri; +} + + switch_status_t sofia_glue_do_invite(switch_core_session_t *session) { char *rpid = NULL; @@ -562,7 +590,6 @@ sofia_private_t *sofia_private; char *invite_contact = NULL, *to_str, *use_from_str, *from_str, *url_str; const char *transport = "udp", *t_var; - char *d_contact = NULL; if (switch_strlen_zero(tech_pvt->dest)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "URL Error! [%s]\n", tech_pvt->dest); @@ -586,7 +613,7 @@ } else { use_from_str = tech_pvt->from_str; } - + if (switch_stristr("port=tcp", url)) { transport = "tcp"; } else { @@ -595,33 +622,13 @@ transport = t_var; } } - url_str = switch_core_session_sprintf(session, "%s;transport=%s", url, transport); - } - - d_contact = sofia_glue_get_url_from_contact(tech_pvt->invite_contact, 1); - - if (switch_stristr("port=", d_contact)) { - invite_contact = switch_core_session_sprintf(session, "<%s>", d_contact); - } else { - if (strchr(d_contact, ';')) { - invite_contact = switch_core_session_sprintf(session, "<%s&transport=%s>", d_contact, transport); - } else { - invite_contact = switch_core_session_sprintf(session, "%s;transport=%s", d_contact, transport); - } - } - - if (strchr(use_from_str, '>')) { - from_str = switch_core_session_sprintf(session, "%s;transport=%s", use_from_str, transport); - } else { - from_str = switch_core_session_sprintf(session, "<%s;transport=%s>", use_from_str, transport); - } - - if (strchr(tech_pvt->dest_to, '>')) { - to_str = switch_core_session_sprintf(session, "%s;transport=%s", tech_pvt->dest_to, transport); - } else { - to_str = switch_core_session_sprintf(session, "<%s;transport=%s>", tech_pvt->dest_to, transport); } + url_str = sofia_overcome_sip_uri_weakness(session, url, transport); + invite_contact = sofia_overcome_sip_uri_weakness(session, tech_pvt->invite_contact, transport); + from_str = sofia_overcome_sip_uri_weakness(session, use_from_str, NULL); + to_str = sofia_overcome_sip_uri_weakness(session, tech_pvt->dest_to, NULL); + tech_pvt->nh = nua_handle(tech_pvt->profile->nua, NULL, NUTAG_URL(url_str), SIPTAG_TO_STR(to_str), @@ -630,7 +637,6 @@ TAG_END()); switch_safe_free(d_url); - switch_safe_free(d_contact); if (!(sofia_private = malloc(sizeof(*sofia_private)))) { abort(); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Thu Nov 15 11:22:18 2007 @@ -155,7 +155,7 @@ { char *r = in; - if (in && (switch_stristr(in, "null"))) { + if (in && (switch_stristr("null", in))) { in = NULL; } Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Thu Nov 15 11:22:18 2007 @@ -334,7 +334,7 @@ } -SWITCH_DECLARE(const char *) switch_stristr(const char *str, const char *instr) +SWITCH_DECLARE(const char *) switch_stristr(const char *instr, const char *str) { /* ** Rev History: 16/07/97 Greg Thayer Optimized Modified: freeswitch/trunk/src/switch_xml.cpp ============================================================================== --- freeswitch/trunk/src/switch_xml.cpp (original) +++ freeswitch/trunk/src/switch_xml.cpp Thu Nov 15 11:22:18 2007 @@ -1018,7 +1018,7 @@ } } - if ((tcmd = (char *)switch_stristr(bp, "<X-pre-process"))) { + if ((tcmd = (char *)switch_stristr("<X-pre-process", bp))) { if ((e = strstr(tcmd, "/>"))) { *e += 2; *e = '\0'; @@ -1027,15 +1027,15 @@ } } - if (!(tcmd = (char *)switch_stristr(tcmd, "cmd"))) { + if (!(tcmd = (char *)switch_stristr("cmd", tcmd))) { continue; } - if (!(tcmd = (char *)switch_stristr(tcmd, "="))) { + if (!(tcmd = (char *)switch_stristr("=", tcmd))) { continue; } - if (!(tcmd = (char *)switch_stristr(tcmd, "\""))) { + if (!(tcmd = (char *)switch_stristr("\"", tcmd))) { continue; } @@ -1046,15 +1046,15 @@ *e++ = '\0'; } - if (!(targ = (char *)switch_stristr(e, "data"))) { + if (!(targ = (char *)switch_stristr("data", e))) { continue; } - if (!(targ = (char *)switch_stristr(targ, "="))) { + if (!(targ = (char *)switch_stristr("=", targ))) { continue; } - if (!(targ = (char *)switch_stristr(targ, "\""))) { + if (!(targ = (char *)switch_stristr("\"", targ))) { continue; } @@ -1694,7 +1694,7 @@ } if (xml->free_path) { - if (!switch_stristr(xml->free_path, ".fsxml")) { + if (!switch_stristr(".fsxml", xml->free_path)) { unlink(xml->free_path); } switch_safe_free(xml->free_path);

1 0

[commit] r6273 - freeswitch/trunk/w32/Library
by Freeswitch SVN 15 Nov '07

15 Nov '07

Author: mikej Date: Wed Nov 14 19:51:33 2007 New Revision: 6273 Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Log: fix windows release build Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj ============================================================================== --- freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj (original) +++ freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Wed Nov 14 19:51:33 2007 @@ -447,6 +447,16 @@ PrecompiledHeaderFile="" /> </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + /> + </FileConfiguration> </File> </Filter> <Filter @@ -491,11 +501,11 @@ > </File> <File - RelativePath="..\..\src\include\private\switch_core.h" + RelativePath="..\..\src\include\switch_core.h" > </File> <File - RelativePath="..\..\src\include\switch_core.h" + RelativePath="..\..\src\include\private\switch_core.h" > </File> <File

1 0

[commit] r6272 - freeswitch/trunk/src
by Freeswitch SVN 14 Nov '07

14 Nov '07

Author: mikej Date: Wed Nov 14 16:32:56 2007 New Revision: 6272 Modified: freeswitch/trunk/src/switch_xml.cpp Log: windows build ugliness Modified: freeswitch/trunk/src/switch_xml.cpp ============================================================================== --- freeswitch/trunk/src/switch_xml.cpp (original) +++ freeswitch/trunk/src/switch_xml.cpp Wed Nov 14 16:32:56 2007 @@ -989,7 +989,7 @@ int read_fd = -1; switch_size_t cur = 0, ml = 0; char *q, *cmd, buf[2048], ebuf[8192]; - const char *tcmd, *targ; + char *tcmd, *targ; if ((read_fd = open(file, O_RDONLY, 0)) < 0) { return read_fd; @@ -1018,7 +1018,7 @@ } } - if ((tcmd = switch_stristr(bp, "<X-pre-process"))) { + if ((tcmd = (char *)switch_stristr(bp, "<X-pre-process"))) { if ((e = strstr(tcmd, "/>"))) { *e += 2; *e = '\0'; @@ -1027,15 +1027,15 @@ } } - if (!(tcmd = switch_stristr(tcmd, "cmd"))) { + if (!(tcmd = (char *)switch_stristr(tcmd, "cmd"))) { continue; } - if (!(tcmd = switch_stristr(tcmd, "="))) { + if (!(tcmd = (char *)switch_stristr(tcmd, "="))) { continue; } - if (!(tcmd = switch_stristr(tcmd, "\""))) { + if (!(tcmd = (char *)switch_stristr(tcmd, "\""))) { continue; } @@ -1046,15 +1046,15 @@ *e++ = '\0'; } - if (!(targ = switch_stristr(e, "data"))) { + if (!(targ = (char *)switch_stristr(e, "data"))) { continue; } - if (!(targ = switch_stristr(targ, "="))) { + if (!(targ = (char *)switch_stristr(targ, "="))) { continue; } - if (!(targ = switch_stristr(targ, "\""))) { + if (!(targ = (char *)switch_stristr(targ, "\""))) { continue; }

1 0

[commit] r6271 - freeswitch/trunk
by Freeswitch SVN 14 Nov '07

14 Nov '07

Author: mikej Date: Wed Nov 14 16:31:31 2007 New Revision: 6271 Modified: freeswitch/trunk/Freeswitch.sln Log: files moving Modified: freeswitch/trunk/Freeswitch.sln ============================================================================== --- freeswitch/trunk/Freeswitch.sln (original) +++ freeswitch/trunk/Freeswitch.sln Wed Nov 14 16:31:31 2007 @@ -434,7 +434,6 @@ conf\freeswitch.xml = conf\freeswitch.xml conf\iax.conf.xml = conf\iax.conf.xml conf\ivr.conf.xml = conf\ivr.conf.xml - conf\lang_en.xml = conf\lang_en.xml conf\lang_fr.xml = conf\lang_fr.xml conf\mod_cdr.conf.xml = conf\mod_cdr.conf.xml conf\modules.conf.xml = conf\modules.conf.xml

1 0

[commit] r6270 - freeswitch/trunk/src
by Freeswitch SVN 14 Nov '07

14 Nov '07

Author: anthm Date: Wed Nov 14 16:24:21 2007 New Revision: 6270 Modified: freeswitch/trunk/src/switch_xml.cpp Log: update Modified: freeswitch/trunk/src/switch_xml.cpp ============================================================================== --- freeswitch/trunk/src/switch_xml.cpp (original) +++ freeswitch/trunk/src/switch_xml.cpp Wed Nov 14 16:24:21 2007 @@ -26,7 +26,7 @@ * Anthony Minessale II <anthmct(a)yahoo.com> * * - * switch_xml.c -- XML PARSER + * switch_xml.cpp -- XML PARSER * * Derived from ezxml http://ezxml.sourceforge.net * Original Copyright

1 0

[commit] r6269 - in freeswitch/trunk/conf/lang/fr: . demo vm
by Freeswitch SVN 14 Nov '07

14 Nov '07

Author: brian Date: Wed Nov 14 16:21:09 2007 New Revision: 6269 Added: freeswitch/trunk/conf/lang/fr/demo/demo.xml - copied unchanged from r6264, /freeswitch/trunk/conf/lang_fr.xml freeswitch/trunk/conf/lang/fr/fr.xml freeswitch/trunk/conf/lang/fr/vm/sounds.xml - copied unchanged from r6264, /freeswitch/trunk/conf/voicemail_fr.xml Log: Added: freeswitch/trunk/conf/lang/fr/fr.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/lang/fr/fr.xml Wed Nov 14 16:21:09 2007 @@ -0,0 +1,7 @@ +<include> + <language name="fr" sound-path="/snds" tts-engine="cepstral" tts-voice="david"> + <X-PRE-PROCESS cmd="include" data="demo/demo.xml"/> +  + <X-PRE-PROCESS cmd="include" data="vm/sounds.xml"/> + </language> +</include>

1 0

[commit] r6268 - in freeswitch/trunk/conf/lang/fr: demo vm
by Freeswitch SVN 14 Nov '07

14 Nov '07

Author: brian Date: Wed Nov 14 16:19:15 2007 New Revision: 6268 Added: freeswitch/trunk/conf/lang/fr/demo/ freeswitch/trunk/conf/lang/fr/vm/ Log:

1 0