Mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-06-08 07:06:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

[daemon] WIP: rework accessing from webconsole and App

Browse source 
Signed-off-by: R4SAS <r4sas@i2pmail.org>
This commit is contained in:
R4SAS 2022-06-08 22:51:09 +03:00
parent 78193fc8f8
commit fbe2e734c2
No known key found for this signature in database
GPG key ID: 66F6C87B98EBCFE2
12 changed files with 96 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

36
libi2pd_webconsole/HTTPServer.cpp
View file

@ -31,10 +31,9 @@
#include "ECIESX25519AEADRatchetSession.h"
#include "I18N.h"
#ifdef WIN32_APP
#include "Daemon.h"
#include "Win32App.h"
#endif
//#ifdef WIN32_APP
//#include "Win32App.h"
//#endif
// Inja template engine
#include "inja/inja.hpp"
@ -281,13 +280,13 @@ namespace http {
ShowUptime(s, remains);
s << "<br>\r\n";
}
#elif defined(WIN32_APP)
/*#elif defined(WIN32_APP)
if (i2p::win32::g_GracefulShutdownEndtime != 0) {
uint16_t remains = (i2p::win32::g_GracefulShutdownEndtime - GetTickCount()) / 1000;
s << "<b>" << tr("Stopping in") << ":</b> ";
ShowUptime(s, remains);
s << "<br>\r\n";
}
}*/
#endif
s << "<b>" << tr("Tunnel creation success rate") << ":</b> " << i2p::tunnel::tunnels.GetTunnelCreationSuccessRate () << "%<br>\r\n";
s << "<b>" << tr("Received") << ":</b> ";
@ -714,11 +713,12 @@ namespace http {
s << " <a href=\"" << webroot << "?cmd=" << HTTP_COMMAND_SHUTDOWN_CANCEL << "&token=" << token << "\">" << tr("Cancel graceful shutdown") << "</a><br>\r\n";
else
s << " <a href=\"" << webroot << "?cmd=" << HTTP_COMMAND_SHUTDOWN_START << "&token=" << token << "\">" << tr("Start graceful shutdown") << "</a><br>\r\n";
#elif defined(WIN32_APP)
/*#elif defined(WIN32_APP)
if (i2p::util::DaemonWin32::Instance().isGraceful)
s << " <a href=\"" << webroot << "?cmd=" << HTTP_COMMAND_SHUTDOWN_CANCEL << "&token=" << token << "\">" << tr("Cancel graceful shutdown") << "</a><br>\r\n";
else
s << " <a href=\"" << webroot << "?cmd=" << HTTP_COMMAND_SHUTDOWN_START << "&token=" << token << "\">" << tr("Start graceful shutdown") << "</a><br>\r\n";
*/
#endif
s << " <a href=\"" << webroot << "?cmd=" << HTTP_COMMAND_SHUTDOWN_NOW << "&token=" << token << "\">" << tr("Force shutdown") << "</a><br><br>\r\n";
@ -1023,8 +1023,8 @@ namespace http {
}
}
HTTPConnection::HTTPConnection (std::string hostname, std::shared_ptr<boost::asio::ip::tcp::socket> socket):
m_Socket (socket), m_BufferLen (0), expected_host(hostname)
HTTPConnection::HTTPConnection (std::string hostname, std::shared_ptr<boost::asio::ip::tcp::socket> socket, HTTPServer& server):
m_Socket (socket), m_Server (server), m_BufferLen (0), expected_host(hostname)
{
/* cache options */
i2p::config::GetOption("http.auth", needAuth);
@ -1248,8 +1248,9 @@ namespace http {
// TODO: rewrite timer access
#if ((!defined(WIN32) && !defined(QT_GUI_LIB) && !defined(ANDROID)) || defined(ANDROID_BINARY))
if (m_DaemonGracefulTimer) m_DaemonGracefulTimer = 10 * 60;
#elif defined(WIN32_APP)
/*#elif defined(WIN32_APP)
i2p::win32::GracefulShutdown ();
*/
#endif
}
else if (cmd == HTTP_COMMAND_SHUTDOWN_CANCEL)
@ -1258,18 +1259,19 @@ namespace http {
// TODO: rewrite timer access
#if ((!defined(WIN32) && !defined(QT_GUI_LIB) && !defined(ANDROID)) || defined(ANDROID_BINARY))
if (m_DaemonGracefulTimer) m_DaemonGracefulTimer = 0;
#elif defined(WIN32_APP)
/*#elif defined(WIN32_APP)
i2p::win32::StopGracefulShutdown ();
*/
#endif
}
else if (cmd == HTTP_COMMAND_SHUTDOWN_NOW)
{
// TODO: rewrite stop command access
#ifndef WIN32_APP
if (m_DaemonStop) m_DaemonStop();
#else
i2p::win32::StopWin32App ();
#endif
//#ifndef WIN32_APP
m_Server.GetDaemonStop();
//#else
// i2p::win32::StopWin32App ();
//#endif
}
else if (cmd == HTTP_COMMAND_LOGLEVEL)
{
@ -1503,7 +1505,7 @@ namespace http {
void HTTPServer::CreateConnection(std::shared_ptr<boost::asio::ip::tcp::socket> newSocket)
{
auto conn = std::make_shared<HTTPConnection> (m_Hostname, newSocket);
auto conn = std::make_shared<HTTPConnection> (m_Hostname, newSocket, *this);
conn->Receive ();
}
} // http

13
libi2pd_webconsole/HTTPServer.h
View file

@ -25,11 +25,13 @@ namespace http
const size_t HTTP_CONNECTION_BUFFER_SIZE = 8192;
const int TOKEN_EXPIRATION_TIMEOUT = 30; // in seconds
class HTTPServer;
class HTTPConnection: public std::enable_shared_from_this<HTTPConnection>
{
public:
HTTPConnection (std::string serverhost, std::shared_ptr<boost::asio::ip::tcp::socket> socket);
HTTPConnection (std::string serverhost, std::shared_ptr<boost::asio::ip::tcp::socket> socket, HTTPServer& server);
void Receive ();
private:
@ -48,6 +50,7 @@ namespace http
private:
std::shared_ptr<boost::asio::ip::tcp::socket> m_Socket;
HTTPServer& m_Server;
char m_Buffer[HTTP_CONNECTION_BUFFER_SIZE + 1];
size_t m_BufferLen;
std::string m_SendBuffer;
@ -70,9 +73,11 @@ namespace http
void Stop ();
typedef std::function<void ()> DaemonStop;
typedef int DaemonGracefulTimer;
void SetDaemonStop (const DaemonStop& f) { m_DaemonStop = f; };
void SetDaemonGracefulTimer (const DaemonGracefulTimer& f) { m_DaemonGracefulTimer = f; };
DaemonStop GetDaemonStop () { return m_DaemonStop; };
void SetDaemonGracefulTimer (const int& f) { m_DaemonGracefulTimer = f; };
int GetDaemonGracefulTimer () { return m_DaemonGracefulTimer; };
private:
@ -94,7 +99,7 @@ namespace http
private:
DaemonStop m_DaemonStop;
DaemonGracefulTimer m_DaemonGracefulTimer;
int m_DaemonGracefulTimer;
};
//all the below functions are also used by Qt GUI, see mainwindow.cpp -> getStatusPageHtml