Merge lp:~alan-griffiths/mir/socket-connection into lp:mir

[Alan Griffiths]

frontend, config: Mechanism for connecting via a socket pair.

frontend, config: Mechanism for connecting via a socket pair.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1099
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/2103
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1988
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/3/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-team-mir-development-branch-ci/3/rebuild

review: Needs Fixing (continuous-integration)

[Kevin DuBois (kdub)]

read through once, looks okay to me. want to look it over again, abstain for now

review: Abstain

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1099
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/15/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/2116
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/2001
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/15/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-team-mir-development-branch-ci/15/rebuild

review: Needs Fixing (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Not a thorough review yet, but I like the new design separating the connection and session creation concerns.

A couple of nits I noticed:

952 +// Makes provides a client-side socket fd for each connection

1734 + EXPECT_CALL(*client, next_buffer_done()).Times(8);
1735 +
1736 + for (int i = 0; i != 8; ++i)

int const num_buffer_requests{8} ?

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1100
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/19/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/2121
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/2006
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/19/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-team-mir-development-branch-ci/19/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1101
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/21/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/2123
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/2008
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/21/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-team-mir-development-branch-ci/21/rebuild

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Looks good.

Nits:

496 +char const* const no_server_socket_opt = "no-file";

Not used.

504 + return std::make_shared<mf::ProtobufSessionCreator>(
505 + the_ipc_factory(the_frontend_shell(),
506 + the_buffer_allocator()),

Current indentation makes the_buffer_allocator() seem like an argument of std::make_shared<mf::ProtobufSessionCreator>() instead of (the correct) the_ipc_factory().

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1103
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/23/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/2128
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/2013
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/23
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/23/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-team-mir-development-branch-ci/23/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-autolanding/5/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/2129
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/2014
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-autolanding/5
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-autolanding/5/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

[Kevin DuBois (kdub)]

client_socket_fd()
the function looks like its making a new session, and creating an fd for a new client. The name could be create_fd_for_new_client()?

create_session_for()
are we creating a session for the socket? or creating a session with a socket? create_session_from_socket()

those are pretty minor naming issues though, lgtm

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'examples/basic_server.cpp'
--- examples/basic_server.cpp	2013-08-29 03:48:16 +0000
+++ examples/basic_server.cpp	2013-09-25 14:20:36 +0000
@@ -16,18 +16,53 @@
  * Authored by: Alan Griffiths <[e-mail]>
  */
 
+#include "server_configuration.h"
+
+#include "mir/abnormal_exit.h"
+#include "mir/frontend/connector.h"
+#include "mir/options/option.h"
+#include "mir/report_exception.h"
 #include "mir/run_mir.h"
-#include "mir/report_exception.h"
-#include "server_configuration.h"
 
 #include <iostream>
 
+namespace
+{
+char const* const launch_child_opt = "launch-client";
+
+struct ServerConfiguration : mir::examples::ServerConfiguration
+{
+    ServerConfiguration(int argc, char const** argv) :
+        mir::examples::ServerConfiguration(argc, argv)
+    {
+        namespace po = boost::program_options;
+
+        add_options()
+            (launch_child_opt, po::value<std::string>(), "system() command to launch client");
+    }
+
+    void launch_client()
+    {
+        if (the_options()->is_set(launch_child_opt))
+        {
+            char buffer[128] = {0};
+            sprintf(buffer, "fd://%d", the_connector()->client_socket_fd());
+            setenv("MIR_SOCKET", buffer, 1);
+            auto ignore = system((the_options()->get(launch_child_opt, "") + "&").c_str());
+            (void)ignore;
+        }
+    }
+
+    using mir::examples::ServerConfiguration::the_options;
+};
+}
+
 int main(int argc, char const* argv[])
 try
 {
-    mir::examples::ServerConfiguration config(argc, argv);
+    ServerConfiguration config(argc, argv);
 
-    run_mir(config, [](mir::DisplayServer&) {/* empty init */});
+    run_mir(config, [&](mir::DisplayServer&){ config.launch_client(); });
     return 0;
 }
 catch (...)

=== modified file 'examples/render_surfaces.cpp'
--- examples/render_surfaces.cpp	2013-09-19 13:24:22 +0000
+++ examples/render_surfaces.cpp	2013-09-25 14:20:36 +0000
@@ -19,7 +19,7 @@
 #include "mir/compositor/default_display_buffer_compositor_factory.h"
 #include "mir/compositor/display_buffer_compositor.h"
 #include "mir/graphics/graphic_buffer_allocator.h"
-#include "mir/frontend/communicator.h"
+#include "mir/frontend/connector.h"
 #include "mir/shell/surface_creation_parameters.h"
 #include "mir/geometry/size.h"
 #include "mir/geometry/rectangles.h"
@@ -266,15 +266,16 @@
 
     ///\internal [RenderSurfacesServerConfiguration_stubs_tag]
     // Stub out server connectivity.
-    std::shared_ptr<mf::Communicator> the_communicator() override
+    std::shared_ptr<mf::Connector> the_connector() override
     {
-        struct NullCommunicator : public mf::Communicator
+        struct NullConnector : public mf::Connector
         {
             void start() {}
             void stop() {}
+            int client_socket_fd() const override { return 0; }
         };
 
-        return std::make_shared<NullCommunicator>();
+        return std::make_shared<NullConnector>();
     }
     ///\internal [RenderSurfacesServerConfiguration_stubs_tag]
 

=== modified file 'include/server/mir/default_server_configuration.h'
--- include/server/mir/default_server_configuration.h	2013-09-23 13:37:44 +0000
+++ include/server/mir/default_server_configuration.h	2013-09-25 14:20:36 +0000
@@ -41,8 +41,9 @@
 namespace frontend
 {
 class Shell;
-class Communicator;
+class Connector;
 class ProtobufIpcFactory;
+class SessionCreator;
 class SessionMediatorReport;
 class MessageProcessorReport;
 class SessionAuthorizer;
@@ -118,7 +119,7 @@
     /** @name DisplayServer dependencies
      * dependencies of DisplayServer on the rest of the Mir
      *  @{ */
-    virtual std::shared_ptr<frontend::Communicator> the_communicator();
+    virtual std::shared_ptr<frontend::Connector>    the_connector();
     virtual std::shared_ptr<graphics::Display>      the_display();
     virtual std::shared_ptr<compositor::Compositor> the_compositor();
     virtual std::shared_ptr<input::InputManager>    the_input_manager();
@@ -168,6 +169,11 @@
     virtual std::shared_ptr<frontend::Shell>                  the_frontend_shell();
     virtual std::shared_ptr<frontend::EventSink>              the_global_event_sink();
     virtual std::shared_ptr<frontend::DisplayChanger>         the_frontend_display_changer();
+    /** @name frontend configuration - internal dependencies
+     * internal dependencies of frontend
+     *  @{ */
+    virtual std::shared_ptr<frontend::SessionCreator>         the_session_creator();
+    /** @} */
     /** @} */
 
     virtual std::shared_ptr<shell::FocusController> the_focus_controller();
@@ -243,7 +249,7 @@
     virtual std::shared_ptr<shell::MediatingDisplayChanger> the_mediating_display_changer();
     virtual std::shared_ptr<shell::BroadcastingSessionEventSink> the_broadcasting_session_event_sink();
 
-    CachedPtr<frontend::Communicator> communicator;
+    CachedPtr<frontend::Connector>   connector;
     CachedPtr<shell::SessionManager> session_manager;
 
 
@@ -266,6 +272,7 @@
     CachedPtr<frontend::MessageProcessorReport> message_processor_report;
     CachedPtr<frontend::SessionAuthorizer> session_authorizer;
     CachedPtr<frontend::EventSink> global_event_sink;
+    CachedPtr<frontend::SessionCreator>    session_creator;
     CachedPtr<compositor::RendererFactory> renderer_factory;
     CachedPtr<compositor::BufferStreamFactory> buffer_stream_factory;
     CachedPtr<surfaces::SurfaceStack> surface_stack;

=== renamed file 'include/server/mir/frontend/communicator.h' => 'include/server/mir/frontend/connector.h'
--- include/server/mir/frontend/communicator.h	2013-04-25 09:48:54 +0000
+++ include/server/mir/frontend/connector.h	2013-09-25 14:20:36 +0000
@@ -16,29 +16,29 @@
  * Authored by: Thomas Voss <[e-mail]>
  */
 
-#ifndef MIR_FRONTEND_COMMUNICATOR_H_
-#define MIR_FRONTEND_COMMUNICATOR_H_
+#ifndef MIR_FRONTEND_CONNECTOR_H_
+#define MIR_FRONTEND_CONNECTOR_H_
 
 namespace mir
 {
 namespace frontend
 {
-
-class Communicator
+/// Handle client process connections
+class Connector
 {
 public:
-    virtual ~Communicator() {}
-
     virtual void start() = 0;
     virtual void stop() = 0;
 
+    virtual int client_socket_fd() const = 0;
+
 protected:
-    Communicator() = default;
-    Communicator(const Communicator&) = delete;
-    Communicator& operator=(const Communicator&) = delete;
+    Connector() = default;
+    virtual ~Connector() = default;
+    Connector(const Connector&) = delete;
+    Connector& operator=(const Connector&) = delete;
 };
-
-}
-}
-
-#endif // MIR_FRONTEND_COMMUNICATOR_H_
+}
+}
+
+#endif // MIR_FRONTEND_CONNECTOR_H_

=== renamed file 'include/server/mir/frontend/communicator_report.h' => 'include/server/mir/frontend/connector_report.h'
--- include/server/mir/frontend/communicator_report.h	2013-06-19 16:14:40 +0000
+++ include/server/mir/frontend/connector_report.h	2013-09-25 14:20:36 +0000
@@ -16,8 +16,8 @@
  * Authored by: Alan Griffiths <[e-mail]
  */
 
-#ifndef MIR_FRONTEND_COMMUNICATOR_REPORT_H_
-#define MIR_FRONTEND_COMMUNICATOR_REPORT_H_
+#ifndef MIR_FRONTEND_CONNECTOR_REPORT_H_
+#define MIR_FRONTEND_CONNECTOR_REPORT_H_
 
 #include <stdexcept>
 
@@ -26,20 +26,20 @@
 namespace frontend
 {
 
-class CommunicatorReport
+class ConnectorReport
 {
 public:
 
     virtual void error(std::exception const& error) = 0;
 
 protected:
-    virtual ~CommunicatorReport() = default;
-    CommunicatorReport() = default;
-    CommunicatorReport(const CommunicatorReport&) = delete;
-    CommunicatorReport& operator=(const CommunicatorReport&) = delete;
+    virtual ~ConnectorReport() = default;
+    ConnectorReport() = default;
+    ConnectorReport(const ConnectorReport&) = delete;
+    ConnectorReport& operator=(const ConnectorReport&) = delete;
 };
 
-class NullCommunicatorReport : public CommunicatorReport
+class NullConnectorReport : public ConnectorReport
 {
 public:
 
@@ -48,4 +48,4 @@
 }
 }
 
-#endif // MIR_FRONTEND_COMMUNICATOR_REPORT_H_
+#endif // MIR_FRONTEND_CONNECTOR_REPORT_H_

=== added file 'include/server/mir/frontend/session_creator.h'
--- include/server/mir/frontend/session_creator.h	1970-01-01 00:00:00 +0000
+++ include/server/mir/frontend/session_creator.h	2013-09-25 14:20:36 +0000
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Alan Griffiths <[e-mail]>
+ */
+
+#ifndef MIR_FRONTEND_SESSION_CREATOR_H_
+#define MIR_FRONTEND_SESSION_CREATOR_H_
+
+#include <boost/asio.hpp>
+
+#include <memory>
+
+namespace mir
+{
+namespace frontend
+{
+class SessionCreator
+{
+public:
+    virtual void create_session_for(std::shared_ptr<boost::asio::local::stream_protocol::socket> const& socket) = 0;
+
+protected:
+    SessionCreator() = default;
+    virtual ~SessionCreator() noexcept = default;
+    SessionCreator(SessionCreator const&) = delete;
+    SessionCreator& operator=(SessionCreator const&) = delete;
+};
+}
+}
+
+#endif /* MIR_FRONTEND_SESSION_CREATOR_H_ */

=== modified file 'include/server/mir/server_configuration.h'
--- include/server/mir/server_configuration.h	2013-09-18 21:09:29 +0000
+++ include/server/mir/server_configuration.h	2013-09-25 14:20:36 +0000
@@ -28,7 +28,7 @@
 }
 namespace frontend
 {
-class Communicator;
+class Connector;
 class Shell;
 }
 namespace shell
