lp:~mir-team/mir/support-multiple-protocols-in-the-server
Created by
Chris Halse Rogers
and last modified
- Get this branch:
- bzr branch lp:~mir-team/mir/support-multiple-protocols-in-the-server
Members of
Mir development team
can upload to this branch. Log in for directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Alan Griffiths: Needs Fixing
- PS Jenkins bot (community): Needs Fixing (continuous-integration)
- Robert Carr (community): Approve
- Alexandros Frantzis (community): Needs Information
-
Diff: 4257 lines (+2847/-223)65 files modifiedCMakeLists.txt (+1/-0)
src/client/connection_configuration.h (+10/-1)
src/client/default_connection_configuration.cpp (+18/-9)
src/client/default_connection_configuration.h (+2/-2)
src/client/mir_connection.cpp (+68/-23)
src/client/mir_connection.h (+6/-4)
src/client/mir_surface.cpp (+2/-2)
src/client/mir_surface.h (+4/-4)
src/client/rpc/CMakeLists.txt (+2/-0)
src/client/rpc/handshaking_connection_creator.cpp (+310/-0)
src/client/rpc/handshaking_connection_creator.h (+61/-0)
src/client/rpc/make_rpc_channel.h (+2/-15)
src/client/rpc/make_socket_rpc_channel.cpp (+16/-21)
src/client/rpc/protobuf_protocol.cpp (+50/-0)
src/client/rpc/protobuf_protocol.h (+65/-0)
src/client/rpc/protocol_interpreter.h (+57/-0)
src/client/rpc/rpc_channel_resolver.h (+52/-0)
src/client/rpc/stream_socket_transport.cpp (+15/-0)
src/client/rpc/stream_socket_transport.h (+2/-0)
src/client/rpc/stream_transport.h (+7/-0)
src/common/CMakeLists.txt (+1/-0)
src/common/dispatch/simple_dispatch_thread.cpp (+8/-14)
src/common/frontend/CMakeLists.txt (+30/-0)
src/common/frontend/protobuf_handshake_protocol.cpp (+46/-0)
src/common/symbols.map (+20/-0)
src/common/thread/CMakeLists.txt (+2/-1)
src/common/thread/signal_blocker.cpp (+48/-0)
src/include/common/mir/frontend/handshake_protocol.h (+85/-0)
src/include/common/mir/frontend/protobuf_handshake_protocol.h (+43/-0)
src/include/common/mir/signal_blocker.h (+36/-0)
src/include/server/mir/default_server_configuration.h (+5/-2)
src/server/CMakeLists.txt (+3/-0)
src/server/frontend/CMakeLists.txt (+2/-2)
src/server/frontend/default_configuration.cpp (+24/-15)
src/server/frontend/default_ipc_factory.cpp (+4/-5)
src/server/frontend/default_ipc_factory.h (+1/-2)
src/server/frontend/handshaking_connection_creator.cpp (+166/-0)
src/server/frontend/handshaking_connection_creator.h (+74/-0)
src/server/frontend/protobuf_ipc_factory.h (+5/-2)
src/server/frontend/protobuf_protocol.cpp (+28/-29)
src/server/frontend/protobuf_protocol.h (+19/-16)
src/server/frontend/protocol_interpreter.h (+70/-0)
src/server/frontend/published_socket_connector.cpp (+1/-2)
src/server/symbols.map (+10/-0)
tests/acceptance-tests/CMakeLists.txt (+4/-0)
tests/acceptance-tests/test_protocol_versioning.cpp (+228/-0)
tests/include/mir_test/test_protobuf_client.h (+1/-0)
tests/include/mir_test_doubles/stub_ipc_factory.h (+1/-0)
tests/integration-tests/client/test_screencast.cpp (+4/-2)
tests/integration-tests/test_error_reporting.cpp (+2/-3)
tests/integration-tests/test_protobuf.cpp (+15/-12)
tests/mir_test_doubles/test_protobuf_client.cpp (+21/-7)
tests/mir_test_doubles/test_protobuf_socket_server.cpp (+12/-10)
tests/unit-tests/CMakeLists.txt (+1/-0)
tests/unit-tests/client/CMakeLists.txt (+2/-0)
tests/unit-tests/client/test_client_mir_surface.cpp (+6/-2)
tests/unit-tests/client/test_handshaking_connection_creator.cpp (+526/-0)
tests/unit-tests/client/test_mir_connection.cpp (+181/-8)
tests/unit-tests/client/test_protobuf_rpc_channel.cpp (+1/-0)
tests/unit-tests/client/test_stream_transport.cpp (+78/-3)
tests/unit-tests/frontend/CMakeLists.txt (+1/-0)
tests/unit-tests/frontend/stress_protobuf_communicator.cpp (+3/-3)
tests/unit-tests/frontend/test_handshaking_connection_creator.cpp (+277/-0)
tests/unit-tests/frontend/test_protobuf_reports_errors.cpp (+1/-1)
tests/unit-tests/frontend/test_published_socket_connector.cpp (+1/-1)
Related source package recipes
Branch information
Recent revisions
- 1477. By Chris Halse Rogers
-
Oh, that's why I removed MockObserver from the anonymous namespace.
I'm not sure why g++ complains about it, but there you go.
- 1475. By Chris Halse Rogers
-
Improve protocol header size test.
Check that the exception we generate has an appropriate error message.
Then, fix the test by actually sending the client data the header
says we will so that the server code doesn't time out trying to read
the header we haven't sent.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:mir
