proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-16 22:52:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

2005-02-23 Andrew J. Schorr <ajschorr@alumni.princeton.edu>

Browse Source 
* {vty.h,vty.c}: Remove vty_finish (duplicate of vty_reset).
	* isis_main.c: (reload) Call vty_reset instead of vty_finish (both
	  functions were exactly the same).
This commit is contained in:
ajs 2005-02-23 15:48:32 +00:00
parent 5c33349b3e
commit cdb6ee94bc
5 changed files with 10 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
isisd/ChangeLog
View File

@ -1,3 +1,8 @@
2005-02-23 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* isis_main.c: (reload) Call vty_reset instead of vty_finish (both
functions were exactly the same).
2005-01-18 Hasso Tepper <hasso at quagga.net> 2005-01-18 Hasso Tepper <hasso at quagga.net>
* *.c: Changed many functions to static. Some commented out * *.c: Changed many functions to static. Some commented out

2
isisd/isis_main.c
View File

@ -139,7 +139,7 @@ reload ()
{ {
zlog_debug ("Reload"); zlog_debug ("Reload");
/* FIXME: Clean up func call here */ /* FIXME: Clean up func call here */
vty_finish (); vty_reset ();
execve (_progpath, _argv, _envp); execve (_progpath, _argv, _envp);
} }

4
lib/ChangeLog
View File

@ -1,3 +1,7 @@
2005-02-23 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* {vty.h,vty.c}: Remove vty_finish (duplicate of vty_reset).
2005-02-23 Andrew J. Schorr <ajschorr@alumni.princeton.edu> 2005-02-23 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* buffer.h: Make the struct buffer and struct buffer_data structures * buffer.h: Make the struct buffer and struct buffer_data structures

40
lib/vty.c
View File

@ -2780,46 +2780,6 @@ vty_reset ()
} }
} }
/* for ospf6d easy temprary reload function */
/* vty_reset + close accept socket */
void
vty_finish ()
{
unsigned int i;
struct vty *vty;
struct thread *vty_serv_thread;
for (i = 0; i < vector_max (vtyvec); i++)
if ((vty = vector_slot (vtyvec, i)) != NULL)
{
buffer_reset (vty->obuf);
vty->status = VTY_CLOSE;
vty_close (vty);
}
for (i = 0; i < vector_max (Vvty_serv_thread); i++)
if ((vty_serv_thread = vector_slot (Vvty_serv_thread, i)) != NULL)
{
thread_cancel (vty_serv_thread);
vector_slot (Vvty_serv_thread, i) = NULL;
close (i);
}
vty_timeout_val = VTY_TIMEOUT_DEFAULT;
if (vty_accesslist_name)
{
XFREE(MTYPE_VTY, vty_accesslist_name);
vty_accesslist_name = NULL;
}
if (vty_ipv6_accesslist_name)
{
XFREE(MTYPE_VTY, vty_ipv6_accesslist_name);
vty_ipv6_accesslist_name = NULL;
}
}
static void static void
vty_save_cwd (void) vty_save_cwd (void)
{ {

1
lib/vty.h
View File

@ -181,7 +181,6 @@ extern char integrate_default[];
void vty_init (struct thread_master *); void vty_init (struct thread_master *);
void vty_init_vtysh (void); void vty_init_vtysh (void);
void vty_reset (void); void vty_reset (void);
void vty_finish (void);
struct vty *vty_new (void); struct vty *vty_new (void);
int vty_out (struct vty *, const char *, ...) PRINTF_ATTRIBUTE(2, 3); int vty_out (struct vty *, const char *, ...) PRINTF_ATTRIBUTE(2, 3);
void vty_read_config (char *, char *); void vty_read_config (char *, char *);