]> git.sur5r.net Git - openocd/commitdiff
committed bugfix from Michael Bruck
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Mon, 25 Feb 2008 08:08:31 +0000 (08:08 +0000)
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Mon, 25 Feb 2008 08:08:31 +0000 (08:08 +0000)
git-svn-id: svn://svn.berlios.de/openocd/trunk@340 b42882b7-edfa-0310-969c-e2dbd0fdcd60

src/server/server.c

index 6e43cf7cf27f269dbf67af9654ed9f2428a155a3..0aa3383492e85315c9536ad4f574934fb1ec0d38 100644 (file)
-/***************************************************************************
- *   Copyright (C) 2005 by Dominic Rath                                    *
- *   Dominic.Rath@gmx.de                                                   *
- *                                                                         *
- *   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     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   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.             *
- ***************************************************************************/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "replacements.h"
-
-#include "server.h"
-
-#include "log.h"
-#include "telnet_server.h"
-#include "target.h"
-
-#include <command.h>
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <signal.h>
-
-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);
-
-int add_connection(service_t *service, command_context_t *cmd_ctx)
-{
-       unsigned int address_size;
-       connection_t *c, **p;
-       int retval;
-       
-       c = malloc(sizeof(connection_t));
-       c->fd = -1;
-       memset(&c->sin, 0, sizeof(c->sin));
-       c->cmd_ctx = copy_command_context(cmd_ctx);
-       c->service = service;
-       c->input_pending = 0;
-       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)
-       {
-               INFO("accepted '%s' connection from %i", service->name, c->sin.sin_port);
-       }
-       else
-       {
-               close_socket(c->fd);
-               INFO("attempted '%s' connection rejected", service->name);
-               free(c);
-       }
-       
-       /* add to the end of linked list */
-       for (p = &service->connections; *p; p = &(*p)->next);
-       *p = c;
-       
-       service->max_connections--;
-       
-       return ERROR_OK;
-}
-
-int remove_connection(service_t *service, connection_t *connection)
-{
-       connection_t **p = &service->connections;
-       connection_t *c;
-       
-       /* find connection */
-       while(c = *p)
-       {               
-               if (c->fd == connection->fd)
-               {       
-                       service->connection_closed(c);
-                       close_socket(c->fd);
-                       command_done(c->cmd_ctx);
-                       
-                       /* delete connection */
-                       *p = c->next;
-                       free(c);
-                       
-                       service->max_connections++;
-                       break;
-               }
-               
-               /* 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;
-       int so_reuseaddr_option = 1;
-       
-       c = malloc(sizeof(service_t));
-       
-       c->name = strdup(name);
-       c->type = type;
-       c->port = port;
-       c->max_connections = max_connections;
-       c->fd = -1;
-       c->connections = NULL;
-       c->new_connection = new_connection_handler;
-       c->input = input_handler;
-       c->connection_closed = connection_closed_handler;
-       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)
-       {
-               ERROR("couldn't bind to socket: %s", strerror(errno));
-               exit(-1);
-       }
-       
-       if (listen(c->fd, 1) == -1)
-       {
-               ERROR("couldn't listen on socket: %s", strerror(errno));
-               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 **p = services;
-       service_t *c;
-       
-       /* find service */
-       while(c = *p)
-       {               
-               if (c->port == port)
-               {       
-                       if (c->name)
-                               free(c->name);
-                       
-                       if (c->priv)
-                               free(c->priv);
-                       
-                       /* delete service */
-                       *p = c->next;
-                       free(c);
-               }
-
-               /* redirect p to next list pointer */
-               p = &(*p)->next;
-       }
-       
-       return ERROR_OK;
-}
-
-int remove_services()
-{
-       service_t *c = services;
-
-       /* loop service */
-       while(c)
-       {
-               service_t *next = c->next;
-
-               if (c->name)
-                       free(c->name);
-
-               if (c->priv)
-                       free(c->priv);
-
-               /* delete service */
-               free(c);
-
-               /* remember the last service for unlinking */
-               c = next;
-       }
-
-       services = NULL;
-       
-       return ERROR_OK;
-}
-
-int server_loop(command_context_t *command_context)
-{
-       service_t *service;
-
-       /* used in select() */
-       fd_set read_fds;
-       struct timeval tv;
-       int fd_max;
-       
-       /* used in accept() */
-       int retval;
-       
-#ifndef _WIN32
-       if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
-               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)
-       {
-               /* monitor sockets for acitvity */
-               fd_max = 0;
-               FD_ZERO(&read_fds);
-
-               /* add service and connection fds to read_fds */
-               for (service = services; service; service = service->next)
-               {
-                       if (service->fd != -1)
-                       {
-                               /* listen for new connections */
-                               FD_SET(service->fd, &read_fds);
-
-                               if (service->fd > fd_max)
-                                       fd_max = service->fd;
-                       }
-                       
-                       if (service->connections)
-                       {
-                               connection_t *c;
-                               
-                               for (c = service->connections; c; c = c->next)
-                               {
-                                       /* check for activity on the connection */
-                                       FD_SET(c->fd, &read_fds);
-                                       if (c->fd > fd_max)
-                                               fd_max = c->fd;
-                               }
-                       }
-               }
-               
-#ifndef _WIN32
-               /* add STDIN to read_fds */
-               FD_SET(fileno(stdin), &read_fds);
-#endif
-
-               retval = select(fd_max + 1, &read_fds, NULL, NULL, &tv);
-               
-               if (retval == -1)
-               {
-#ifdef _WIN32
-
-                       errno = WSAGetLastError();
-
-                       if (errno == WSAEINTR)
-                               FD_ZERO(&read_fds);
-                       else
-                       {
-                               ERROR("error during select: %s", strerror(errno));
-                               exit(-1);
-                       }
-#else
-
-                       if (errno == EINTR)
+/***************************************************************************\r
+ *   Copyright (C) 2005 by Dominic Rath                                    *\r
+ *   Dominic.Rath@gmx.de                                                   *\r
+ *                                                                         *\r
+ *   This program is free software; you can redistribute it and/or modify  *\r
+ *   it under the terms of the GNU General Public License as published by  *\r
+ *   the Free Software Foundation; either version 2 of the License, or     *\r
+ *   (at your option) any later version.                                   *\r
+ *                                                                         *\r
+ *   This program is distributed in the hope that it will be useful,       *\r
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *\r
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *\r
+ *   GNU General Public License for more details.                          *\r
+ *                                                                         *\r
+ *   You should have received a copy of the GNU General Public License     *\r
+ *   along with this program; if not, write to the                         *\r
+ *   Free Software Foundation, Inc.,                                       *\r
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *\r
+ ***************************************************************************/\r
+#ifdef HAVE_CONFIG_H\r
+#include "config.h"\r
+#endif\r
+\r
+#include "replacements.h"\r
+\r
+#include "server.h"\r
+\r
+#include "log.h"\r
+#include "telnet_server.h"\r
+#include "target.h"\r
+\r
+#include <command.h>\r
+#include <string.h>\r
+#include <stdlib.h>\r
+#include <errno.h>\r
+#include <unistd.h>\r
+#include <sys/types.h>\r
+#include <fcntl.h>\r
+#include <signal.h>\r
+\r
+service_t *services = NULL;\r
+\r
+/* shutdown_openocd == 1: exit the main event loop, and quit the debugger */\r
+static int shutdown_openocd = 0;\r
+int handle_shutdown_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);\r
+\r
+int add_connection(service_t *service, command_context_t *cmd_ctx)\r
+{\r
+       unsigned int address_size;\r
+       connection_t *c, **p;\r
+       int retval;\r
+       \r
+       c = malloc(sizeof(connection_t));\r
+       c->fd = -1;\r
+       memset(&c->sin, 0, sizeof(c->sin));\r
+       c->cmd_ctx = copy_command_context(cmd_ctx);\r
+       c->service = service;\r
+       c->input_pending = 0;\r
+       c->priv = NULL;\r
+       c->next = NULL;\r
+\r
+       address_size = sizeof(c->sin);\r
+       c->fd = accept(service->fd, (struct sockaddr *)&service->sin, &address_size);\r
+                               \r
+       if ((retval = service->new_connection(c)) == ERROR_OK)\r
+       {\r
+               INFO("accepted '%s' connection from %i", service->name, c->sin.sin_port);\r
+       }\r
+       else\r
+       {\r
+               close_socket(c->fd);\r
+               INFO("attempted '%s' connection rejected", service->name);\r
+               free(c);\r
+       }\r
+       \r
+       /* add to the end of linked list */\r
+       for (p = &service->connections; *p; p = &(*p)->next);\r
+       *p = c;\r
+       \r
+       service->max_connections--;\r
+       \r
+       return ERROR_OK;\r
+}\r
+\r
+int remove_connection(service_t *service, connection_t *connection)\r
+{\r
+       connection_t **p = &service->connections;\r
+       connection_t *c;\r
+       \r
+       /* find connection */\r
+       while(c = *p)\r
+       {               \r
+               if (c->fd == connection->fd)\r
+               {       \r
+                       service->connection_closed(c);\r
+                       close_socket(c->fd);\r
+                       command_done(c->cmd_ctx);\r
+                       \r
+                       /* delete connection */\r
+                       *p = c->next;\r
+                       free(c);\r
+                       \r
+                       service->max_connections++;\r
+                       break;\r
+               }\r
+               \r
+               /* redirect p to next list pointer */\r
+               p = &(*p)->next;                \r
+       }\r
+       \r
+       return ERROR_OK;\r
+}\r
+\r
+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)\r
+{\r
+       service_t *c, **p;\r
+       int so_reuseaddr_option = 1;\r
+       \r
+       c = malloc(sizeof(service_t));\r
+       \r
+       c->name = strdup(name);\r
+       c->type = type;\r
+       c->port = port;\r
+       c->max_connections = max_connections;\r
+       c->fd = -1;\r
+       c->connections = NULL;\r
+       c->new_connection = new_connection_handler;\r
+       c->input = input_handler;\r
+       c->connection_closed = connection_closed_handler;\r
+       c->priv = priv;\r
+       c->next = NULL;\r
+       \r
+       if ((c->fd = socket(AF_INET, SOCK_STREAM, 0)) == -1)\r
+       {\r
+               ERROR("error creating socket: %s", strerror(errno));\r
+               exit(-1);\r
+       }\r
+       \r
+       setsockopt(c->fd, SOL_SOCKET, SO_REUSEADDR, (void*)&so_reuseaddr_option, sizeof(int));\r
+       \r
+       socket_nonblock(c->fd);\r
+       \r
+       memset(&c->sin, 0, sizeof(c->sin));\r
+       c->sin.sin_family = AF_INET;\r
+       c->sin.sin_addr.s_addr = INADDR_ANY;\r
+       c->sin.sin_port = htons(port);\r
+       \r
+       if (bind(c->fd, (struct sockaddr *)&c->sin, sizeof(c->sin)) == -1)\r
+       {\r
+               ERROR("couldn't bind to socket: %s", strerror(errno));\r
+               exit(-1);\r
+       }\r
+       \r
+       if (listen(c->fd, 1) == -1)\r
+       {\r
+               ERROR("couldn't listen on socket: %s", strerror(errno));\r
+               exit(-1);\r
+       }\r
+       \r
+       /* add to the end of linked list */\r
+       for (p = &services; *p; p = &(*p)->next);\r
+       *p = c;\r
+       \r
+       return ERROR_OK;\r
+}\r
+\r
+int remove_service(unsigned short port)\r
+{\r
+       service_t **p = &services;\r
+       service_t *c;\r
+       \r
+       /* find service */\r
+       while(c = *p)\r
+       {               \r
+               if (c->port == port)\r
+               {       \r
+                       if (c->name)\r
+                               free(c->name);\r
+                       \r
+                       if (c->priv)\r
+                               free(c->priv);\r
+                       \r
+                       /* delete service */\r
+                       *p = c->next;\r
+                       free(c);\r
+               }\r
+\r
+               /* redirect p to next list pointer */\r
+               p = &(*p)->next;\r
+       }\r
+       \r
+       return ERROR_OK;\r
+}\r
+\r
+int remove_services()\r
+{\r
+       service_t *c = services;\r
+\r
+       /* loop service */\r
+       while(c)\r
+       {\r
+               service_t *next = c->next;\r
+\r
+               if (c->name)\r
+                       free(c->name);\r
+\r
+               if (c->priv)\r
+                       free(c->priv);\r
+\r
+               /* delete service */\r
+               free(c);\r
+\r
+               /* remember the last service for unlinking */\r
+               c = next;\r
+       }\r
+\r
+       services = NULL;\r
+       \r
+       return ERROR_OK;\r
+}\r
+\r
+int server_loop(command_context_t *command_context)\r
+{\r
+       service_t *service;\r
+\r
+       /* used in select() */\r
+       fd_set read_fds;\r
+       struct timeval tv;\r
+       int fd_max;\r
+       \r
+       /* used in accept() */\r
+       int retval;\r
+       \r
+#ifndef _WIN32\r
+       if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)\r
+               ERROR("couldn't set SIGPIPE to SIG_IGN");\r
+#endif\r
+       \r
+       /* do regular tasks after at most 10ms */\r
+       tv.tv_sec = 0;\r
+       tv.tv_usec = 10000;\r
+       \r
+       while(!shutdown_openocd)\r
+       {\r
+               /* monitor sockets for acitvity */\r
+               fd_max = 0;\r
+               FD_ZERO(&read_fds);\r
+\r
+               /* add service and connection fds to read_fds */\r
+               for (service = services; service; service = service->next)\r
+               {\r
+                       if (service->fd != -1)\r
                        {\r
-                               FD_ZERO(&read_fds);
+                               /* listen for new connections */\r
+                               FD_SET(service->fd, &read_fds);\r
+\r
+                               if (service->fd > fd_max)\r
+                                       fd_max = service->fd;\r
                        }\r
-                       else
-                       {
-                               ERROR("error during select: %s", strerror(errno));
-                               exit(-1);
-                       }
-#endif
-               }
-               
-               target_call_timer_callbacks();
-
-               if (retval == 0)
-               {
-                       /* do regular tasks after at most 100ms */
-                       tv.tv_sec = 0;
-                       tv.tv_usec = 10000;
+                       \r
+                       if (service->connections)\r
+                       {\r
+                               connection_t *c;\r
+                               \r
+                               for (c = service->connections; c; c = c->next)\r
+                               {\r
+                                       /* check for activity on the connection */\r
+                                       FD_SET(c->fd, &read_fds);\r
+                                       if (c->fd > fd_max)\r
+                                               fd_max = c->fd;\r
+                               }\r
+                       }\r
+               }\r
+               \r
+#ifndef _WIN32\r
+               /* add STDIN to read_fds */\r
+               FD_SET(fileno(stdin), &read_fds);\r
+#endif\r
+\r
+               retval = select(fd_max + 1, &read_fds, NULL, NULL, &tv);\r
+               \r
+               if (retval == -1)\r
+               {\r
+#ifdef _WIN32\r
+\r
+                       errno = WSAGetLastError();\r
+\r
+                       if (errno == WSAEINTR)\r
+                               FD_ZERO(&read_fds);\r
+                       else\r
+                       {\r
+                               ERROR("error during select: %s", strerror(errno));\r
+                               exit(-1);\r
+                       }\r
+#else\r
+\r
+                       if (errno == EINTR)\r
+                       {\r
+                               FD_ZERO(&read_fds);\r
+                       }\r
+                       else\r
+                       {\r
+                               ERROR("error during select: %s", strerror(errno));\r
+                               exit(-1);\r
+                       }\r
+#endif\r
+               }\r
+               \r
+               target_call_timer_callbacks();\r
+\r
+               if (retval == 0)\r
+               {\r
+                       /* do regular tasks after at most 100ms */\r
+                       tv.tv_sec = 0;\r
+                       tv.tv_usec = 10000;\r
                        FD_ZERO(&read_fds); /* eCos leaves read_fds unchanged in this case!  */\r
-               }
-               
-               for (service = services; service; service = service->next)
-               {
-                       /* handle new connections on listeners */
-                       if ((service->fd != -1) 
-                               && (FD_ISSET(service->fd, &read_fds))) 
-                       {
-                               if (service->max_connections > 0)
+               }\r
+               \r
+               for (service = services; service; service = service->next)\r
+               {\r
+                       /* handle new connections on listeners */\r
+                       if ((service->fd != -1) \r
+                               && (FD_ISSET(service->fd, &read_fds))) \r
+                       {\r
+                               if (service->max_connections > 0)\r
+                               {\r
+                                       add_connection(service, command_context);\r
+                               }\r
+                               else\r
+                               {\r
+                                       struct sockaddr_in sin;\r
+                                       unsigned int address_size = sizeof(sin);\r
+                                       int tmp_fd;\r
+                                       tmp_fd = accept(service->fd, (struct sockaddr *)&service->sin, &address_size);\r
+                                       close_socket(tmp_fd);\r
+                                       INFO("rejected '%s' connection, no more connections allowed", service->name);\r
+                               }\r
+                       }\r
+                       \r
+                       /* handle activity on connections */\r
+                       if (service->connections)\r
+                       {\r
+                               connection_t *c;\r
+                               \r
+                               for (c = service->connections; c;)\r
                                {\r
-                                       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);
-                               }
-                       }
-                       
-                       /* handle activity on connections */
-                       if (service->connections)
-                       {
-                               connection_t *c;
-                               
-                               for (c = service->connections; c;)
-                               {
-                                       if ((FD_ISSET(c->fd, &read_fds)) || c->input_pending)
-                                       {
-                                               if (service->input(c) != ERROR_OK)
-                                               {
-                                                       connection_t *next = c->next;
-                                                       remove_connection(service, c);
-                                                       INFO("dropped '%s' connection", service->name);
-                                                       c = next;
-                                                       continue;
-                                               }
-                                       }
-                                       c = c->next;
-                               }
-                       }
-               }
-               
-#ifndef _WIN32
-               if (FD_ISSET(fileno(stdin), &read_fds))
-               {
-                       if (getc(stdin) == 'x')
-                       {
-                               shutdown_openocd = 1;
-                       }
-               }
-#else
-               MSG msg;
-               while (PeekMessage(&msg,NULL,0,0,PM_REMOVE))
-               {
-                       if (msg.message == WM_QUIT)
-                               shutdown_openocd = 1;
-               }
-#endif
-       }
-       
-       return ERROR_OK;
-}
-
-#ifdef _WIN32
-BOOL WINAPI ControlHandler(DWORD dwCtrlType)
-{
-    shutdown_openocd = 1;
-    return TRUE;
-}
-
-void sig_handler(int sig) {
-    shutdown_openocd = 1;
-}
-#endif
-
-int server_init()
-{
-#ifdef _WIN32
-       WORD wVersionRequested;
-       WSADATA wsaData;
-
-       wVersionRequested = MAKEWORD( 2, 2 );
-
-       if (WSAStartup(wVersionRequested, &wsaData) != 0)
-       {
-               ERROR("Failed to Open Winsock");
-               exit(-1);
-       }
-
-       SetConsoleCtrlHandler( ControlHandler, TRUE );
-
-       signal(SIGINT, sig_handler);
-       signal(SIGTERM, sig_handler);
-       signal(SIGBREAK, sig_handler);
-       signal(SIGABRT, sig_handler);
-#endif
-
-       
-       return ERROR_OK;
-}
-
-int server_quit()
-{
-       remove_services();
-
-#ifdef _WIN32
-       WSACleanup();
-       SetConsoleCtrlHandler( ControlHandler, FALSE );
-#endif
-
-       return ERROR_OK;
-}
-
-int server_register_commands(command_context_t *context)
-{
-       register_command(context, NULL, "shutdown", handle_shutdown_command,
-                                        COMMAND_ANY, "shut the server down");
-       
-       return ERROR_OK;
-}
-
-/* tell the server we want to shut down */
-int handle_shutdown_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
-{
-       shutdown_openocd = 1;
-
-       return ERROR_COMMAND_CLOSE_CONNECTION;
-}
-
-
+                                       if ((FD_ISSET(c->fd, &read_fds)) || c->input_pending)\r
+                                       {\r
+                                               if (service->input(c) != ERROR_OK)\r
+                                               {\r
+                                                       connection_t *next = c->next;\r
+                                                       remove_connection(service, c);\r
+                                                       INFO("dropped '%s' connection", service->name);\r
+                                                       c = next;\r
+                                                       continue;\r
+                                               }\r
+                                       }\r
+                                       c = c->next;\r
+                               }\r
+                       }\r
+               }\r
+               \r
+#ifndef _WIN32\r
+               if (FD_ISSET(fileno(stdin), &read_fds))\r
+               {\r
+                       if (getc(stdin) == 'x')\r
+                       {\r
+                               shutdown_openocd = 1;\r
+                       }\r
+               }\r
+#else\r
+               MSG msg;\r
+               while (PeekMessage(&msg,NULL,0,0,PM_REMOVE))\r
+               {\r
+                       if (msg.message == WM_QUIT)\r
+                               shutdown_openocd = 1;\r
+               }\r
+#endif\r
+       }\r
+       \r
+       return ERROR_OK;\r
+}\r
+\r
+#ifdef _WIN32\r
+BOOL WINAPI ControlHandler(DWORD dwCtrlType)\r
+{\r
+    shutdown_openocd = 1;\r
+    return TRUE;\r
+}\r
+\r
+void sig_handler(int sig) {\r
+    shutdown_openocd = 1;\r
+}\r
+#endif\r
+\r
+int server_init()\r
+{\r
+#ifdef _WIN32\r
+       WORD wVersionRequested;\r
+       WSADATA wsaData;\r
+\r
+       wVersionRequested = MAKEWORD( 2, 2 );\r
+\r
+       if (WSAStartup(wVersionRequested, &wsaData) != 0)\r
+       {\r
+               ERROR("Failed to Open Winsock");\r
+               exit(-1);\r
+       }\r
+\r
+       SetConsoleCtrlHandler( ControlHandler, TRUE );\r
+\r
+       signal(SIGINT, sig_handler);\r
+       signal(SIGTERM, sig_handler);\r
+       signal(SIGBREAK, sig_handler);\r
+       signal(SIGABRT, sig_handler);\r
+#endif\r
+\r
+       \r
+       return ERROR_OK;\r
+}\r
+\r
+int server_quit()\r
+{\r
+       remove_services();\r
+\r
+#ifdef _WIN32\r
+       WSACleanup();\r
+       SetConsoleCtrlHandler( ControlHandler, FALSE );\r
+#endif\r
+\r
+       return ERROR_OK;\r
+}\r
+\r
+int server_register_commands(command_context_t *context)\r
+{\r
+       register_command(context, NULL, "shutdown", handle_shutdown_command,\r
+                                        COMMAND_ANY, "shut the server down");\r
+       \r
+       return ERROR_OK;\r
+}\r
+\r
+/* tell the server we want to shut down */\r
+int handle_shutdown_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)\r
+{\r
+       shutdown_openocd = 1;\r
+\r
+       return ERROR_COMMAND_CLOSE_CONNECTION;\r
+}\r
+\r
+\r