Merge pull request #6 from 0x0c/main

Main
YUKAI · Feb 5, 2024 · 35f69db · 35f69db
2 parents 141484c + 67c5e90
commit 35f69db
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.15.0)
 add_definitions("-Wall")
 set(CMAKE_CXX_STANDARD 11)
 
-project(savanna VERSION 0.0.13 DESCRIPTION "boost-beast wrapper")
+project(savanna VERSION 0.0.14 DESCRIPTION "boost-beast wrapper")
 
 find_package(Boost 1.70.0 REQUIRED COMPONENTS system)
 find_package(OpenSSL REQUIRED)

diff --git a/include/savanna/async_websocket.hpp b/include/savanna/async_websocket.hpp
@@ -191,7 +191,7 @@ namespace savanna
 			void on_close_l(beast::error_code ec) override { }
 
 		public:
-			~raw_stream_logic() override
+			virtual ~raw_stream_logic() override
 			{
 				raw_stream_ = nullptr;
 				resolver_ = nullptr;
@@ -211,6 +211,7 @@ namespace savanna
 			}
 			void read() override
 			{
+				if(!raw_stream_->is_open()) return;
 				buffer_.consume(buffer_.size());
 				raw_stream_->async_read(
 				    buffer_,
@@ -220,6 +221,7 @@ namespace savanna
 			}
 			void write(std::string data) override
 			{
+				if(!raw_stream_->is_open()) return;
 				raw_stream_->async_write(
 				    net::buffer(data),
 				    beast::bind_front_handler(
@@ -228,6 +230,7 @@ namespace savanna
 			}
 			void close() override
 			{
+				if(!raw_stream_->is_open()) return;
 				raw_stream_->async_close(
 				    beast::websocket::close_code::normal,
 				    beast::bind_front_handler(
@@ -325,7 +328,7 @@ namespace savanna
 			void on_close_l(beast::error_code ec) override { }
 
 		public:
-			~ssl_stream_logic() override
+			virtual ~ssl_stream_logic() override
 			{
 				ssl_stream_ = nullptr;
 				resolver_ = nullptr;
@@ -346,6 +349,7 @@ namespace savanna
 			}
 			void read() override
 			{
+				if(!ssl_stream_->is_open()) return;
 				buffer_.consume(buffer_.size());
 				ssl_stream_->async_read(
 				    buffer_,
@@ -355,6 +359,7 @@ namespace savanna
 			}
 			void write(std::string data) override
 			{
+				if(!ssl_stream_->is_open()) return;
 				ssl_stream_->async_write(
 				    net::buffer(data),
 				    beast::bind_front_handler(
@@ -363,11 +368,12 @@ namespace savanna
 			}
 			void close() override
 			{
+				if(!ssl_stream_->is_open()) return
 				ssl_stream_->async_close(
-				    beast::websocket::close_code::normal,
-				    beast::bind_front_handler(
-				        &interface::on_close,
-				        shared_from_this()));
+					beast::websocket::close_code::normal,
+					beast::bind_front_handler(
+						&interface::on_close,
+						shared_from_this()));
 			}
 		};
 
@@ -460,10 +466,7 @@ namespace savanna
 				ssl_cache_ = ssl_cache;
 			}
 
-			~reuse_websocket_executor()
-			{
-				close();
-			}
+			virtual ~reuse_websocket_executor(){ }
 
 			state current_state()
 			{

diff --git a/include/savanna/reuse_async_url_session.hpp b/include/savanna/reuse_async_url_session.hpp
@@ -142,7 +142,7 @@ namespace ssl_reuse
 
 		void on_shutdown_l(beast::error_code ec) override {}
 	public:
-		~http_logic() override{
+		virtual ~http_logic() override{
 			tcp_stream_ = nullptr;
 			resolver_ = nullptr;
 		}
@@ -378,8 +378,7 @@ namespace ssl_reuse
 		{
 			ssl_cache_ = {};
 		}
-		~reuse_async_url_session(){
-		}
+		virtual ~reuse_async_url_session(){ }
 
 		template <class Body>
 		std::shared_ptr<reuse_async_request_executor<Body>> prepare(ssl::context ssl_ctx){

diff --git a/include/savanna/websocket.hpp b/include/savanna/websocket.hpp
@@ -110,7 +110,7 @@ namespace savanna
 			{
 			}
 
-			~session()
+			virtual ~session()
 			{
 				close();
 			}
-Original file line number
+Diff line change
@@ Expand Up / @@ -110,7 +110,7 @@ namespace savanna @@
     			{
     			}
-    			~session()
+    			virtual ~session()
     			{
     				close();
     			}
@@ Expand Down @@