From de842255f9a1930d7f927e94e7ea800bcfd1434c Mon Sep 17 00:00:00 2001 From: Patrick Ruddy Date: Wed, 3 Oct 2018 18:22:34 +0100 Subject: ospf6d: decimal area format in interface command The ospf6 "interface area " command only allows the area to be specified in the ipv4 address format, whereas the show run command always shows it in the format in which the area was created. This causes the frr-reload script to be unable to remove ospfv3 interfaces when the area was created in decimal format. The solution is to allow both formats to be configured as they can be for other area commands. Signed-off-by: Duncan Eastoe --- ospf6d/ospf6_area.c | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'ospf6d/ospf6_area.c') diff --git a/ospf6d/ospf6_area.c b/ospf6d/ospf6_area.c index 9fe077b544..713ce26ecb 100644 --- a/ospf6d/ospf6_area.c +++ b/ospf6d/ospf6_area.c @@ -379,22 +379,6 @@ void ospf6_area_show(struct vty *vty, struct ospf6_area *oa) vty_out(vty, "SPF has not been run\n"); } - -#define OSPF6_CMD_AREA_GET(str, oa) \ - { \ - char *ep; \ - uint32_t area_id = htonl(strtoul(str, &ep, 10)); \ - if (*ep && inet_pton(AF_INET, str, &area_id) != 1) { \ - vty_out(vty, "Malformed Area-ID: %s\n", str); \ - return CMD_SUCCESS; \ - } \ - int format = !*ep ? OSPF6_AREA_FMT_DECIMAL \ - : OSPF6_AREA_FMT_DOTTEDQUAD; \ - oa = ospf6_area_lookup(area_id, ospf6); \ - if (oa == NULL) \ - oa = ospf6_area_create(area_id, ospf6, format); \ - } - DEFUN (area_range, area_range_cmd, "area range X:X::X:X/M []", -- cgit v1.2.3