From 980d2d8aeb770894141fca2f0904417a18a78fe1 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthony.minessale@gmail.com>
Date: Tue, 19 Sep 2006 20:04:35 +0000
Subject: [PATCH] tweak

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@2757 d0543943-73ff-0310-b7d9-9358b9ac24b2
---
 src/switch_ivr.c | 11 ++++++++++-
 src/switch_rtp.c | 12 ++++++++++--
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/switch_ivr.c b/src/switch_ivr.c
index ef6aabea45..633f6345a6 100644
--- a/src/switch_ivr.c
+++ b/src/switch_ivr.c
@@ -1809,7 +1809,9 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
 			peer_channels[i] = NULL;
 			peer_sessions[i] = NULL;
 			continue;
-		} 
+		}
+
+		switch_core_session_read_lock(peer_sessions[i]);
 		pool = NULL;
 	
 		peer_channels[i] = switch_core_session_get_channel(peer_sessions[i]);
@@ -1986,6 +1988,13 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
 		switch_core_codec_destroy(&write_codec);
 	}
 
+	for (i = 0; i < argc; i++) {
+		if (!peer_channels[i]) {
+			continue;
+		}
+		switch_core_session_rwunlock(peer_sessions[i]);
+	}
+
 	return status;
 }
 
diff --git a/src/switch_rtp.c b/src/switch_rtp.c
index 9f6c6a1771..338125042e 100644
--- a/src/switch_rtp.c
+++ b/src/switch_rtp.c
@@ -584,10 +584,15 @@ SWITCH_DECLARE(void) switch_rtp_destroy(switch_rtp_t **rtp_session)
 	}
 
 	switch_mutex_lock((*rtp_session)->flag_mutex);
+	
+	if ((*rtp_session)->packet_buffer) {
+		switch_buffer_destroy(&(*rtp_session)->packet_buffer);
+	}
+			
 	switch_rtp_kill_socket(*rtp_session);
 	switch_socket_close((*rtp_session)->sock);
 	(*rtp_session)->sock = NULL;
-	switch_mutex_unlock((*rtp_session)->flag_mutex);
+
 
 	if (switch_test_flag((*rtp_session), SWITCH_RTP_FLAG_VAD)) {
 		switch_rtp_disable_vad(*rtp_session);
@@ -602,6 +607,8 @@ SWITCH_DECLARE(void) switch_rtp_destroy(switch_rtp_t **rtp_session)
 		switch_core_timer_destroy(&(*rtp_session)->timer);
 	}
 
+	switch_mutex_unlock((*rtp_session)->flag_mutex);
+
 	return;
 }
 
@@ -1099,7 +1106,8 @@ static int rtp_common_write(switch_rtp_t *rtp_session, void *data, uint32_t data
 		send_msg->header.m = m ? 1 : 0;
 		if (packetize) {
 			if (!rtp_session->packet_buffer) {
-				if (switch_buffer_create(rtp_session->pool, &rtp_session->packet_buffer, rtp_session->packet_size * 2) != SWITCH_STATUS_SUCCESS) {
+				if (switch_buffer_create_dynamic(&rtp_session->packet_buffer, rtp_session->packet_size, rtp_session->packet_size * 2, 0) 
+					!= SWITCH_STATUS_SUCCESS) {
 					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Buffer memory error\n");
 					return -1;
 				}