#include <sys/types.h>
#include <fcntl.h>
#include <signal.h>
+#ifndef _WIN32
+#include <netinet/tcp.h>
+#endif
service_t *services = NULL;
int add_connection(service_t *service, command_context_t *cmd_ctx)
{
unsigned int address_size;
- connection_t *c, *p;
+ connection_t *c, **p;
int retval;
+ int flag=1;
c = malloc(sizeof(connection_t));
c->fd = -1;
c->next = NULL;
address_size = sizeof(c->sin);
+
c->fd = accept(service->fd, (struct sockaddr *)&service->sin, &address_size);
-
+
+ /* This increases performance dramatically for e.g. GDB load which
+ * does not have a sliding window protocol. */
+ retval=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, c->sin.sin_port);
if ((retval = service->new_connection(c)) == ERROR_OK)
{
- INFO("accepted '%s' connection from %i", service->name, c->sin.sin_port);
}
else
{
close_socket(c->fd);
- INFO("attempted '%s' connection rejected", service->name);
+ LOG_ERROR("attempted '%s' connection rejected", service->name);
free(c);
+ return retval;
}
- if (service->connections)
- {
- for (p = service->connections; p && p->next; p = p->next);
- if (p)
- p->next = c;
- }
- else
- {
- service->connections = c;
- }
+ /* add to the end of linked list */
+ for (p = &service->connections; *p; p = &(*p)->next);
+ *p = c;
service->max_connections--;
int remove_connection(service_t *service, connection_t *connection)
{
- connection_t *c = service->connections;
+ connection_t **p = &service->connections;
+ connection_t *c;
/* find connection */
- while(c)
- {
- connection_t *next = c->next;
-
+ while((c = *p))
+ {
if (c->fd == connection->fd)
{
- service->connections = next;
service->connection_closed(c);
close_socket(c->fd);
-
command_done(c->cmd_ctx);
/* delete connection */
+ *p = c->next;
free(c);
service->max_connections++;
break;
}
- /* remember the last connection for unlinking */
- c = next;
+ /* redirect p to next list pointer */
+ p = &(*p)->next;
}
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)
{
- service_t *c, *p;
+ service_t *c, **p;
int so_reuseaddr_option = 1;
c = malloc(sizeof(service_t));
if ((c->fd = socket(AF_INET, SOCK_STREAM, 0)) == -1)
{
- ERROR("error creating socket: %s", strerror(errno));
+ LOG_ERROR("error creating socket: %s", strerror(errno));
exit(-1);
}
if (bind(c->fd, (struct sockaddr *)&c->sin, sizeof(c->sin)) == -1)
{
- ERROR("couldn't bind to socket: %s", strerror(errno));
+ LOG_ERROR("couldn't bind to socket: %s", strerror(errno));
exit(-1);
}
+#ifndef _WIN32
+ int segsize=65536;
+ setsockopt(c->fd, IPPROTO_TCP, TCP_MAXSEG, &segsize, sizeof(int));
+#endif
+ int window_size = 128 * 1024;
+
+ /* These setsockopt()s must happen before the listen() */
+
+ setsockopt(c->fd, SOL_SOCKET, SO_SNDBUF,
+ (char *)&window_size, sizeof(window_size));
+ setsockopt(c->fd, SOL_SOCKET, SO_RCVBUF,
+ (char *)&window_size, sizeof(window_size));
+
if (listen(c->fd, 1) == -1)
{
- ERROR("couldn't listen on socket: %s", strerror(errno));
+ LOG_ERROR("couldn't listen on socket: %s", strerror(errno));
exit(-1);
}
- if (services)
- {
- for (p = services; p && p->next; p = p->next);
- if (p)
- p->next = c;
- }
- else
- {
- services = c;
- }
+ /* add to the end of linked list */
+ for (p = &services; *p; p = &(*p)->next);
+ *p = c;
return ERROR_OK;
}
int remove_service(unsigned short port)
{
- service_t *c = services;
+ service_t **p = &services;
+ service_t *c;
/* find service */
- while(c)
- {
- service_t *next = c->next;
-
+ while((c = *p))
+ {
if (c->port == port)
{
if (c->name)
free(c->priv);
/* delete service */
+ *p = c->next;
free(c);
}
-
- /* remember the last service for unlinking */
- c = next;
+
+ /* redirect p to next list pointer */
+ p = &(*p)->next;
}
return ERROR_OK;
c = next;
}
+ services = NULL;
+
return ERROR_OK;
}
+extern void openocd_sleep_prelude();
+extern void openocd_sleep_postlude();
+
int server_loop(command_context_t *command_context)
{
service_t *service;
#ifndef _WIN32
if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
- ERROR("couldn't set SIGPIPE to SIG_IGN");
+ LOG_ERROR("couldn't set SIGPIPE to SIG_IGN");
#endif
-
+
/* do regular tasks after at most 10ms */
tv.tv_sec = 0;
tv.tv_usec = 10000;
}
#ifndef _WIN32
+#ifndef BUILD_ECOSBOARD
/* add STDIN to read_fds */
FD_SET(fileno(stdin), &read_fds);
#endif
+#endif
+
+ openocd_sleep_prelude();
+ kept_alive();
+ // Only while we're sleeping we'll let others run
+ retval = select(fd_max + 1, &read_fds, NULL, NULL, &tv);
+ openocd_sleep_postlude();
- if ((retval = select(fd_max + 1, &read_fds, NULL, NULL, &tv)) == -1)
+ if (retval == -1)
{
#ifdef _WIN32
FD_ZERO(&read_fds);
else
{
- ERROR("error during select: %s", strerror(errno));
+ LOG_ERROR("error during select: %s", strerror(errno));
exit(-1);
}
#else
if (errno == EINTR)
+ {
FD_ZERO(&read_fds);
+ }
else
{
- ERROR("error during select: %s", strerror(errno));
+ LOG_ERROR("error during select: %s", strerror(errno));
exit(-1);
}
#endif
/* do regular tasks after at most 100ms */
tv.tv_sec = 0;
tv.tv_usec = 10000;
-
-#if 0
- if (shutdown_openocd)
- return ERROR_COMMAND_CLOSE_CONNECTION;
-
- handle_target();
-#endif
+ FD_ZERO(&read_fds); /* eCos leaves read_fds unchanged in this case! */
}
for (service = services; service; service = service->next)
&& (FD_ISSET(service->fd, &read_fds)))
{
if (service->max_connections > 0)
+ {
add_connection(service, command_context);
+ }
else
{
struct sockaddr_in sin;
int tmp_fd;
tmp_fd = accept(service->fd, (struct sockaddr *)&service->sin, &address_size);
close_socket(tmp_fd);
- INFO("rejected '%s' connection, no more connections allowed", service->name);
+ LOG_INFO("rejected '%s' connection, no more connections allowed", service->name);
}
}
{
connection_t *next = c->next;
remove_connection(service, c);
- INFO("dropped '%s' connection", service->name);
+ LOG_INFO("dropped '%s' connection", service->name);
c = next;
continue;
}
}
#ifndef _WIN32
+#ifndef BUILD_ECOSBOARD
if (FD_ISSET(fileno(stdin), &read_fds))
{
if (getc(stdin) == 'x')
shutdown_openocd = 1;
}
}
+#endif
#else
MSG msg;
while (PeekMessage(&msg,NULL,0,0,PM_REMOVE))
if (WSAStartup(wVersionRequested, &wsaData) != 0)
{
- ERROR("Failed to Open Winsock");
+ LOG_ERROR("Failed to Open Winsock");
exit(-1);
}
return ERROR_COMMAND_CLOSE_CONNECTION;
}
+
Code Review / openocd.git / blobdiff