proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-17 18:27:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #627 from donaldsharp/ripng

Browse Source 
Ripng
This commit is contained in:
David Lamparter 2017-05-30 14:29:35 +02:00 committed by GitHub
commit eed6bb1eec
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ripngd/ripng_interface.c
View File

@ -755,9 +755,7 @@ ripng_enable_apply (struct interface *ifp)
/* Update running status of the interface. */ /* Update running status of the interface. */
if (ri->enable_network || ri->enable_interface) if (ri->enable_network || ri->enable_interface)
{ {
{ zlog_info ("RIPng INTERFACE ON %s", ifp->name);
if (IS_RIPNG_DEBUG_EVENT)
zlog_debug ("RIPng turn on %s", ifp->name);
/* Add interface wake up thread. */ /* Add interface wake up thread. */
thread_add_timer(master, ripng_interface_wakeup, ifp, 1, thread_add_timer(master, ripng_interface_wakeup, ifp, 1,
@ -765,7 +763,6 @@ ripng_enable_apply (struct interface *ifp)
ripng_connect_set (ifp, 1); ripng_connect_set (ifp, 1);
} }
}
else else
{ {
if (ri->running) if (ri->running)
@ -949,7 +946,7 @@ DEFUN (ripng_network,
ripng_network_cmd, ripng_network_cmd,
"network IF_OR_ADDR", "network IF_OR_ADDR",
"RIPng enable on specified interface or network.\n" "RIPng enable on specified interface or network.\n"
"Interface or address") "Interface or address\n")
{ {
int idx_if_or_addr = 1; int idx_if_or_addr = 1;
int ret; int ret;
@ -979,7 +976,7 @@ DEFUN (no_ripng_network,
"no network IF_OR_ADDR", "no network IF_OR_ADDR",
NO_STR NO_STR
"RIPng enable on specified interface or network.\n" "RIPng enable on specified interface or network.\n"
"Interface or address") "Interface or address\n")
{ {
int idx_if_or_addr = 2; int idx_if_or_addr = 2;
int ret; int ret;

6
ripngd/ripngd.c
View File

@ -2170,7 +2170,7 @@ DEFUN (clear_ipv6_rip,
"clear ipv6 ripng", "clear ipv6 ripng",
CLEAR_STR CLEAR_STR
IPV6_STR IPV6_STR
"Clear IPv6 RIP database") "Clear IPv6 RIP database\n")
{ {
struct route_node *rp; struct route_node *rp;
struct ripng_info *rinfo; struct ripng_info *rinfo;
@ -2357,7 +2357,7 @@ DEFUN (no_ripng_aggregate_address,
"no aggregate-address X:X::X:X/M", "no aggregate-address X:X::X:X/M",
NO_STR NO_STR
"Delete aggregate RIPng route announcement\n" "Delete aggregate RIPng route announcement\n"
"Aggregate network") "Aggregate network\n")
{ {
int idx_ipv6_prefixlen = 2; int idx_ipv6_prefixlen = 2;
int ret; int ret;
@ -2576,7 +2576,7 @@ DEFUN (show_ipv6_protocols,
"show ipv6 protocols", "show ipv6 protocols",
SHOW_STR SHOW_STR
IPV6_STR IPV6_STR
"Routing protocol information") "Routing protocol information\n")
{ {
if (! ripng) if (! ripng)
return CMD_SUCCESS; return CMD_SUCCESS;