proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-16 18:50:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixup of some last remaining differences between stg and git

Browse Source
This commit is contained in:
Donald Sharp 2015-07-22 13:12:22 -07:00
parent c8ed14ddb6
commit 7ce2a26cd7
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/vty.c
View File

@ -2399,7 +2399,7 @@ vty_read_config (char *config_file,
{ {
fprintf (stderr, "%s: failed to open configuration file %s: %s\n", fprintf (stderr, "%s: failed to open configuration file %s: %s\n",
__func__, config_default_dir, safe_strerror (errno)); __func__, config_default_dir, safe_strerror (errno));
confp = vty_use_backup_config (config_default_dir); confp = vty_use_backup_config (config_default_dir);
if (confp) if (confp)
{ {
@ -2409,10 +2409,10 @@ vty_read_config (char *config_file,
else else
{ {
fprintf (stderr, "can't open configuration file [%s]\n", fprintf (stderr, "can't open configuration file [%s]\n",
config_default_dir); config_default_dir);
exit (1); exit (1);
} }
} }
else else
fullpath = config_default_dir; fullpath = config_default_dir;
} }

2
ripd/ripd.c
View File

@ -2159,7 +2159,7 @@ rip_output_process (struct connected *ifc, struct sockaddr_in *to,
/* Reset stream and RTE counter. */ /* Reset stream and RTE counter. */
stream_reset (s); stream_reset (s);
rtemax = RIP_MAX_RTE; rtemax = (RIP_PACKET_MAXSIZ - 4) / 20;
/* Get RIP interface. */ /* Get RIP interface. */
ri = ifc->ifp->info; ri = ifc->ifp->info;

1
vtysh/vtysh.c
View File

@ -2020,6 +2020,7 @@ backup_config_file (const char *fbackup)
static int static int
write_config_integrated(void) write_config_integrated(void)
{ {
int ret;
u_int i; u_int i;
char line[] = "write terminal\n"; char line[] = "write terminal\n";
FILE *fp, *fp1; FILE *fp, *fp1;

3
vtysh/vtysh_user.c
View File

@ -38,9 +38,6 @@
#include "linklist.h" #include "linklist.h"
#include "command.h" #include "command.h"
extern struct list *config_top;
extern void config_add_line(struct list *config, const char *line);
/* /*
* Compiler is warning about prototypes not being declared. * Compiler is warning about prototypes not being declared.
* The DEFUNSH and DEFUN macro's are messing with the * The DEFUNSH and DEFUN macro's are messing with the