#include "server.h"
#include <target/target.h>
+#include <target/target_request.h>
#include "openocd.h"
#include "tcl_server.h"
#include "telnet_server.h"
/* shutdown_openocd == 1: exit the main event loop, and quit the debugger */
static int shutdown_openocd = 0;
-/* set when using pipes rather than tcp */
-int server_use_pipes = 0;
-
static int add_connection(struct service *service, struct command_context *cmd_ctx)
{
socklen_t address_size;
c->fd_out = c->fd;
/* This increases performance dramatically for e.g. GDB load which
- * does not have a sliding window protocol. */
- retval = setsockopt(c->fd, /* socket affected */
+ * does not have a sliding window protocol.
+ *
+ * Ignore errors from this fn as it probably just means less performance
+ */
+ setsockopt(c->fd, /* socket affected */
IPPROTO_TCP, /* set option at TCP level */
TCP_NODELAY, /* name of option */
(char *)&flag, /* the cast is historical cruft */
sizeof(int)); /* length of option value */
- LOG_INFO("accepting '%s' connection from %i", service->name, service->port);
+ LOG_INFO("accepting '%s' connection from %s", service->name, service->port);
if ((retval = service->new_connection(c)) != ERROR_OK)
{
close_socket(c->fd);
free(c);
return retval;
}
- }
- else if (service->type == CONNECTION_PIPE)
+ } else if (service->type == CONNECTION_STDINOUT)
{
c->fd = service->fd;
c->fd_out = fileno(stdout);
+#ifdef _WIN32
+ /* we are using stdin/out so ignore ctrl-c under windoze */
+ SetConsoleCtrlHandler(NULL, TRUE);
+#endif
+
/* do not check for new connections again on stdin */
service->fd = -1;
+ LOG_INFO("accepting '%s' connection from pipe", service->name);
+ if ((retval = service->new_connection(c)) != ERROR_OK)
+ {
+ LOG_ERROR("attempted '%s' connection rejected", service->name);
+ free(c);
+ return retval;
+ }
+ } else if (service->type == CONNECTION_PIPE)
+ {
+ c->fd = service->fd;
/* do not check for new connections again on stdin */
service->fd = -1;
- LOG_INFO("accepting '%s' connection from pipe", service->name);
+ char * out_file = alloc_printf("%so", service->port);
+ c->fd_out = open(out_file, O_WRONLY);
+ free(out_file);
+ if (c->fd_out == -1)
+ {
+ LOG_ERROR("could not open %s", service->port);
+ exit(1);
+ }
+
+ LOG_INFO("accepting '%s' connection from pipe %s", service->name, service->port);
if ((retval = service->new_connection(c)) != ERROR_OK)
{
LOG_ERROR("attempted '%s' connection rejected", service->name);
{
service->connection_closed(c);
if (service->type == CONNECTION_TCP)
+ {
close_socket(c->fd);
+ } else if (service->type == CONNECTION_PIPE)
+ {
+ /* The service will listen to the pipe again */
+ c->service->fd = c->fd;
+ }
+
command_done(c->cmd_ctx);
/* delete connection */
return ERROR_OK;
}
-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)
+/* FIX! make service return error instead of invoking exit() */
+int add_service(char *name, const char *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)
{
struct service *c, **p;
int so_reuseaddr_option = 1;
c = malloc(sizeof(struct service));
c->name = strdup(name);
- c->type = type;
- c->port = port;
- c->max_connections = max_connections;
+ c->port = strdup(port);
+ c->max_connections = 1; /* Only TCP/IP ports can support more than one connection */
c->fd = -1;
c->connections = NULL;
c->new_connection = new_connection_handler;
c->connection_closed = connection_closed_handler;
c->priv = priv;
c->next = NULL;
+ long portnumber;
+ if (strcmp(c->port, "pipe") == 0)
+ {
+ c->type = CONNECTION_STDINOUT;
+ } else
+ {
+ char *end;
+ portnumber = strtol(c->port, &end, 0);
+ if (!*end && (parse_long(c->port, &portnumber) == ERROR_OK))
+ {
+ c->portnumber = portnumber;
+ c->type = CONNECTION_TCP;
+ } else
+ {
+ c->type = CONNECTION_PIPE;
+ }
+ }
- if (type == CONNECTION_TCP)
+ if (c->type == CONNECTION_TCP)
{
+ c->max_connections = max_connections;
+
if ((c->fd = socket(AF_INET, SOCK_STREAM, 0)) == -1)
{
LOG_ERROR("error creating socket: %s", strerror(errno));
memset(&c->sin, 0, sizeof(c->sin));
c->sin.sin_family = AF_INET;
c->sin.sin_addr.s_addr = INADDR_ANY;
- c->sin.sin_port = htons(port);
+ c->sin.sin_port = htons(c->portnumber);
if (bind(c->fd, (struct sockaddr *)&c->sin, sizeof(c->sin)) == -1)
{
exit(-1);
}
}
- else if (type == CONNECTION_PIPE)
+ else if (c->type == CONNECTION_STDINOUT)
{
c->fd = fileno(stdin);
socket_nonblock(c->fd);
#endif
}
- else
+ else if (c->type == CONNECTION_PIPE)
{
- LOG_ERROR("unknown connection type: %d", type);
+#ifdef _WIN32
+ /* we currenty do not support named pipes under win32
+ * so exit openocd for now */
+ LOG_ERROR("Named pipes currently not supported under this os");
exit(1);
+#else
+ /* Pipe we're reading from */
+ c->fd = open(c->port, O_RDONLY | O_NONBLOCK);
+ if (c->fd == -1)
+ {
+ LOG_ERROR("could not open %s", c->port);
+ exit(1);
+ }
+#endif
}
/* add to the end of linked list */
return ERROR_OK;
}
-int add_service_pipe(char *name, const char *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)
-{
- enum connection_type type = CONNECTION_TCP;
- long portnumber;
- char *end;
- strtol(port, &end, 0);
- if (!*end)
- {
- if ((parse_long(port, &portnumber) == ERROR_OK) && (portnumber == 0))
- {
- type = CONNECTION_PIPE;
- }
- } else
- {
- LOG_ERROR("Illegal port number %s", port);
- return ERROR_FAIL;
- }
- return add_service(name, type, portnumber, max_connections, new_connection_handler,
- input_handler, connection_closed_handler, priv);
-}
-
static int remove_services(void)
{
struct service *c = services;
struct service *next = c->next;
if (c->name)
- free(c->name);
+ free((void *)c->name);
if (c->type == CONNECTION_PIPE)
{
if (c->fd != -1)
close(c->fd);
}
+ if (c->port)
+ free((void *)c->port);
if (c->priv)
free(c->priv);
poll_ok = true;
}
+ /* This is a simple back-off algorithm where we immediately
+ * re-poll if we did something this time around.
+ *
+ * This greatly improves performance of DCC.
+ */
+ poll_ok = poll_ok || target_got_message();
+
for (service = services; service; service = service->next)
{
/* handle new connections on listeners */
{
if ((FD_ISSET(c->fd, &read_fds)) || c->input_pending)
{
- if ((retval = service->input(c)) != ERROR_OK)
+ retval = service->input(c);
+ if (retval != ERROR_OK)
{
struct connection *next = c->next;
if (service->type == CONNECTION_PIPE)
shutdown_openocd = 1;
}
remove_connection(service, c);
- LOG_INFO("dropped '%s' connection - error %d", service->name, retval);
+ LOG_INFO("dropped '%s' connection", service->name);
c = next;
continue;
}
exit(-1);
}
- if (server_use_pipes == 0)
- {
- /* register ctrl-c handler */
- SetConsoleCtrlHandler(ControlHandler, TRUE);
- }
- else
- {
- /* we are using pipes so ignore ctrl-c */
- SetConsoleCtrlHandler(NULL, TRUE);
- }
+ /* register ctrl-c handler */
+ SetConsoleCtrlHandler(ControlHandler, TRUE);
signal(SIGINT, sig_handler);
signal(SIGTERM, sig_handler);
.name = "shutdown",
.handler = &handle_shutdown_command,
.mode = COMMAND_ANY,
+ .usage = "",
.help = "shut the server down",
},
COMMAND_REGISTRATION_DONE
break;
}
default:
- return ERROR_INVALID_ARGUMENTS;
+ return ERROR_COMMAND_SYNTAX_ERROR;
}
return ERROR_OK;
}
break;
}
default:
- return ERROR_INVALID_ARGUMENTS;
+ return ERROR_COMMAND_SYNTAX_ERROR;
}
return ERROR_OK;
}
projects / fw / openocd / blobdiff