server: read/write now goes through connection fn's

[openocd.git] / src / server / server.h

diff --git a/src/server/server.h b/src/server/server.h
index 062691b0a2c5be1df5ad854f8e26b7c9944c2f91..46188bb44e2a91916ba862bbfaa20ebfaff0a1ef 100644 (file)
--- a/src/server/server.h
+++ b/src/server/server.h
@@ -26,7 +26,7 @@
 #ifndef SERVER_H
 #define SERVER_H
 
-#include "log.h"
+#include <helper/log.h>
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
@@ -41,8 +41,9 @@ enum connection_type
 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;
@@ -74,12 +75,25 @@ int add_service(char *name, enum connection_type type, unsigned short port,
                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(command_context_t *context);
+int server_register_commands(struct command_context *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, httpd.c, or ecosboard.c
+ */
+void openocd_sleep_prelude(void);
+/**
+ * Used by server_loop(), defined in server_stubs.c, httpd.c, or ecosboard.c
+ */
+void openocd_sleep_postlude(void);
 
 /**
  * Defines an extended command handler function declaration to enable