ospfd: Implement non-broadcast support for point-to-multipoint networks

This extends non-broadcast support to point-to-multipoint networks.
Neighbors will be explicitly configured and polled in lieu of multicast
dicovery. Toptotests and documentation updates are included.

Additionally, the ospf neighbor commands have been greatly simplified taking
advantage of DEFPY() capabilities.

The AllOSPFRouters (224.0.0.5) is still joined for non-broadcast networks
since it is joined for NBMA networks. It seems this could be removed but
it should done be in a separate commit.

Signed-off-by: Acee Lindem <acee@lindem.com>

1 files changed, 55 insertions, 129 deletions

diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index 93dd12ce49..bf131ff225 100644
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -2406,130 +2406,30 @@ DEFUN (no_ospf_timers_lsa_min_arrival,
 	return CMD_SUCCESS;
 }
 
-DEFUN (ospf_neighbor,
-       ospf_neighbor_cmd,
-       "neighbor A.B.C.D [priority (0-255) [poll-interval (1-65535)]]",
-       NEIGHBOR_STR
-       "Neighbor IP address\n"
-       "Neighbor Priority\n"
-       "Priority\n"
-       "Dead Neighbor Polling interval\n"
-       "Seconds\n")
-{
-	VTY_DECLVAR_INSTANCE_CONTEXT(ospf, ospf);
-	int idx_ipv4 = 1;
-	int idx_pri = 3;
-	int idx_poll = 5;
-	struct in_addr nbr_addr;
-	unsigned int priority = OSPF_NEIGHBOR_PRIORITY_DEFAULT;
-	unsigned int interval = OSPF_POLL_INTERVAL_DEFAULT;
-
-	if (!inet_aton(argv[idx_ipv4]->arg, &nbr_addr)) {
-		vty_out(vty, "Please specify Neighbor ID by A.B.C.D\n");
-		return CMD_WARNING_CONFIG_FAILED;
-	}
-
-	if (argc > 2)
-		priority = strtoul(argv[idx_pri]->arg, NULL, 10);
-
-	if (argc > 4)
-		interval = strtoul(argv[idx_poll]->arg, NULL, 10);
-
-	ospf_nbr_nbma_set(ospf, nbr_addr);
-
-	if (argc > 2)
-		ospf_nbr_nbma_priority_set(ospf, nbr_addr, priority);
-
-	if (argc > 4)
-		ospf_nbr_nbma_poll_interval_set(ospf, nbr_addr, interval);
-
-	return CMD_SUCCESS;
-}
-
-DEFUN (ospf_neighbor_poll_interval,
-       ospf_neighbor_poll_interval_cmd,
-       "neighbor A.B.C.D poll-interval (1-65535) [priority (0-255)]",
-       NEIGHBOR_STR
-       "Neighbor IP address\n"
-       "Dead Neighbor Polling interval\n"
-       "Seconds\n"
-       "OSPF priority of non-broadcast neighbor\n"
-       "Priority\n")
-{
-	VTY_DECLVAR_INSTANCE_CONTEXT(ospf, ospf);
-	int idx_ipv4 = 1;
-	int idx_poll = 3;
-	int idx_pri = 5;
-	struct in_addr nbr_addr;
-	unsigned int priority;
-	unsigned int interval;
-
-	if (!inet_aton(argv[idx_ipv4]->arg, &nbr_addr)) {
-		vty_out(vty, "Please specify Neighbor ID by A.B.C.D\n");
-		return CMD_WARNING_CONFIG_FAILED;
-	}
-
-	interval = strtoul(argv[idx_poll]->arg, NULL, 10);
-
-	priority = argc > 4 ? strtoul(argv[idx_pri]->arg, NULL, 10)
-			    : OSPF_NEIGHBOR_PRIORITY_DEFAULT;
-
-	ospf_nbr_nbma_set(ospf, nbr_addr);
-	ospf_nbr_nbma_poll_interval_set(ospf, nbr_addr, interval);
-
-	if (argc > 4)
-		ospf_nbr_nbma_priority_set(ospf, nbr_addr, priority);
-
-	return CMD_SUCCESS;
-}
-
-DEFUN (no_ospf_neighbor,
-       no_ospf_neighbor_cmd,
-       "no neighbor A.B.C.D [priority (0-255) [poll-interval (1-65525)]]",
-       NO_STR
-       NEIGHBOR_STR
-       "Neighbor IP address\n"
-       "Neighbor Priority\n"
-       "Priority\n"
-       "Dead Neighbor Polling interval\n"
-       "Seconds\n")
+DEFPY(ospf_neighbor, ospf_neighbor_cmd,
+      "[no] neighbor A.B.C.D$nbr_address [{priority (0-255)$priority | poll-interval (1-65535)$interval}]",
+      NO_STR
+      NEIGHBOR_STR
+      "Neighbor IP address\n"
+      "Neighbor Priority\n"
+      "Priority\n"
+      "Dead Neighbor Polling interval\n"
+      "Seconds\n")
 {
 	VTY_DECLVAR_INSTANCE_CONTEXT(ospf, ospf);
-	int idx_ipv4 = 2;
-	struct in_addr nbr_addr;
-
-	if (!inet_aton(argv[idx_ipv4]->arg, &nbr_addr)) {
-		vty_out(vty, "Please specify Neighbor ID by A.B.C.D\n");
-		return CMD_WARNING_CONFIG_FAILED;
-	}
-
-	(void)ospf_nbr_nbma_unset(ospf, nbr_addr);
 
-	return CMD_SUCCESS;
-}
-
-DEFUN (no_ospf_neighbor_poll,
-       no_ospf_neighbor_poll_cmd,
-       "no neighbor A.B.C.D poll-interval (1-65535) [priority (0-255)]",
-       NO_STR
-       NEIGHBOR_STR
-       "Neighbor IP address\n"
-       "Dead Neighbor Polling interval\n"
-       "Seconds\n"
-       "Neighbor Priority\n"
-       "Priority\n")
-{
-	VTY_DECLVAR_INSTANCE_CONTEXT(ospf, ospf);
-	int idx_ipv4 = 2;
-	struct in_addr nbr_addr;
+	if (no)
+		ospf_nbr_nbma_unset(ospf, nbr_address);
+	else {
+		ospf_nbr_nbma_set(ospf, nbr_address);
+		if (priority_str)
+			ospf_nbr_nbma_priority_set(ospf, nbr_address, priority);
 
-	if (!inet_aton(argv[idx_ipv4]->arg, &nbr_addr)) {
-		vty_out(vty, "Please specify Neighbor ID by A.B.C.D\n");
-		return CMD_WARNING_CONFIG_FAILED;
+		if (interval_str)
+			ospf_nbr_nbma_poll_interval_set(ospf, nbr_address,
+							interval);
 	}
 
-	(void)ospf_nbr_nbma_unset(ospf, nbr_addr);
-
 	return CMD_SUCCESS;
 }
 
@@ -4148,6 +4048,8 @@ static void show_ip_ospf_interface_sub(struct vty *vty, struct ospf *ospf,
 		ospf_interface_auth_show(vty, oi, json_interface_sub, use_json);
 
 		ospf_interface_auth_show(vty, oi, json_oi, use_json);
+
+		/* Point-to-Multipoint Interface options. */
 		if (oi->type == OSPF_IFTYPE_POINTOMULTIPOINT) {
 			if (use_json) {
 				json_object_boolean_add(json_interface_sub,
@@ -4162,6 +4064,19 @@ static void show_ip_ospf_interface_sub(struct vty *vty, struct ospf *ospf,
 					"  %sDelay reflooding LSAs received on P2MP interface\n",
 					oi->p2mp_delay_reflood ? "" : "Don't ");
 			}
+			if (use_json) {
+				json_object_boolean_add(json_interface_sub,
+							"p2mpNonBroadcast",
+							oi->p2mp_non_broadcast);
+
+				json_object_boolean_add(json_oi,
+							"p2mpNonBroadcast",
+							oi->p2mp_non_broadcast);
+			} else {
+				vty_out(vty,
+					"  P2MP interface does %ssupport broadcast\n",
+					oi->p2mp_non_broadcast ? "not " : "");
+			}
 		}
 
 		/* Add ospf_interface object to main json blob using SIP as key
@@ -5970,7 +5885,7 @@ static int show_ip_ospf_neighbor_detail_all_common(struct vty *vty,
 			prev_nbr = nbr;
 		}
 
-		if (oi->type != OSPF_IFTYPE_NBMA)
+		if (!OSPF_IF_NON_BROADCAST(oi))
 			continue;
 
 		struct listnode *nd;
@@ -8548,7 +8463,7 @@ DEFUN_HIDDEN (no_ospf_hello_interval,
 DEFUN(ip_ospf_network, ip_ospf_network_cmd,
       "ip ospf network <broadcast|"
       "non-broadcast|"
-      "point-to-multipoint [delay-reflood]|"
+      "point-to-multipoint [delay-reflood|non-broadcast]|"
       "point-to-point [dmvpn]>",
       "IP Information\n"
       "OSPF interface commands\n"
@@ -8557,6 +8472,7 @@ DEFUN(ip_ospf_network, ip_ospf_network_cmd,
       "Specify OSPF NBMA network\n"
       "Specify OSPF point-to-multipoint network\n"
       "Specify OSPF delayed reflooding of LSAs received on P2MP interface\n"
+      "Specify OSPF point-to-multipoint network doesn't support broadcast\n"
       "Specify OSPF point-to-point network\n"
       "Specify OSPF point-to-point DMVPN network\n")
 {
@@ -8565,6 +8481,7 @@ DEFUN(ip_ospf_network, ip_ospf_network_cmd,
 	int old_type = IF_DEF_PARAMS(ifp)->type;
 	uint8_t old_ptp_dmvpn = IF_DEF_PARAMS(ifp)->ptp_dmvpn;
 	uint8_t old_p2mp_delay_reflood = IF_DEF_PARAMS(ifp)->p2mp_delay_reflood;
+	uint8_t old_p2mp_non_broadcast = IF_DEF_PARAMS(ifp)->p2mp_non_broadcast;
 	struct route_node *rn;
 
 	if (old_type == OSPF_IFTYPE_LOOPBACK) {
@@ -8576,16 +8493,19 @@ DEFUN(ip_ospf_network, ip_ospf_network_cmd,
 	IF_DEF_PARAMS(ifp)->ptp_dmvpn = 0;
 	IF_DEF_PARAMS(ifp)->p2mp_delay_reflood =
 		OSPF_P2MP_DELAY_REFLOOD_DEFAULT;
+	IF_DEF_PARAMS(ifp)->p2mp_non_broadcast = OSPF_P2MP_NON_BROADCAST_DEFAULT;
 
 	if (argv_find(argv, argc, "broadcast", &idx))
 		IF_DEF_PARAMS(ifp)->type = OSPF_IFTYPE_BROADCAST;
-	else if (argv_find(argv, argc, "non-broadcast", &idx))
-		IF_DEF_PARAMS(ifp)->type = OSPF_IFTYPE_NBMA;
 	else if (argv_find(argv, argc, "point-to-multipoint", &idx)) {
 		IF_DEF_PARAMS(ifp)->type = OSPF_IFTYPE_POINTOMULTIPOINT;
 		if (argv_find(argv, argc, "delay-reflood", &idx))
 			IF_DEF_PARAMS(ifp)->p2mp_delay_reflood = true;
-	} else if (argv_find(argv, argc, "point-to-point", &idx)) {
+		if (argv_find(argv, argc, "non-broadcast", &idx))
+			IF_DEF_PARAMS(ifp)->p2mp_non_broadcast = true;
+	} else if (argv_find(argv, argc, "non-broadcast", &idx))
+		IF_DEF_PARAMS(ifp)->type = OSPF_IFTYPE_NBMA;
+	else if (argv_find(argv, argc, "point-to-point", &idx)) {
 		IF_DEF_PARAMS(ifp)->type = OSPF_IFTYPE_POINTOPOINT;
 		if (argv_find(argv, argc, "dmvpn", &idx))
 			IF_DEF_PARAMS(ifp)->ptp_dmvpn = 1;
@@ -8593,7 +8513,8 @@ DEFUN(ip_ospf_network, ip_ospf_network_cmd,
 
 	if (IF_DEF_PARAMS(ifp)->type == old_type &&
 	    IF_DEF_PARAMS(ifp)->ptp_dmvpn == old_ptp_dmvpn &&
-	    IF_DEF_PARAMS(ifp)->p2mp_delay_reflood == old_p2mp_delay_reflood)
+	    IF_DEF_PARAMS(ifp)->p2mp_delay_reflood == old_p2mp_delay_reflood &&
+	    IF_DEF_PARAMS(ifp)->p2mp_non_broadcast == old_p2mp_non_broadcast)
 		return CMD_SUCCESS;
 
 	SET_IF_PARAM(IF_DEF_PARAMS(ifp), type);
@@ -8607,13 +8528,16 @@ DEFUN(ip_ospf_network, ip_ospf_network_cmd,
 		oi->type = IF_DEF_PARAMS(ifp)->type;
 		oi->ptp_dmvpn = IF_DEF_PARAMS(ifp)->ptp_dmvpn;
 		oi->p2mp_delay_reflood = IF_DEF_PARAMS(ifp)->p2mp_delay_reflood;
+		oi->p2mp_non_broadcast = IF_DEF_PARAMS(ifp)->p2mp_non_broadcast;
 
 		/*
 		 * The OSPF interface only needs to be flapped if the network
 		 * type or DMVPN parameter changes.
 		 */
 		if (IF_DEF_PARAMS(ifp)->type != old_type ||
-		    IF_DEF_PARAMS(ifp)->ptp_dmvpn != old_ptp_dmvpn) {
+		    IF_DEF_PARAMS(ifp)->ptp_dmvpn != old_ptp_dmvpn ||
+		    IF_DEF_PARAMS(ifp)->p2mp_non_broadcast !=
+			    old_p2mp_non_broadcast) {
 			if (oi->state > ISM_Down) {
 				OSPF_ISM_EVENT_EXECUTE(oi, ISM_InterfaceDown);
 				OSPF_ISM_EVENT_EXECUTE(oi, ISM_InterfaceUp);
@@ -8657,6 +8581,7 @@ DEFUN (no_ip_ospf_network,
 	IF_DEF_PARAMS(ifp)->ptp_dmvpn = 0;
 	IF_DEF_PARAMS(ifp)->p2mp_delay_reflood =
 		OSPF_P2MP_DELAY_REFLOOD_DEFAULT;
+	IF_DEF_PARAMS(ifp)->p2mp_non_broadcast = OSPF_P2MP_NON_BROADCAST_DEFAULT;
 
 	if (IF_DEF_PARAMS(ifp)->type == old_type)
 		return CMD_SUCCESS;
@@ -12225,6 +12150,10 @@ static int config_write_interface_one(struct vty *vty, struct vrf *vrf)
 						    OSPF_IFTYPE_POINTOMULTIPOINT &&
 					    params->p2mp_delay_reflood)
 						vty_out(vty, " delay-reflood");
+					if (params->type ==
+						    OSPF_IFTYPE_POINTOMULTIPOINT &&
+					    params->p2mp_non_broadcast)
+						vty_out(vty, " non-broadcast");
 					if (params != IF_DEF_PARAMS(ifp) && rn)
 						vty_out(vty, " %pI4",
 							&rn->p.u.prefix4);
@@ -13753,11 +13682,8 @@ void ospf_vty_init(void)
 	install_element(OSPF_NODE, &ospf_auto_cost_reference_bandwidth_cmd);
 	install_element(OSPF_NODE, &no_ospf_auto_cost_reference_bandwidth_cmd);
 
-	/* "neighbor" commands. */
+	/* "neighbor" command. */
 	install_element(OSPF_NODE, &ospf_neighbor_cmd);
-	install_element(OSPF_NODE, &ospf_neighbor_poll_interval_cmd);
-	install_element(OSPF_NODE, &no_ospf_neighbor_cmd);
-	install_element(OSPF_NODE, &no_ospf_neighbor_poll_cmd);
 
 	/* write multiplier commands */
 	install_element(OSPF_NODE, &ospf_write_multiplier_cmd);