X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fserver%2Fserver.h;h=bbcfdc0fafb045c04968bd42f84081604d533e5d;hb=c58c24c42f91b5a2c2ad138db12f1ec1ef16b270;hp=2bfedb490ab43b5a976238d50d845ffd84eeb8b9;hpb=8775a0f6638d966b6ef135b488da6efb954e2573;p=openocd.git

diff --git a/src/server/server.h b/src/server/server.h
index 2bfedb490a..bbcfdc0faf 100644
--- a/src/server/server.h
+++ b/src/server/server.h
@@ -23,45 +23,46 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+
 #ifndef SERVER_H
 #define SERVER_H
 
-#include "log.h"
+#include <helper/log.h>
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
 
-enum connection_type
-{
+enum connection_type {
 	CONNECTION_TCP,
-	CONNECTION_PIPE
+	CONNECTION_PIPE,
+	CONNECTION_STDINOUT
 };
 
-typedef struct connection_s
-{
+struct connection {
 	int fd;
+	int fd_out;	/* When using pipes we're writing to a different fd */
 	struct sockaddr_in sin;
-	command_context_t *cmd_ctx;
+	struct command_context *cmd_ctx;
 	struct service *service;
 	int input_pending;
 	void *priv;
-	struct connection_s *next;
-} connection_t;
+	struct connection *next;
+};
 
-typedef int (*new_connection_handler_t)(connection_t *connection);
-typedef int (*input_handler_t)(connection_t *connection);
-typedef int (*connection_closed_handler_t)(connection_t *connection);
+typedef int (*new_connection_handler_t)(struct connection *connection);
+typedef int (*input_handler_t)(struct connection *connection);
+typedef int (*connection_closed_handler_t)(struct connection *connection);
 
-struct service
-{
-	char *name;
+struct service {
+	const char *name;
 	enum connection_type type;
-	unsigned short port;
+	const char *port;
+	unsigned short portnumber;
 	int fd;
 	struct sockaddr_in sin;
 	int max_connections;
-	connection_t *connections;
+	struct connection *connections;
 	new_connection_handler_t new_connection;
 	input_handler_t input;
 	connection_closed_handler_t connection_closed;
@@ -69,17 +70,30 @@ struct service
 	struct service *next;
 };
 
-int add_service(char *name, enum connection_type type, unsigned short 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);
 
-int server_init(void);
+int server_preinit(void);
+int server_init(struct command_context *cmd_ctx);
 int server_quit(void);
 
-int server_loop(command_context_t *command_context);
+int server_loop(struct command_context *command_context);
+
+int server_register_commands(struct command_context *context);
 
-int server_register_commands(command_context_t *context);
+int connection_write(struct connection *connection, const void *data, int len);
+int connection_read(struct connection *connection, void *data, int len);
+
+/**
+ * Used by server_loop(), defined in server_stubs.c
+ */
+void openocd_sleep_prelude(void);
+/**
+ * Used by server_loop(), defined in server_stubs.c
+ */
+void openocd_sleep_postlude(void);
 
 /**
  * Defines an extended command handler function declaration to enable
@@ -87,14 +101,16 @@ int server_register_commands(command_context_t *context);
  * Call server_port like a normal COMMAND_HANDLER with an extra @a out parameter
  * to receive the specified port number.
  */
+#define SERVER_PIPE_COMMAND() \
+	COMMAND_HELPER(server_pipe_command, const char **out)
+SERVER_PIPE_COMMAND();
+
 #define SERVER_PORT_COMMAND() \
-		COMMAND_HELPER(server_port_command, unsigned short *out)
+	COMMAND_HELPER(server_port_command, unsigned short *out)
 
 SERVER_PORT_COMMAND();
 
-extern int server_use_pipes;
-
-#define ERROR_SERVER_REMOTE_CLOSED	(-400)
-#define ERROR_CONNECTION_REJECTED	(-401)
+#define ERROR_SERVER_REMOTE_CLOSED		(-400)
+#define ERROR_CONNECTION_REJECTED		(-401)
 
-#endif /* SERVER_H */
+#endif	/* SERVER_H */