diff options
| author | Øyvind Harboe <oyvind.harboe@zylin.com> | 2010-09-27 08:50:49 +0200 |
|---|---|---|
| committer | Øyvind Harboe <oyvind.harboe@zylin.com> | 2010-10-01 10:26:08 +0200 |
| commit | 50d5441e2a615fb2c44b41a777e4373901f7a2e6 (patch) | |
| tree | 20f11272f6cdf5646b086ffa014808f372906b0b /src/server/server.h | |
| parent | 6c137a2fc0bf53b9c0b8eda51e6f5361552b0112 (diff) | |
| download | openocd+libswd-50d5441e2a615fb2c44b41a777e4373901f7a2e6.tar.gz openocd+libswd-50d5441e2a615fb2c44b41a777e4373901f7a2e6.tar.bz2 openocd+libswd-50d5441e2a615fb2c44b41a777e4373901f7a2e6.tar.xz openocd+libswd-50d5441e2a615fb2c44b41a777e4373901f7a2e6.zip | |
server: add support for pipes
-p/--pipe is now deprecated. Use '-c "gdb_port pipe;log_output openocd.log"'
instead. Warning logged.
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
Diffstat (limited to 'src/server/server.h')
| -rw-r--r-- | src/server/server.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/server/server.h b/src/server/server.h index 2c9ed445..face1386 100644 --- a/src/server/server.h +++ b/src/server/server.h @@ -35,7 +35,8 @@ enum connection_type { CONNECTION_TCP, - CONNECTION_PIPE + CONNECTION_PIPE, + CONNECTION_STDINOUT }; struct connection @@ -58,7 +59,8 @@ struct service { char *name; enum connection_type type; - unsigned short port; + const char *port; + unsigned short portnumber; int fd; struct sockaddr_in sin; int max_connections; @@ -70,12 +72,7 @@ struct service struct service *next; }; -int add_service(char *name, enum connection_type type, unsigned short port, - int max_connections, new_connection_handler_t new_connection_handler, - input_handler_t in_handler, connection_closed_handler_t close_handler, - void *priv); - -int add_service_pipe(char *name, const char *port, +int add_service(char *name, const char *port, int max_connections, new_connection_handler_t new_connection_handler, input_handler_t in_handler, connection_closed_handler_t close_handler, void *priv); @@ -115,8 +112,6 @@ SERVER_PIPE_COMMAND(); SERVER_PORT_COMMAND(); -extern int server_use_pipes; - #define ERROR_SERVER_REMOTE_CLOSED (-400) #define ERROR_CONNECTION_REJECTED (-401) |