X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fserver%2Fserver.c;h=4e8ddc692e6b861f204d43d7680487880e157607;hb=0689e3dd6752f45f493eceb3edf040fbc7849846;hp=4c4fdecccd1972b203ec9a2c9ac262879680915b;hpb=1429d2c659ab9b84dee673e7697da7eab44a8f90;p=openocd.git

diff --git a/src/server/server.c b/src/server/server.c
index 4c4fdecccd..4e8ddc692e 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -47,7 +47,7 @@ int handle_shutdown_command(struct command_context_s *cmd_ctx, char *cmd, char *
 int add_connection(service_t *service, command_context_t *cmd_ctx)
 {
 	unsigned int address_size;
-	connection_t *c, *p;
+	connection_t *c, **p;
 	int retval;
 	
 	c = malloc(sizeof(connection_t));
@@ -73,16 +73,9 @@ int add_connection(service_t *service, command_context_t *cmd_ctx)
 		free(c);
 	}
 	
-	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 +84,28 @@ 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);
-			
 			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 +113,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));
@@ -166,29 +157,21 @@ int add_service(char *name, enum connection_type type, unsigned short port, int
 		exit(-1);
 	}
 	
-	if (services)
-	{
-		for (p = services; p && p->next; p = p->next);
-		if (p)
-			p->next = c;
-	}
-	else
-	{
-		services = c;
-	}
+	/* 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,11 +181,12 @@ 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;
@@ -230,6 +214,8 @@ int remove_services()
 		c = next;
 	}
 
+	services = NULL;
+	
 	return ERROR_OK;
 }
 
@@ -291,7 +277,9 @@ int server_loop(command_context_t *command_context)
 		FD_SET(fileno(stdin), &read_fds);
 #endif
 
-		if ((retval = select(fd_max + 1, &read_fds, NULL, NULL, &tv)) == -1)
+		retval = select(fd_max + 1, &read_fds, NULL, NULL, &tv);
+		
+		if (retval == -1)
 		{
 #ifdef _WIN32
 
@@ -307,7 +295,9 @@ int server_loop(command_context_t *command_context)
 #else
 
 			if (errno == EINTR)
+			{
 				FD_ZERO(&read_fds);
+			}
 			else
 			{
 				ERROR("error during select: %s", strerror(errno));
@@ -323,13 +313,7 @@ int server_loop(command_context_t *command_context)
 			/* 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,7 +323,9 @@ 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;
@@ -386,7 +372,8 @@ int server_loop(command_context_t *command_context)
 		MSG msg;
 		while (PeekMessage(&msg,NULL,0,0,PM_REMOVE))
 		{
-			if (msg.message==WM_QUIT) shutdown_openocd = 1;
+			if (msg.message == WM_QUIT)
+				shutdown_openocd = 1;
 		}
 #endif
 	}
@@ -422,10 +409,10 @@ int server_init()
 
 	SetConsoleCtrlHandler( ControlHandler, TRUE );
 
-        signal(SIGINT, sig_handler);
-        signal(SIGTERM, sig_handler);
-        signal(SIGBREAK, sig_handler);
-        signal(SIGABRT, sig_handler);
+	signal(SIGINT, sig_handler);
+	signal(SIGTERM, sig_handler);
+	signal(SIGBREAK, sig_handler);
+	signal(SIGABRT, sig_handler);
 #endif
 
 	
@@ -460,3 +447,4 @@ int handle_shutdown_command(struct command_context_s *cmd_ctx, char *cmd, char *
 	return ERROR_COMMAND_CLOSE_CONNECTION;
 }
 
+