From 938357b7ae075b0fd710edcf542991a214ab3c84 Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Thu, 24 Jan 2013 21:04:42 -0800
Subject: [PATCH] Start cleaning up some of the bastardization.

---
 src/cpp/ripple/AutoSocket.h              | 26 ++++++++++++++++++
 src/cpp/websocketpp/src/roles/server.hpp | 35 ++++++------------------
 2 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/src/cpp/ripple/AutoSocket.h b/src/cpp/ripple/AutoSocket.h
index 9f04d3b4e7..d965825259 100644
--- a/src/cpp/ripple/AutoSocket.h
+++ b/src/cpp/ripple/AutoSocket.h
@@ -103,6 +103,32 @@ public:
 			PlainSocket().async_read_some(buffers, handler);
 	}
 
+	template <typename Buf, typename Handler> void async_write(const Buf& buffers, Handler handler)
+	{
+		if (isSecure())
+			boost::asio::async_write(*mSocket, buffers, handler);
+		else
+			boost::asio::async_write(PlainSocket(), buffers, handler);
+	}
+
+
+	template <typename Buf, typename Condition, typename Handler>
+		void async_read(const Buf& buffers, Condition cond, Handler handler)
+	{
+		if (isSecure())
+			boost::asio::async_read(*mSocket, buffers, cond, handler);
+		else
+			boost::asio::async_read(PlainSocket(), buffers, cond, handler);
+	}
+
+	template <typename Buf, typename Handler> void async_read(const Buf& buffers, Handler handler)
+	{
+		if (isSecure())
+			boost::asio::async_read(*mSocket, buffers, handler);
+		else
+			boost::asio::async_read(PlainSocket(), buffers, handler);
+	}
+
 	template <typename Seq, typename Handler> void async_write_some(const Seq& buffers, Handler handler)
 	{
 		if (isSecure())
diff --git a/src/cpp/websocketpp/src/roles/server.hpp b/src/cpp/websocketpp/src/roles/server.hpp
index e0621d8ac6..0e3de9db85 100644
--- a/src/cpp/websocketpp/src/roles/server.hpp
+++ b/src/cpp/websocketpp/src/roles/server.hpp
@@ -845,32 +845,15 @@ void server<endpoint>::connection<connection_type>::write_response() {
     
     m_endpoint.m_alog->at(log::alevel::DEBUG_HANDSHAKE) << raw << log::endl;
 
-    if (m_connection.get_socket().isSecure())
-    {
-		boost::asio::async_write(
-			m_connection.get_socket().SSLSocket(),
-			//boost::asio::buffer(raw),
-			buffer,
-			boost::bind(
-				&type::handle_write_response,
-				m_connection.shared_from_this(),
-				boost::asio::placeholders::error
-			)
-		);
-	}
-	else
-	{
-		boost::asio::async_write(
-			m_connection.get_socket().PlainSocket(),
-			//boost::asio::buffer(raw),
-			buffer,
-			boost::bind(
-				&type::handle_write_response,
-				m_connection.shared_from_this(),
-				boost::asio::placeholders::error
-			)
-		);
-	}
+	m_connection.get_socket().async_write(
+		//boost::asio::buffer(raw),
+		buffer,
+		boost::bind(
+			&type::handle_write_response,
+			m_connection.shared_from_this(),
+			boost::asio::placeholders::error
+		)
+	);
 }
 
 template <class endpoint>