@@ -57,7 +57,7 @@
 public:
     // TODO most of these interfaces are wider DisplayServer needs...
     // TODO ...some or all of them need narrowing
-    virtual std::shared_ptr<frontend::Communicator> the_communicator() = 0;
+    virtual std::shared_ptr<frontend::Connector> the_connector() = 0;
     virtual std::shared_ptr<graphics::Display> the_display() = 0;
     virtual std::shared_ptr<compositor::Compositor> the_compositor() = 0;
     virtual std::shared_ptr<input::InputManager> the_input_manager() = 0;

=== modified file 'include/test/mir_test/test_protobuf_server.h'
--- include/test/mir_test/test_protobuf_server.h	2013-06-19 16:14:40 +0000
+++ include/test/mir_test/test_protobuf_server.h	2013-09-25 14:20:36 +0000
@@ -25,8 +25,8 @@
 {
 namespace frontend
 {
-class Communicator;
-class CommunicatorReport;
+class Connector;
+class ConnectorReport;
 }
 
 namespace protobuf
@@ -45,10 +45,10 @@
     TestProtobufServer(
         std::string const& socket_name,
         std::shared_ptr<protobuf::DisplayServer> const& tool,
-        std::shared_ptr<frontend::CommunicatorReport> const& report);
+        std::shared_ptr<frontend::ConnectorReport> const& report);
 
     // "Server" side
-    std::shared_ptr<frontend::Communicator> const comm;
+    std::shared_ptr<frontend::Connector> const comm;
 };
 }
 }

=== modified file 'src/server/default_server_configuration.cpp'
--- src/server/default_server_configuration.cpp	2013-09-23 13:37:44 +0000
+++ src/server/default_server_configuration.cpp	2013-09-25 14:20:36 +0000
@@ -171,6 +171,7 @@
 };
 
 char const* const server_socket_opt           = "file";
+char const* const no_server_socket_opt        = "no-file";
 char const* const session_mediator_report_opt = "session-mediator-report";
 char const* const msg_processor_report_opt    = "msg-processor-report";
 char const* const display_report_opt          = "display-report";
@@ -255,6 +256,7 @@
             "Host socket filename. [string:default={$MIR_SOCKET,/tmp/mir_socket}]")
         ("file,f", po::value<std::string>(),
             "Socket filename. [string:default=/tmp/mir_socket]")
+        (no_server_socket_opt, "Do not provide a socket filename for client connections")
         (platform_graphics_lib, po::value<std::string>(),
             "Library to use for platform graphics support [default=libmirplatformgraphics.so]")
         ("enable-input,i", po::value<bool>(),

=== modified file 'src/server/display_server.cpp'
--- src/server/display_server.cpp	2013-09-18 21:09:29 +0000
+++ src/server/display_server.cpp	2013-09-25 14:20:36 +0000
@@ -25,7 +25,7 @@
 #include "mir/display_changer.h"
 
 #include "mir/compositor/compositor.h"
-#include "mir/frontend/communicator.h"
+#include "mir/frontend/connector.h"
 #include "mir/graphics/display.h"
 #include "mir/input/input_manager.h"
 
@@ -72,7 +72,7 @@
           display{config.the_display()},
           input_configuration{config.the_input_configuration()},
           compositor{config.the_compositor()},
-          communicator{config.the_communicator()},
+          connector{config.the_connector()},
           input_manager{config.the_input_manager()},
           main_loop{config.the_main_loop()},
           pause_resume_listener{config.the_pause_resume_listener()},
@@ -103,8 +103,8 @@
                 [this] { compositor->start(); }};
 
             TryButRevertIfUnwinding comm{
-                [this] { communicator->stop(); },
-                [this] { communicator->start(); }};
+                [this] { connector->stop(); },
+                [this] { connector->start(); }};
 
             display->pause();
 
@@ -129,8 +129,8 @@
                 [this] { display->pause(); }};
 
             TryButRevertIfUnwinding comm{
-                [this] { communicator->start(); },
-                [this] { communicator->stop(); }};
+                [this] { connector->start(); },
+                [this] { connector->stop(); }};
 
             if (configure_display_on_resume)
             {
@@ -176,7 +176,7 @@
     std::shared_ptr<mg::Display> const display;
     std::shared_ptr<input::InputConfiguration> const input_configuration;
     std::shared_ptr<mc::Compositor> const compositor;
-    std::shared_ptr<mf::Communicator> const communicator;
+    std::shared_ptr<mf::Connector> const connector;
     std::shared_ptr<mi::InputManager> const input_manager;
     std::shared_ptr<mir::MainLoop> const main_loop;
     std::shared_ptr<mir::PauseResumeListener> const pause_resume_listener;
@@ -201,7 +201,7 @@
 
 void mir::DisplayServer::run()
 {
-    p->communicator->start();
+    p->connector->start();
     p->compositor->start();
     p->input_manager->start();
 
@@ -209,7 +209,7 @@
 
     p->input_manager->stop();
     p->compositor->stop();
-    p->communicator->stop();
+    p->connector->stop();
 }
 
 void mir::DisplayServer::stop()

=== modified file 'src/server/frontend/CMakeLists.txt'
--- src/server/frontend/CMakeLists.txt	2013-08-28 03:41:48 +0000
+++ src/server/frontend/CMakeLists.txt	2013-09-25 14:20:36 +0000
@@ -9,20 +9,19 @@
   protobuf_buffer_packer.cpp
   null_message_processor.cpp
   global_event_sender.cpp
-
+  published_socket_connector.cpp
+  protobuf_session_creator.cpp
+  socket_session.cpp
   resource_cache.cpp
   socket_messenger.cpp
   event_sender.cpp
   surface.cpp
+
+  default_configuration.cpp
+
   ${PROTO_HDRS}
 )
 
