vty: handle static allocation consistently

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
kronosnet · Nov 1, 2010 · 2162a40 · 2162a40
1 parent 6fe6f32
commit 2162a40
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/vty.c b/vty.c
@@ -22,7 +22,7 @@ STATIC int vty_current_connections = 0;
 STATIC int daemon_quit = 0;
 
 pthread_mutex_t knet_vty_mutex = PTHREAD_MUTEX_INITIALIZER;
-struct knet_vty knet_vtys[KNET_VTY_TOTAL_MAX_CONN+1];
+struct knet_vty knet_vtys[KNET_VTY_TOTAL_MAX_CONN];
 
 static void sigterm_handler(int sig)
 {
@@ -148,7 +148,7 @@ int knet_vty_main_loop(const char *configfile, const char *ip_addr,
 
 		if ((se_result == -1) && (daemon_quit)) {
 			log_info("Got a SIGTERM, requesting CLI threads to exit");	
-			for(conn_index = 0; conn_index <= KNET_VTY_TOTAL_MAX_CONN; conn_index++) {
+			for(conn_index = 0; conn_index < KNET_VTY_TOTAL_MAX_CONN; conn_index++) {
 				if (knet_vtys[conn_index].active) {
 					knet_vty_write(&knet_vtys[conn_index], "%s%sServer is going down..%s%s",
 						telnet_newline, telnet_newline, telnet_newline, telnet_newline);
@@ -169,7 +169,7 @@ int knet_vty_main_loop(const char *configfile, const char *ip_addr,
 
 		if (se_result == 0) {
 			pthread_mutex_lock(&knet_vty_mutex);
-			for(conn_index = 0; conn_index <= KNET_VTY_TOTAL_MAX_CONN; conn_index++) {
+			for(conn_index = 0; conn_index < KNET_VTY_TOTAL_MAX_CONN; conn_index++) {
 				if ((knet_vtys[conn_index].active) &&
 				    (!knet_vtys[conn_index].disable_idle)) {
 					knet_vtys[conn_index].idle++;

diff --git a/vty.h b/vty.h
@@ -41,7 +41,7 @@ struct knet_vty {
 };
 
 extern pthread_mutex_t knet_vty_mutex;
-extern struct knet_vty knet_vtys[KNET_VTY_TOTAL_MAX_CONN+1];
+extern struct knet_vty knet_vtys[KNET_VTY_TOTAL_MAX_CONN];
 
 int knet_vty_main_loop(const char *configfile, const char *ip_addr,
 		       const char *port);

diff --git a/vty_cli_cmds.c b/vty_cli_cmds.c
@@ -33,7 +33,7 @@ static int knet_cmd_who(struct knet_vty *vty)
 
 	pthread_mutex_lock(&knet_vty_mutex);
 
-	for(conn_index = 0; conn_index <= KNET_VTY_TOTAL_MAX_CONN; conn_index++) {
+	for(conn_index = 0; conn_index < KNET_VTY_TOTAL_MAX_CONN; conn_index++) {
 		if (knet_vtys[conn_index].active) {
 			knet_vty_write(vty, " User: %s on vty(%d) from %s%s",
 				knet_vtys[conn_index].username,