Merge pull request #240 from chris-turner137/master

Added method accept() to TwoPartyServer for servicing arbitrary AsyncIoStreams.

c++/src/capnp/rpc-twoparty.c++

@@ -159,15 +159,19 @@ struct TwoPartyServer::AcceptedConnection {
         rpcSystem(makeRpcServer(network, kj::mv(bootstrapInterface))) {}
 };
 
-kj::Promise<void> TwoPartyServer::listen(kj::ConnectionReceiver& listener) {
-  return listener.accept()
-      .then([this,&listener](kj::Own<kj::AsyncIoStream>&& connection) mutable {
+void TwoPartyServer::accept(kj::Own<kj::AsyncIoStream>&& connection)
+{
   auto connectionState = kj::heap<AcceptedConnection>(bootstrapInterface, kj::mv(connection));
 
   // Run the connection until disconnect.
   auto promise = connectionState->network.onDisconnect();
   tasks.add(promise.attach(kj::mv(connectionState)));
+}
 
+kj::Promise<void> TwoPartyServer::listen(kj::ConnectionReceiver& listener) {
+  return listener.accept()
+      .then([this,&listener](kj::Own<kj::AsyncIoStream>&& connection) mutable {
+    accept(kj::mv(connection));
     return listen(listener);
   });
 }

c++/src/capnp/rpc-twoparty.h

@@ -119,6 +119,9 @@ class TwoPartyServer: private kj::TaskSet::ErrorHandler {
 public:
   explicit TwoPartyServer(Capability::Client bootstrapInterface);
 
+  void accept(kj::Own<kj::AsyncIoStream>&& connection);
+  // Accepts the connection for servicing.
+
   kj::Promise<void> listen(kj::ConnectionReceiver& listener);
   // Listens for connections on the given listener. The returned promise never resolves unless an
   // exception is thrown while trying to accept. You may discard the returned promise to cancel