Clean duplicated on_handshake method

Author: philippeVerney

src/etp/AbstractClientSessionCRTP.h

@@ -52,7 +52,7 @@ namespace ETP_NS
 					}
 				},
 				std::bind(
-					&AbstractClientSessionCRTP::on_handshake,
+					&ClientSession::on_handshake,
 					std::static_pointer_cast<AbstractClientSessionCRTP>(shared_from_this()),
 					std::placeholders::_1));
 #else
@@ -74,7 +74,7 @@ namespace ETP_NS
 			derived().ws().async_handshake(responseType,
 				etpServerHost + ":" + etpServerPort, etpServerTarget,
 				std::bind(
-					&AbstractClientSessionCRTP::on_handshake,
+					&ClientSession::on_handshake,
 					std::static_pointer_cast<AbstractClientSessionCRTP>(shared_from_this()),
 					std::placeholders::_1));
 #endif
@@ -109,25 +109,6 @@ namespace ETP_NS
 					std::placeholders::_2));
 		}
 
-		void on_handshake(boost::system::error_code ec)
-		{
-			if (ec) {
-				std::cerr << "on_handshake : " << ec.message() << std::endl;
-				std::cerr << "Sometimes some ETP server require a trailing slash at the end of their URL. Did you also check your optional \"data-partition-id\" additional Header Field?" << std::endl;
-				return;
-			}
-
-			if (!responseType.count(boost::beast::http::field::sec_websocket_protocol) ||
-				responseType[boost::beast::http::field::sec_websocket_protocol] != "etp12.energistics.org")
-				std::cerr << "The client MUST specify the Sec-Websocket-Protocol header value of etp12.energistics.org, and the server MUST reply with the same" << std::endl;
-
-			successfulConnection = true;
-			webSocketSessionClosed = false;
-
-			send(requestSession, 0, 0x02);
-			do_read();
-		}
-
 		void setMaxWebSocketMessagePayloadSize(int64_t value) final {
 			maxWebSocketMessagePayloadSize = value;
 			derived().ws().read_message_max(value);

src/etp/ssl/HttpsClientSession.h

@@ -118,7 +118,7 @@ namespace ETP_NS
 				tcp::resolver::results_type results)
 		{
 			if (ec) {
-				std::cerr << "resolve : " << ec.message() << std::endl;
+				std::cerr << "HTTP over SSL resolve : " << ec.message() << std::endl;
 				return;
 			}
 
@@ -141,7 +141,7 @@ namespace ETP_NS
 			on_connect(boost::system::error_code ec)
 		{
 			if (ec) {
-				std::cerr << "connect : " << ec.message() << std::endl;
+				std::cerr << "HTTP over SSL connect : " << ec.message() << std::endl;
 				return;
 			}
 
@@ -173,7 +173,7 @@ namespace ETP_NS
 			boost::ignore_unused(bytes_transferred);
 
 			if (ec) {
-				std::cerr << "Proxy handshake write : " << ec.message() << std::endl;
+				std::cerr << "HTTP over SSL Proxy handshake write : " << ec.message() << std::endl;
 				return;
 			}
 
@@ -207,7 +207,7 @@ namespace ETP_NS
 		{
 			boost::ignore_unused(bytes_transferred);
 			if (ec) {
-				std::cerr << "read : " << ec.message() << std::endl;
+				std::cerr << "HTTP over SSL read : " << ec.message() << std::endl;
 				return;
 			}
 
@@ -224,7 +224,7 @@ namespace ETP_NS
 			on_handshake(boost::system::error_code ec)
 		{
 			if (ec) {
-				std::cerr << "handshake : " << ec.message() << std::endl;
+				std::cerr << "HTTP over SSL handshake : " << ec.message() << std::endl;
 				return;
 			}
 
@@ -245,7 +245,7 @@ namespace ETP_NS
 			boost::ignore_unused(bytes_transferred);
 
 			if (ec) {
-				std::cerr << "write : " << ec.message() << std::endl;
+				std::cerr << "HTTP over SSL write : " << ec.message() << std::endl;
 				return;
 			}
 
@@ -266,7 +266,7 @@ namespace ETP_NS
 			boost::ignore_unused(bytes_transferred);
 
 			if (ec) {
-				std::cerr << "read : " << ec.message() << std::endl;
+				std::cerr << "HTTP over SSL read : " << ec.message() << std::endl;
 				return;
 			}