strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1
14900 commits 1 branch 0 tags 244 MiB
Commit graph

146 commits

Author SHA1 Message Date
Ashod Nakashian
5ae94cc7ec wsd: onConnect takes shared_ptr and better logging 
Change-Id: I175dfa1f28444b9bb1f612242ee44b6d0507272c
Reviewed-on: https://gerrit.libreoffice.org/35737
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2017-03-27 03:20:22 +00:00
Ashod Nakashian
c1ffb64904 wsd: correct shutdown status code echoed back 
Change-Id: Ieb685135ab280ed76070af3392bfa69cf313f35a
Reviewed-on: https://gerrit.libreoffice.org/35708
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2017-03-26 05:08:46 +00:00
Ashod Nakashian
3895897213 wsd: improved socket logging 
Change-Id: Ib4751a5a73b7ec0c7ca319f552d5e0aaff06ffea
Reviewed-on: https://gerrit.libreoffice.org/35707
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2017-03-26 05:07:37 +00:00
Ashod Nakashian
b01e555b47 wsd: correct copying of socket shutdown message 
Avoid segfaulting.

Change-Id: I320606937a0d3a3e53270a70ef0a00fcb01b855a
 2017-03-20 23:25:54 -04:00
Ashod Nakashian
53da72a1dc wsd: fix hot looping the poll 
When not sending ping the ping time is not set
which results in the setting the poll timeout to
a negative value, forcing it to return immediately.

This happens when sending ping before upgrading
to WebSocket, which isn't common. One way to
reproduce it, however, is to connect to the
admin console with an unauthenticated socket.

Change-Id: I9f3db1a02b8f8e2781d23d843e848068ad434958
 2017-03-20 00:41:54 -04:00
Ashod Nakashian
e9675ed6e1 wsd: close socket when WS close handshake is complete 
We shouldn't send any more data after the client
shuts down, or after we initiate shutdown.

Change-Id: Ibf0cf61dcabe9d02ddcb7eb40b2df23712c5a136
 2017-03-20 00:41:53 -04:00
Ashod Nakashian
6283dbd9cc wsd: copy and un-mask web-socket data at the same time 
Change-Id: I2a4831065ae0a81f20d0513b0772d7d427ffc4ea
 2017-03-20 00:41:53 -04:00
Ashod Nakashian
14779f5cd4 wsd: return moved socket state to stop any IO processing 
Once a socket has changed ownership to a new
poll it will assert thread affinity with said
new poll. So we cannot do any IO on the old
poll's thread at that point and on.

Change-Id: I662f188dea7c377a18f3e546839ec43f2875dc7b
 2017-03-20 00:41:53 -04:00
Michael Meeks
50661924b7 Dump much more ClientSession state, and also websocket latency. 2017-03-18 15:03:04 +00:00
Michael Meeks
b8b5cc2069 Shorten time to send first ping - to assess socket latency. 
Also ensure we never send a ping on a non-upgraded websocket.
 2017-03-18 15:03:04 +00:00
Michael Meeks
a6a4094e52 Send ping message, handle pong & store ping-time on the Websocket. 2017-03-17 22:59:03 +00:00
Michael Meeks
9381d4134f Unify and simplify timeout and poll events setup. 
Both happen at the same time, and need support from the
SocketHandlerInterface.

Rename hasQueuedWrites to getPollEvents and merge updateTimeout.
 2017-03-17 22:00:28 +00:00
Michael Meeks
69feb165dd Remove websocket assert on performWrites. 
Since commit 862d7a0734
      wsd: write as many messages to socket as possible:

This can be called even if hasQueuedWrites returns false.
 2017-03-16 17:23:42 +00:00
Ashod Nakashian
c8bece208d wsd: socket logs include socket FD for better traceability 
Change-Id: I994c7c5ab73b97be312a9d6abf3258dc5f4c08c1
 2017-03-15 00:04:55 -04:00
