From bfa7b5467d8645c11a4f614bdf0c0e5acdea261d Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Wed, 19 May 2021 01:03:35 +0200 Subject: [PATCH] remove smart pointer of ftp server --- src/TaskFTP.cpp | 13 ++++++------- src/TaskFTP.h | 4 ++-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/TaskFTP.cpp b/src/TaskFTP.cpp index 0f4a05d..d9615cf 100644 --- a/src/TaskFTP.cpp +++ b/src/TaskFTP.cpp @@ -13,30 +13,29 @@ FTPTask::~FTPTask() { } bool FTPTask::setup(System &system) { - _ftpServer = std::shared_ptr(new FTPServer()); for (Configuration::Ftp::User user : system.getUserConfig()->ftp.users) { logPrintD("Adding user to FTP Server: "); logPrintlnD(user.name); - _ftpServer->addUser(user.name, user.password); + _ftpServer.addUser(user.name, user.password); } - _ftpServer->addFilesystem("SPIFFS", &SPIFFS); + _ftpServer.addFilesystem("SPIFFS", &SPIFFS); _stateInfo = "waiting"; return true; } bool FTPTask::loop(System &system) { if (!_beginCalled) { - _ftpServer->begin(); + _ftpServer.begin(); _beginCalled = true; } - _ftpServer->handle(); + _ftpServer.handle(); static bool configWasOpen = false; - if (configWasOpen && _ftpServer->countConnections() == 0) { + if (configWasOpen && _ftpServer.countConnections() == 0) { logPrintlnW("Maybe the config has been changed via FTP, lets restart now to get the new config..."); logPrintlnW(""); ESP.restart(); } - if (_ftpServer->countConnections() > 0) { + if (_ftpServer.countConnections() > 0) { configWasOpen = true; _stateInfo = "has connection"; } diff --git a/src/TaskFTP.h b/src/TaskFTP.h index 6d5bf2b..83c0ea7 100644 --- a/src/TaskFTP.h +++ b/src/TaskFTP.h @@ -13,8 +13,8 @@ public: virtual bool loop(System &system) override; private: - std::shared_ptr _ftpServer; - bool _beginCalled; + FTPServer _ftpServer; + bool _beginCalled; }; #endif