X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fserver%2Fserver.h;h=5e862815bb1eadd465b4647e50b1df355f557747;hb=6e95f16d0a7d2b07caa1340b3bc3c2309ea12043;hp=dab28eca3dfe09bd47d8946f5e24e810a4415545;hpb=ae5732b9e4f085b89da3f9ce07eb526e159e1937;p=openocd.git

diff --git a/src/server/server.h b/src/server/server.h
index dab28eca3d..5e862815bb 100644
--- 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 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);
 
-typedef struct service_s
+struct service
 {
 	char *name;
 	enum connection_type type;
@@ -61,22 +61,36 @@ 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(struct command_context *command_context);
+
+int server_register_commands(struct command_context *context);
 
-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(void);
-extern int server_quit(void);
-extern int server_loop(command_context_t *command_context);
-extern 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)
 
-int server_port_command(struct command_context_s *cmd_ctx,
-		char *cmd, char **args, int argc, unsigned short *port);
+SERVER_PORT_COMMAND();
 
 extern int server_use_pipes;