set of updates:

* [webconsole] change error handling code to restart acceptor after any error * [webconsole] call shutdown vefore stopping acceptor on exit * update license headers for modified files, change year to file creation year, not 2013 (when project started) Signed-off-by: R4SAS <[email protected]>
PurpleI2P · Feb 18, 2022 · a51ef0c · a51ef0c
1 parent bf3d7e7
commit a51ef0c
Show file tree

Hide file tree

Showing 16 changed files with 26 additions and 22 deletions.
diff --git a/contrib/webconsole/style.css b/contrib/webconsole/style.css
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2021, The PurpleI2P Project
+ * Copyright (c) 2021-2022, The PurpleI2P Project
  *
  * This file is part of Purple i2pd project and licensed under BSD3
  *

diff --git a/daemon/HTTPServer.cpp b/daemon/HTTPServer.cpp
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013-2020, The PurpleI2P Project
+* Copyright (c) 2013-2022, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *
@@ -1391,7 +1391,13 @@ namespace http {
 	void HTTPServer::Stop ()
 	{
 		m_IsRunning = false;
+
+		boost::system::error_code ec;
+		m_Acceptor.shutdown(boost::asio::ip::tcp::socket::shutdown_both, ec);
+		if (ec)
+			LogPrint (eLogDebug, "HTTPServer: Couldn't shutdown acceptor: ", ec.message ());
 		m_Acceptor.close();
+
 		m_Service.stop ();
 		if (m_Thread)
 		{
@@ -1427,15 +1433,13 @@ namespace http {
 	void HTTPServer::HandleAccept(const boost::system::error_code& ecode,
 		std::shared_ptr<boost::asio::ip::tcp::socket> newSocket)
 	{
-		if (ecode)
+		if (!ecode)
+			CreateConnection(newSocket);
+		else
 		{
 			if(newSocket) newSocket->close();
-			LogPrint(eLogError, "HTTP Server: Error handling accept ", ecode.message());
-			if(ecode != boost::asio::error::operation_aborted)
-				Accept();
-			return;
+			LogPrint(eLogError, "HTTP Server: Error handling accept: ", ecode.message());
 		}
-		CreateConnection(newSocket);
 		Accept ();
 	}
 

diff --git a/daemon/HTTPServerResources.h b/daemon/HTTPServerResources.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013-2021, The PurpleI2P Project
+* Copyright (c) 2013-2022, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *

diff --git a/i18n/I18N.h b/i18n/I18N.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2021, The PurpleI2P Project
+* Copyright (c) 2022, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *

diff --git a/i18n/Uzbek.cpp b/i18n/Uzbek.cpp
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2021, The PurpleI2P Project
+* Copyright (c) 2021-2022, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *

diff --git a/libi2pd/Destination.cpp b/libi2pd/Destination.cpp
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013-2021, The PurpleI2P Project
+* Copyright (c) 2013-2022, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *

diff --git a/libi2pd/I2PEndian.cpp b/libi2pd/I2PEndian.cpp
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013-2020, The PurpleI2P Project
+* Copyright (c) 2013-2022, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *

diff --git a/libi2pd/I2PEndian.h b/libi2pd/I2PEndian.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013-2020, The PurpleI2P Project
+* Copyright (c) 2013-2022, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *

diff --git a/libi2pd/Reseed.cpp b/libi2pd/Reseed.cpp
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013-2021, The PurpleI2P Project
+* Copyright (c) 2013-2022, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *

diff --git a/libi2pd/SSU2.cpp b/libi2pd/SSU2.cpp
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013-2022, The PurpleI2P Project
+* Copyright (c) 2022, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *

diff --git a/libi2pd/SSU2.h b/libi2pd/SSU2.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013-2022, The PurpleI2P Project
+* Copyright (c) 2022, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *

diff --git a/libi2pd/util.cpp b/libi2pd/util.cpp
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013-2020, The PurpleI2P Project
+* Copyright (c) 2013-2022, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *

diff --git a/libi2pd/version.h b/libi2pd/version.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013-2021, The PurpleI2P Project
+* Copyright (c) 2013-2022, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *

diff --git a/libi2pd_wrapper/api.go b/libi2pd_wrapper/api.go
@@ -1,7 +1,7 @@
 package api
 
 /*
-* Copyright (c) 2013-2020, The PurpleI2P Project
+* Copyright (c) 2021-2022, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *

diff --git a/libi2pd_wrapper/capi.cpp b/libi2pd_wrapper/capi.cpp
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013-2020, The PurpleI2P Project
+* Copyright (c) 2021-2022, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *

diff --git a/libi2pd_wrapper/capi.h b/libi2pd_wrapper/capi.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013-2020, The PurpleI2P Project
+* Copyright (c) 2021-2022, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *