connection_t -> struct connection

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

diff --git a/src/server/server.h b/src/server/server.h
index d4f1b6b5a5ce47627253aec0a78713a777acef16..062691b0a2c5be1df5ad854f8e26b7c9944c2f91 100644 (file)
--- a/src/server/server.h
+++ b/src/server/server.h
@@ -38,22 +38,22 @@ enum connection_type
        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;
@@ -61,13 +61,13 @@ 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,
@@ -81,8 +81,16 @@ int server_loop(command_context_t *command_context);
 
 int server_register_commands(command_context_t *context);
 
-int server_port_command(struct command_context_s *cmd_ctx,
-               char *cmd, char **args, int argc, unsigned short *port);
+/**
+ * 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 server_use_pipes;