X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fserver%2Fserver.c;h=3a3d33fa62a88b7079f10d7989531e40ed681962;hp=ac5e17e56981a4fc8835929b85b69259fd5fba0b;hb=dc575dc5bf8cb597a0e9a47794744ae6b1928087;hpb=4b97f3cbb9603c13f69f8d3b5371c12045593126 diff --git a/src/server/server.c b/src/server/server.c index ac5e17e569..3a3d33fa62 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -2,6 +2,12 @@ * Copyright (C) 2005 by Dominic Rath * * Dominic.Rath@gmx.de * * * + * Copyright (C) 2007,2008 Øyvind Harboe * + * oyvind.harboe@zylin.com * + * * + * Copyright (C) 2008 by Spencer Oliver * + * spen@spen-soft.co.uk * + * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * @@ -21,34 +27,31 @@ #include "config.h" #endif -#include "replacements.h" - #include "server.h" - -#include "log.h" -#include "telnet_server.h" #include "target.h" -#include -#include -#include -#include -#include -#include -#include #include +#ifndef _WIN32 +#include +#endif + + service_t *services = NULL; /* shutdown_openocd == 1: exit the main event loop, and quit the debugger */ static int shutdown_openocd = 0; int handle_shutdown_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +/* set when using pipes rather than tcp */ +int server_use_pipes = 0; + int add_connection(service_t *service, command_context_t *cmd_ctx) { - unsigned int address_size; - connection_t *c, *p; + socklen_t address_size; + connection_t *c, **p; int retval; + int flag = 1; c = malloc(sizeof(connection_t)); c->fd = -1; @@ -59,30 +62,48 @@ int add_connection(service_t *service, command_context_t *cmd_ctx) c->priv = NULL; c->next = NULL; - address_size = sizeof(c->sin); - c->fd = accept(service->fd, (struct sockaddr *)&service->sin, &address_size); - - if ((retval = service->new_connection(c)) == ERROR_OK) + if (service->type == CONNECTION_TCP) { - INFO("accepted '%s' connection from %i", service->name, c->sin.sin_port); + 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) + { + close_socket(c->fd); + LOG_ERROR("attempted '%s' connection rejected", service->name); + free(c); + return retval; + } } - else + else if (service->type == CONNECTION_PIPE) { - close_socket(c->fd); - INFO("attempted '%s' connection rejected", service->name); - free(c); + 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); + if ((retval = service->new_connection(c)) != ERROR_OK) + { + 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--; @@ -91,30 +112,29 @@ int add_connection(service_t *service, command_context_t *cmd_ctx) 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); - + if (service->type == CONNECTION_TCP) + 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; @@ -122,7 +142,7 @@ int remove_connection(service_t *service, connection_t *connection) 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)); @@ -139,56 +159,86 @@ int add_service(char *name, enum connection_type type, unsigned short port, int c->priv = priv; c->next = NULL; - if ((c->fd = socket(AF_INET, SOCK_STREAM, 0)) == -1) - { - ERROR("error creating socket: %s", strerror(errno)); - exit(-1); - } - - setsockopt(c->fd, SOL_SOCKET, SO_REUSEADDR, (void*)&so_reuseaddr_option, sizeof(int)); - - socket_nonblock(c->fd); - - 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); - - if (bind(c->fd, (struct sockaddr *)&c->sin, sizeof(c->sin)) == -1) + if (type == CONNECTION_TCP) { - ERROR("couldn't bind to socket: %s", strerror(errno)); - exit(-1); - } + if ((c->fd = socket(AF_INET, SOCK_STREAM, 0)) == -1) + { + LOG_ERROR("error creating socket: %s", strerror(errno)); + exit(-1); + } + + setsockopt(c->fd, SOL_SOCKET, SO_REUSEADDR, (void*)&so_reuseaddr_option, sizeof(int)); + + socket_nonblock(c->fd); + + 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); + + if (bind(c->fd, (struct sockaddr *)&c->sin, sizeof(c->sin)) == -1) + { + 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; - if (listen(c->fd, 1) == -1) - { - ERROR("couldn't listen on socket: %s", strerror(errno)); - exit(-1); + /* 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) + { + LOG_ERROR("couldn't listen on socket: %s", strerror(errno)); + exit(-1); + } } - - if (services) + else if (type == CONNECTION_PIPE) { - for (p = services; p && p->next; p = p->next); - if (p) - p->next = c; + /* use stdin */ + c->fd = STDIN_FILENO; + +#ifdef _WIN32 + /* for win32 set stdin/stdout to binary mode */ + if (_setmode(_fileno(stdout), _O_BINARY) < 0) + LOG_WARNING("cannot change stdout mode to binary"); + if (_setmode(_fileno(stdin), _O_BINARY) < 0) + LOG_WARNING("cannot change stdin mode to binary"); + if (_setmode(_fileno(stderr), _O_BINARY) < 0) + LOG_WARNING("cannot change stderr mode to binary"); +#else + socket_nonblock(c->fd); +#endif } else { - services = c; + LOG_ERROR("unknown connection type: %d", type); + exit(1); } + /* 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) @@ -198,22 +248,23 @@ int remove_service(unsigned short port) 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; } -int remove_services() +int remove_services(void) { service_t *c = services; /* loop service */ - while(c) + while (c) { service_t *next = c->next; @@ -230,9 +281,14 @@ int remove_services() c = next; } + services = NULL; + return ERROR_OK; } +extern void openocd_sleep_prelude(void); +extern void openocd_sleep_postlude(void); + int server_loop(command_context_t *command_context) { service_t *service; @@ -247,14 +303,14 @@ int server_loop(command_context_t *command_context) #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; - while(!shutdown_openocd) + while (!shutdown_openocd) { /* monitor sockets for acitvity */ fd_max = 0; @@ -287,11 +343,23 @@ int server_loop(command_context_t *command_context) } #ifndef _WIN32 - /* add STDIN to read_fds */ - FD_SET(fileno(stdin), &read_fds); +#if BUILD_ECOSBOARD == 0 + if (server_use_pipes == 0) + { + /* add STDIN to read_fds */ + FD_SET(fileno(stdin), &read_fds); + } +#endif #endif - if ((retval = select(fd_max + 1, &read_fds, NULL, NULL, &tv)) == -1) + openocd_sleep_prelude(); + kept_alive(); + + /* Only while we're sleeping we'll let others run */ + retval = socket_select(fd_max + 1, &read_fds, NULL, NULL, &tv); + openocd_sleep_postlude(); + + if (retval == -1) { #ifdef _WIN32 @@ -301,35 +369,32 @@ int server_loop(command_context_t *command_context) 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 } target_call_timer_callbacks(); + process_jim_events (); if (retval == 0) { /* 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) @@ -339,15 +404,20 @@ int server_loop(command_context_t *command_context) && (FD_ISSET(service->fd, &read_fds))) { if (service->max_connections > 0) + { add_connection(service, command_context); + } else { - struct sockaddr_in sin; - unsigned int address_size = sizeof(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); + if (service->type != CONNECTION_PIPE) + { + struct sockaddr_in sin; + socklen_t address_size = sizeof(sin); + int tmp_fd; + tmp_fd = accept(service->fd, (struct sockaddr *)&service->sin, &address_size); + close_socket(tmp_fd); + } + LOG_INFO("rejected '%s' connection, no more connections allowed", service->name); } } @@ -360,11 +430,16 @@ int server_loop(command_context_t *command_context) { if ((FD_ISSET(c->fd, &read_fds)) || c->input_pending) { - if (service->input(c) != ERROR_OK) + if ((retval = service->input(c)) != ERROR_OK) { connection_t *next = c->next; + if (service->type == CONNECTION_PIPE) + { + /* if connection uses a pipe then shutdown openocd on error */ + shutdown_openocd = 1; + } remove_connection(service, c); - INFO("dropped '%s' connection", service->name); + LOG_INFO("dropped '%s' connection - error %d", service->name, retval); c = next; continue; } @@ -375,13 +450,26 @@ int server_loop(command_context_t *command_context) } #ifndef _WIN32 - if (FD_ISSET(fileno(stdin), &read_fds)) +#if BUILD_ECOSBOARD == 0 + /* check for data on stdin if not using pipes */ + if (server_use_pipes == 0) { - if (getc(stdin) == 'x') + if (FD_ISSET(fileno(stdin), &read_fds)) { - shutdown_openocd = 1; + if (getc(stdin) == 'x') + { + shutdown_openocd = 1; + } } } +#endif +#else + MSG msg; + while (PeekMessage(&msg,NULL,0,0,PM_REMOVE)) + { + if (msg.message == WM_QUIT) + shutdown_openocd = 1; + } #endif } @@ -391,39 +479,56 @@ int server_loop(command_context_t *command_context) #ifdef _WIN32 BOOL WINAPI ControlHandler(DWORD dwCtrlType) { - shutdown_openocd = 1; - return TRUE; + shutdown_openocd = 1; + return TRUE; +} + +void sig_handler(int sig) { + shutdown_openocd = 1; } #endif -int server_init() +int server_init(void) { #ifdef _WIN32 WORD wVersionRequested; WSADATA wsaData; - wVersionRequested = MAKEWORD( 2, 2 ); + wVersionRequested = MAKEWORD(2, 2); if (WSAStartup(wVersionRequested, &wsaData) != 0) { - ERROR("Failed to Open Winsock"); + LOG_ERROR("Failed to Open Winsock"); exit(-1); } - SetConsoleCtrlHandler( ControlHandler, TRUE ); -#endif + if (server_use_pipes == 0) + { + /* register ctrl-c handler */ + SetConsoleCtrlHandler(ControlHandler, TRUE); + } + else + { + /* we are using pipes so ignore ctrl-c */ + SetConsoleCtrlHandler(NULL, TRUE); + } + signal(SIGINT, sig_handler); + signal(SIGTERM, sig_handler); + signal(SIGBREAK, sig_handler); + signal(SIGABRT, sig_handler); +#endif return ERROR_OK; } -int server_quit() +int server_quit(void) { remove_services(); #ifdef _WIN32 WSACleanup(); - SetConsoleCtrlHandler( ControlHandler, FALSE ); + SetConsoleCtrlHandler(ControlHandler, FALSE); #endif return ERROR_OK; @@ -444,4 +549,3 @@ int handle_shutdown_command(struct command_context_s *cmd_ctx, char *cmd, char * return ERROR_COMMAND_CLOSE_CONNECTION; } -