server/server: Remove all connections on shutdown

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

diff --git a/src/server/server.c b/src/server/server.c
index 1e52e979d7ff0fce99baa183c660822d1c45f167..6fa864bbc67eb8ec5222f044e20245c758d8bc4f 100644 (file)
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -300,10 +300,11 @@ int add_service(char *name,
                }
 
                struct sockaddr_in addr_in;
                }
 
                struct sockaddr_in addr_in;

+               addr_in.sin_port = 0;

                socklen_t addr_in_size = sizeof(addr_in);
                socklen_t addr_in_size = sizeof(addr_in);

-               getsockname(c->fd, (struct sockaddr *)&addr_in, &addr_in_size);
-               LOG_INFO("Listening on port %hu for %s connections",
-                               ntohs(addr_in.sin_port), name);
+               if (getsockname(c->fd, (struct sockaddr *)&addr_in, &addr_in_size) == 0)
+                       LOG_INFO("Listening on port %hu for %s connections",
+                                ntohs(addr_in.sin_port), name);

        } else if (c->type == CONNECTION_STDINOUT) {
                c->fd = fileno(stdin);
 
        } else if (c->type == CONNECTION_STDINOUT) {
                c->fd = fileno(stdin);
 


@@ -344,6 +345,21 @@ int add_service(char *name,
        return ERROR_OK;
 }
 
        return ERROR_OK;
 }
 

+static void remove_connections(struct service *service)
+{
+       struct connection *connection;
+
+       connection = service->connections;
+
+       while (connection) {
+               struct connection *tmp;
+
+               tmp = connection->next;
+               remove_connection(service, connection);
+               connection = tmp;
+       }
+}
+

 static int remove_services(void)
 {
        struct service *c = services;
 static int remove_services(void)
 {
        struct service *c = services;


@@ -352,6 +368,8 @@ static int remove_services(void)
        while (c) {
                struct service *next = c->next;
 
        while (c) {
                struct service *next = c->next;
 

+               remove_connections(c);
+

                if (c->name)
                        free(c->name);
 
                if (c->name)
                        free(c->name);