kit/Kit.cpp | 2 +- net/ServerSocket.hpp | 4 ++++ net/Socket.cpp | 19 ++++++++----------- wsd/LOOLWSD.cpp | 2 ++ 4 files changed, 15 insertions(+), 12 deletions(-)
New commits: commit 9c02d82f7ccb4abb19dd40837418ac10a8da9040 Author: Tor Lillqvist <t...@collabora.com> AuthorDate: Sun Mar 31 14:34:24 2019 +0300 Commit: Tor Lillqvist <t...@collabora.com> CommitDate: Sun Mar 31 14:34:24 2019 +0300 Fix build in the MOBILEAPP case Did not check how well it works. Change-Id: I5ca1b349aafcfddaed517e51ca6bd25e9749779d diff --git a/kit/Kit.cpp b/kit/Kit.cpp index ff4a3a7ed..42663d3ee 100644 --- a/kit/Kit.cpp +++ b/kit/Kit.cpp @@ -2530,7 +2530,7 @@ void lokit_main( #if !MOBILEAPP mainKit.insertNewUnixSocket(MasterLocation, pathAndQuery, websocketHandler); #else - mainKit.insertNewFakeSocketSync(docBrokerSocket, websocketHandler); + mainKit.insertNewFakeSocket(docBrokerSocket, websocketHandler); #endif LOG_INF("New kit client websocket inserted."); diff --git a/net/ServerSocket.hpp b/net/ServerSocket.hpp index dd07af4fe..ff4d4aa26 100644 --- a/net/ServerSocket.hpp +++ b/net/ServerSocket.hpp @@ -96,6 +96,8 @@ protected: std::shared_ptr<SocketFactory> _sockFactory; }; +#if !MOBILEAPP + /// A non-blocking, streaming Unix Domain Socket for local use class LocalServerSocket : public ServerSocket { @@ -114,4 +116,6 @@ private: #endif +#endif + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/net/Socket.cpp b/net/Socket.cpp index 02fb7f972..441128f16 100644 --- a/net/Socket.cpp +++ b/net/Socket.cpp @@ -200,6 +200,8 @@ void SocketPoll::wakeupWorld() wakeup(fd); } +#if !MOBILEAPP + void SocketPoll::insertNewWebSocketSync( const Poco::URI &uri, const std::shared_ptr<SocketHandlerInterface>& websocketHandler) @@ -331,7 +333,8 @@ void SocketPoll::insertNewUnixSocket( } } -#if MOBILEAPP +#else + void SocketPoll::insertNewFakeSocket( int peerSocket, const std::shared_ptr<SocketHandlerInterface>& websocketHandler) @@ -361,6 +364,7 @@ void SocketPoll::insertNewFakeSocket( } } } + #endif void ServerSocket::dumpState(std::ostream& os) @@ -539,6 +543,8 @@ std::shared_ptr<Socket> ServerSocket::accept() return nullptr; } +#if !MOBILEAPP + int Socket::getPid() const { struct ucred creds; @@ -553,11 +559,7 @@ int Socket::getPid() const std::shared_ptr<Socket> LocalServerSocket::accept() { -#if !MOBILEAPP const int rc = ::accept4(getFD(), nullptr, nullptr, SOCK_NONBLOCK); -#else - const int rc = fakeSocketAccept4(getFD()); -#endif try { LOG_DBG("Accepted prisoner socket #" << rc << ", creating socket object."); @@ -565,7 +567,6 @@ std::shared_ptr<Socket> LocalServerSocket::accept() return std::shared_ptr<Socket>(nullptr); std::shared_ptr<Socket> _socket = _sockFactory->create(rc); -#if MOBILEAPP // Sanity check this incoming socket struct ucred creds; socklen_t credSize = sizeof(struct ucred); @@ -592,7 +593,6 @@ std::shared_ptr<Socket> LocalServerSocket::accept() std::shared_ptr<Socket> _socket = _sockFactory->create(rc); LOG_DBG("Accepted socket is UDS - address " << addr << " and pid/gid " << creds.pid << "/" << creds.gid); -#endif return _socket; } catch (const std::exception& ex) @@ -605,7 +605,6 @@ std::shared_ptr<Socket> LocalServerSocket::accept() /// Returns true on success only. std::string LocalServerSocket::bind() { -#if !MOBILEAPP int rc; struct sockaddr_un addrunix; do @@ -625,12 +624,10 @@ std::string LocalServerSocket::bind() if (rc >= 0) return std::string(&addrunix.sun_path[1]); -#endif + return ""; } -#if !MOBILEAPP - bool StreamSocket::parseHeader(const char *clientName, Poco::MemoryInputStream &message, Poco::Net::HTTPRequest &request, diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp index b4060d643..e7365eef2 100644 --- a/wsd/LOOLWSD.cpp +++ b/wsd/LOOLWSD.cpp @@ -2900,12 +2900,14 @@ public: SocketPoll::InhibitThreadChecks = true; os << "LOOLWSDServer:\n" +#if !MOBILEAPP << " Ports: server " << ClientPortNumber << " prisoner " << MasterLocation << "\n" << " SSL: " << (LOOLWSD::isSSLEnabled() ? "https" : "http") << "\n" << " SSL-Termination: " << (LOOLWSD::isSSLTermination() ? "yes" : "no") << "\n" << " Security " << (LOOLWSD::NoCapsForKit ? "no" : "") << " chroot, " << (LOOLWSD::NoSeccomp ? "no" : "") << " api lockdown\n" +#endif << " TerminationFlag: " << TerminationFlag << "\n" << " isShuttingDown: " << ShutdownRequestFlag << "\n" << " NewChildren: " << NewChildren.size() << "\n" _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits