diff options
| author | David Lamparter <equinox@diac24.net> | 2017-08-16 19:28:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-16 19:28:09 +0200 |
| commit | 74218b297f34f965d0ef3a7a9eb33598b8af16d1 (patch) | |
| tree | 12894da9641bdbc50493f05d148281bfa9cd37d0 /ospfd | |
| parent | Merge pull request #984 from donaldsharp/debugging (diff) | |
| parent | ospfd: remember area-id format for ifaces (diff) | |
| download | frr-74218b297f34f965d0ef3a7a9eb33598b8af16d1.tar.xz frr-74218b297f34f965d0ef3a7a9eb33598b8af16d1.zip | |
Merge pull request #989 from qlyoung/if-area-df
ospfd: remember area-id format for ifaces
Diffstat (limited to 'ospfd')
| -rw-r--r-- | ospfd/ospf_interface.h | 2 | ||||
| -rw-r--r-- | ospfd/ospf_vty.c | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/ospfd/ospf_interface.h b/ospfd/ospf_interface.h index d4b495b20..829a3f429 100644 --- a/ospfd/ospf_interface.h +++ b/ospfd/ospf_interface.h @@ -66,6 +66,8 @@ struct ospf_if_params { DECLARE_IF_PARAM(u_char, priority); /* OSPF Interface priority */ /* Enable OSPF on this interface with area if_area */ DECLARE_IF_PARAM(struct in_addr, if_area); + u_int32_t if_area_id_fmt; + DECLARE_IF_PARAM(u_char, type); /* type of interface */ #define OSPF_IF_ACTIVE 0 #define OSPF_IF_PASSIVE 1 diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c index 13d4780db..d9354e0cb 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c @@ -6971,6 +6971,7 @@ DEFUN (ip_ospf_area, /* enable ospf on this interface with area_id */ SET_IF_PARAM(params, if_area); params->if_area = area_id; + params->if_area_id_fmt = format; ospf_interface_area_set(ifp); ospf->if_ospf_cli_count++; @@ -8312,8 +8313,13 @@ static int config_write_interface(struct vty *vty) else vty_out(vty, " ip ospf"); - vty_out(vty, " area %s", - inet_ntoa(params->if_area)); + + size_t buflen = MAX(strlen("4294967295"), + strlen("255.255.255.255")); + char buf[buflen]; + area_id2str(buf, sizeof(buf), ¶ms->if_area, + params->if_area_id_fmt); + vty_out(vty, " area %s", buf); if (params != IF_DEF_PARAMS(ifp)) vty_out(vty, " %s", inet_ntoa(rn->p.u.prefix4)); |