Browse Source

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 <r4sas@i2pmail.org>
pull/1732/head
R4SAS 2 years ago
parent
commit
a51ef0cfc6
Signed by: r4sas
GPG Key ID: 66F6C87B98EBCFE2
  1. 2
      contrib/webconsole/style.css
  2. 18
      daemon/HTTPServer.cpp
  3. 2
      daemon/HTTPServerResources.h
  4. 2
      i18n/I18N.h
  5. 2
      i18n/Uzbek.cpp
  6. 2
      libi2pd/Destination.cpp
  7. 2
      libi2pd/I2PEndian.cpp
  8. 2
      libi2pd/I2PEndian.h
  9. 2
      libi2pd/Reseed.cpp
  10. 2
      libi2pd/SSU2.cpp
  11. 2
      libi2pd/SSU2.h
  12. 2
      libi2pd/util.cpp
  13. 2
      libi2pd/version.h
  14. 2
      libi2pd_wrapper/api.go
  15. 2
      libi2pd_wrapper/capi.cpp
  16. 2
      libi2pd_wrapper/capi.h

2
contrib/webconsole/style.css

@ -1,5 +1,5 @@ @@ -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
*

18
daemon/HTTPServer.cpp

@ -1,5 +1,5 @@ @@ -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 { @@ -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 { @@ -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 ();
}

2
daemon/HTTPServerResources.h

@ -1,5 +1,5 @@ @@ -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
*

2
i18n/I18N.h

@ -1,5 +1,5 @@ @@ -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
*

2
i18n/Uzbek.cpp

@ -1,5 +1,5 @@ @@ -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
*

2
libi2pd/Destination.cpp

@ -1,5 +1,5 @@ @@ -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
*

2
libi2pd/I2PEndian.cpp

@ -1,5 +1,5 @@ @@ -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
*

2
libi2pd/I2PEndian.h

@ -1,5 +1,5 @@ @@ -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
*

2
libi2pd/Reseed.cpp

@ -1,5 +1,5 @@ @@ -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
*

2
libi2pd/SSU2.cpp

@ -1,5 +1,5 @@ @@ -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
*

2
libi2pd/SSU2.h

@ -1,5 +1,5 @@ @@ -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
*

2
libi2pd/util.cpp

@ -1,5 +1,5 @@ @@ -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
*

2
libi2pd/version.h

@ -1,5 +1,5 @@ @@ -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
*

2
libi2pd_wrapper/api.go

@ -1,7 +1,7 @@ @@ -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
*

2
libi2pd_wrapper/capi.cpp

@ -1,5 +1,5 @@ @@ -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
*

2
libi2pd_wrapper/capi.h

@ -1,5 +1,5 @@ @@ -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
*

Loading…
Cancel
Save