-list(APPEND FRONTEND_SOURCES
-  protobuf_socket_communicator.cpp
-  make_protobuf_socket_communicator.cpp
-  socket_session.cpp
-)
-
 if (MIR_PLATFORM STREQUAL "android")
   list(APPEND FRONTEND_SOURCES session_mediator_android.cpp)
 elseif (MIR_PLATFORM STREQUAL "gbm")

=== renamed file 'src/server/frontend/make_protobuf_socket_communicator.cpp' => 'src/server/frontend/default_configuration.cpp'
--- src/server/frontend/make_protobuf_socket_communicator.cpp	2013-08-28 03:41:48 +0000
+++ src/server/frontend/default_configuration.cpp	2013-09-25 14:20:36 +0000
@@ -17,39 +17,67 @@
  */
 
 #include "mir/default_server_configuration.h"
+#include "protobuf_session_creator.h"
+
 #include "mir/options/option.h"
 #include "mir/frontend/shell.h"
 #include "mir/shell/session_container.h"
 #include "mir/shell/session.h"
-#include "protobuf_socket_communicator.h"
-#include "mir/frontend/communicator_report.h"
+#include "published_socket_connector.h"
+#include "mir/frontend/connector_report.h"
 
 namespace mf = mir::frontend;
-namespace mg = mir::graphics;
-namespace mc = mir::compositor;
 namespace msh = mir::shell;
 
