* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+
#ifndef SERVER_H
#define SERVER_H
#include <netinet/in.h>
#endif
-enum connection_type
-{
+enum connection_type {
CONNECTION_TCP,
- CONNECTION_PIPE
+ 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;
typedef int (*input_handler_t)(struct connection *connection);
typedef int (*connection_closed_handler_t)(struct connection *connection);
-struct service
-{
- char *name;
+struct service {
+ const char *name;
enum connection_type type;
- unsigned short port;
+ const char *port;
+ unsigned short portnumber;
int fd;
struct sockaddr_in sin;
int max_connections;
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 add_service_pipe(char *name, const char *port,
+int add_service(char *name, const char *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 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);
* to receive the specified port number.
*/
#define SERVER_PIPE_COMMAND() \
- COMMAND_HELPER(server_pipe_command, const char **out)
+ 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_port_command, unsigned short *out)
SERVER_PORT_COMMAND();
-extern int server_use_pipes;
-
-#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 */