Ashod Nakashian
aa19964b03 wsd: SSL logging improvement 
Change-Id: I99d08a764fd43ab0c7eb50a1f017202e6bbc3477
 2017-03-15 00:04:55 -04:00
Ashod Nakashian
c9a07a3087 wsd: assert socket is in correct thread 
Change-Id: I22c3f62bdf45188641326774dd86b7cacfce9198
Reviewed-on: https://gerrit.libreoffice.org/35120
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2017-03-13 04:20:41 +00:00
Michael Meeks
160446fd23 Work on resurrecting dying DocumentBrokers if we can. 
The hope is that they will close lingering session sockets at the
end and the client will re-connect.
 2017-03-10 17:58:51 +00:00
Michael Meeks
7a90430f85 Cleanup logging on single packet websocket messages more cleanly. 2017-03-10 14:49:19 +00:00
Michael Meeks
11f3a29cb2 WebSocket - several messages can appear in a single packet. 2017-03-10 14:36:21 +00:00
Michael Meeks
a5a227e9a3 Re-work socket buffer options, sizing and setting. 
Only set nodelay and small socket buffers on WebSockets.
Avoid writing more data than can be absorbed by our socket buffer.
It is fine to set socket buffer sizes after bind/accept.
 2017-03-10 10:55:29 +00:00
Miklos Vajna
400c580800 net: fix -Werror,-Wconstant-conversion 
Change-Id: If2bbad6d3909c7d6df9eed5edf260609d64db3a8
 2017-03-10 11:06:43 +01:00
Ashod Nakashian
b8af470918 nb: serve files synchronously 
As there isn't support (yet) to send files
asynchronously, when the socket native buffer
is small, asynchronous writes naturally return
EWOULDBLOCK. As a temp solution, we send files
synchronously, so there is no need to poll.

This should be replaced witha file-server
polling/serving thread that is dedicated to
sending files only (which closes the connection
when done).

Change-Id: I062fea44bfe54ab8d147b745da97bd499bf00657
 2017-03-10 10:47:44 +01:00
Michael Meeks
20f15d4001 Switch Prisoner socket handling to use the SocketPoll. 
Kills the Poco ThreadPool usage, and significantly improves debuggability.
 2017-03-10 10:47:43 +01:00
Michael Meeks
d4cc2e899c ClientSession: kill the writing thread. 2017-03-10 10:47:42 +01:00
Jan Holesovsky
17d8b645b4 nb: It seems uppercase 'S' is preferred in Sec-WebSocket-Accept. 
Change-Id: I6cc86f26cf7e3c9370e5d534877bfeeb6607f5a4
 2017-03-10 10:47:42 +01:00
Jan Holesovsky
62afe66df0 nb: Make the loolnb / clientnb work again. 
The more testing the better :-)

Change-Id: Ibe4249f18109d50b06e1fa35e6d0fef67f9b3643
 2017-03-10 10:47:42 +01:00
Jan Holesovsky
653df9dcce nb: No need for the WebSocketSender I think. 
Change-Id: I133bb8341a846d70f95e0c70274541b5db62f65d
 2017-03-10 10:47:42 +01:00
Ashod Nakashian
b7e94d03ea nb: websocket closing handshake 
Change-Id: I45a6f2e680349fa2f77c20bb8f783093b9e1f212
 2017-03-10 10:47:41 +01:00
Ashod Nakashian
4abf706af6 nb: websocket shutdown support 
Change-Id: I2fcab98e9725eca86d097f34236889fdf9289c47
 2017-03-10 10:47:41 +01:00
Ashod Nakashian
27452ec98c nb: support WS shutdown 
Change-Id: I08084abb25e494384235260dd1df83adc5e3a624
 2017-03-10 10:47:41 +01:00
Ashod Nakashian
f9197ff020 nb: separate sendMessage and sendFrame 
There are other types of frames than application
data.

Also a message can be composed of multiple frames.

Change-Id: Ia97349553b61ae05fa78854222808eaa43386c0e
 2017-03-10 10:47:41 +01:00
