1 files changed, 4 insertions, 27 deletions
diff --git a/lib/vty.c b/lib/vty.c
index c500a45194..54a5f727e1 100644
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -2212,7 +2212,10 @@ vtysh_read (struct thread *thread)
         }
     }
 
-  vty_event (VTYSH_READ, sock, vty);
+  if (vty->status == VTY_CLOSE)
+    vty_close (vty);
+  else
+    vty_event (VTYSH_READ, sock, vty);
 
   return 0;
 }
@@ -3151,29 +3154,3 @@ vty_terminate (void)
       Vvty_serv_thread = NULL;
     }
 }
-
-/* Utility functions to get arguments from commands generated
-   by the xml2cli.pl script. */
-const char *
-vty_get_arg_value (struct vty_arg *args[], const char *arg)
-{
-  while (*args)
-    {
-      if (strcmp ((*args)->name, arg) == 0)
-        return (*args)->value;
-      args++;
-    }
-  return NULL;
-}
-
-struct vty_arg *
-vty_get_arg (struct vty_arg *args[], const char *arg)
-{
-  while (*args)
-    {
-      if (strcmp ((*args)->name, arg) == 0)
-        return *args;
-      args++;
-    }
-  return NULL;
-}