connection_t -> struct connection

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

diff --git a/src/server/server.h b/src/server/server.h
index 2543f22f8d013eab1c465d497889982e560b2ec1..062691b0a2c5be1df5ad854f8e26b7c9944c2f91 100644 (file)
--- a/src/server/server.h
+++ b/src/server/server.h
@@ -2,6 +2,12 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   oyvind.harboe@zylin.com                                               *
+ *                                                                         *
+ *   Copyright (C) 2008 by Spencer Oliver                                  *
+ *   spen@spen-soft.co.uk                                                  *
+ *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
@@ -20,35 +26,34 @@
 #ifndef SERVER_H
 #define SERVER_H
 
-#include "command.h"
-#include "binarybuffer.h"
-#include "replacements.h"
+#include "log.h"
 
-#include <sys/types.h>
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
 
 enum connection_type
 {
-       CONNECTION_GDB,
-       CONNECTION_TELNET,
-       CONNECTION_TCL,
+       CONNECTION_TCP,
+       CONNECTION_PIPE
 };
 
-typedef struct connection_s
+struct connection
 {
        int fd;
        struct sockaddr_in sin;
        command_context_t *cmd_ctx;
-       struct service_s *service;
+       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);
 
-typedef struct service_s
+struct service
 {
        char *name;
        enum connection_type type;
@@ -56,19 +61,38 @@ typedef struct service_s
        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;
        void *priv;
-       struct service_s *next;
-} service_t;
+       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 server_init(void);
+int server_quit(void);
+
+int server_loop(command_context_t *command_context);
+
+int server_register_commands(command_context_t *context);
+
+/**
+ * Defines an extended command handler function declaration to enable
+ * access to (and manipulation of) the server port number.
+ * Call server_port like a normal COMMAND_HANDLER with an extra @a out parameter
+ * to receive the specified port number.
+ */
+#define SERVER_PORT_COMMAND() \
+               COMMAND_HELPER(server_port_command, unsigned short *out)
+
+SERVER_PORT_COMMAND();
 
-extern 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 input_handler, connection_closed_handler_t connection_closed_handler, void *priv);
-extern int server_init();
-extern int server_quit();
-extern int server_loop(command_context_t *command_context);
-extern int server_register_commands(command_context_t *context);
+extern int server_use_pipes;
 
 #define ERROR_SERVER_REMOTE_CLOSED     (-400)
 #define ERROR_CONNECTION_REJECTED      (-401)