server: remove connection limit from tcl and telnet servers

Add constant CONNECTION_LIMIT_UNLIMITED which indicates a service
has no connection limit

Change-Id: I008d31264010c25fa44ca74eb6d5740eca38bee1
Signed-off-by: Austin Morton <austinpmorton@gmail.com>
Reviewed-on: http://openocd.zylin.com/2937
Tested-by: jenkins
Reviewed-by: Paul Fertser <fercerpav@gmail.com>

diff --git a/src/server/server.c b/src/server/server.c
index 7e90d89fd2d6af7d1a3cc89b80a70186e84a6c6e..24747f9387dc36258a3374042c64a13ad931227d 100644 (file)
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -145,7 +145,8 @@ static int add_connection(struct service *service, struct command_context *cmd_c
                ;
        *p = c;
 
-       service->max_connections--;
+       if (service->max_connections != CONNECTION_LIMIT_UNLIMITED)
+               service->max_connections--;
 
        return ERROR_OK;
 }
@@ -172,7 +173,9 @@ static int remove_connection(struct service *service, struct connection *connect
                        *p = c->next;
                        free(c);
 
-                       service->max_connections++;
+                       if (service->max_connections != CONNECTION_LIMIT_UNLIMITED)
+                               service->max_connections++;
+
                        break;
                }
 
@@ -446,7 +449,7 @@ int server_loop(struct command_context *command_context)
                        /* handle new connections on listeners */
                        if ((service->fd != -1)
                            && (FD_ISSET(service->fd, &read_fds))) {
-                               if (service->max_connections > 0)
+                               if (service->max_connections != 0)
                                        add_connection(service, command_context);
                                else {
                                        if (service->type == CONNECTION_TCP) {

diff --git a/src/server/server.h b/src/server/server.h
index 34c870aabc4a836e07d65ac0225f8b5a63d482f7..061523346caa52d8e22404ead24ffb5852fc0870 100644 (file)
--- a/src/server/server.h
+++ b/src/server/server.h
@@ -39,6 +39,8 @@ enum connection_type {
        CONNECTION_STDINOUT
 };
 
+#define CONNECTION_LIMIT_UNLIMITED             (-1)
+
 struct connection {
        int fd;
        int fd_out;     /* When using pipes we're writing to a different fd */

diff --git a/src/server/tcl_server.c b/src/server/tcl_server.c
index 409567c9d90e9e515cee078dea3b3048409daf4e..a4270a8445667445a448730e8d627ad455342d29 100644 (file)
--- a/src/server/tcl_server.c
+++ b/src/server/tcl_server.c
@@ -250,7 +250,7 @@ int tcl_init(void)
                return ERROR_OK;
        }
 
-       return add_service("tcl", tcl_port, 1,
+       return add_service("tcl", tcl_port, CONNECTION_LIMIT_UNLIMITED,
                &tcl_new_connection, &tcl_input,
                &tcl_closed, NULL);
 }

diff --git a/src/server/telnet_server.c b/src/server/telnet_server.c
index 92d8c5ea6903486387b2a6fe34f28679ed27a1e9..2187dbe280bdf71585ad2905acd40cd5f6194879 100644 (file)
--- a/src/server/telnet_server.c
+++ b/src/server/telnet_server.c
@@ -625,7 +625,7 @@ int telnet_init(char *banner)
 
        return add_service("telnet",
                telnet_port,
-               1,
+               CONNECTION_LIMIT_UNLIMITED,
                telnet_new_connection,
                telnet_input,
                telnet_connection_closed,