matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

ospf6d: fix DEFUN formatting wrecked by clang

Browse source 
clang-format doesn't understand `DEFUN` and formats it rather ugly.
Standard approach was to skip these in clang-format, which hasn't
happened here sadly.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2024-04-25 11:45:19 +02:00
parent 7ba58e97ff
commit b47657600b
2 changed files with 458 additions and 246 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

602
ospf6d/ospf6_interface.c
View file

@ -1395,10 +1395,17 @@ static int show_ospf6_interface_common(struct vty *vty, vrf_id_t vrf_id,
} }
/* show interface */ /* show interface */
DEFUN(show_ipv6_ospf6_interface, show_ipv6_ospf6_interface_ifname_cmd, DEFUN(show_ipv6_ospf6_interface,
show_ipv6_ospf6_interface_ifname_cmd,
"show ipv6 ospf6 [vrf <NAME|all>] interface [IFNAME] [json]", "show ipv6 ospf6 [vrf <NAME|all>] interface [IFNAME] [json]",
SHOW_STR IP6_STR OSPF6_STR VRF_CMD_HELP_STR SHOW_STR
"All VRFs\n" INTERFACE_STR IFNAME_STR JSON_STR) IP6_STR
OSPF6_STR
VRF_CMD_HELP_STR
"All VRFs\n"
INTERFACE_STR
IFNAME_STR
JSON_STR)
{ {
int idx_ifname = 4; int idx_ifname = 4;
int intf_idx = 5; int intf_idx = 5;
@ -1598,11 +1605,18 @@ static int ospf6_interface_show_traffic_common(struct vty *vty, int argc,
} }
/* show interface */ /* show interface */
DEFUN(show_ipv6_ospf6_interface_traffic, show_ipv6_ospf6_interface_traffic_cmd, DEFUN(show_ipv6_ospf6_interface_traffic,
show_ipv6_ospf6_interface_traffic_cmd,
"show ipv6 ospf6 [vrf <NAME|all>] interface traffic [IFNAME] [json]", "show ipv6 ospf6 [vrf <NAME|all>] interface traffic [IFNAME] [json]",
SHOW_STR IP6_STR OSPF6_STR VRF_CMD_HELP_STR SHOW_STR
"All VRFs\n" INTERFACE_STR IP6_STR
"Protocol Packet counters\n" IFNAME_STR JSON_STR) OSPF6_STR
VRF_CMD_HELP_STR
"All VRFs\n"
INTERFACE_STR
"Protocol Packet counters\n"
IFNAME_STR
JSON_STR)
{ {
struct ospf6 *ospf6; struct ospf6 *ospf6;
struct listnode *node; struct listnode *node;
@ -1631,17 +1645,21 @@ DEFUN(show_ipv6_ospf6_interface_traffic, show_ipv6_ospf6_interface_traffic_cmd,
DEFUN(show_ipv6_ospf6_interface_ifname_prefix, DEFUN(show_ipv6_ospf6_interface_ifname_prefix,
show_ipv6_ospf6_interface_ifname_prefix_cmd, show_ipv6_ospf6_interface_ifname_prefix_cmd,
"show ipv6 ospf6 [vrf <NAME|all>] interface IFNAME prefix\ "show ipv6 ospf6 [vrf <NAME|all>] interface IFNAME prefix "
[<\ "[<detail|<X:X::X:X|X:X::X:X/M> [<match|detail>]>] [json]",
detail\ SHOW_STR
|<X:X::X:X|X:X::X:X/M> [<match|detail>]\ IP6_STR
>] [json]", OSPF6_STR
SHOW_STR IP6_STR OSPF6_STR VRF_CMD_HELP_STR VRF_CMD_HELP_STR
"All VRFs\n" INTERFACE_STR IFNAME_STR "All VRFs\n"
INTERFACE_STR IFNAME_STR
"Display connected prefixes to advertise\n" "Display connected prefixes to advertise\n"
"Display details of the prefixes\n" OSPF6_ROUTE_ADDRESS_STR "Display details of the prefixes\n"
OSPF6_ROUTE_PREFIX_STR OSPF6_ROUTE_MATCH_STR OSPF6_ROUTE_ADDRESS_STR
"Display details of the prefixes\n" JSON_STR) OSPF6_ROUTE_PREFIX_STR
OSPF6_ROUTE_MATCH_STR
"Display details of the prefixes\n"
JSON_STR)
{ {
int idx_ifname = 4; int idx_ifname = 4;
int idx_prefix = 6; int idx_prefix = 6;
@ -1693,17 +1711,23 @@ DEFUN(show_ipv6_ospf6_interface_ifname_prefix,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN(show_ipv6_ospf6_interface_prefix, show_ipv6_ospf6_interface_prefix_cmd, DEFUN(show_ipv6_ospf6_interface_prefix,
"show ipv6 ospf6 [vrf <NAME|all>] interface prefix\ show_ipv6_ospf6_interface_prefix_cmd,
[<\ "show ipv6 ospf6 [vrf <NAME|all>] interface prefix "
detail\ "[<detail|<X:X::X:X|X:X::X:X/M> [<match|detail>]>] [json]",
|<X:X::X:X|X:X::X:X/M> [<match|detail>]\ SHOW_STR
>] [json]", IP6_STR
SHOW_STR IP6_STR OSPF6_STR VRF_CMD_HELP_STR OSPF6_STR
"All VRFs\n" INTERFACE_STR "Display connected prefixes to advertise\n" VRF_CMD_HELP_STR
"Display details of the prefixes\n" OSPF6_ROUTE_ADDRESS_STR "All VRFs\n"
OSPF6_ROUTE_PREFIX_STR OSPF6_ROUTE_MATCH_STR INTERFACE_STR
"Display details of the prefixes\n" JSON_STR) "Display connected prefixes to advertise\n"
"Display details of the prefixes\n"
OSPF6_ROUTE_ADDRESS_STR
OSPF6_ROUTE_PREFIX_STR
OSPF6_ROUTE_MATCH_STR
"Display details of the prefixes\n"
JSON_STR)
{ {
struct vrf *vrf = NULL; struct vrf *vrf = NULL;
int idx_prefix = 5; int idx_prefix = 5;
@ -1802,11 +1826,14 @@ void ospf6_interface_stop(struct ospf6_interface *oi)
} }
/* interface variable set command */ /* interface variable set command */
DEFUN(ipv6_ospf6_area, ipv6_ospf6_area_cmd, DEFUN (ipv6_ospf6_area,
"ipv6 ospf6 area <A.B.C.D|(0-4294967295)>", ipv6_ospf6_area_cmd,
IP6_STR OSPF6_STR "Specify the OSPF6 area ID\n" "ipv6 ospf6 area <A.B.C.D|(0-4294967295)>",
"OSPF6 area ID in IPv4 address notation\n" IP6_STR
"OSPF6 area ID in decimal notation\n") OSPF6_STR
"Specify the OSPF6 area ID\n"
"OSPF6 area ID in IPv4 address notation\n"
"OSPF6 area ID in decimal notation\n")
{ {
VTY_DECLVAR_CONTEXT(interface, ifp); VTY_DECLVAR_CONTEXT(interface, ifp);
struct ospf6_interface *oi; struct ospf6_interface *oi;
@ -1840,11 +1867,15 @@ DEFUN(ipv6_ospf6_area, ipv6_ospf6_area_cmd,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN(no_ipv6_ospf6_area, no_ipv6_ospf6_area_cmd, DEFUN (no_ipv6_ospf6_area,
"no ipv6 ospf6 area [<A.B.C.D|(0-4294967295)>]", no_ipv6_ospf6_area_cmd,
NO_STR IP6_STR OSPF6_STR "Specify the OSPF6 area ID\n" "no ipv6 ospf6 area [<A.B.C.D|(0-4294967295)>]",
"OSPF6 area ID in IPv4 address notation\n" NO_STR
"OSPF6 area ID in decimal notation\n") IP6_STR
OSPF6_STR
"Specify the OSPF6 area ID\n"
"OSPF6 area ID in IPv4 address notation\n"
"OSPF6 area ID in decimal notation\n")
{ {
VTY_DECLVAR_CONTEXT(interface, ifp); VTY_DECLVAR_CONTEXT(interface, ifp);
struct ospf6_interface *oi; struct ospf6_interface *oi;
@ -1864,9 +1895,14 @@ DEFUN(no_ipv6_ospf6_area, no_ipv6_ospf6_area_cmd,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN(ipv6_ospf6_ifmtu, ipv6_ospf6_ifmtu_cmd, "ipv6 ospf6 ifmtu (1-65535)", DEFUN (ipv6_ospf6_ifmtu,
IP6_STR OSPF6_STR "Interface MTU\n" ipv6_ospf6_ifmtu_cmd,
"OSPFv3 Interface MTU\n") "ipv6 ospf6 ifmtu (1-65535)",
IP6_STR
OSPF6_STR
"Interface MTU\n"
"OSPFv3 Interface MTU\n"
)
{ {
VTY_DECLVAR_CONTEXT(interface, ifp); VTY_DECLVAR_CONTEXT(interface, ifp);
int idx_number = 3; int idx_number = 3;
@ -1915,10 +1951,15 @@ DEFUN(ipv6_ospf6_ifmtu, ipv6_ospf6_ifmtu_cmd, "ipv6 ospf6 ifmtu (1-65535)",
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN(no_ipv6_ospf6_ifmtu, no_ipv6_ospf6_ifmtu_cmd, DEFUN (no_ipv6_ospf6_ifmtu,
"no ipv6 ospf6 ifmtu [(1-65535)]", no_ipv6_ospf6_ifmtu_cmd,
NO_STR IP6_STR OSPF6_STR "Interface MTU\n" "no ipv6 ospf6 ifmtu [(1-65535)]",
"OSPFv3 Interface MTU\n") NO_STR
IP6_STR
OSPF6_STR
"Interface MTU\n"
"OSPFv3 Interface MTU\n"
)
{ {
VTY_DECLVAR_CONTEXT(interface, ifp); VTY_DECLVAR_CONTEXT(interface, ifp);
struct ospf6_interface *oi; struct ospf6_interface *oi;
@ -1956,9 +1997,13 @@ DEFUN(no_ipv6_ospf6_ifmtu, no_ipv6_ospf6_ifmtu_cmd,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN(ipv6_ospf6_cost, ipv6_ospf6_cost_cmd, "ipv6 ospf6 cost (1-65535)", DEFUN (ipv6_ospf6_cost,
IP6_STR OSPF6_STR "Interface cost\n" ipv6_ospf6_cost_cmd,
"Outgoing metric of this interface\n") "ipv6 ospf6 cost (1-65535)",
IP6_STR
OSPF6_STR
"Interface cost\n"
"Outgoing metric of this interface\n")
{ {
VTY_DECLVAR_CONTEXT(interface, ifp); VTY_DECLVAR_CONTEXT(interface, ifp);
int idx_number = 3; int idx_number = 3;
@ -1989,10 +2034,14 @@ DEFUN(ipv6_ospf6_cost, ipv6_ospf6_cost_cmd, "ipv6 ospf6 cost (1-65535)",
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN(no_ipv6_ospf6_cost, no_ipv6_ospf6_cost_cmd, DEFUN (no_ipv6_ospf6_cost,
"no ipv6 ospf6 cost [(1-65535)]", no_ipv6_ospf6_cost_cmd,
NO_STR IP6_STR OSPF6_STR "Calculate interface cost from bandwidth\n" "no ipv6 ospf6 cost [(1-65535)]",
"Outgoing metric of this interface\n") NO_STR
IP6_STR
OSPF6_STR
"Calculate interface cost from bandwidth\n"
"Outgoing metric of this interface\n")
{ {
VTY_DECLVAR_CONTEXT(interface, ifp); VTY_DECLVAR_CONTEXT(interface, ifp);
struct ospf6_interface *oi; struct ospf6_interface *oi;
@ -2010,11 +2059,12 @@ DEFUN(no_ipv6_ospf6_cost, no_ipv6_ospf6_cost_cmd,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN(auto_cost_reference_bandwidth, auto_cost_reference_bandwidth_cmd, DEFUN (auto_cost_reference_bandwidth,
"auto-cost reference-bandwidth (1-4294967)", auto_cost_reference_bandwidth_cmd,
"Calculate OSPF interface cost according to bandwidth\n" "auto-cost reference-bandwidth (1-4294967)",
"Use reference bandwidth method to assign OSPF cost\n" "Calculate OSPF interface cost according to bandwidth\n"
"The reference bandwidth in terms of Mbits per second\n") "Use reference bandwidth method to assign OSPF cost\n"
"The reference bandwidth in terms of Mbits per second\n")
{ {
VTY_DECLVAR_CONTEXT(ospf6, o); VTY_DECLVAR_CONTEXT(ospf6, o);
int idx_number = 2; int idx_number = 2;
@ -2041,11 +2091,13 @@ DEFUN(auto_cost_reference_bandwidth, auto_cost_reference_bandwidth_cmd,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN(no_auto_cost_reference_bandwidth, no_auto_cost_reference_bandwidth_cmd, DEFUN (no_auto_cost_reference_bandwidth,
"no auto-cost reference-bandwidth [(1-4294967)]", no_auto_cost_reference_bandwidth_cmd,
NO_STR "Calculate OSPF interface cost according to bandwidth\n" "no auto-cost reference-bandwidth [(1-4294967)]",
"Use reference bandwidth method to assign OSPF cost\n" NO_STR
"The reference bandwidth in terms of Mbits per second\n") "Calculate OSPF interface cost according to bandwidth\n"
"Use reference bandwidth method to assign OSPF cost\n"
"The reference bandwidth in terms of Mbits per second\n")
{ {
VTY_DECLVAR_CONTEXT(ospf6, o); VTY_DECLVAR_CONTEXT(ospf6, o);
struct ospf6_area *oa; struct ospf6_area *oa;
@ -2064,10 +2116,11 @@ DEFUN(no_auto_cost_reference_bandwidth, no_auto_cost_reference_bandwidth_cmd,
} }
DEFUN(ospf6_write_multiplier, ospf6_write_multiplier_cmd, DEFUN (ospf6_write_multiplier,
"write-multiplier (1-100)", ospf6_write_multiplier_cmd,
"Write multiplier\n" "write-multiplier (1-100)",
"Maximum number of interface serviced per write\n") "Write multiplier\n"
"Maximum number of interface serviced per write\n")
{ {
VTY_DECLVAR_CONTEXT(ospf6, o); VTY_DECLVAR_CONTEXT(ospf6, o);
uint32_t write_oi_count; uint32_t write_oi_count;
@ -2082,10 +2135,12 @@ DEFUN(ospf6_write_multiplier, ospf6_write_multiplier_cmd,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN(no_ospf6_write_multiplier, no_ospf6_write_multiplier_cmd, DEFUN (no_ospf6_write_multiplier,
"no write-multiplier (1-100)", no_ospf6_write_multiplier_cmd,
NO_STR "Write multiplier\n" "no write-multiplier (1-100)",
"Maximum number of interface serviced per write\n") NO_STR
"Write multiplier\n"
"Maximum number of interface serviced per write\n")
{ {
VTY_DECLVAR_CONTEXT(ospf6, o); VTY_DECLVAR_CONTEXT(ospf6, o);
@ -2093,9 +2148,13 @@ DEFUN(no_ospf6_write_multiplier, no_ospf6_write_multiplier_cmd,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN(ipv6_ospf6_hellointerval, ipv6_ospf6_hellointerval_cmd, DEFUN (ipv6_ospf6_hellointerval,
"ipv6 ospf6 hello-interval (1-65535)", ipv6_ospf6_hellointerval_cmd,
IP6_STR OSPF6_STR "Time between HELLO packets\n" SECONDS_STR) "ipv6 ospf6 hello-interval (1-65535)",
IP6_STR
OSPF6_STR
"Time between HELLO packets\n"
SECONDS_STR)
{ {
VTY_DECLVAR_CONTEXT(interface, ifp); VTY_DECLVAR_CONTEXT(interface, ifp);
int idx_number = 3; int idx_number = 3;
@ -2123,15 +2182,23 @@ DEFUN(ipv6_ospf6_hellointerval, ipv6_ospf6_hellointerval_cmd,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
ALIAS(ipv6_ospf6_hellointerval, no_ipv6_ospf6_hellointerval_cmd, ALIAS (ipv6_ospf6_hellointerval,
"no ipv6 ospf6 hello-interval [(1-65535)]", no_ipv6_ospf6_hellointerval_cmd,
NO_STR IP6_STR OSPF6_STR "Time between HELLO packets\n" SECONDS_STR) "no ipv6 ospf6 hello-interval [(1-65535)]",
NO_STR
IP6_STR
OSPF6_STR
"Time between HELLO packets\n"
SECONDS_STR)
/* interface variable set command */ /* interface variable set command */
DEFUN(ipv6_ospf6_deadinterval, ipv6_ospf6_deadinterval_cmd, DEFUN (ipv6_ospf6_deadinterval,
"ipv6 ospf6 dead-interval (1-65535)", ipv6_ospf6_deadinterval_cmd,
IP6_STR OSPF6_STR "ipv6 ospf6 dead-interval (1-65535)",
"Interval time after which a neighbor is declared down\n" SECONDS_STR) IP6_STR
OSPF6_STR
"Interval time after which a neighbor is declared down\n"
SECONDS_STR)
{ {
VTY_DECLVAR_CONTEXT(interface, ifp); VTY_DECLVAR_CONTEXT(interface, ifp);
int idx_number = 3; int idx_number = 3;
@ -2149,16 +2216,23 @@ DEFUN(ipv6_ospf6_deadinterval, ipv6_ospf6_deadinterval_cmd,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
ALIAS(ipv6_ospf6_deadinterval, no_ipv6_ospf6_deadinterval_cmd, ALIAS (ipv6_ospf6_deadinterval,
"no ipv6 ospf6 dead-interval [(1-65535)]", no_ipv6_ospf6_deadinterval_cmd,
NO_STR IP6_STR OSPF6_STR "no ipv6 ospf6 dead-interval [(1-65535)]",
"Interval time after which a neighbor is declared down\n" SECONDS_STR) NO_STR
IP6_STR
OSPF6_STR
"Interval time after which a neighbor is declared down\n"
SECONDS_STR)
DEFPY(ipv6_ospf6_gr_hdelay, ipv6_ospf6_gr_hdelay_cmd, DEFPY(ipv6_ospf6_gr_hdelay,
ipv6_ospf6_gr_hdelay_cmd,
"ipv6 ospf6 graceful-restart hello-delay (1-1800)", "ipv6 ospf6 graceful-restart hello-delay (1-1800)",
IP6_STR OSPF6_STR "Graceful Restart parameters\n" IP6_STR
"Delay the sending of the first hello packets.\n" OSPF6_STR
"Delay in seconds\n") "Graceful Restart parameters\n"
"Delay the sending of the first hello packets.\n"
"Delay in seconds\n")
{ {
VTY_DECLVAR_CONTEXT(interface, ifp); VTY_DECLVAR_CONTEXT(interface, ifp);
struct ospf6_interface *oi; struct ospf6_interface *oi;
@ -2173,11 +2247,15 @@ DEFPY(ipv6_ospf6_gr_hdelay, ipv6_ospf6_gr_hdelay_cmd,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFPY(no_ipv6_ospf6_gr_hdelay, no_ipv6_ospf6_gr_hdelay_cmd, DEFPY(no_ipv6_ospf6_gr_hdelay,
no_ipv6_ospf6_gr_hdelay_cmd,
"no ipv6 ospf6 graceful-restart hello-delay [(1-1800)]", "no ipv6 ospf6 graceful-restart hello-delay [(1-1800)]",
NO_STR IP6_STR OSPF6_STR "Graceful Restart parameters\n" NO_STR
"Delay the sending of the first hello packets.\n" IP6_STR
"Delay in seconds\n") OSPF6_STR
"Graceful Restart parameters\n"
"Delay the sending of the first hello packets.\n"
"Delay in seconds\n")
{ {
VTY_DECLVAR_CONTEXT(interface, ifp); VTY_DECLVAR_CONTEXT(interface, ifp);
struct ospf6_interface *oi; struct ospf6_interface *oi;
@ -2194,9 +2272,13 @@ DEFPY(no_ipv6_ospf6_gr_hdelay, no_ipv6_ospf6_gr_hdelay_cmd,
} }
/* interface variable set command */ /* interface variable set command */
DEFUN(ipv6_ospf6_transmitdelay, ipv6_ospf6_transmitdelay_cmd, DEFUN (ipv6_ospf6_transmitdelay,
"ipv6 ospf6 transmit-delay (1-3600)", ipv6_ospf6_transmitdelay_cmd,
IP6_STR OSPF6_STR "Link state transmit delay\n" SECONDS_STR) "ipv6 ospf6 transmit-delay (1-3600)",
IP6_STR
OSPF6_STR
"Link state transmit delay\n"
SECONDS_STR)
{ {
VTY_DECLVAR_CONTEXT(interface, ifp); VTY_DECLVAR_CONTEXT(interface, ifp);
int idx_number = 3; int idx_number = 3;
@ -2214,15 +2296,23 @@ DEFUN(ipv6_ospf6_transmitdelay, ipv6_ospf6_transmitdelay_cmd,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
ALIAS(ipv6_ospf6_transmitdelay, no_ipv6_ospf6_transmitdelay_cmd, ALIAS (ipv6_ospf6_transmitdelay,
"no ipv6 ospf6 transmit-delay [(1-3600)]", no_ipv6_ospf6_transmitdelay_cmd,
NO_STR IP6_STR OSPF6_STR "Link state transmit delay\n" SECONDS_STR) "no ipv6 ospf6 transmit-delay [(1-3600)]",
NO_STR
IP6_STR
OSPF6_STR
"Link state transmit delay\n"
SECONDS_STR)
/* interface variable set command */ /* interface variable set command */
DEFUN(ipv6_ospf6_retransmitinterval, ipv6_ospf6_retransmitinterval_cmd, DEFUN (ipv6_ospf6_retransmitinterval,
"ipv6 ospf6 retransmit-interval (1-65535)", ipv6_ospf6_retransmitinterval_cmd,
IP6_STR OSPF6_STR "ipv6 ospf6 retransmit-interval (1-65535)",
"Time between retransmitting lost link state advertisements\n" SECONDS_STR) IP6_STR
OSPF6_STR
"Time between retransmitting lost link state advertisements\n"
SECONDS_STR)
{ {
VTY_DECLVAR_CONTEXT(interface, ifp); VTY_DECLVAR_CONTEXT(interface, ifp);
int idx_number = 3; int idx_number = 3;
@ -2240,16 +2330,23 @@ DEFUN(ipv6_ospf6_retransmitinterval, ipv6_ospf6_retransmitinterval_cmd,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
ALIAS(ipv6_ospf6_retransmitinterval, no_ipv6_ospf6_retransmitinterval_cmd, ALIAS (ipv6_ospf6_retransmitinterval,
"no ipv6 ospf6 retransmit-interval [(1-65535)]", no_ipv6_ospf6_retransmitinterval_cmd,
NO_STR IP6_STR OSPF6_STR "no ipv6 ospf6 retransmit-interval [(1-65535)]",
"Time between retransmitting lost link state advertisements\n" SECONDS_STR) NO_STR
IP6_STR
OSPF6_STR
"Time between retransmitting lost link state advertisements\n"
SECONDS_STR)
/* interface variable set command */ /* interface variable set command */
DEFUN(ipv6_ospf6_priority, ipv6_ospf6_priority_cmd, DEFUN (ipv6_ospf6_priority,
"ipv6 ospf6 priority (0-255)", ipv6_ospf6_priority_cmd,
IP6_STR OSPF6_STR "Router priority\n" "ipv6 ospf6 priority (0-255)",
"Priority value\n") IP6_STR
OSPF6_STR
"Router priority\n"
"Priority value\n")
{ {
VTY_DECLVAR_CONTEXT(interface, ifp); VTY_DECLVAR_CONTEXT(interface, ifp);
int idx_number = 3; int idx_number = 3;
@ -2275,15 +2372,22 @@ DEFUN(ipv6_ospf6_priority, ipv6_ospf6_priority_cmd,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
ALIAS(ipv6_ospf6_priority, no_ipv6_ospf6_priority_cmd, ALIAS (ipv6_ospf6_priority,
"no ipv6 ospf6 priority [(0-255)]", no_ipv6_ospf6_priority_cmd,
NO_STR IP6_STR OSPF6_STR "Router priority\n" "no ipv6 ospf6 priority [(0-255)]",
"Priority value\n") NO_STR
IP6_STR
OSPF6_STR
"Router priority\n"
"Priority value\n")
DEFUN(ipv6_ospf6_instance, ipv6_ospf6_instance_cmd, DEFUN (ipv6_ospf6_instance,
"ipv6 ospf6 instance-id (0-255)", ipv6_ospf6_instance_cmd,
IP6_STR OSPF6_STR "Instance ID for this interface\n" "ipv6 ospf6 instance-id (0-255)",
"Instance ID value\n") IP6_STR
OSPF6_STR
"Instance ID for this interface\n"
"Instance ID value\n")
{ {
VTY_DECLVAR_CONTEXT(interface, ifp); VTY_DECLVAR_CONTEXT(interface, ifp);
int idx_number = 3; int idx_number = 3;
@ -2301,14 +2405,22 @@ DEFUN(ipv6_ospf6_instance, ipv6_ospf6_instance_cmd,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
ALIAS(ipv6_ospf6_instance, no_ipv6_ospf6_instance_cmd, ALIAS (ipv6_ospf6_instance,
"no ipv6 ospf6 instance-id [(0-255)]", no_ipv6_ospf6_instance_cmd,
NO_STR IP6_STR OSPF6_STR "Instance ID for this interface\n" "no ipv6 ospf6 instance-id [(0-255)]",
"Instance ID value\n") NO_STR
IP6_STR
OSPF6_STR
"Instance ID for this interface\n"
"Instance ID value\n")
DEFUN(ipv6_ospf6_passive, ipv6_ospf6_passive_cmd, "ipv6 ospf6 passive", DEFUN (ipv6_ospf6_passive,
IP6_STR OSPF6_STR ipv6_ospf6_passive_cmd,
"Passive interface; no adjacency will be formed on this interface\n") "ipv6 ospf6 passive",
IP6_STR
OSPF6_STR
"Passive interface; no adjacency will be formed on this interface\n"
)
{ {
VTY_DECLVAR_CONTEXT(interface, ifp); VTY_DECLVAR_CONTEXT(interface, ifp);
struct ospf6_interface *oi; struct ospf6_interface *oi;
@ -2334,9 +2446,14 @@ DEFUN(ipv6_ospf6_passive, ipv6_ospf6_passive_cmd, "ipv6 ospf6 passive",
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN(no_ipv6_ospf6_passive, no_ipv6_ospf6_passive_cmd, "no ipv6 ospf6 passive", DEFUN (no_ipv6_ospf6_passive,
NO_STR IP6_STR OSPF6_STR no_ipv6_ospf6_passive_cmd,
"passive interface: No Adjacency will be formed on this I/F\n") "no ipv6 ospf6 passive",
NO_STR
IP6_STR
OSPF6_STR
"passive interface: No Adjacency will be formed on this I/F\n"
)
{ {
VTY_DECLVAR_CONTEXT(interface, ifp); VTY_DECLVAR_CONTEXT(interface, ifp);
struct ospf6_interface *oi; struct ospf6_interface *oi;
@ -2359,8 +2476,13 @@ DEFUN(no_ipv6_ospf6_passive, no_ipv6_ospf6_passive_cmd, "no ipv6 ospf6 passive",
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN(ipv6_ospf6_mtu_ignore, ipv6_ospf6_mtu_ignore_cmd, "ipv6 ospf6 mtu-ignore", DEFUN (ipv6_ospf6_mtu_ignore,
IP6_STR OSPF6_STR "Disable MTU mismatch detection on this interface\n") ipv6_ospf6_mtu_ignore_cmd,
"ipv6 ospf6 mtu-ignore",
IP6_STR
OSPF6_STR
"Disable MTU mismatch detection on this interface\n"
)
{ {
VTY_DECLVAR_CONTEXT(interface, ifp); VTY_DECLVAR_CONTEXT(interface, ifp);
struct ospf6_interface *oi; struct ospf6_interface *oi;
@ -2376,10 +2498,14 @@ DEFUN(ipv6_ospf6_mtu_ignore, ipv6_ospf6_mtu_ignore_cmd, "ipv6 ospf6 mtu-ignore",
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN(no_ipv6_ospf6_mtu_ignore, no_ipv6_ospf6_mtu_ignore_cmd, DEFUN (no_ipv6_ospf6_mtu_ignore,
"no ipv6 ospf6 mtu-ignore", no_ipv6_ospf6_mtu_ignore_cmd,
NO_STR IP6_STR OSPF6_STR "no ipv6 ospf6 mtu-ignore",
"Disable MTU mismatch detection on this interface\n") NO_STR
IP6_STR
OSPF6_STR
"Disable MTU mismatch detection on this interface\n"
)
{ {
VTY_DECLVAR_CONTEXT(interface, ifp); VTY_DECLVAR_CONTEXT(interface, ifp);
struct ospf6_interface *oi; struct ospf6_interface *oi;
@ -2395,11 +2521,14 @@ DEFUN(no_ipv6_ospf6_mtu_ignore, no_ipv6_ospf6_mtu_ignore_cmd,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN(ipv6_ospf6_advertise_prefix_list, ipv6_ospf6_advertise_prefix_list_cmd, DEFUN(ipv6_ospf6_advertise_prefix_list,
ipv6_ospf6_advertise_prefix_list_cmd,
"ipv6 ospf6 advertise prefix-list PREFIXLIST6_NAME", "ipv6 ospf6 advertise prefix-list PREFIXLIST6_NAME",
IP6_STR OSPF6_STR "Advertising options\n" IP6_STR
"Filter prefix using prefix-list\n" OSPF6_STR
"Prefix list name\n") "Advertising options\n"
"Filter prefix using prefix-list\n"
"Prefix list name\n")
{ {
VTY_DECLVAR_CONTEXT(interface, ifp); VTY_DECLVAR_CONTEXT(interface, ifp);
int idx_word = 4; int idx_word = 4;
@ -2432,9 +2561,12 @@ DEFUN(ipv6_ospf6_advertise_prefix_list, ipv6_ospf6_advertise_prefix_list_cmd,
DEFUN(no_ipv6_ospf6_advertise_prefix_list, DEFUN(no_ipv6_ospf6_advertise_prefix_list,
no_ipv6_ospf6_advertise_prefix_list_cmd, no_ipv6_ospf6_advertise_prefix_list_cmd,
"no ipv6 ospf6 advertise prefix-list [PREFIXLIST6_NAME]", "no ipv6 ospf6 advertise prefix-list [PREFIXLIST6_NAME]",
NO_STR IP6_STR OSPF6_STR "Advertising options\n" NO_STR
"Filter prefix using prefix-list\n" IP6_STR
"Prefix list name\n") OSPF6_STR
"Advertising options\n"
"Filter prefix using prefix-list\n"
"Prefix list name\n")
{ {
VTY_DECLVAR_CONTEXT(interface, ifp); VTY_DECLVAR_CONTEXT(interface, ifp);
struct ospf6_interface *oi; struct ospf6_interface *oi;
@ -2462,12 +2594,16 @@ DEFUN(no_ipv6_ospf6_advertise_prefix_list,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN(ipv6_ospf6_network, ipv6_ospf6_network_cmd, DEFUN (ipv6_ospf6_network,
"ipv6 ospf6 network <broadcast|point-to-point|point-to-multipoint>", ipv6_ospf6_network_cmd,
IP6_STR OSPF6_STR "Network type\n" "ipv6 ospf6 network <broadcast|point-to-point|point-to-multipoint>",
"Specify OSPF6 broadcast network\n" IP6_STR
"Specify OSPF6 point-to-point network\n" OSPF6_STR
"Specify OSPF6 point-to-multipoint network\n") "Network type\n"
"Specify OSPF6 broadcast network\n"
"Specify OSPF6 point-to-point network\n"
"Specify OSPF6 point-to-multipoint network\n"
)
{ {
VTY_DECLVAR_CONTEXT(interface, ifp); VTY_DECLVAR_CONTEXT(interface, ifp);
int idx_network = 3; int idx_network = 3;
@ -2506,11 +2642,15 @@ DEFUN(ipv6_ospf6_network, ipv6_ospf6_network_cmd,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN(no_ipv6_ospf6_network, no_ipv6_ospf6_network_cmd, DEFUN (no_ipv6_ospf6_network,
"no ipv6 ospf6 network [<broadcast|point-to-point>]", no_ipv6_ospf6_network_cmd,
NO_STR IP6_STR OSPF6_STR "Set default network type\n" "no ipv6 ospf6 network [<broadcast|point-to-point>]",
"Specify OSPF6 broadcast network\n" NO_STR
"Specify OSPF6 point-to-point network\n") IP6_STR
OSPF6_STR
"Set default network type\n"
"Specify OSPF6 broadcast network\n"
"Specify OSPF6 point-to-point network\n")
{ {
VTY_DECLVAR_CONTEXT(interface, ifp); VTY_DECLVAR_CONTEXT(interface, ifp);
struct ospf6_interface *oi; struct ospf6_interface *oi;
@ -2537,11 +2677,14 @@ DEFUN(no_ipv6_ospf6_network, no_ipv6_ospf6_network_cmd,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFPY(ipv6_ospf6_p2xp_only_cfg_neigh, ipv6_ospf6_p2xp_only_cfg_neigh_cmd, DEFPY (ipv6_ospf6_p2xp_only_cfg_neigh,
"[no] ipv6 ospf6 p2p-p2mp config-neighbors-only", ipv6_ospf6_p2xp_only_cfg_neigh_cmd,
NO_STR IP6_STR OSPF6_STR "[no] ipv6 ospf6 p2p-p2mp config-neighbors-only",
"Point-to-point and Point-to-Multipoint parameters\n" NO_STR
"Only form adjacencies with explicitly configured neighbors\n") IP6_STR
OSPF6_STR
"Point-to-point and Point-to-Multipoint parameters\n"
"Only form adjacencies with explicitly configured neighbors\n")
{ {
VTY_DECLVAR_CONTEXT(interface, ifp); VTY_DECLVAR_CONTEXT(interface, ifp);
struct ospf6_interface *oi = ifp->info; struct ospf6_interface *oi = ifp->info;
@ -2561,11 +2704,14 @@ DEFPY(ipv6_ospf6_p2xp_only_cfg_neigh, ipv6_ospf6_p2xp_only_cfg_neigh_cmd,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFPY(ipv6_ospf6_p2xp_no_multicast_hello, ipv6_ospf6_p2xp_no_multicast_hello_cmd, DEFPY (ipv6_ospf6_p2xp_no_multicast_hello,
"[no] ipv6 ospf6 p2p-p2mp disable-multicast-hello", ipv6_ospf6_p2xp_no_multicast_hello_cmd,
NO_STR IP6_STR OSPF6_STR "[no] ipv6 ospf6 p2p-p2mp disable-multicast-hello",
"Point-to-point and Point-to-Multipoint parameters\n" NO_STR
"Do not send multicast hellos\n") IP6_STR
OSPF6_STR
"Point-to-point and Point-to-Multipoint parameters\n"
"Do not send multicast hellos\n")
{ {
VTY_DECLVAR_CONTEXT(interface, ifp); VTY_DECLVAR_CONTEXT(interface, ifp);
struct ospf6_interface *oi = ifp->info; struct ospf6_interface *oi = ifp->info;
@ -2585,13 +2731,16 @@ DEFPY(ipv6_ospf6_p2xp_no_multicast_hello, ipv6_ospf6_p2xp_no_multicast_hello_cmd
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFPY(ipv6_ospf6_p2xp_connected_pfx, ipv6_ospf6_p2xp_connected_pfx_cmd, DEFPY (ipv6_ospf6_p2xp_connected_pfx,
"[no] ipv6 ospf6 p2p-p2mp connected-prefixes <include$incl|exclude$excl>", ipv6_ospf6_p2xp_connected_pfx_cmd,
NO_STR IP6_STR OSPF6_STR "[no] ipv6 ospf6 p2p-p2mp connected-prefixes <include$incl|exclude$excl>",
"Point-to-point and Point-to-Multipoint parameters\n" NO_STR
"Adjust handling of directly connected prefixes\n" IP6_STR
"Advertise prefixes and own /128 (default for PtP)\n" OSPF6_STR
"Ignore, only advertise own /128 (default for PtMP)\n") "Point-to-point and Point-to-Multipoint parameters\n"
"Adjust handling of directly connected prefixes\n"
"Advertise prefixes and own /128 (default for PtP)\n"
"Ignore, only advertise own /128 (default for PtMP)\n")
{ {
VTY_DECLVAR_CONTEXT(interface, ifp); VTY_DECLVAR_CONTEXT(interface, ifp);
struct ospf6_interface *oi = ifp->info; struct ospf6_interface *oi = ifp->info;
@ -2619,11 +2768,14 @@ DEFPY(ipv6_ospf6_p2xp_connected_pfx, ipv6_ospf6_p2xp_connected_pfx_cmd,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
ALIAS(ipv6_ospf6_p2xp_connected_pfx, no_ipv6_ospf6_p2xp_connected_pfx_cmd, ALIAS (ipv6_ospf6_p2xp_connected_pfx,
"no ipv6 ospf6 p2p-p2mp connected-prefixes", no_ipv6_ospf6_p2xp_connected_pfx_cmd,
NO_STR IP6_STR OSPF6_STR "no ipv6 ospf6 p2p-p2mp connected-prefixes",
"Point-to-point and Point-to-Multipoint parameters\n" NO_STR
"Adjust handling of directly connected prefixes\n") IP6_STR
OSPF6_STR
"Point-to-point and Point-to-Multipoint parameters\n"
"Adjust handling of directly connected prefixes\n")
static int config_write_ospf6_interface(struct vty *vty, struct vrf *vrf) static int config_write_ospf6_interface(struct vty *vty, struct vrf *vrf)
@ -2873,9 +3025,16 @@ void ospf6_interface_clear(struct interface *ifp)
} }
/* Clear interface */ /* Clear interface */
DEFUN(clear_ipv6_ospf6_interface, clear_ipv6_ospf6_interface_cmd, DEFUN (clear_ipv6_ospf6_interface,
"clear ipv6 ospf6 [vrf NAME] interface [IFNAME]", clear_ipv6_ospf6_interface_cmd,
CLEAR_STR IP6_STR OSPF6_STR VRF_CMD_HELP_STR INTERFACE_STR IFNAME_STR) "clear ipv6 ospf6 [vrf NAME] interface [IFNAME]",
CLEAR_STR
IP6_STR
OSPF6_STR
VRF_CMD_HELP_STR
INTERFACE_STR
IFNAME_STR
)
{ {
struct vrf *vrf; struct vrf *vrf;
int idx_vrf = 3; int idx_vrf = 3;
@ -2916,16 +3075,26 @@ void install_element_ospf6_clear_interface(void)
install_element(ENABLE_NODE, &clear_ipv6_ospf6_interface_cmd); install_element(ENABLE_NODE, &clear_ipv6_ospf6_interface_cmd);
} }
DEFUN(debug_ospf6_interface, debug_ospf6_interface_cmd, "debug ospf6 interface", DEFUN (debug_ospf6_interface,
DEBUG_STR OSPF6_STR "Debug OSPFv3 Interface\n") debug_ospf6_interface_cmd,
"debug ospf6 interface",
DEBUG_STR
OSPF6_STR
"Debug OSPFv3 Interface\n"
)
{ {
OSPF6_DEBUG_INTERFACE_ON(); OSPF6_DEBUG_INTERFACE_ON();
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN(no_debug_ospf6_interface, no_debug_ospf6_interface_cmd, DEFUN (no_debug_ospf6_interface,
"no debug ospf6 interface", no_debug_ospf6_interface_cmd,
NO_STR DEBUG_STR OSPF6_STR "Debug OSPFv3 Interface\n") "no debug ospf6 interface",
NO_STR
DEBUG_STR
OSPF6_STR
"Debug OSPFv3 Interface\n"
)
{ {
OSPF6_DEBUG_INTERFACE_OFF(); OSPF6_DEBUG_INTERFACE_OFF();
return CMD_SUCCESS; return CMD_SUCCESS;
@ -2962,9 +3131,11 @@ void ospf6_auth_write_config(struct vty *vty, struct ospf6_auth_data *at_data)
DEFUN(ipv6_ospf6_intf_auth_trailer_keychain, DEFUN(ipv6_ospf6_intf_auth_trailer_keychain,
ipv6_ospf6_intf_auth_trailer_keychain_cmd, ipv6_ospf6_intf_auth_trailer_keychain_cmd,
"ipv6 ospf6 authentication keychain KEYCHAIN_NAME", "ipv6 ospf6 authentication keychain KEYCHAIN_NAME",
IP6_STR OSPF6_STR "Enable authentication on this interface\n" IP6_STR
"Keychain\n" OSPF6_STR
"Keychain name\n") "Enable authentication on this interface\n"
"Keychain\n"
"Keychain name\n")
{ {
VTY_DECLVAR_CONTEXT(interface, ifp); VTY_DECLVAR_CONTEXT(interface, ifp);
int keychain_idx = 4; int keychain_idx = 4;
@ -2994,9 +3165,12 @@ DEFUN(ipv6_ospf6_intf_auth_trailer_keychain,
DEFUN(no_ipv6_ospf6_intf_auth_trailer_keychain, DEFUN(no_ipv6_ospf6_intf_auth_trailer_keychain,
no_ipv6_ospf6_intf_auth_trailer_keychain_cmd, no_ipv6_ospf6_intf_auth_trailer_keychain_cmd,
"no ipv6 ospf6 authentication keychain [KEYCHAIN_NAME]", "no ipv6 ospf6 authentication keychain [KEYCHAIN_NAME]",
NO_STR IP6_STR OSPF6_STR "Enable authentication on this interface\n" NO_STR
"Keychain\n" IP6_STR
"Keychain name\n") OSPF6_STR
"Enable authentication on this interface\n"
"Keychain\n"
"Keychain name\n")
{ {
VTY_DECLVAR_CONTEXT(interface, ifp); VTY_DECLVAR_CONTEXT(interface, ifp);
struct ospf6_interface *oi; struct ospf6_interface *oi;
@ -3018,21 +3192,24 @@ DEFUN(no_ipv6_ospf6_intf_auth_trailer_keychain,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN(ipv6_ospf6_intf_auth_trailer_key, ipv6_ospf6_intf_auth_trailer_key_cmd, DEFUN(ipv6_ospf6_intf_auth_trailer_key,
ipv6_ospf6_intf_auth_trailer_key_cmd,
"ipv6 ospf6 authentication key-id (1-65535) hash-algo " "ipv6 ospf6 authentication key-id (1-65535) hash-algo "
"<md5|hmac-sha-1|hmac-sha-256|hmac-sha-384|hmac-sha-512> " "<md5|hmac-sha-1|hmac-sha-256|hmac-sha-384|hmac-sha-512> "
"key WORD", "key WORD",
IP6_STR OSPF6_STR "Authentication\n" IP6_STR
"Key ID\n" OSPF6_STR
"Key ID value\n" "Authentication\n"
"Cryptographic-algorithm\n" "Key ID\n"
"Use MD5 algorithm\n" "Key ID value\n"
"Use HMAC-SHA-1 algorithm\n" "Cryptographic-algorithm\n"
"Use HMAC-SHA-256 algorithm\n" "Use MD5 algorithm\n"
"Use HMAC-SHA-384 algorithm\n" "Use HMAC-SHA-1 algorithm\n"
"Use HMAC-SHA-512 algorithm\n" "Use HMAC-SHA-256 algorithm\n"
"Password\n" "Use HMAC-SHA-384 algorithm\n"
"Password string (key)\n") "Use HMAC-SHA-512 algorithm\n"
"Password\n"
"Password string (key)\n")
{ {
VTY_DECLVAR_CONTEXT(interface, ifp); VTY_DECLVAR_CONTEXT(interface, ifp);
int key_id_idx = 4; int key_id_idx = 4;
@ -3077,17 +3254,20 @@ DEFUN(no_ipv6_ospf6_intf_auth_trailer_key,
"no ipv6 ospf6 authentication key-id [(1-65535) hash-algo " "no ipv6 ospf6 authentication key-id [(1-65535) hash-algo "
"<md5|hmac-sha-1|hmac-sha-256|hmac-sha-384|hmac-sha-512> " "<md5|hmac-sha-1|hmac-sha-256|hmac-sha-384|hmac-sha-512> "
"key WORD]", "key WORD]",
NO_STR IP6_STR OSPF6_STR "Authentication\n" NO_STR
"Key ID\n" IP6_STR
"Key ID value\n" OSPF6_STR
"Cryptographic-algorithm\n" "Authentication\n"
"Use MD5 algorithm\n" "Key ID\n"
"Use HMAC-SHA-1 algorithm\n" "Key ID value\n"
"Use HMAC-SHA-256 algorithm\n" "Cryptographic-algorithm\n"
"Use HMAC-SHA-384 algorithm\n" "Use MD5 algorithm\n"
"Use HMAC-SHA-512 algorithm\n" "Use HMAC-SHA-1 algorithm\n"
"Password\n" "Use HMAC-SHA-256 algorithm\n"
"Password string (key)\n") "Use HMAC-SHA-384 algorithm\n"
"Use HMAC-SHA-512 algorithm\n"
"Password\n"
"Password string (key)\n")
{ {
VTY_DECLVAR_CONTEXT(interface, ifp); VTY_DECLVAR_CONTEXT(interface, ifp);
struct ospf6_interface *oi; struct ospf6_interface *oi;

102
ospf6d/ospf6_neighbor.c
View file

@ -704,10 +704,14 @@ static void p2xp_neigh_refresh(struct ospf6_neighbor *on, uint32_t prev_cost)
#include "ospf6d/ospf6_neighbor_clippy.c" #include "ospf6d/ospf6_neighbor_clippy.c"
#endif #endif
DEFPY(ipv6_ospf6_p2xp_neigh, ipv6_ospf6_p2xp_neigh_cmd, DEFPY (ipv6_ospf6_p2xp_neigh,
"[no] ipv6 ospf6 neighbor X:X::X:X", ipv6_ospf6_p2xp_neigh_cmd,
NO_STR IP6_STR OSPF6_STR "Configure static neighbor\n" "[no] ipv6 ospf6 neighbor X:X::X:X",
"Neighbor link-local address\n") NO_STR
IP6_STR
OSPF6_STR
"Configure static neighbor\n"
"Neighbor link-local address\n")
{ {
VTY_DECLVAR_CONTEXT(interface, ifp); VTY_DECLVAR_CONTEXT(interface, ifp);
struct ospf6_interface *oi = ifp->info; struct ospf6_interface *oi = ifp->info;
@ -745,12 +749,16 @@ DEFPY(ipv6_ospf6_p2xp_neigh, ipv6_ospf6_p2xp_neigh_cmd,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFPY(ipv6_ospf6_p2xp_neigh_cost, ipv6_ospf6_p2xp_neigh_cost_cmd, DEFPY (ipv6_ospf6_p2xp_neigh_cost,
"[no] ipv6 ospf6 neighbor X:X::X:X cost (1-65535)", ipv6_ospf6_p2xp_neigh_cost_cmd,
NO_STR IP6_STR OSPF6_STR "Configure static neighbor\n" "[no] ipv6 ospf6 neighbor X:X::X:X cost (1-65535)",
"Neighbor link-local address\n" NO_STR
"Outgoing metric for this neighbor\n" IP6_STR
"Outgoing metric for this neighbor\n") OSPF6_STR
"Configure static neighbor\n"
"Neighbor link-local address\n"
"Outgoing metric for this neighbor\n"
"Outgoing metric for this neighbor\n")
{ {
VTY_DECLVAR_CONTEXT(interface, ifp); VTY_DECLVAR_CONTEXT(interface, ifp);
struct ospf6_interface *oi = ifp->info; struct ospf6_interface *oi = ifp->info;
@ -821,13 +829,16 @@ static void p2xp_unicast_hello_send(struct event *event)
ospf6_hello_send_addr(oi, &p2xp_cfg->addr); ospf6_hello_send_addr(oi, &p2xp_cfg->addr);
} }
DEFPY(ipv6_ospf6_p2xp_neigh_poll_interval, DEFPY (ipv6_ospf6_p2xp_neigh_poll_interval,
ipv6_ospf6_p2xp_neigh_poll_interval_cmd, ipv6_ospf6_p2xp_neigh_poll_interval_cmd,
"[no] ipv6 ospf6 neighbor X:X::X:X poll-interval (1-65535)", "[no] ipv6 ospf6 neighbor X:X::X:X poll-interval (1-65535)",
NO_STR IP6_STR OSPF6_STR "Configure static neighbor\n" NO_STR
"Neighbor link-local address\n" IP6_STR
"Send unicast hellos to neighbor when down\n" OSPF6_STR
"Unicast hello interval when down (seconds)\n") "Configure static neighbor\n"
"Neighbor link-local address\n"
"Send unicast hellos to neighbor when down\n"
"Unicast hello interval when down (seconds)\n")
{ {
VTY_DECLVAR_CONTEXT(interface, ifp); VTY_DECLVAR_CONTEXT(interface, ifp);
struct ospf6_interface *oi = ifp->info; struct ospf6_interface *oi = ifp->info;
@ -1340,13 +1351,18 @@ static void ospf6_neighbor_show_detail_common(struct vty *vty,
} }
} }
DEFUN(show_ipv6_ospf6_neighbor, show_ipv6_ospf6_neighbor_cmd, DEFUN(show_ipv6_ospf6_neighbor,
show_ipv6_ospf6_neighbor_cmd,
"show ipv6 ospf6 [vrf <NAME|all>] neighbor [<detail|drchoice>] [json]", "show ipv6 ospf6 [vrf <NAME|all>] neighbor [<detail|drchoice>] [json]",
SHOW_STR IP6_STR OSPF6_STR VRF_CMD_HELP_STR SHOW_STR
IP6_STR
OSPF6_STR
VRF_CMD_HELP_STR
"All VRFs\n" "All VRFs\n"
"Neighbor list\n" "Neighbor list\n"
"Display details\n" "Display details\n"
"Display DR choices\n" JSON_STR) "Display DR choices\n"
JSON_STR)
{ {
struct ospf6 *ospf6; struct ospf6 *ospf6;
struct listnode *node; struct listnode *node;
@ -1415,12 +1431,17 @@ static int ospf6_neighbor_show_common(struct vty *vty, int argc,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN(show_ipv6_ospf6_neighbor_one, show_ipv6_ospf6_neighbor_one_cmd, DEFUN(show_ipv6_ospf6_neighbor_one,
show_ipv6_ospf6_neighbor_one_cmd,
"show ipv6 ospf6 [vrf <NAME|all>] neighbor A.B.C.D [json]", "show ipv6 ospf6 [vrf <NAME|all>] neighbor A.B.C.D [json]",
SHOW_STR IP6_STR OSPF6_STR VRF_CMD_HELP_STR SHOW_STR
IP6_STR
OSPF6_STR
VRF_CMD_HELP_STR
"All VRFs\n" "All VRFs\n"
"Neighbor list\n" "Neighbor list\n"
"Specify Router-ID as IPv4 address notation\n" JSON_STR) "Specify Router-ID as IPv4 address notation\n"
JSON_STR)
{ {
int idx_ipv4 = 4; int idx_ipv4 = 4;
struct ospf6 *ospf6; struct ospf6 *ospf6;
@ -1460,11 +1481,14 @@ void ospf6_neighbor_init(void)
&ipv6_ospf6_p2xp_neigh_poll_interval_cmd); &ipv6_ospf6_p2xp_neigh_poll_interval_cmd);
} }
DEFUN(debug_ospf6_neighbor, debug_ospf6_neighbor_cmd, DEFUN (debug_ospf6_neighbor,
"debug ospf6 neighbor [<state|event>]", debug_ospf6_neighbor_cmd,
DEBUG_STR OSPF6_STR "Debug OSPFv3 Neighbor\n" "debug ospf6 neighbor [<state|event>]",
"Debug OSPFv3 Neighbor State Change\n" DEBUG_STR
"Debug OSPFv3 Neighbor Event\n") OSPF6_STR
"Debug OSPFv3 Neighbor\n"
"Debug OSPFv3 Neighbor State Change\n"
"Debug OSPFv3 Neighbor Event\n")
{ {
int idx_type = 3; int idx_type = 3;
unsigned char level = 0; unsigned char level = 0;
@ -1482,11 +1506,15 @@ DEFUN(debug_ospf6_neighbor, debug_ospf6_neighbor_cmd,
} }
DEFUN(no_debug_ospf6_neighbor, no_debug_ospf6_neighbor_cmd, DEFUN (no_debug_ospf6_neighbor,
"no debug ospf6 neighbor [<state|event>]", no_debug_ospf6_neighbor_cmd,
NO_STR DEBUG_STR OSPF6_STR "Debug OSPFv3 Neighbor\n" "no debug ospf6 neighbor [<state|event>]",
"Debug OSPFv3 Neighbor State Change\n" NO_STR
"Debug OSPFv3 Neighbor Event\n") DEBUG_STR
OSPF6_STR
"Debug OSPFv3 Neighbor\n"
"Debug OSPFv3 Neighbor State Change\n"
"Debug OSPFv3 Neighbor Event\n")
{ {
int idx_type = 4; int idx_type = 4;
unsigned char level = 0; unsigned char level = 0;
@ -1504,8 +1532,12 @@ DEFUN(no_debug_ospf6_neighbor, no_debug_ospf6_neighbor_cmd,
} }
DEFUN(no_debug_ospf6, no_debug_ospf6_cmd, "no debug ospf6", DEFUN (no_debug_ospf6,
NO_STR DEBUG_STR OSPF6_STR) no_debug_ospf6_cmd,
"no debug ospf6",
NO_STR
DEBUG_STR
OSPF6_STR)
{ {
unsigned int i; unsigned int i;