X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fserver%2Fserver.h;h=34c870aabc4a836e07d65ac0225f8b5a63d482f7;hp=34cf1cf0aae2d14439bf98f0c52bd69302371969;hb=5087a9554851cd7e1d33d13deb0f5d35b89369f6;hpb=4f9a9b8ebae8425eda3a71ccb782789cd3b8f6b7

diff --git a/src/server/server.h b/src/server/server.h
index 34cf1cf0aa..34c870aabc 100644
--- a/src/server/server.h
+++ b/src/server/server.h
@@ -21,8 +21,9 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
+
 #ifndef SERVER_H
 #define SERVER_H
 
@@ -32,17 +33,15 @@
 #include <netinet/in.h>
 #endif
 
-enum connection_type
-{
+enum connection_type {
 	CONNECTION_TCP,
 	CONNECTION_PIPE,
 	CONNECTION_STDINOUT
 };
 
-struct connection
-{
+struct connection {
 	int fd;
-	int fd_out; /* When using pipes we're writing to a different 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;
@@ -55,11 +54,10 @@ 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);
 
-struct service
-{
-	const char *name;
+struct service {
+	char *name;
 	enum connection_type type;
-	const char *port;
+	char *port;
 	unsigned short portnumber;
 	int fd;
 	struct sockaddr_in sin;
@@ -80,6 +78,7 @@ int add_service(char *name, const char *port,
 int server_preinit(void);
 int server_init(struct command_context *cmd_ctx);
 int server_quit(void);
+void exit_on_signal(int);
 
 int server_loop(struct command_context *command_context);
 
@@ -89,11 +88,11 @@ 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 or ecosboard.c
+ * Used by server_loop(), defined in server_stubs.c
  */
 void openocd_sleep_prelude(void);
 /**
- * Used by server_loop(), defined in server_stubs.c or ecosboard.c
+ * Used by server_loop(), defined in server_stubs.c
  */
 void openocd_sleep_postlude(void);
 
@@ -103,16 +102,11 @@ 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.
  */
-#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)
+COMMAND_HELPER(server_pipe_command, char **out);
 
-SERVER_PORT_COMMAND();
+COMMAND_HELPER(server_port_command, unsigned short *out);
 
-#define ERROR_SERVER_REMOTE_CLOSED	(-400)
-#define ERROR_CONNECTION_REJECTED	(-401)
+#define ERROR_SERVER_REMOTE_CLOSED		(-400)
+#define ERROR_CONNECTION_REJECTED		(-401)
 
-#endif /* SERVER_H */
+#endif	/* SERVER_H */