From 1daf1b993237321f922e7c3fdea3e8f777bea4b0 Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Mon, 21 Oct 2013 21:54:22 -0700
Subject: [PATCH] Use MultiSocket for websocket

---
 Builds/VisualStudio2012/RippleD.vcxproj         |  1 +
 Builds/VisualStudio2012/RippleD.vcxproj.filters |  6 +++---
 src/ripple_app/websocket/WSServerHandler.h      | 12 ++++++------
 src/websocket/src/sockets/multitls.hpp          |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Builds/VisualStudio2012/RippleD.vcxproj b/Builds/VisualStudio2012/RippleD.vcxproj
index 31e9343a5..074dd34c9 100644
--- a/Builds/VisualStudio2012/RippleD.vcxproj
+++ b/Builds/VisualStudio2012/RippleD.vcxproj
@@ -2062,6 +2062,7 @@
     <ClInclude Include="..\..\src\websocket\src\sha1\sha1.h" />
     <ClInclude Include="..\..\src\websocket\src\shared_const_buffer.hpp" />
     <ClInclude Include="..\..\src\websocket\src\sockets\autotls.hpp" />
+    <ClInclude Include="..\..\src\websocket\src\sockets\multitls.hpp" />
     <ClInclude Include="..\..\src\websocket\src\sockets\plain.hpp" />
     <ClInclude Include="..\..\src\websocket\src\sockets\socket_base.hpp" />
     <ClInclude Include="..\..\src\websocket\src\sockets\tls.hpp" />
diff --git a/Builds/VisualStudio2012/RippleD.vcxproj.filters b/Builds/VisualStudio2012/RippleD.vcxproj.filters
index 062fa9e7f..d33a1332d 100644
--- a/Builds/VisualStudio2012/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2012/RippleD.vcxproj.filters
@@ -1736,9 +1736,6 @@
     <ClInclude Include="..\..\src\ripple_net\basics\RPCDoor.h">
       <Filter>[2] Old Ripple\ripple_net\basics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple_core\functional\LoadSource.h">
-      <Filter>[1] Ripple\ripple_core\functional</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\ripple_app\main\LoadManager.h">
       <Filter>[1] Ripple\ripple_app\main</Filter>
     </ClInclude>
@@ -2358,6 +2355,9 @@
     <ClInclude Include="..\..\src\ripple\sitefiles\api\Listener.h">
       <Filter>[1] Ripple\sitefiles\api</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\websocket\src\sockets\multitls.hpp">
+      <Filter>[0] Libraries\websocket</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\src\ripple_data\protocol\ripple.proto">
diff --git a/src/ripple_app/websocket/WSServerHandler.h b/src/ripple_app/websocket/WSServerHandler.h
index 7966beb18..69ff01d9d 100644
--- a/src/ripple_app/websocket/WSServerHandler.h
+++ b/src/ripple_app/websocket/WSServerHandler.h
@@ -250,9 +250,9 @@ public:
         {
             try
             {
-                WriteLog (lsDEBUG, WSServerHandlerLog) << "Ws:: Rejected("
-                                                       << cpClient->get_socket ().remote_endpoint ().to_string ()
-                                                       << ") '" << mpMessage->get_payload () << "'";
+                WriteLog (lsDEBUG, WSServerHandlerLog) <<
+                    "Ws:: Rejected(" << cpClient->get_socket ().remote_endpoint ().to_string () <<
+                    ") '" << mpMessage->get_payload () << "'";
             }
             catch (...)
             {
@@ -302,9 +302,9 @@ public:
 
         try
         {
-            WriteLog (lsDEBUG, WSServerHandlerLog) << "Ws:: Receiving("
-                                                   << cpClient->get_socket ().remote_endpoint ().to_string ()
-                                                   << ") '" << mpMessage->get_payload () << "'";
+            WriteLog (lsDEBUG, WSServerHandlerLog) <<
+                "Ws:: Receiving(" << cpClient->get_socket ().remote_endpoint ().to_string () <<
+                ") '" << mpMessage->get_payload () << "'";
         }
         catch (...)
         {
diff --git a/src/websocket/src/sockets/multitls.hpp b/src/websocket/src/sockets/multitls.hpp
index 4c69f638a..9c77f80aa 100644
--- a/src/websocket/src/sockets/multitls.hpp
+++ b/src/websocket/src/sockets/multitls.hpp
@@ -52,7 +52,7 @@ public:
     }
 
     void set_plain_only() {
-	m_plain_only = true;
+    	m_plain_only = true;
     }
 
     // should be private friended?