| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2012 The Native Client Authors. All rights reserved. | 2 * Copyright (c) 2012 The Native Client Authors. All rights reserved. |
| 3 * Use of this source code is governed by a BSD-style license that can be | 3 * Use of this source code is governed by a BSD-style license that can be |
| 4 * found in the LICENSE file. | 4 * found in the LICENSE file. |
| 5 */ | 5 */ |
| 6 | 6 |
| 7 #ifndef NATIVE_CLIENT_SRC_PUBLIC_CHROME_MAIN_H_ | 7 #ifndef NATIVE_CLIENT_SRC_PUBLIC_CHROME_MAIN_H_ |
| 8 #define NATIVE_CLIENT_SRC_PUBLIC_CHROME_MAIN_H_ 1 | 8 #define NATIVE_CLIENT_SRC_PUBLIC_CHROME_MAIN_H_ 1 |
| 9 | 9 |
| 10 #include "native_client/src/include/build_config.h" | 10 #include "native_client/src/include/build_config.h" |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 * | 106 * |
| 107 * This is intended for security hardening. It reduces the | 107 * This is intended for security hardening. It reduces the |
| 108 * proportion of address space that can contain attacker-controlled | 108 * proportion of address space that can contain attacker-controlled |
| 109 * executable code. It reduces the chance of a spraying attack | 109 * executable code. It reduces the chance of a spraying attack |
| 110 * succeeding if there is a vulnerability that allows jumping into | 110 * succeeding if there is a vulnerability that allows jumping into |
| 111 * the middle of an instruction. Note that setting a limit here is | 111 * the middle of an instruction. Note that setting a limit here is |
| 112 * only useful if enable_dyncode_syscalls is false. | 112 * only useful if enable_dyncode_syscalls is false. |
| 113 */ | 113 */ |
| 114 uint32_t initial_nexe_max_code_bytes; | 114 uint32_t initial_nexe_max_code_bytes; |
| 115 | 115 |
| 116 #if NACL_LINUX || NACL_OSX |
| 117 /* |
| 118 * Server socket that will be used by debug stub to accept connections |
| 119 * from NaCl GDB. This socket descriptor has already had bind() and listen() |
| 120 * called on it. Optional; may be -1. |
| 121 * TODO(leslieb): Deprecated when debug_stub_pipe_fd is fully implemented in |
| 122 * chrome. |
| 123 */ |
| 124 int debug_stub_server_bound_socket_fd; |
| 125 |
| 116 /* | 126 /* |
| 117 * Socketpair fd sent from the embedder. This will be used to send information | 127 * Socketpair fd sent from the embedder. This will be used to send information |
| 118 * between a server socket set up in the embedder and the debug stub. | 128 * between a server socket set up in the embedder and the debug stub. |
| 119 * | 129 * |
| 120 * Since the embedder needs to notify the debug stub of disconnects on the | 130 * Since the embedder needs to notify the debug stub of disconnects on the |
| 121 * server socket, each chunk of data is prepended with a 4 byte length. A | 131 * server socket, each chunk of data is prepended with a 4 byte length. A |
| 122 * length of -1 signifies a disconnect on the embedder side. There is no | 132 * length of -1 signifies a disconnect on the embedder side. There is no |
| 123 * extra encoding on data going from debug stub to the embedder. | 133 * extra encoding on data going from debug stub to the embedder. |
| 124 * Optional; may be -1. This will be used over | 134 * Optional; may be -1. This will be used over |
| 125 * debug_stub_server_bound_socket_fd if both are set. | 135 * debug_stub_server_bound_socket_fd if both are set. |
| 126 */ | 136 */ |
| 127 NaClHandle debug_stub_pipe_fd; | 137 int debug_stub_pipe_fd; |
| 128 | |
| 129 #if NACL_LINUX || NACL_OSX | |
| 130 /* | |
| 131 * Server socket that will be used by debug stub to accept connections | |
| 132 * from NaCl GDB. This socket descriptor has already had bind() and listen() | |
| 133 * called on it. Optional; may be -1. | |
| 134 * TODO(leslieb): Deprecated when debug_stub_pipe_fd is fully implemented in | |
| 135 * chrome. | |
| 136 */ | |
| 137 int debug_stub_server_bound_socket_fd; | |
| 138 #endif | 138 #endif |
| 139 | 139 |
| 140 #if NACL_WINDOWS | 140 #if NACL_WINDOWS |
| 141 /* | 141 /* |
| 142 * Callback called when debug stub port is known. Optional; may be NULL. | 142 * Callback called when debug stub port is known. Optional; may be NULL. |
| 143 * TODO(leslieb): Deprecated when debug_stub_pipe_fd is fully implemented in | |
| 144 * chrome. | |
| 145 */ | 143 */ |
| 146 void (*debug_stub_server_port_selected_handler_func)(uint16_t port); | 144 void (*debug_stub_server_port_selected_handler_func)(uint16_t port); |
| 147 #endif | 145 #endif |
| 148 | 146 |
| 149 /* | 147 /* |
| 150 * Callback to use for creating shared memory objects. Optional; | 148 * Callback to use for creating shared memory objects. Optional; |
| 151 * may be NULL. | 149 * may be NULL. |
| 152 */ | 150 */ |
| 153 NaClCreateMemoryObjectFunc create_memory_object_func; | 151 NaClCreateMemoryObjectFunc create_memory_object_func; |
| 154 | 152 |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 272 * exit status. | 270 * exit status. |
| 273 * | 271 * |
| 274 * This is safer than exit(), which does some teardown that can cause running | 272 * This is safer than exit(), which does some teardown that can cause running |
| 275 * threads to crash. | 273 * threads to crash. |
| 276 */ | 274 */ |
| 277 void NaClExit(int code); | 275 void NaClExit(int code); |
| 278 | 276 |
| 279 EXTERN_C_END | 277 EXTERN_C_END |
| 280 | 278 |
| 281 #endif | 279 #endif |
| OLD | NEW |