-std::shared_ptr<mf::Communicator>
-mir::DefaultServerConfiguration::the_communicator()
-{
-    return communicator(
-        [&,this]() -> std::shared_ptr<mf::Communicator>
+namespace
+{
+char const* const no_server_socket_opt        = "no-file";
+}
+
+std::shared_ptr<mf::SessionCreator>
+mir::DefaultServerConfiguration::the_session_creator()
+{
+    return session_creator([this]
+        {
+            return std::make_shared<mf::ProtobufSessionCreator>(
+                the_ipc_factory(the_frontend_shell(), the_buffer_allocator()),
+                the_session_authorizer());
+        });
+}
+
+std::shared_ptr<mf::Connector>
+mir::DefaultServerConfiguration::the_connector()
+{
+    return connector(
+        [&,this]() -> std::shared_ptr<mf::Connector>
         {
             auto const threads = the_options()->get("ipc-thread-pool", 10);
             auto shell_sessions = the_shell_session_container();
-            return std::make_shared<mf::ProtobufSocketCommunicator>(
-                the_socket_file(),
-                the_ipc_factory(the_frontend_shell(), the_buffer_allocator()),
-                the_session_authorizer(),
-                threads,
-                [shell_sessions]
+            auto const& force_requests_to_complete = [shell_sessions]
+            {
+                shell_sessions->for_each([](std::shared_ptr<msh::Session> const& session)
                 {
-                    shell_sessions->for_each([](std::shared_ptr<msh::Session> const& session)
-                    {
-                        session->force_requests_to_complete();
-                    });
-                },
-                std::make_shared<mf::NullCommunicatorReport>());
+                    session->force_requests_to_complete();
+                });
+            };
+
+            if (the_options()->is_set(no_server_socket_opt))
+            {
+                return std::make_shared<mf::BasicConnector>(
+                    the_session_creator(),
+                    threads,
+                    force_requests_to_complete,
+                    std::make_shared<mf::NullConnectorReport>());
+            }
+            else
+            {
+                return std::make_shared<mf::PublishedSocketConnector>(
+                    the_socket_file(),
+                    the_session_creator(),
+                    threads,
+                    force_requests_to_complete,
+                    std::make_shared<mf::NullConnectorReport>());
+            }
         });
 }
 

=== added file 'src/server/frontend/protobuf_session_creator.cpp'
--- src/server/frontend/protobuf_session_creator.cpp	1970-01-01 00:00:00 +0000
+++ src/server/frontend/protobuf_session_creator.cpp	2013-09-25 14:20:36 +0000
@@ -0,0 +1,73 @@
+/*
+ * Copyright © 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Alan Griffiths <[e-mail]>
+ */
+
+#include "protobuf_session_creator.h"
+
+#include "event_sender.h"
+#include "protobuf_message_processor.h"
+#include "socket_messenger.h"
+#include "socket_session.h"
+
+#include "mir/frontend/protobuf_ipc_factory.h"
+#include "mir/frontend/session_authorizer.h"
+#include "mir/protobuf/google_protobuf_guard.h"
+
+namespace mf = mir::frontend;
+namespace mfd = mir::frontend::detail;
+namespace ba = boost::asio;
+
+mf::ProtobufSessionCreator::ProtobufSessionCreator(
+    std::shared_ptr<ProtobufIpcFactory> const& ipc_factory,
+    std::shared_ptr<mf::SessionAuthorizer> const& session_authorizer)
+:   ipc_factory(ipc_factory),
+    session_authorizer(session_authorizer),
+    next_session_id(0),
+    connected_sessions(std::make_shared<mfd::ConnectedSessions<mfd::SocketSession>>())
+{
+}
+
+mf::ProtobufSessionCreator::~ProtobufSessionCreator() noexcept
+{
+    connected_sessions->clear();
+}
+
+int mf::ProtobufSessionCreator::next_id()
+{
+    return next_session_id.fetch_add(1);
+}
+
+void mf::ProtobufSessionCreator::create_session_for(std::shared_ptr<ba::local::stream_protocol::socket> const& socket)
+{
+    auto const messenger = std::make_shared<detail::SocketMessenger>(socket);
+    auto const client_pid = messenger->client_pid();
+
+    if (session_authorizer->connection_is_allowed(client_pid))
+    {
+        auto const authorized_to_resize_display = session_authorizer->configure_display_is_allowed(client_pid);
+        auto const event_sink = std::make_shared<detail::EventSender>(messenger);
+        auto const msg_processor = std::make_shared<detail::ProtobufMessageProcessor>(
+            messenger,
+            ipc_factory->make_ipc_server(event_sink, authorized_to_resize_display),
+            ipc_factory->resource_cache(),
+            ipc_factory->report());
+
+        const auto& session = std::make_shared<mfd::SocketSession>(messenger, next_id(), connected_sessions, msg_processor);
+        connected_sessions->add(session);
+        session->read_next_message();
+    }
+}

=== added file 'src/server/frontend/protobuf_session_creator.h'
--- src/server/frontend/protobuf_session_creator.h	1970-01-01 00:00:00 +0000
+++ src/server/frontend/protobuf_session_creator.h	2013-09-25 14:20:36 +0000
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Alan Griffiths <[e-mail]>
+ */
+
+#ifndef MIR_FRONTEND_PROTOBUF_SESSION_CREATOR_H_
+#define MIR_FRONTEND_PROTOBUF_SESSION_CREATOR_H_
+
+#include "mir/frontend/session_creator.h"
+#include "connected_sessions.h"
+
+#include <atomic>
+
+namespace mir
+{
+namespace frontend
+{
+class ProtobufIpcFactory;
+class SessionAuthorizer;
+
+namespace detail
+{
+struct SocketSession;
+}
+
+class ProtobufSessionCreator : public SessionCreator
+{
+public:
+    ProtobufSessionCreator(
+        std::shared_ptr<ProtobufIpcFactory> const& ipc_factory,
+        std::shared_ptr<SessionAuthorizer> const& session_authorizer);
+    ~ProtobufSessionCreator() noexcept;
+
+    void create_session_for(std::shared_ptr<boost::asio::local::stream_protocol::socket> const& socket);
+
+private:
+    int next_id();
+
+    std::shared_ptr<ProtobufIpcFactory> const ipc_factory;
+    std::shared_ptr<SessionAuthorizer> const session_authorizer;
+    std::atomic<int> next_session_id;
+    std::shared_ptr<detail::ConnectedSessions<detail::SocketSession>> const connected_sessions;
+};
+}
+}
+
+#endif /* MIR_FRONTEND_PROTOBUF_SESSION_CREATOR_H_ */

=== renamed file 'src/server/frontend/protobuf_socket_communicator.cpp' => 'src/server/frontend/published_socket_connector.cpp'
--- src/server/frontend/protobuf_socket_communicator.cpp	2013-08-28 03:41:48 +0000
+++ src/server/frontend/published_socket_connector.cpp	2013-09-25 14:20:36 +0000
@@ -16,67 +16,78 @@
  * Authored by: Thomas Guest <[e-mail]>
  */
 
-#include "protobuf_socket_communicator.h"
-#include "protobuf_message_processor.h"
-#include "socket_session.h"
+#include "published_socket_connector.h"
+#include "protobuf_session_creator.h"
 
-#include "mir/frontend/communicator_report.h"
-#include "mir/frontend/protobuf_ipc_factory.h"
-#include "mir/frontend/session_authorizer.h"
-#include "socket_messenger.h"
-#include "event_sender.h"
-#include "mir/protobuf/google_protobuf_guard.h"
+#include "mir/frontend/connector_report.h"
 
 #include <boost/signals2.hpp>
+#include <boost/exception/errinfo_errno.hpp>
+#include <boost/throw_exception.hpp>
+
+#include <sys/socket.h>
 
 namespace mf = mir::frontend;
 namespace mfd = mir::frontend::detail;
 namespace ba = boost::asio;
 
-mf::ProtobufSocketCommunicator::ProtobufSocketCommunicator(
-    std::string const& socket_file,
-    std::shared_ptr<ProtobufIpcFactory> const& ipc_factory,
-    std::shared_ptr<mf::SessionAuthorizer> const& session_authorizer,
+mf::PublishedSocketConnector::PublishedSocketConnector(
+    const std::string& socket_file,
+    std::shared_ptr<SessionCreator> const& session_creator,
     int threads,
     std::function<void()> const& force_requests_to_complete,
-    std::shared_ptr<CommunicatorReport> const& report)
-:   socket_file((std::remove(socket_file.c_str()), socket_file)),
-    acceptor(io_service, socket_file),
-    io_service_threads(threads),
-    ipc_factory(ipc_factory),
-    session_authorizer(session_authorizer),
-    next_session_id(0),
-    connected_sessions(std::make_shared<mfd::ConnectedSessions<mfd::SocketSession>>()),
-    force_requests_to_complete(force_requests_to_complete),
-    report(report)
+    std::shared_ptr<ConnectorReport> const& report)
+:   BasicConnector(session_creator, threads, force_requests_to_complete, report),
+    socket_file(socket_file),
+    acceptor(io_service, socket_file)
 {
     start_accept();
 }
 
-void mf::ProtobufSocketCommunicator::start_accept()
+mf::PublishedSocketConnector::~PublishedSocketConnector() noexcept
+{
+    std::remove(socket_file.c_str());
+}
+
+void mf::PublishedSocketConnector::start_accept()
 {
     auto socket = std::make_shared<boost::asio::local::stream_protocol::socket>(io_service);
 
     acceptor.async_accept(
         *socket,
         boost::bind(
-            &ProtobufSocketCommunicator::on_new_connection,
+            &PublishedSocketConnector::on_new_connection,
             this,
             socket,
             ba::placeholders::error));
 }
 
-int mf::ProtobufSocketCommunicator::next_id()
-{
-    int id = next_session_id.load();
-    while (!next_session_id.compare_exchange_weak(id, id + 1)) std::this_thread::yield();
-    return id;
-}
-
-
-void mf::ProtobufSocketCommunicator::start()
-{
-    auto run_io_service = [&]
+void mf::PublishedSocketConnector::on_new_connection(
+    std::shared_ptr<boost::asio::local::stream_protocol::socket> const& socket,
+    boost::system::error_code const& ec)
+{
+    if (!ec)
+    {
+        create_session_for(socket);
+    }
+    start_accept();
+}
+
+mf::BasicConnector::BasicConnector(
+    std::shared_ptr<SessionCreator> const& session_creator,
+    int threads,
+    std::function<void()> const& force_requests_to_complete,
+    std::shared_ptr<ConnectorReport> const& report)
+:   io_service_threads(threads),
+    force_requests_to_complete(force_requests_to_complete),
+    report(report),
+    session_creator{session_creator}
+{
+}
+
+void mf::BasicConnector::start()
+{
+    auto run_io_service = [this]
     {
         while (true)
         try
@@ -92,16 +103,16 @@
 
     for (auto& thread : io_service_threads)
     {
-        thread = std::move(std::thread(run_io_service));
+        thread = std::thread(run_io_service);
     }
 }
 
-void mf::ProtobufSocketCommunicator::stop()
+void mf::BasicConnector::stop()
 {
     /* Stop processing new requests */
     io_service.stop();
 
-    /* 
+    /*
      * Ensure that any pending requests will complete (i.e., that they
      * will not block indefinitely waiting for a resource from the server)
      */
@@ -120,44 +131,36 @@
     io_service.reset();
 }
 
-mf::ProtobufSocketCommunicator::~ProtobufSocketCommunicator()
+void mf::BasicConnector::create_session_for(std::shared_ptr<boost::asio::local::stream_protocol::socket> const& server_socket) const
+{
+    session_creator->create_session_for(server_socket);
+}
+
+int mf::BasicConnector::client_socket_fd() const
+{
+    enum { server, client, size };
+    int socket_fd[size];
+
+    if (socketpair(AF_LOCAL, SOCK_STREAM, 0, socket_fd))
+    {
+        BOOST_THROW_EXCEPTION(
+            boost::enable_error_info(
+                std::runtime_error("Could not create socket pair")) << boost::errinfo_errno(errno));
+    }
+
+    auto const server_socket = std::make_shared<boost::asio::local::stream_protocol::socket>(
+        io_service, boost::asio::local::stream_protocol(), socket_fd[server]);
+
+    create_session_for(server_socket);
+
+    return socket_fd[client];
+}
+
+mf::BasicConnector::~BasicConnector() noexcept
 {
     stop();
-
-    connected_sessions->clear();
-
-    std::remove(socket_file.c_str());
-}
-
-void mf::ProtobufSocketCommunicator::on_new_connection(
-    std::shared_ptr<boost::asio::local::stream_protocol::socket> const& socket,
-    boost::system::error_code const& ec)
-{
-    if (!ec)
-    {
-        auto messenger = std::make_shared<detail::SocketMessenger>(socket);
-        auto client_pid = messenger->client_pid(); 
-        if (session_authorizer->connection_is_allowed(client_pid))
-        {
-            auto authorized_to_resize_display = session_authorizer->configure_display_is_allowed(client_pid);
-            auto event_sink = std::make_shared<detail::EventSender>(messenger);
-            auto msg_processor = std::make_shared<detail::ProtobufMessageProcessor>(
-                messenger,
-                ipc_factory->make_ipc_server(event_sink, authorized_to_resize_display),
-                ipc_factory->resource_cache(),
-                ipc_factory->report());
-            auto const& session = std::make_shared<mfd::SocketSession>(
-                messenger,
-                next_id(),
-                connected_sessions,
-                msg_processor);
-            connected_sessions->add(session);
-            session->read_next_message();
-        }
-    }
-    start_accept();
-}
-
-void mf::NullCommunicatorReport::error(std::exception const& /*error*/)
+}
+
+void mf::NullConnectorReport::error(std::exception const& /*error*/)
 {
 }

=== renamed file 'src/server/frontend/protobuf_socket_communicator.h' => 'src/server/frontend/published_socket_connector.h'
--- src/server/frontend/protobuf_socket_communicator.h	2013-08-28 03:41:48 +0000
+++ src/server/frontend/published_socket_connector.h	2013-09-25 14:20:36 +0000
@@ -19,13 +19,10 @@
 #ifndef MIR_FRONTEND_PROTOBUF_ASIO_COMMUNICATOR_H_
 #define MIR_FRONTEND_PROTOBUF_ASIO_COMMUNICATOR_H_
 
-#include "connected_sessions.h"
-
-#include "mir/frontend/communicator.h"
+#include "mir/frontend/connector.h"
 
 #include <boost/asio.hpp>
 
-#include <atomic>
 #include <thread>
 #include <string>
 #include <vector>
@@ -43,52 +40,54 @@
 {
 namespace frontend
 {
-class ResourceCache;
-class ProtobufIpcFactory;
-class SessionAuthorizer;
-
-namespace detail
-{
-struct SocketSession;
-class MessageSender;
-}
-
-class CommunicatorReport;
-
-class ProtobufSocketCommunicator : public Communicator
-{
-public:
-    // Create communicator based on Boost asio and Google protobufs
-    // using the supplied socket.
-    explicit ProtobufSocketCommunicator(
+class SessionCreator;
+class ConnectorReport;
+
+/// provides a client-side socket fd for each connection
+class BasicConnector : public Connector
+{
+public:
+    explicit BasicConnector(
+        std::shared_ptr<SessionCreator> const& session_creator,
+        int threads,
+        std::function<void()> const& force_requests_to_complete,
+        std::shared_ptr<ConnectorReport> const& report);
+    ~BasicConnector() noexcept;
+    void start() override;
+    void stop() override;
+    int client_socket_fd() const override;
+
+protected:
+    void create_session_for(std::shared_ptr<boost::asio::local::stream_protocol::socket> const& server_socket) const;
+    boost::asio::io_service mutable io_service;
+
+private:
+    std::vector<std::thread> io_service_threads;
+    std::function<void()> const force_requests_to_complete;
+    std::shared_ptr<ConnectorReport> const report;
+    std::shared_ptr<SessionCreator> const session_creator;
+};
+
+/// Accept connections over a published socket
+class PublishedSocketConnector : public BasicConnector
+{
+public:
+    explicit PublishedSocketConnector(
         const std::string& socket_file,
-        std::shared_ptr<ProtobufIpcFactory> const& ipc_factory,
-        std::shared_ptr<SessionAuthorizer> const& session_authorizer,
+        std::shared_ptr<SessionCreator> const& session_creator,
         int threads,
         std::function<void()> const& force_requests_to_complete,
-        std::shared_ptr<CommunicatorReport> const& report);
-    ~ProtobufSocketCommunicator();
-    void start();
-    void stop();
+        std::shared_ptr<ConnectorReport> const& report);
+    ~PublishedSocketConnector() noexcept;
 
 private:
     void start_accept();
     void on_new_connection(std::shared_ptr<boost::asio::local::stream_protocol::socket> const& socket,
                            boost::system::error_code const& ec);
-    int next_id();
 
     const std::string socket_file;
-    boost::asio::io_service io_service;
     boost::asio::local::stream_protocol::acceptor acceptor;
-    std::vector<std::thread> io_service_threads;
-    std::shared_ptr<ProtobufIpcFactory> const ipc_factory;
-    std::shared_ptr<SessionAuthorizer> const session_authorizer;
-    std::atomic<int> next_session_id;
-    std::shared_ptr<detail::ConnectedSessions<detail::SocketSession>> const connected_sessions;
-    std::function<void()> const force_requests_to_complete;
-    std::shared_ptr<CommunicatorReport> const report;
 };
-
 }
 }
 

=== modified file 'src/server/frontend/socket_messenger.cpp'
--- src/server/frontend/socket_messenger.cpp	2013-08-28 03:41:48 +0000
+++ src/server/frontend/socket_messenger.cpp	2013-09-25 14:20:36 +0000
@@ -59,7 +59,8 @@
     // function has completed (if it would be executed asynchronously.
     // NOTE: we rely on this synchronous behavior as per the comment in
     // mf::SessionMediator::create_surface
-    ba::write(*socket, ba::buffer(whole_message));
+    boost::system::error_code err;
+    ba::write(*socket, ba::buffer(whole_message), err);
 }
 
 void mfd::SocketMessenger::send_fds(std::vector<int32_t> const& fds)

=== modified file 'tests/acceptance-tests/test_client_library.cpp'
--- tests/acceptance-tests/test_client_library.cpp	2013-09-17 14:31:42 +0000
+++ tests/acceptance-tests/test_client_library.cpp	2013-09-25 14:20:36 +0000
@@ -22,7 +22,7 @@
 #include "mir_toolkit/mir_client_library_debug.h"
 #include "src/client/client_buffer.h"
 
-#include "mir/frontend/communicator.h"
+#include "mir/frontend/connector.h"
 
 #include "mir_protobuf.pb.h"
 

=== modified file 'tests/acceptance-tests/test_server_shutdown.cpp'
--- tests/acceptance-tests/test_server_shutdown.cpp	2013-09-17 14:31:42 +0000
+++ tests/acceptance-tests/test_server_shutdown.cpp	2013-09-25 14:20:36 +0000
@@ -326,19 +326,19 @@
      */
     std::weak_ptr<mir::graphics::Display> display = server_config->the_display();
     std::weak_ptr<mir::compositor::Compositor> compositor = server_config->the_compositor();
-    std::weak_ptr<mir::frontend::Communicator> communicator = server_config->the_communicator();
+    std::weak_ptr<mir::frontend::Connector> connector = server_config->the_connector();
     std::weak_ptr<mir::input::InputManager> input_manager = server_config->the_input_manager();
 
     server_config.reset();
 
     EXPECT_EQ(0, display.use_count());
     EXPECT_EQ(0, compositor.use_count());
-    EXPECT_EQ(0, communicator.use_count());
+    EXPECT_EQ(0, connector.use_count());
     EXPECT_EQ(0, input_manager.use_count());
 
     if (display.use_count() != 0 ||
         compositor.use_count() != 0 ||
-        communicator.use_count() != 0 ||
+        connector.use_count() != 0 ||
         input_manager.use_count() != 0)
     {
         resources_freed_failure.set();

=== modified file 'tests/acceptance-tests/test_test_framework.cpp'
--- tests/acceptance-tests/test_test_framework.cpp	2013-04-24 05:22:20 +0000
+++ tests/acceptance-tests/test_test_framework.cpp	2013-09-25 14:20:36 +0000
@@ -18,7 +18,7 @@
 
 #include "mir_test_framework/display_server_test_fixture.h"
 
-#include "mir/frontend/communicator.h"
+#include "mir/frontend/connector.h"
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>

=== modified file 'tests/integration-tests/client/test_client_render.cpp'
--- tests/integration-tests/client/test_client_render.cpp	2013-08-28 03:41:48 +0000
+++ tests/integration-tests/client/test_client_render.cpp	2013-09-25 14:20:36 +0000
@@ -27,7 +27,7 @@
 #include "mir_test/stub_server_tool.h"
 #include "mir_test/test_protobuf_server.h"
 
-#include "mir/frontend/communicator.h"
+#include "mir/frontend/connector.h"
 
 #include <gmock/gmock.h>
 #include <thread>

=== modified file 'tests/integration-tests/shell/test_session.cpp'
--- tests/integration-tests/shell/test_session.cpp	2013-08-28 03:41:48 +0000
+++ tests/integration-tests/shell/test_session.cpp	2013-09-25 14:20:36 +0000
@@ -29,7 +29,7 @@
 #include "mir/surfaces/buffer_stream.h"
 #include "mir/compositor/renderer.h"
 #include "mir/compositor/renderer_factory.h"
-#include "mir/frontend/communicator.h"
+#include "mir/frontend/connector.h"
 
 #include "mir_test_doubles/stub_buffer.h"
 #include "mir_test_doubles/null_display.h"
@@ -61,15 +61,16 @@
         return input_configuration;
     }
 
-    std::shared_ptr<mf::Communicator> the_communicator() override
+    std::shared_ptr<mf::Connector> the_connector() override
     {
-        struct NullCommunicator : public mf::Communicator
+        struct NullConnector : public mf::Connector
         {
             void start() {}
             void stop() {}
+            int client_socket_fd() const override { return 0; }
         };
 
-        return std::make_shared<NullCommunicator>();
+        return std::make_shared<NullConnector>();
     }
 
     std::shared_ptr<mg::GraphicBufferAllocator> the_buffer_allocator() override

=== modified file 'tests/integration-tests/test_display_server_main_loop_events.cpp'
--- tests/integration-tests/test_display_server_main_loop_events.cpp	2013-09-18 21:09:29 +0000
+++ tests/integration-tests/test_display_server_main_loop_events.cpp	2013-09-25 14:20:36 +0000
@@ -17,7 +17,7 @@
  */
 
 #include "mir/compositor/compositor.h"
-#include "mir/frontend/communicator.h"
+#include "mir/frontend/connector.h"
 #include "mir/graphics/display_configuration.h"
 #include "mir/graphics/display_configuration_policy.h"
 #include "mir/main_loop.h"
@@ -53,11 +53,12 @@
 namespace
 {
 
-class MockCommunicator : public mf::Communicator
+class MockConnector : public mf::Connector
 {
 public:
     MOCK_METHOD0(start, void());
     MOCK_METHOD0(stop, void());
+    MOCK_CONST_METHOD0(client_socket_fd, int());
 };
 
 class MockDisplayChanger : public mir::DisplayChanger
@@ -226,12 +227,12 @@
         return mock_compositor;
     }
 
-    std::shared_ptr<mf::Communicator> the_communicator() override
+    std::shared_ptr<mf::Connector> the_connector() override
     {
-        if (!mock_communicator)
-            mock_communicator = std::make_shared<MockCommunicator>();
+        if (!mock_connector)
+            mock_connector = std::make_shared<MockConnector>();
 
-        return mock_communicator;
+        return mock_connector;
     }
 
     std::shared_ptr<mi::InputManager> the_input_manager() override
@@ -262,10 +263,10 @@
         return mock_compositor;
     }
 
-    std::shared_ptr<MockCommunicator> the_mock_communicator()
+    std::shared_ptr<MockConnector> the_mock_connector()
     {
-        the_communicator();
-        return mock_communicator;
+        the_connector();
+        return mock_connector;
     }
 
     std::shared_ptr<mtd::MockInputManager> the_mock_input_manager()
@@ -304,7 +305,7 @@
 private:
     std::shared_ptr<mtd::MockCompositor> mock_compositor;
     std::shared_ptr<MockDisplay> mock_display;
-    std::shared_ptr<MockCommunicator> mock_communicator;
+    std::shared_ptr<MockConnector> mock_connector;
     std::shared_ptr<mtd::MockInputManager> mock_input_manager;
     std::shared_ptr<MockDisplayChanger> mock_display_changer;
 
@@ -410,33 +411,33 @@
 
     auto mock_compositor = server_config.the_mock_compositor();
     auto mock_display = server_config.the_mock_display();
-    auto mock_communicator = server_config.the_mock_communicator();
+    auto mock_connector = server_config.the_mock_connector();
     auto mock_input_manager = server_config.the_mock_input_manager();
 
     {
         InSequence s;
 
         /* Start */
-        EXPECT_CALL(*mock_communicator, start()).Times(1);
+        EXPECT_CALL(*mock_connector, start()).Times(1);
         EXPECT_CALL(*mock_compositor, start()).Times(1);
         EXPECT_CALL(*mock_input_manager, start()).Times(1);
 
         /* Pause */
         EXPECT_CALL(*mock_input_manager, stop()).Times(1);
         EXPECT_CALL(*mock_compositor, stop()).Times(1);
-        EXPECT_CALL(*mock_communicator, stop()).Times(1);
+        EXPECT_CALL(*mock_connector, stop()).Times(1);
         EXPECT_CALL(*mock_display, pause()).Times(1);
 
         /* Resume */
         EXPECT_CALL(*mock_display, resume()).Times(1);
-        EXPECT_CALL(*mock_communicator, start()).Times(1);
+        EXPECT_CALL(*mock_connector, start()).Times(1);
         EXPECT_CALL(*mock_input_manager, start()).Times(1);
         EXPECT_CALL(*mock_compositor, start()).Times(1);
 
         /* Stop */
         EXPECT_CALL(*mock_input_manager, stop()).Times(1);
         EXPECT_CALL(*mock_compositor, stop()).Times(1);
-        EXPECT_CALL(*mock_communicator, stop()).Times(1);
+        EXPECT_CALL(*mock_connector, stop()).Times(1);
     }
 
     mir::run_mir(server_config,
@@ -461,27 +462,27 @@
 
     auto mock_compositor = server_config.the_mock_compositor();
     auto mock_display = server_config.the_mock_display();
-    auto mock_communicator = server_config.the_mock_communicator();
+    auto mock_connector = server_config.the_mock_connector();
     auto mock_input_manager = server_config.the_mock_input_manager();
 
     {
         InSequence s;
 
         /* Start */
-        EXPECT_CALL(*mock_communicator, start()).Times(1);
+        EXPECT_CALL(*mock_connector, start()).Times(1);
         EXPECT_CALL(*mock_compositor, start()).Times(1);
         EXPECT_CALL(*mock_input_manager, start()).Times(1);
 
         /* Pause */
         EXPECT_CALL(*mock_input_manager, stop()).Times(1);
         EXPECT_CALL(*mock_compositor, stop()).Times(1);
-        EXPECT_CALL(*mock_communicator, stop()).Times(1);
+        EXPECT_CALL(*mock_connector, stop()).Times(1);
         EXPECT_CALL(*mock_display, pause()).Times(1);
 
         /* Stop */
         EXPECT_CALL(*mock_input_manager, stop()).Times(1);
         EXPECT_CALL(*mock_compositor, stop()).Times(1);
-        EXPECT_CALL(*mock_communicator, stop()).Times(1);
+        EXPECT_CALL(*mock_connector, stop()).Times(1);
     }
 
     mir::run_mir(server_config,
@@ -505,33 +506,33 @@
 
     auto mock_compositor = server_config.the_mock_compositor();
     auto mock_display = server_config.the_mock_display();
-    auto mock_communicator = server_config.the_mock_communicator();
+    auto mock_connector = server_config.the_mock_connector();
     auto mock_input_manager = server_config.the_mock_input_manager();
 
     {
         InSequence s;
 
         /* Start */
-        EXPECT_CALL(*mock_communicator, start()).Times(1);
+        EXPECT_CALL(*mock_connector, start()).Times(1);
         EXPECT_CALL(*mock_compositor, start()).Times(1);
         EXPECT_CALL(*mock_input_manager, start()).Times(1);
 
         /* Pause failure */
         EXPECT_CALL(*mock_input_manager, stop()).Times(1);
         EXPECT_CALL(*mock_compositor, stop()).Times(1);
-        EXPECT_CALL(*mock_communicator, stop()).Times(1);
+        EXPECT_CALL(*mock_connector, stop()).Times(1);
         EXPECT_CALL(*mock_display, pause())
             .WillOnce(Throw(std::runtime_error("")));
 
         /* Attempt to continue */
-        EXPECT_CALL(*mock_communicator, start()).Times(1);
+        EXPECT_CALL(*mock_connector, start()).Times(1);
         EXPECT_CALL(*mock_compositor, start()).Times(1);
         EXPECT_CALL(*mock_input_manager, start()).Times(1);
 
         /* Stop */
         EXPECT_CALL(*mock_input_manager, stop()).Times(1);
         EXPECT_CALL(*mock_compositor, stop()).Times(1);
-        EXPECT_CALL(*mock_communicator, stop()).Times(1);
+        EXPECT_CALL(*mock_connector, stop()).Times(1);
     }
 
     mir::run_mir(server_config,
@@ -555,7 +556,7 @@
 
     auto mock_compositor = server_config.the_mock_compositor();
     auto mock_display = server_config.the_mock_display();
-    auto mock_communicator = server_config.the_mock_communicator();
+    auto mock_connector = server_config.the_mock_connector();
     auto mock_input_manager = server_config.the_mock_input_manager();
     auto mock_display_changer = server_config.the_mock_display_changer();
 
@@ -563,7 +564,7 @@
         InSequence s;
 
         /* Start */
-        EXPECT_CALL(*mock_communicator, start()).Times(1);
+        EXPECT_CALL(*mock_connector, start()).Times(1);
         EXPECT_CALL(*mock_compositor, start()).Times(1);
         EXPECT_CALL(*mock_input_manager, start()).Times(1);
 
@@ -575,7 +576,7 @@
         /* Stop */
         EXPECT_CALL(*mock_input_manager, stop()).Times(1);
         EXPECT_CALL(*mock_compositor, stop()).Times(1);
-        EXPECT_CALL(*mock_communicator, stop()).Times(1);
+        EXPECT_CALL(*mock_connector, stop()).Times(1);
     }
 
     mir::run_mir(server_config,
@@ -599,7 +600,7 @@
 
     auto mock_compositor = server_config.the_mock_compositor();
     auto mock_display = server_config.the_mock_display();
-    auto mock_communicator = server_config.the_mock_communicator();
+    auto mock_connector = server_config.the_mock_connector();
     auto mock_input_manager = server_config.the_mock_input_manager();
     auto mock_display_changer = server_config.the_mock_display_changer();
 
@@ -607,19 +608,19 @@
         InSequence s;
 
         /* Start */
-        EXPECT_CALL(*mock_communicator, start()).Times(1);
+        EXPECT_CALL(*mock_connector, start()).Times(1);
         EXPECT_CALL(*mock_compositor, start()).Times(1);
         EXPECT_CALL(*mock_input_manager, start()).Times(1);
 
         /* Pause event */
         EXPECT_CALL(*mock_input_manager, stop()).Times(1);
         EXPECT_CALL(*mock_compositor, stop()).Times(1);
-        EXPECT_CALL(*mock_communicator, stop()).Times(1);
+        EXPECT_CALL(*mock_connector, stop()).Times(1);
         EXPECT_CALL(*mock_display, pause()) .Times(1);
 
         /* Resume and reconfigure event */
         EXPECT_CALL(*mock_display, resume()).Times(1);
-        EXPECT_CALL(*mock_communicator, start()).Times(1);
+        EXPECT_CALL(*mock_connector, start()).Times(1);
 
         EXPECT_CALL(*mock_display_changer,
                     configure_for_hardware_change(_, mir::DisplayChanger::RetainSystemState))
@@ -631,7 +632,7 @@
         /* Stop */
         EXPECT_CALL(*mock_input_manager, stop()).Times(1);
         EXPECT_CALL(*mock_compositor, stop()).Times(1);
-        EXPECT_CALL(*mock_communicator, stop()).Times(1);
+        EXPECT_CALL(*mock_connector, stop()).Times(1);
     }
 
     mir::run_mir(server_config,

=== modified file 'tests/integration-tests/test_error_reporting.cpp'
--- tests/integration-tests/test_error_reporting.cpp	2013-08-28 03:41:48 +0000
+++ tests/integration-tests/test_error_reporting.cpp	2013-09-25 14:20:36 +0000
@@ -21,7 +21,7 @@
 
 #include "mir/frontend/protobuf_ipc_factory.h"
 #include "mir/frontend/resource_cache.h"
-#include "mir/frontend/communicator.h"
+#include "mir/frontend/connector.h"
 
 #include "mir_protobuf.pb.h"
 

=== modified file 'tests/mir_test_doubles/test_protobuf_socket_server.cpp'
--- tests/mir_test_doubles/test_protobuf_socket_server.cpp	2013-08-28 03:41:48 +0000
+++ tests/mir_test_doubles/test_protobuf_socket_server.cpp	2013-09-25 14:20:36 +0000
@@ -19,8 +19,9 @@
 #include "mir_test/test_protobuf_server.h"
 #include "mir_test_doubles/stub_ipc_factory.h"
 #include "mir_test_doubles/stub_session_authorizer.h"
-#include "mir/frontend/communicator_report.h"
-#include "src/server/frontend/protobuf_socket_communicator.h"
+#include "mir/frontend/connector_report.h"
+#include "src/server/frontend/published_socket_connector.h"
+#include "src/server/frontend/protobuf_session_creator.h"
 
 namespace mt = mir::test;
 namespace mtd = mir::test::doubles;
@@ -28,15 +29,14 @@
 
 namespace
 {
-std::shared_ptr<mf::Communicator> make_communicator(
+std::shared_ptr<mf::Connector> make_connector(
     std::string const& socket_name,
     std::shared_ptr<mf::ProtobufIpcFactory> const& factory,
-    std::shared_ptr<mf::CommunicatorReport> const& report)
+    std::shared_ptr<mf::ConnectorReport> const& report)
 {
-    return std::make_shared<mf::ProtobufSocketCommunicator>(
+    return std::make_shared<mf::PublishedSocketConnector>(
         socket_name,
-        factory,
-        std::make_shared<mtd::StubSessionAuthorizer>(),
+        std::make_shared<mf::ProtobufSessionCreator>(factory, std::make_shared<mtd::StubSessionAuthorizer>()),
         10,
         []{},
         report);
@@ -46,14 +46,14 @@
 mt::TestProtobufServer::TestProtobufServer(
     std::string const& socket_name,
     const std::shared_ptr<protobuf::DisplayServer>& tool) :
-    TestProtobufServer(socket_name, tool, std::make_shared<mf::NullCommunicatorReport>())
+    TestProtobufServer(socket_name, tool, std::make_shared<mf::NullConnectorReport>())
 {
 }
 
 mt::TestProtobufServer::TestProtobufServer(
     std::string const& socket_name,
     const std::shared_ptr<protobuf::DisplayServer>& tool,
-    std::shared_ptr<frontend::CommunicatorReport> const& report) :
-    comm(make_communicator(socket_name, std::make_shared<mtd::StubIpcFactory>(*tool), report))
+    std::shared_ptr<frontend::ConnectorReport> const& report) :
+    comm(make_connector(socket_name, std::make_shared<mtd::StubIpcFactory>(*tool), report))
 {
 }

=== modified file 'tests/unit-tests/client/test_client_mir_surface.cpp'
--- tests/unit-tests/client/test_client_mir_surface.cpp	2013-08-28 03:41:48 +0000
+++ tests/unit-tests/client/test_client_mir_surface.cpp	2013-09-25 14:20:36 +0000
@@ -30,7 +30,7 @@
 #include "src/client/rpc/mir_basic_rpc_channel.h"
 
 #include "mir/frontend/resource_cache.h"
-#include "mir/frontend/communicator.h"
+#include "mir/frontend/connector.h"
 #include "mir/input/input_platform.h"
 #include "mir/input/input_receiver_thread.h"
 

=== modified file 'tests/unit-tests/frontend/CMakeLists.txt'
--- tests/unit-tests/frontend/CMakeLists.txt	2013-08-28 03:41:48 +0000
+++ tests/unit-tests/frontend/CMakeLists.txt	2013-09-25 14:20:36 +0000
@@ -1,7 +1,7 @@
 list(APPEND UNIT_TEST_SOURCES
   ${CMAKE_CURRENT_SOURCE_DIR}/test_client_buffer_tracker.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/stress_protobuf_communicator.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_protobuf_communicator.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_published_socket_connector.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_protobuf_surface_apis.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_protobuf_reports_errors.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_protobuf_buffer_packer.cpp

=== modified file 'tests/unit-tests/frontend/stress_protobuf_communicator.cpp'
--- tests/unit-tests/frontend/stress_protobuf_communicator.cpp	2013-08-28 03:41:48 +0000
+++ tests/unit-tests/frontend/stress_protobuf_communicator.cpp	2013-09-25 14:20:36 +0000
@@ -16,7 +16,7 @@
  * Authored by: Alan Griffiths <[e-mail]>
  */
 
-#include "mir/frontend/communicator.h"
+#include "mir/frontend/connector.h"
 #include "mir/frontend/resource_cache.h"
 
 #include "mir_protobuf.pb.h"

=== modified file 'tests/unit-tests/frontend/test_protobuf_reports_errors.cpp'
--- tests/unit-tests/frontend/test_protobuf_reports_errors.cpp	2013-06-19 16:14:40 +0000
+++ tests/unit-tests/frontend/test_protobuf_reports_errors.cpp	2013-09-25 14:20:36 +0000
@@ -17,7 +17,7 @@
  *              Alan Griffiths <[e-mail]>
  */
 
-#include "mir/frontend/communicator.h"
+#include "mir/frontend/connector.h"
 #include "mir/frontend/resource_cache.h"
 
 #include "mir_test/stub_server_tool.h"

=== modified file 'tests/unit-tests/frontend/test_protobuf_sends_fds.cpp'
--- tests/unit-tests/frontend/test_protobuf_sends_fds.cpp	2013-06-03 08:14:01 +0000
+++ tests/unit-tests/frontend/test_protobuf_sends_fds.cpp	2013-09-25 14:20:36 +0000
@@ -17,7 +17,7 @@
  *              Alan Griffiths <[e-mail]>
  */
 
-#include "mir/frontend/communicator.h"
+#include "mir/frontend/connector.h"
 #include "mir/frontend/resource_cache.h"
 
 #include "mir_protobuf.pb.h"

=== modified file 'tests/unit-tests/frontend/test_protobuf_surface_apis.cpp'
--- tests/unit-tests/frontend/test_protobuf_surface_apis.cpp	2013-06-03 08:14:01 +0000
+++ tests/unit-tests/frontend/test_protobuf_surface_apis.cpp	2013-09-25 14:20:36 +0000
@@ -17,7 +17,7 @@
  *              Alan Griffiths <[e-mail]>
  */
 
-#include "mir/frontend/communicator.h"
+#include "mir/frontend/connector.h"
 #include "mir/frontend/resource_cache.h"
 
 #include "mir_protobuf.pb.h"

=== renamed file 'tests/unit-tests/frontend/test_protobuf_communicator.cpp' => 'tests/unit-tests/frontend/test_published_socket_connector.cpp'
--- tests/unit-tests/frontend/test_protobuf_communicator.cpp	2013-08-28 03:41:48 +0000
+++ tests/unit-tests/frontend/test_published_socket_connector.cpp	2013-09-25 14:20:36 +0000
@@ -17,10 +17,11 @@
  *              Alan Griffiths <[e-mail]>
  */
 
-#include "mir/frontend/communicator.h"
-#include "mir/frontend/communicator_report.h"
+#include "mir/frontend/connector.h"
+#include "mir/frontend/connector_report.h"
 #include "mir/frontend/resource_cache.h"
-#include "src/server/frontend/protobuf_socket_communicator.h"
+#include "src/server/frontend/published_socket_connector.h"
+#include "src/server/frontend/protobuf_session_creator.h"
 
 #include "mir_protobuf.pb.h"
 
@@ -45,7 +46,7 @@
 
 namespace
 {
-class MockCommunicatorReport : public mf::CommunicatorReport
+class MockCommunicatorReport : public mf::ConnectorReport
 {
 public:
 
@@ -55,20 +56,21 @@
 };
 }
 
-struct ProtobufCommunicator : public ::testing::Test
+struct PublishedSocketConnector : public ::testing::Test
 {
     static void SetUpTestCase()
     {
+    }
+
+    void SetUp()
+    {
         communicator_report = std::make_shared<MockCommunicatorReport>();
         stub_server_tool = std::make_shared<mt::StubServerTool>();
         stub_server = std::make_shared<mt::TestProtobufServer>(
             "./test_socket",
             stub_server_tool,
             communicator_report);
-    }
 
-    void SetUp()
-    {
         using namespace testing;
         EXPECT_CALL(*communicator_report, error(_)).Times(AnyNumber());
         stub_server->comm->start();
@@ -81,27 +83,27 @@
         stub_server->comm->stop();
         testing::Mock::VerifyAndClearExpectations(communicator_report.get());
         client.reset();
-    }
 
-    static void TearDownTestCase()
-    {
         stub_server.reset();
         stub_server_tool.reset();
         communicator_report.reset();
     }
 
+    static void TearDownTestCase()
+    {
+    }
+
     std::shared_ptr<mt::TestProtobufClient> client;
     static std::shared_ptr<MockCommunicatorReport> communicator_report;
     static std::shared_ptr<mt::StubServerTool> stub_server_tool;
-private:
     static std::shared_ptr<mt::TestProtobufServer> stub_server;
 };
 
-std::shared_ptr<mt::StubServerTool> ProtobufCommunicator::stub_server_tool;
-std::shared_ptr<MockCommunicatorReport> ProtobufCommunicator::communicator_report;
-std::shared_ptr<mt::TestProtobufServer> ProtobufCommunicator::stub_server;
+std::shared_ptr<mt::StubServerTool> PublishedSocketConnector::stub_server_tool;
+std::shared_ptr<MockCommunicatorReport> PublishedSocketConnector::communicator_report;
+std::shared_ptr<mt::TestProtobufServer> PublishedSocketConnector::stub_server;
 
-TEST_F(ProtobufCommunicator, create_surface_results_in_a_callback)
+TEST_F(PublishedSocketConnector, create_surface_results_in_a_callback)
 {
     EXPECT_CALL(*client, create_surface_done()).Times(1);
 
@@ -114,7 +116,7 @@
     client->wait_for_create_surface();
 }
 
-TEST_F(ProtobufCommunicator, connection_sets_app_name)
+TEST_F(PublishedSocketConnector, connection_sets_app_name)
 {
     EXPECT_CALL(*client, connect_done()).Times(1);
 
@@ -131,7 +133,7 @@
     EXPECT_EQ(__PRETTY_FUNCTION__, stub_server_tool->app_name);
 }
 
-TEST_F(ProtobufCommunicator, create_surface_sets_surface_name)
+TEST_F(PublishedSocketConnector, create_surface_sets_surface_name)
 {
     EXPECT_CALL(*client, connect_done()).Times(1);
     EXPECT_CALL(*client, create_surface_done()).Times(1);
@@ -160,7 +162,7 @@
 }
 
 
-TEST_F(ProtobufCommunicator,
+TEST_F(PublishedSocketConnector,
         create_surface_results_in_a_surface_being_created)
 {
     EXPECT_CALL(*client, create_surface_done()).Times(1);
@@ -184,7 +186,7 @@
 
 }
 
-TEST_F(ProtobufCommunicator, double_disconnection_attempt_throws_exception)
+TEST_F(PublishedSocketConnector, double_disconnection_attempt_throws_exception)
 {
     using namespace testing;
 
@@ -219,7 +221,7 @@
     }, std::runtime_error);
 }
 
-TEST_F(ProtobufCommunicator, getting_and_advancing_buffers)
+TEST_F(PublishedSocketConnector, getting_and_advancing_buffers)
 {
     EXPECT_CALL(*client, create_surface_done()).Times(testing::AtLeast(0));
     EXPECT_CALL(*client, disconnect_done()).Times(testing::AtLeast(0));
@@ -256,7 +258,7 @@
     client->wait_for_disconnect_done();
 }
 
-TEST_F(ProtobufCommunicator,
+TEST_F(PublishedSocketConnector,
        connect_create_surface_then_disconnect_a_session)
 {
     EXPECT_CALL(*client, create_surface_done()).Times(1);
@@ -278,7 +280,7 @@
     client->wait_for_disconnect_done();
 }
 
-TEST_F(ProtobufCommunicator, drm_auth_magic_is_processed_by_the_server)
+TEST_F(PublishedSocketConnector, drm_auth_magic_is_processed_by_the_server)
 {
     mir::protobuf::DRMMagic magic;
     mir::protobuf::DRMAuthMagicStatus status;
@@ -308,7 +310,7 @@
 
 }
 
-TEST_F(ProtobufCommunicator, forces_requests_to_complete_when_stopping)
+TEST_F(PublishedSocketConnector, forces_requests_to_complete_when_stopping)
 {
     MockForceRequests mock_force_requests;
     auto stub_server_tool = std::make_shared<mt::StubServerTool>();
@@ -318,17 +320,18 @@
     EXPECT_CALL(mock_force_requests, force_requests_to_complete())
         .Times(2);
 
-    auto comms = std::make_shared<mf::ProtobufSocketCommunicator>(
-                    "./test_socket1", ipc_factory, 
-                    std::make_shared<mtd::StubSessionAuthorizer>(), 10,
-                    std::bind(&MockForceRequests::force_requests_to_complete,
-                              &mock_force_requests),
-                    std::make_shared<mf::NullCommunicatorReport>());
+    auto comms = std::make_shared<mf::PublishedSocketConnector>(
+        "./test_socket1",
+        std::make_shared<mf::ProtobufSessionCreator>(ipc_factory, std::make_shared<mtd::StubSessionAuthorizer>()),
+        10,
+        std::bind(&MockForceRequests::force_requests_to_complete, &mock_force_requests),
+        std::make_shared<mf::NullConnectorReport>());
+
     comms->start();
     comms->stop();
 }
 
-TEST_F(ProtobufCommunicator, disorderly_disconnection_handled)
+TEST_F(PublishedSocketConnector, disorderly_disconnection_handled)
 {
     using namespace testing;
 
@@ -363,7 +366,7 @@
     while (!done && cv.wait_until(lock, deadline) != std::cv_status::timeout);
 }
 
-TEST_F(ProtobufCommunicator, configure_display)
+TEST_F(PublishedSocketConnector, configure_display)
 {
     EXPECT_CALL(*client, display_configure_done())
         .Times(1);
@@ -376,3 +379,57 @@
 
     client->wait_for_configure_display_done();
 }
+
+TEST_F(PublishedSocketConnector, connection_using_socket_fd)
+{
+    int const next_buffer_calls{8};
+    char buffer[128] = {0};
+    sprintf(buffer, "fd://%d", stub_server->comm->client_socket_fd());
+    auto client = std::make_shared<mt::TestProtobufClient>(buffer, 100);
+    client->connect_parameters.set_application_name(__PRETTY_FUNCTION__);
+
+    EXPECT_CALL(*client, connect_done()).Times(1);
+
+    client->display_server.connect(
+        0,
+        &client->connect_parameters,
+        &client->connection,
+        google::protobuf::NewCallback(client.get(), &mt::TestProtobufClient::connect_done));
+
+    EXPECT_CALL(*client, create_surface_done()).Times(testing::AtLeast(0));
+    EXPECT_CALL(*client, disconnect_done()).Times(testing::AtLeast(0));
+
+    client->display_server.create_surface(
+        0,
+        &client->surface_parameters,
+        &client->surface,
+        google::protobuf::NewCallback(client.get(), &mt::TestProtobufClient::create_surface_done));
+
+    client->wait_for_create_surface();
+
+    EXPECT_TRUE(client->surface.has_buffer());
+    EXPECT_CALL(*client, next_buffer_done()).Times(next_buffer_calls);
+
+    for (int i = 0; i != next_buffer_calls; ++i)
+    {
+        client->display_server.next_buffer(
+            0,
+            &client->surface.id(),
+            client->surface.mutable_buffer(),
+            google::protobuf::NewCallback(client.get(), &mt::TestProtobufClient::next_buffer_done));
+
+        client->wait_for_next_buffer();
+        EXPECT_TRUE(client->surface.has_buffer());
+    }
+
+    client->display_server.disconnect(
+        0,
+        &client->ignored,
+        &client->ignored,
+        google::protobuf::NewCallback(client.get(), &mt::TestProtobufClient::disconnect_done));
+
+    client->wait_for_disconnect_done();
+
+    EXPECT_EQ(__PRETTY_FUNCTION__, stub_server_tool->app_name);
+}
+