proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-31 08:35:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Matthew Grant <grantma@anathoth.gen.nz>

Browse Source 
[zebra 17290] [PATCHES] - Fixes for problems in 0.93b

portfix patch
This commit is contained in:
paul 2003-01-22 19:47:09 +00:00
parent d753e9eec9
commit 4fc4e7ab47
6 changed files with 65 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bgpd/bgp_main.c
View File

@ -113,7 +113,7 @@ sighup (int sig)
vty_read_config (config_file, config_current, config_default);
/* Create VTY's socket */
vty_serv_sock (vty_addr, vty_port ? vty_port : BGP_VTY_PORT, BGP_VTYSH_PATH);
vty_serv_sock (vty_addr, vty_port, BGP_VTYSH_PATH);
/* Try to return to normal operation. */
}
@ -222,7 +222,15 @@ main (int argc, char **argv)
vty_addr = optarg;
break;
case 'P':
vty_port = atoi (optarg);
/* Deal with atoi() returning 0 on failure, and bgpd not
listening on bgp port... */
if (strcmp(optarg, "0") == 0)
{
vty_port = 0;
break;
}
vty_port = atoi (optarg);
vty_port = (vty_port ? vty_port : BGP_VTY_PORT);
break;
case 'r':
retain_mode = 1;

15
ospf6d/ospf6_main.c
View File

@ -206,7 +206,7 @@ main (int argc, char *argv[], char *envp[])
char *p;
int opt;
char *vty_addr = NULL;
int vty_port = 0;
int vty_port = OSPF6_VTY_PORT;
char *config_file = NULL;
char *progname;
struct thread thread;
@ -253,8 +253,16 @@ main (int argc, char *argv[], char *envp[])
pid_file = optarg;
break;
case 'P':
/* Deal with atoi() returning 0 on failure, and ospf6d not
listening on ospf6d port... */
if (strcmp(optarg, "0") == 0)
{
vty_port = 0;
break;
}
vty_port = atoi (optarg);
break;
vty_port = (vty_port ? vty_port : OSPF6_VTY_PORT);
break;
case 'v':
print_version (progname);
exit (0);
@ -305,8 +313,7 @@ main (int argc, char *argv[], char *envp[])
thread_add_read (master, ospf6_receive, NULL, ospf6_sock);
/* Make ospf vty socket. */
vty_serv_sock (vty_addr,
vty_port ? vty_port : OSPF6_VTY_PORT, OSPF6_VTYSH_PATH);
vty_serv_sock (vty_addr, vty_port, OSPF6_VTYSH_PATH);
/* Print start message */
zlog_notice ("OSPF6d (Zebra-%s ospf6d-%s) starts",

17
ospfd/ospf_main.c
View File

@ -170,7 +170,7 @@ main (int argc, char **argv)
{
char *p;
char *vty_addr = NULL;
int vty_port = 0;
int vty_port = OSPF_VTY_PORT;
int daemon_mode = 0;
char *config_file = NULL;
char *progname;
@ -219,8 +219,16 @@ main (int argc, char **argv)
pid_file = optarg;
break;
case 'P':
vty_port = atoi (optarg);
break;
/* Deal with atoi() returning 0 on failure, and ospfd not
listening on ospfd port... */
if (strcmp(optarg, "0") == 0)
{
vty_port = 0;
break;
}
vty_port = atoi (optarg);
vty_port = (vty_port ? vty_port : OSPF_VTY_PORT);
break;
case 'v':
print_version (progname);
exit (0);
@ -277,8 +285,7 @@ main (int argc, char **argv)
pid_output (pid_file);
/* Create VTY socket */
vty_serv_sock (vty_addr,
vty_port ? vty_port : OSPF_VTY_PORT, OSPF_VTYSH_PATH);
vty_serv_sock (vty_addr, vty_port, OSPF_VTYSH_PATH);
/* Print banner. */
zlog (NULL, LOG_INFO, "OSPFd (%s) starts", ZEBRA_VERSION);

10
ripd/rip_main.c
View File

@ -211,7 +211,15 @@ main (int argc, char **argv)
pid_file = optarg;
break;
case 'P':
vty_port = atoi (optarg);
/* Deal with atoi() returning 0 on failure, and ripd not
listening on rip port... */
if (strcmp(optarg, "0") == 0)
{
vty_port = 0;
break;
}
vty_port = atoi (optarg);
vty_port = (vty_port ? vty_port : RIP_VTY_PORT);
break;
case 'r':
retain_mode = 1;

19
ripngd/ripng_main.c
View File

@ -155,7 +155,7 @@ main (int argc, char **argv)
{
char *p;
char *vty_addr = NULL;
int vty_port = 0;
int vty_port = RIPNG_VTY_PORT;
int daemon_mode = 0;
char *config_file = NULL;
char *progname;
@ -197,10 +197,18 @@ main (int argc, char **argv)
break;
case 'i':
pid_file = optarg;
break;
break;
case 'P':
vty_port = atoi (optarg);
break;
/* Deal with atoi() returning 0 on failure, and ripngd not
listening on ripngd port... */
if (strcmp(optarg, "0") == 0)
{
vty_port = 0;
break;
}
vty_port = atoi (optarg);
vty_port = (vty_port ? vty_port : RIPNG_VTY_PORT);
break;
case 'r':
retain_mode = 1;
break;
@ -237,8 +245,7 @@ main (int argc, char **argv)
daemon (0, 0);
/* Create VTY socket */
vty_serv_sock (vty_addr,
vty_port ? vty_port : RIPNG_VTY_PORT, RIPNG_VTYSH_PATH);
vty_serv_sock (vty_addr, vty_port, RIPNG_VTYSH_PATH);
/* Process id file create. */
pid_output (pid_file);

13
zebra/main.c
View File

@ -174,7 +174,7 @@ main (int argc, char **argv)
{
char *p;
char *vty_addr = NULL;
int vty_port = 0;
int vty_port = ZEBRA_VTY_PORT;
int batch_mode = 0;
int daemon_mode = 0;
char *config_file = NULL;
@ -226,7 +226,15 @@ main (int argc, char **argv)
pid_file = optarg;
break;
case 'P':
/* Deal with atoi() returning 0 on failure, and zebra not
listening on zebra port... */
if (strcmp(optarg, "0") == 0)
{
vty_port = 0;
break;
}
vty_port = atoi (optarg);
vty_port = (vty_port ? vty_port : ZEBRA_VTY_PORT);
break;
case 'r':
retain_mode = 1;
@ -305,8 +313,7 @@ main (int argc, char **argv)
pid = getpid ();
/* Make vty server socket. */
vty_serv_sock (vty_addr,
vty_port ? vty_port : ZEBRA_VTY_PORT, ZEBRA_VTYSH_PATH);
vty_serv_sock (vty_addr, vty_port, ZEBRA_VTYSH_PATH);
while (thread_fetch (master, &thread))
thread_call (&thread);