- Fixes '=' whitespace

[openocd.git] / src / server / server.c

diff --git a/src/server/server.c b/src/server/server.c
index b5b9a205db137564f96583b4160f4b481e2d9ef1..a93d6ada4c8b4d11deb30831255731d43b5d30cc 100644 (file)
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -27,26 +27,16 @@
 #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>
+
 #ifndef _WIN32
 #include <netinet/tcp.h>
 #endif
 
+
 service_t *services = NULL;
 
 /* shutdown_openocd == 1: exit the main event loop, and quit the debugger */
@@ -58,10 +48,10 @@ int server_use_pipes = 0;
 
 int add_connection(service_t *service, command_context_t *cmd_ctx)
 {
-       unsigned int address_size;
+       socklen_t address_size;
        connection_t *c, **p;
        int retval;
-       int flag=1;
+       int flag = 1;
        
        c = malloc(sizeof(connection_t));
        c->fd = -1;
@@ -80,7 +70,7 @@ int add_connection(service_t *service, command_context_t *cmd_ctx)
                
                /* This increases performance dramatically for e.g. GDB load which
                 * does not have a sliding window protocol. */
-               retval=setsockopt(c->fd,        /* socket affected */
+               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 */
@@ -97,12 +87,11 @@ int add_connection(service_t *service, command_context_t *cmd_ctx)
        }
        else if (service->type == CONNECTION_PIPE)
        {
-#ifndef _WIN32
                c->fd = service->fd;
                
                /* do not check for new connections again on stdin */
                service->fd = -1;
-#endif
+               
                LOG_INFO("accepting '%s' connection from pipe", service->name);
                if ((retval = service->new_connection(c)) != ERROR_OK)
                {
@@ -127,7 +116,7 @@ int remove_connection(service_t *service, connection_t *connection)
        connection_t *c;
        
        /* find connection */
-       while((c = *p))
+       while ((c = *p))
        {               
                if (c->fd == connection->fd)
                {       
@@ -194,7 +183,7 @@ int add_service(char *name, enum connection_type type, unsigned short port, int
                }
                
 #ifndef _WIN32
-               int segsize=65536;
+               int segsize = 65536;
                setsockopt(c->fd, IPPROTO_TCP, TCP_MAXSEG,  &segsize, sizeof(int));
 #endif
                int window_size = 128 * 1024;   
@@ -223,6 +212,8 @@ int add_service(char *name, enum connection_type type, unsigned short port, int
                        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
@@ -246,7 +237,7 @@ int remove_service(unsigned short port)
        service_t *c;
        
        /* find service */
-       while((c = *p))
+       while ((c = *p))
        {               
                if (c->port == port)
                {       
@@ -273,7 +264,7 @@ int remove_services(void)
        service_t *c = services;
 
        /* loop service */
-       while(c)
+       while (c)
        {
                service_t *next = c->next;
 
@@ -319,7 +310,7 @@ int server_loop(command_context_t *command_context)
        tv.tv_sec = 0;
        tv.tv_usec = 10000;
        
-       while(!shutdown_openocd)
+       while (!shutdown_openocd)
        {
                /* monitor sockets for acitvity */
                fd_max = 0;
@@ -365,7 +356,7 @@ int server_loop(command_context_t *command_context)
                kept_alive();
                
                /* Only while we're sleeping we'll let others run */
-               retval = select(fd_max + 1, &read_fds, NULL, NULL, &tv);
+               retval = socket_select(fd_max + 1, &read_fds, NULL, NULL, &tv);
                openocd_sleep_postlude();
 
                if (retval == -1)
@@ -421,7 +412,7 @@ int server_loop(command_context_t *command_context)
                                        if (service->type != CONNECTION_PIPE)
                                        {
                                                struct sockaddr_in sin;
-                                               unsigned int address_size = sizeof(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);
@@ -503,7 +494,7 @@ int server_init(void)
        WORD wVersionRequested;
        WSADATA wsaData;
 
-       wVersionRequested = MAKEWORD( 2, 2 );
+       wVersionRequested = MAKEWORD(2, 2);
 
        if (WSAStartup(wVersionRequested, &wsaData) != 0)
        {
@@ -511,7 +502,16 @@ int server_init(void)
                exit(-1);
        }
 
-       SetConsoleCtrlHandler( ControlHandler, TRUE );
+       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);