Split secure command channel and untrusted application channel

src/trusted/service_runtime/nacl_secure_service.h

Index: src/trusted/service_runtime/nacl_secure_service.h
diff --git a/src/trusted/service_runtime/nacl_secure_service.h b/src/trusted/service_runtime/nacl_secure_service.h
new file mode 100644
index 0000000000000000000000000000000000000000..10fd7ba022c75a84c94d0ae6ccbaf4f250901641
--- /dev/null
+++ b/src/trusted/service_runtime/nacl_secure_service.h
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2012 The Native Client Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef NATIVE_CLIENT_SRC_TRUSTED_SERVICE_RUNTIME_NACL_SECURE_SERVICE_H_
+#define NATIVE_CLIENT_SRC_TRUSTED_SERVICE_RUNTIME_NACL_SECURE_SERVICE_H_
+
+#include "native_client/src/include/nacl_base.h"
+#include "native_client/src/trusted/service_runtime/sel_ldr.h"
+#include "native_client/src/trusted/simple_service/nacl_simple_service.h"
+#include "native_client/src/trusted/simple_service/nacl_simple_rservice.h"
+
+EXTERN_C_BEGIN
+
+struct NaClApp;
+
+/*
+ * Secure channel.
+ */
+
+struct NaClSecureService {
+  struct NaClSimpleService    base NACL_IS_REFCOUNT_SUBCLASS;
+  struct NaClApp              *nap;
+
+  struct NaClMutex            mu;
+  struct NaClCondVar          cv;

[bsy, 2012/09/26 03:35:33]

remove cv

[Petr Hosek, 2012/09/26 04:22:21]

Removed.

+  /*
+   * |mu| protects the thread count access.
+   */
+  uint32_t                    thread_count;
+};
+
+int NaClSecureServiceCtor(
+    struct NaClSecureService          *self,
+    struct NaClSrpcHandlerDesc const  *srpc_handlers,
+    struct NaClApp                    *nap,
+    struct NaClDesc                   *service_port,
+    struct NaClDesc                   *sock_addr);
+
+void NaClSecureServiceDtor(struct NaClRefCount *vself);
+
+struct NaClSecureServiceVtbl {
+  struct NaClSimpleServiceVtbl  vbase;
+
+  void                          (*WaitForServiceThreadsToExit)(

[bsy, 2012/09/26 03:35:33]

remove this method

[Petr Hosek, 2012/09/26 04:22:21]

Removed.

+      struct NaClSecureService  *self);
+
+  void                          (*ThreadCountIncr)(

[bsy, 2012/09/26 03:35:33]

not clear if these two really need to be virtual functions rather than
non-virtual, but it's okay as is.

[Petr Hosek, 2012/09/26 04:22:21]

Turned into non-virtual, dropped NaClSecureServiceVtbl and used
NaClSimpleServiceVtbl instead.

+      struct NaClSecureService  *self);
+
+  void                          (*ThreadCountDecr)(
+      struct NaClSecureService  *self);
+};
+
+extern struct NaClSecureServiceVtbl const kNaClSecureServiceVtbl;
+
+struct NaClSecureRevClientConnHandler;  /* fwd */
+
+struct NaClSecureReverseClient {
+  struct NaClSimpleRevClient              base;
+  struct NaClApp                          *nap;
+
+  struct NaClMutex                        mu;
+  /*
+   * |mu| protects the service entries hanging off of |queue_head|.
+   */
+  struct NaClSecureRevClientConnHandler   *queue_head;
+  struct NaClSecureRevClientConnHandler   **queue_insert;
+};
+
+struct NaClSecureReverseClientVtbl {
+  struct NaClSimpleRevClientVtbl  vbase;
+
+  int                             (*InsertHandler)(
+      struct NaClSecureReverseClient *self,
+      void                           (*handler)(
+          void                                  *handler_state,
+          struct NaClThreadInterface            *thread_id,
+          struct NaClDesc                       *new_conn),
+      void                           *state);
+
+  struct NaClSecureRevClientConnHandler   *(*RemoveHandler)(
+     struct NaClSecureReverseClient *self);
+};
+
+int NaClSecureReverseClientCtor(
+    struct NaClSecureReverseClient *self,
+    void                            (*client_callback)(
+        void *, struct NaClThreadInterface *, struct NaClDesc *),
+    void                            *state,
+    struct NaClApp                  *nap);
+
+void NaClSecureReverseClientDtor(struct NaClRefCount *vself);
+
+int NaClSecureReverseClientInsertHandler(
+    struct NaClSecureReverseClient  *self,
+    void                            (*handler)(
+        void                                   *handler_state,
+        struct NaClThreadInterface             *thread_if,
+        struct NaClDesc                        *new_conn),
+    void                            *state) NACL_WUR;
+
+struct NaClSecureRevClientConnHandler *NaClSecureReverseClientRemoveHandler(
+    struct NaClSecureReverseClient *self);
+
+extern struct NaClSecureReverseClientVtbl const kNaClSecureReverseClientVtbl;
+
+EXTERN_C_END
+
+#endif /* NATIVE_CLIENT_SRC_TRUSTED_SERVICE_RUNTIME_NACL_SECURE_SERVICE_H_ */