Ashod Nakashian
9d72496038 nb: prefix large WS with nextmessage 
Change-Id: Ie6583c93ada9cff8aa50137431b5c2c5f7b39d97
 2017-03-10 10:47:41 +01:00
Michael Meeks
aa0a85c16d Add debug, and set the 'fin' bit on messages as we send them. 2017-03-10 10:47:41 +01:00
Ashod Nakashian
784dd41eae nb: simplify WS sendMessage interface 
No need to construct vector<char> where
a simple char*/size_t suffice.

Change-Id: Ic70ad65a2078a1f653695504a79532f7831d88be
 2017-03-10 10:47:40 +01:00
Ashod Nakashian
e184a371a0 nb: write socket buffer to socket safely 
Since a socket client can push data into
the socket in a different thread than the one
polling (indeed that's the only possible scenario),
the write buffer must be protected by a lock.

On the other hand, the read buffer is always
invoked from a single thread, the polling. So
it is perfectly safe without locks.

Change-Id: Id0b6a01f8e96124a299810f0aacab9cecd1ff979
 2017-03-10 10:47:40 +01:00
Ashod Nakashian
c2444bba9e nb: more informative WebSocket message logging 
Change-Id: I3229a98dcefc115fe1b730b57fcac71aeb868aad
 2017-03-10 10:47:40 +01:00
Ashod Nakashian
2b4e7bd067 nb: SocketHandlerInterface must hold weak_ptr to Socket 
Because the socket can be freed while a separate
thread is sending data via the handler, we must
have a locked reference to the socket instance
in the handler.

Change-Id: Iefad3fc2b147f96b8d538d9edd7cac3fce25b5bf
 2017-03-10 10:47:40 +01:00
Ashod Nakashian
576bd3ab4d nb: write WS frame to socket 
We need to flush writes to socket as soon as
ready to either send or, if buffers are full,
to poll for write.

With WebSocket we do this after writing a frame.

Change-Id: I1bc276e678375a84079e69624414a16271f25351
 2017-03-10 10:47:40 +01:00
Ashod Nakashian
9efb14def7 nb: pass the WS frame type explicitly 
Change-Id: Iaf4d832af4313b629701c7f07832dcaaf3e53c20
 2017-03-10 10:47:40 +01:00
Ashod Nakashian
32b7d5ceee nb: WebSocketSender used to send back loading progress 
Change-Id: I3b09c44c4d64db39217d364ebff0a647a82457f4
 2017-03-10 10:47:40 +01:00
Ashod Nakashian
5b944cf99b nb: don't own your owner 
Change-Id: Ia74dbd3441b8b1f682091ba3d973dd33b2599309
 2017-03-10 10:47:40 +01:00
Ashod Nakashian
221059cd6b nb: move WebSocket upgrade to the ClientRequestDispatcher 
Change-Id: Id11b139563a55e50d3f7e216e2231d79e07015b3
 2017-03-10 10:47:40 +01:00
Ashod Nakashian
73f9001004 nb: remove HTTP handling from WebSocketHandler 
WebSocketHandler now supports upgrading given
the original HTTP header.

Change-Id: Ifb3b8fee9aef8015548a625bbb88e75f4e97255f
 2017-03-10 10:47:40 +01:00
Ashod Nakashian
5e79581952 nb: StreamSocket must always have a handler 
And also emits disonnection event.

Change-Id: Ibb60c6fca55c58b886f5ff77c6e22769a128e950
 2017-03-10 10:47:39 +01:00
Michael Meeks
5b7e12c16e Cleanup logging, and add message tracing / dumper. 2017-03-10 10:47:39 +01:00
Jan Holesovsky
205a1453d3 nb: Moved the WebSocketHandler to an own header & cpp. 
The cpp is there to keep the header free from the POCO dependency.

Change-Id: I2202c4ed403084ec1ed40001e10b1ec4fc226f7b
 2017-03-10 10:47:39 +01:00