Fix a bunch of typos.

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

diff --git a/src/server/server.h b/src/server/server.h
index be1afbe4083d9cb8637453ed39eac5246c87bb4a..34cf1cf0aae2d14439bf98f0c52bd69302371969 100644 (file)
--- a/src/server/server.h
+++ b/src/server/server.h
@@ -35,12 +35,14 @@
 enum connection_type
 {
        CONNECTION_TCP,
 enum connection_type
 {
        CONNECTION_TCP,

-       CONNECTION_PIPE
+       CONNECTION_PIPE,
+       CONNECTION_STDINOUT

 };
 
 struct connection
 {
        int fd;
 };
 
 struct connection
 {
        int fd;

+       int fd_out; /* When using pipes we're writing to a different fd */

        struct sockaddr_in sin;
        struct command_context *cmd_ctx;
        struct service *service;
        struct sockaddr_in sin;
        struct command_context *cmd_ctx;
        struct service *service;


@@ -55,9 +57,10 @@ typedef int (*connection_closed_handler_t)(struct connection *connection);
 
 struct service
 {
 
 struct service
 {

-       char *name;
+       const char *name;

        enum connection_type type;
        enum connection_type type;

-       unsigned short port;
+       const char *port;
+       unsigned short portnumber;

        int fd;
        struct sockaddr_in sin;
        int max_connections;
        int fd;
        struct sockaddr_in sin;
        int max_connections;


@@ -69,11 +72,12 @@ struct service
        struct service *next;
 };
 
        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 max_connections, new_connection_handler_t new_connection_handler,
                input_handler_t in_handler, connection_closed_handler_t close_handler,
                void *priv);
 

+int server_preinit(void);

 int server_init(struct command_context *cmd_ctx);
 int server_quit(void);
 
 int server_init(struct command_context *cmd_ctx);
 int server_quit(void);
 


@@ -81,12 +85,15 @@ int server_loop(struct command_context *command_context);
 
 int server_register_commands(struct command_context *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
+ * Used by server_loop(), defined in server_stubs.c or ecosboard.c

  */
 void openocd_sleep_prelude(void);
 /**
  */
 void openocd_sleep_prelude(void);
 /**

- * Used by server_loop(), defined in server_stubs.c, httpd.c, or ecosboard.c
+ * Used by server_loop(), defined in server_stubs.c or ecosboard.c

  */
 void openocd_sleep_postlude(void);
 
  */
 void openocd_sleep_postlude(void);
 


@@ -96,13 +103,15 @@ void openocd_sleep_postlude(void);
  * Call server_port like a normal COMMAND_HANDLER with an extra @a out parameter
  * to receive the specified port number.
  */
  * 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)
 
 SERVER_PORT_COMMAND();
 
 #define SERVER_PORT_COMMAND() \
                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)