[Freeswitch-svn] [commit] r8571 - freeswitch/trunk/src

[Freeswitch SVN]

Author: brian
Date: Fri May 23 22:03:16 2008
New Revision: 8571

Modified:
   freeswitch/trunk/src/switch_channel.c
   freeswitch/trunk/src/switch_odbc.c

Log:
pdd and FSCORE-127

Modified: freeswitch/trunk/src/switch_channel.c
==============================================================================
--- freeswitch/trunk/src/switch_channel.c	(original)
+++ freeswitch/trunk/src/switch_channel.c	Fri May 23 22:03:16 2008
@@ -1372,15 +1372,14 @@
 	if (!switch_channel_test_flag(channel, CF_RING_READY)) {
 		switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_NOTICE, "Ring-Ready %s!\n", channel->name);
 		switch_channel_set_flag(channel, CF_RING_READY);
+		if (channel->caller_profile && channel->caller_profile->times) {
+			switch_mutex_lock(channel->profile_mutex);
+			channel->caller_profile->times->progress = switch_timestamp_now();
+			switch_mutex_unlock(channel->profile_mutex);
+		}
 		return SWITCH_STATUS_SUCCESS;
 	}
 
-	if (channel->caller_profile && channel->caller_profile->times) {
-		switch_mutex_lock(channel->profile_mutex);
-		channel->caller_profile->times->progress = switch_timestamp_now();
-		switch_mutex_unlock(channel->profile_mutex);
-	}
-
 	return SWITCH_STATUS_FALSE;
 }
 

Modified: freeswitch/trunk/src/switch_odbc.c
==============================================================================
--- freeswitch/trunk/src/switch_odbc.c	(original)
+++ freeswitch/trunk/src/switch_odbc.c	Fri May 23 22:03:16 2008
@@ -144,8 +144,14 @@
 
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connecting %s\n", handle->dsn);
 	
-	result = SQLConnect(handle->con, (SQLCHAR *) handle->dsn, SQL_NTS, (SQLCHAR *) handle->username, SQL_NTS, (SQLCHAR *) handle->password, SQL_NTS);
-	
+	if(!strstr(handle->dsn, "DRIVER")) { 
+		result = SQLConnect(handle->con, (SQLCHAR *) handle->dsn, SQL_NTS, (SQLCHAR *) handle->username, SQL_NTS, (SQLCHAR *) handle->password, SQL_NTS); 
+	} else { 
+		SQLCHAR outstr[1024] = {0}; 
+		SQLSMALLINT outstrlen = 0; 
+		result = SQLDriverConnect(handle->con, NULL, (SQLCHAR *) handle->dsn, strlen(handle->dsn), outstr, sizeof(outstr), &outstrlen, SQL_DRIVER_NOPROMPT); 
+	} 
+
 	if ((result != SQL_SUCCESS) && (result != SQL_SUCCESS_WITH_INFO)) {
 		char *err_str;
 		if ((err_str = switch_odbc_handle_get_error(handle, NULL))) {