X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fserver%2Fserver.h;h=8c80626759eb199a17aeedaf27cb7926b58061ed;hp=face13867fabdadb084114d85a4bbf6fe8fa5340;hb=a4df0e02b2853be00ebcbcca81f39c99ae2b854c;hpb=50d5441e2a615fb2c44b41a777e4373901f7a2e6;ds=sidebyside
diff --git a/src/server/server.h b/src/server/server.h
index face13867f..8c80626759 100644
--- a/src/server/server.h
+++ b/src/server/server.h
@@ -19,12 +19,15 @@
* GNU General Public License for more details. *
* *
* 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. *
+ * along with this program. If not, see . *
***************************************************************************/
-#ifndef SERVER_H
-#define SERVER_H
+
+#ifndef OPENOCD_SERVER_SERVER_H
+#define OPENOCD_SERVER_SERVER_H
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
#include
@@ -32,17 +35,17 @@
#include
#endif
-enum connection_type
-{
+enum connection_type {
CONNECTION_TCP,
CONNECTION_PIPE,
CONNECTION_STDINOUT
};
-struct connection
-{
+#define CONNECTION_LIMIT_UNLIMITED (-1)
+
+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 +58,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
-{
+struct service {
char *name;
enum connection_type type;
- const char *port;
+ char *port;
unsigned short portnumber;
int fd;
struct sockaddr_in sin;
@@ -80,6 +82,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 +92,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, httpd.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, httpd.c, or ecosboard.c
+ * Used by server_loop(), defined in server_stubs.c
*/
void openocd_sleep_postlude(void);
@@ -103,16 +106,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 /* OPENOCD_SERVER_SERVER_H */