X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fserver%2Fserver.h;h=2bfedb490ab43b5a976238d50d845ffd84eeb8b9;hp=2dba3dabe9e0c3ee82bf505c82b884612a62fc1d;hb=8775a0f6638d966b6ef135b488da6efb954e2573;hpb=8b994145b849c40b0a195c3fb332b9770b2f9097

diff --git a/src/server/server.h b/src/server/server.h
index 2dba3dabe9..2bfedb490a 100644
--- a/src/server/server.h
+++ b/src/server/server.h
@@ -43,7 +43,7 @@ typedef struct connection_s
 	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;
@@ -53,7 +53,7 @@ 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 struct service_s
+struct service
 {
 	char *name;
 	enum connection_type type;
@@ -66,14 +66,31 @@ typedef struct service_s
 	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)
 
-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);
+SERVER_PORT_COMMAND();
 
 extern int server_use_pipes;