LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-21 02:08:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

RequestServer: Port to LibMain :^)

Browse Source
This commit is contained in:
Andreas Kling 2021-11-23 10:41:57 +01:00
parent 5e93db93fc
commit 2828d58a10
Notes: sideshowbarker 2024-07-18 00:49:29 +09:00 
Author: https://github.com/awesomekling
Commit: https://github.com/SerenityOS/serenity/commit/2828d58a102
2 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Userland/Services/RequestServer/CMakeLists.txt
View File

@ -23,4 +23,4 @@ set(SOURCES
) )
serenity_bin(RequestServer) serenity_bin(RequestServer)
target_link_libraries(RequestServer LibCore LibIPC LibGemini LibHTTP) target_link_libraries(RequestServer LibCore LibIPC LibGemini LibHTTP LibMain)

25
Userland/Services/RequestServer/main.cpp
View File

@ -4,11 +4,12 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <AK/Debug.h>
#include <AK/OwnPtr.h> #include <AK/OwnPtr.h>
#include <LibCore/EventLoop.h> #include <LibCore/EventLoop.h>
#include <LibCore/LocalServer.h> #include <LibCore/LocalServer.h>
#include <LibIPC/ClientConnection.h> #include <LibIPC/ClientConnection.h>
#include <LibMain/Main.h>
#include <LibSystem/Wrappers.h>
#include <LibTLS/Certificate.h> #include <LibTLS/Certificate.h>
#include <RequestServer/ClientConnection.h> #include <RequestServer/ClientConnection.h>
#include <RequestServer/GeminiProtocol.h> #include <RequestServer/GeminiProtocol.h>
@ -16,12 +17,9 @@
#include <RequestServer/HttpsProtocol.h> #include <RequestServer/HttpsProtocol.h>
#include <signal.h> #include <signal.h>
int main(int, char**) ErrorOr<int> serenity_main(Main::Arguments)
{ {
if (pledge("stdio inet accept unix rpath sendfd recvfd sigaction", nullptr) < 0) { TRY(System::pledge("stdio inet accept unix rpath sendfd recvfd sigaction", nullptr));
perror("pledge");
return 1;
}
signal(SIGINFO, [](int) { RequestServer::ConnectionCache::dump_jobs(); }); signal(SIGINFO, [](int) { RequestServer::ConnectionCache::dump_jobs(); });
@ -30,18 +28,9 @@ int main(int, char**)
Core::EventLoop event_loop; Core::EventLoop event_loop;
// FIXME: Establish a connection to LookupServer and then drop "unix"? // FIXME: Establish a connection to LookupServer and then drop "unix"?
if (pledge("stdio inet accept unix sendfd recvfd", nullptr) < 0) { TRY(System::pledge("stdio inet accept unix sendfd recvfd", nullptr));
perror("pledge"); TRY(System::unveil("/tmp/portal/lookup", "rw"));
return 1; TRY(System::unveil(nullptr, nullptr));
}
if (unveil("/tmp/portal/lookup", "rw") < 0) {
perror("unveil");
return 1;
}
if (unveil(nullptr, nullptr) < 0) {
perror("unveil");
return 1;
}
[[maybe_unused]] auto gemini = make<RequestServer::GeminiProtocol>(); [[maybe_unused]] auto gemini = make<RequestServer::GeminiProtocol>();
[[maybe_unused]] auto http = make<RequestServer::HttpProtocol>(); [[maybe_unused]] auto http = make<RequestServer::HttpProtocol>();