webservd: Rename Server to DBusServer
rename server.cc/.h to dbus_server.cc/h and also raname class Server
to DBusServer to align with other dbus specific files and classes, such
as dbus_protocol and dbus_request. Also, make it clear we support two
separate IPC mechanisms, Binder and DBus, and those implementations are
the files start with binder_ and dbus_ respectively.
Change-Id: I245bdbdab442b7c6c5d8dcd4a6f6a6de75e727e9
Signed-off-by: Bin Chen <pierr.chen@gmail.com>
diff --git a/webservd/dbus_protocol_handler.cc b/webservd/dbus_protocol_handler.cc
index 50ad487..b260138 100644
--- a/webservd/dbus_protocol_handler.cc
+++ b/webservd/dbus_protocol_handler.cc
@@ -19,9 +19,10 @@
#include <brillo/dbus/exported_object_manager.h>
#include "webservd/dbus_request_handler.h"
+#include "webservd/dbus_server.h"
#include "webservd/protocol_handler.h"
#include "webservd/request.h"
-#include "webservd/server.h"
+
using brillo::dbus_utils::AsyncEventSequencer;
using brillo::dbus_utils::DBusObject;
@@ -33,7 +34,7 @@
ExportedObjectManager* object_manager,
const dbus::ObjectPath& object_path,
ProtocolHandler* protocol_handler,
- Server* server)
+ DBusServer* server)
: dbus_object_{new DBusObject{object_manager, object_manager->GetBus(),
object_path}},
protocol_handler_{protocol_handler},
diff --git a/webservd/dbus_protocol_handler.h b/webservd/dbus_protocol_handler.h
index d93a902..5df5765 100644
--- a/webservd/dbus_protocol_handler.h
+++ b/webservd/dbus_protocol_handler.h
@@ -40,7 +40,7 @@
class ProtocolHandler;
class Request;
-class Server;
+class DBusServer;
// This is a D-Bus interface object for the internal ProtocolHandler class.
class DBusProtocolHandler final
@@ -50,7 +50,7 @@
brillo::dbus_utils::ExportedObjectManager* object_manager,
const dbus::ObjectPath& object_path,
ProtocolHandler* protocol_handler,
- Server* server);
+ DBusServer* server);
~DBusProtocolHandler();
void RegisterAsync(
@@ -117,7 +117,7 @@
// Reference back to the real ProtocolHandler object.
ProtocolHandler* protocol_handler_{nullptr};
// Reference back to the Server class.
- Server* server_{nullptr};
+ DBusServer* server_{nullptr};
// Called when the owner of a service name changes. We're only interested in
// transitions to the empty string, indicating that a service name owner has
diff --git a/webservd/dbus_request_handler.cc b/webservd/dbus_request_handler.cc
index d6f8d21..6af29a3 100644
--- a/webservd/dbus_request_handler.cc
+++ b/webservd/dbus_request_handler.cc
@@ -22,8 +22,8 @@
#include <brillo/mime_utils.h>
#include "libwebserv/dbus-proxies.h"
+#include "webservd/dbus_server.h"
#include "webservd/request.h"
-#include "webservd/server.h"
namespace webservd {
@@ -42,7 +42,7 @@
} // anonymous namespace
-DBusRequestHandler::DBusRequestHandler(Server* server,
+DBusRequestHandler::DBusRequestHandler(DBusServer* server,
RequestHandlerProxy* handler_proxy)
: server_{server},
handler_proxy_{handler_proxy} {
diff --git a/webservd/dbus_request_handler.h b/webservd/dbus_request_handler.h
index 3171f8a..56630cc 100644
--- a/webservd/dbus_request_handler.h
+++ b/webservd/dbus_request_handler.h
@@ -25,13 +25,13 @@
namespace webservd {
-class Server;
+class DBusServer;
// A D-Bus interface for a request handler.
class DBusRequestHandler final : public RequestHandlerInterface {
public:
using RequestHandlerProxy = org::chromium::WebServer::RequestHandlerProxy;
- DBusRequestHandler(Server* server,
+ DBusRequestHandler(DBusServer* server,
RequestHandlerProxy* handler_proxy);
// Called to process an incoming HTTP request this handler is subscribed
@@ -39,7 +39,7 @@
void HandleRequest(Request* request) override;
private:
- Server* server_{nullptr};
+ DBusServer* server_{nullptr};
RequestHandlerProxy* handler_proxy_{nullptr};
DISALLOW_COPY_AND_ASSIGN(DBusRequestHandler);
diff --git a/webservd/server.cc b/webservd/dbus_server.cc
similarity index 92%
rename from webservd/server.cc
rename to webservd/dbus_server.cc
index a68c2fb..03b731a 100644
--- a/webservd/server.cc
+++ b/webservd/dbus_server.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "webservd/server.h"
+#include "webservd/dbus_server.h"
#include <openssl/evp.h>
#include <openssl/x509.h>
@@ -76,7 +76,7 @@
namespace webservd {
-Server::Server(ExportedObjectManager* object_manager, const Config& config,
+DBusServer::DBusServer(ExportedObjectManager* object_manager, const Config& config,
std::unique_ptr<FirewallInterface> firewall)
: dbus_object_{new DBusObject{
object_manager, object_manager->GetBus(),
@@ -89,9 +89,9 @@
config_.default_request_timeout_seconds);
}
-Server::~Server() {}
+DBusServer::~DBusServer() {}
-void Server::RegisterAsync(
+void DBusServer::RegisterAsync(
const AsyncEventSequencer::CompletionAction& completion_callback) {
scoped_refptr<AsyncEventSequencer> sequencer(new AsyncEventSequencer());
dbus_adaptor_.RegisterWithDBusObject(dbus_object_.get());
@@ -102,7 +102,7 @@
CreateProtocolHandler(&handler_config);
firewall_->WaitForServiceAsync(dbus_object_->GetBus().get(),
- base::Bind(&Server::OnFirewallServiceOnline,
+ base::Bind(&DBusServer::OnFirewallServiceOnline,
weak_ptr_factory_.GetWeakPtr()));
dbus_object_->RegisterAsync(
@@ -115,7 +115,7 @@
sequencer->OnAllTasksCompletedCall({completion_callback});
}
-void Server::OnFirewallServiceOnline() {
+void DBusServer::OnFirewallServiceOnline() {
LOG(INFO) << "Firewall service is on-line. "
<< "Opening firewall for protocol handlers";
for (auto& handler_config : config_.protocol_handlers) {
@@ -131,11 +131,11 @@
}
}
-std::string Server::Ping() {
+std::string DBusServer::Ping() {
return "Web Server is running";
}
-void Server::ProtocolHandlerStarted(ProtocolHandler* handler) {
+void DBusServer::ProtocolHandlerStarted(ProtocolHandler* handler) {
CHECK(protocol_handler_map_.find(handler) == protocol_handler_map_.end())
<< "Protocol handler already registered";
std::string path = base::StringPrintf("/org/chromium/WebServer/Servers/%d",
@@ -150,19 +150,19 @@
protocol_handler_map_.emplace(handler, std::move(dbus_protocol_handler));
}
-void Server::ProtocolHandlerStopped(ProtocolHandler* handler) {
+void DBusServer::ProtocolHandlerStopped(ProtocolHandler* handler) {
CHECK_EQ(1u, protocol_handler_map_.erase(handler))
<< "Unknown protocol handler";
}
-void Server::CreateProtocolHandler(Config::ProtocolHandler* handler_config) {
+void DBusServer::CreateProtocolHandler(Config::ProtocolHandler* handler_config) {
std::unique_ptr<ProtocolHandler> protocol_handler{
new ProtocolHandler{handler_config->name, this}};
if (protocol_handler->Start(*handler_config))
protocol_handlers_.push_back(std::move(protocol_handler));
}
-void Server::InitTlsData() {
+void DBusServer::InitTlsData() {
if (!TLS_certificate_.empty())
return; // Already initialized.
@@ -227,7 +227,7 @@
}
}
-base::FilePath Server::GetUploadDirectory() const {
+base::FilePath DBusServer::GetUploadDirectory() const {
base::FilePath upload_dir;
#ifdef __ANDROID__
upload_dir = base::FilePath{"/data/misc/webservd/uploads"};
diff --git a/webservd/server.h b/webservd/dbus_server.h
similarity index 91%
rename from webservd/server.h
rename to webservd/dbus_server.h
index 443d230..b769826 100644
--- a/webservd/server.h
+++ b/webservd/dbus_server.h
@@ -38,14 +38,14 @@
class DBusServerRequest;
// Top-level D-Bus object to interface with the server as a whole.
-class Server final : public org::chromium::WebServer::ServerInterface,
- public ServerInterface {
+class DBusServer final : public org::chromium::WebServer::ServerInterface,
+ public ServerInterface {
public:
- Server(brillo::dbus_utils::ExportedObjectManager* object_manager,
+ DBusServer(brillo::dbus_utils::ExportedObjectManager* object_manager,
const Config& config, std::unique_ptr<FirewallInterface> firewall);
// Need to off-line the destructor to allow |protocol_handler_map_| to contain
// a forward-declared pointer to DBusProtocolHandler.
- ~Server();
+ ~DBusServer();
void RegisterAsync(
const brillo::dbus_utils::AsyncEventSequencer::CompletionAction& cb);
@@ -98,8 +98,8 @@
FileDeleter file_deleter_;
TempFileManager temp_file_manager_{GetUploadDirectory(), &file_deleter_};
- base::WeakPtrFactory<Server> weak_ptr_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(Server);
+ base::WeakPtrFactory<DBusServer> weak_ptr_factory_{this};
+ DISALLOW_COPY_AND_ASSIGN(DBusServer);
};
} // namespace webservd
diff --git a/webservd/main.cc b/webservd/main.cc
index 75e52bf..36a09fb 100644
--- a/webservd/main.cc
+++ b/webservd/main.cc
@@ -35,7 +35,7 @@
#include "webservd/binder_server.h"
#include "webserv_common/binder_constants.h"
#else
-#include "webservd/server.h"
+#include "webservd/dbus_server.h"
#endif
#include "webservd/config.h"
#include "webservd/log_manager.h"
@@ -79,7 +79,7 @@
#ifndef __ANDROID__
void RegisterDBusObjectsAsync(AsyncEventSequencer* sequencer) override {
webservd::LogManager::Init(base::FilePath{config_.log_directory});
- server_.reset(new webservd::Server{
+ server_.reset(new webservd::DBusServer{
object_manager_.get(), config_,
std::unique_ptr<webservd::FirewallInterface>{new FirewallImpl()}});
server_->RegisterAsync(
@@ -125,7 +125,7 @@
std::unique_ptr<webservd::BinderServer> server_;
brillo::BinderWatcher binder_watcher_;
#else
- std::unique_ptr<webservd::Server> server_;
+ std::unique_ptr<webservd::DBusServer> server_;
#endif // __ANDROID__
DISALLOW_COPY_AND_ASSIGN(Daemon);
