summaryrefslogtreecommitdiff
path: root/ospfd/ospf_vty.c
diff options
context:
space:
mode:
Diffstat (limited to 'ospfd/ospf_vty.c')
-rw-r--r--ospfd/ospf_vty.c44
1 files changed, 17 insertions, 27 deletions
diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index 4093837ba7..e8cc50c8d0 100644
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -313,8 +313,7 @@ DEFPY (ospf_router_id,
for (ALL_LIST_ELEMENTS_RO(ospf->areas, node, area))
if (area->full_nbrs) {
vty_out(vty,
- "For this router-id change to take effect,"
- " save config and restart ospfd\n");
+ "For this router-id change to take effect, save config and restart ospfd\n");
return CMD_SUCCESS;
}
@@ -347,8 +346,7 @@ DEFUN_HIDDEN (ospf_router_id_old,
for (ALL_LIST_ELEMENTS_RO(ospf->areas, node, area))
if (area->full_nbrs) {
vty_out(vty,
- "For this router-id change to take effect,"
- " save config and restart ospfd\n");
+ "For this router-id change to take effect, save config and restart ospfd\n");
return CMD_SUCCESS;
}
@@ -381,8 +379,7 @@ DEFPY (no_ospf_router_id,
for (ALL_LIST_ELEMENTS_RO(ospf->areas, node, area))
if (area->full_nbrs) {
vty_out(vty,
- "For this router-id change to take effect,"
- " save config and restart ospfd\n");
+ "For this router-id change to take effect, save config and restart ospfd\n");
return CMD_SUCCESS;
}
@@ -700,6 +697,8 @@ DEFUN (ospf_area_range,
str2prefix_ipv4(argv[idx_ipv4_prefixlen]->arg, &p);
ospf_area_range_set(ospf, area_id, &p, OSPF_AREA_RANGE_ADVERTISE);
+ ospf_area_display_format_set(ospf, ospf_area_get(ospf, area_id),
+ format);
if (argc > 5) {
cost = strtoul(argv[idx_cost]->arg, NULL, 10);
ospf_area_range_cost_set(ospf, area_id, &p, cost);
@@ -1178,9 +1177,9 @@ DEFUN (no_ospf_area_vlink,
"no area <A.B.C.D|(0-4294967295)> virtual-link A.B.C.D [authentication [<message-digest|null>]] [<message-digest-key (1-255) md5 KEY|authentication-key AUTH_KEY>]",
NO_STR
VLINK_HELPSTR_IPADDR
- "Enable authentication on this virtual link\n" \
- "Use message-digest authentication\n" \
- "Use null authentication\n" \
+ "Enable authentication on this virtual link\n"
+ "Use message-digest authentication\n"
+ "Use null authentication\n"
VLINK_HELPSTR_AUTH_MD5
VLINK_HELPSTR_AUTH_SIMPLE)
{
@@ -1385,8 +1384,7 @@ DEFUN (ospf_area_shortcut,
if (ospf->abr_type != OSPF_ABR_SHORTCUT)
vty_out(vty,
- "Shortcut area setting will take effect "
- "only when the router is configured as Shortcut ABR\n");
+ "Shortcut area setting will take effect only when the router is configured as Shortcut ABR\n");
return CMD_SUCCESS;
}
@@ -1718,8 +1716,7 @@ DEFUN (ospf_area_default_cost,
p.prefixlen = 0;
if (IS_DEBUG_OSPF_EVENT)
zlog_debug(
- "ospf_abr_announce_stub_defaults(): "
- "announcing 0.0.0.0/0 to area %s",
+ "ospf_abr_announce_stub_defaults(): announcing 0.0.0.0/0 to area %s",
inet_ntoa(area->area_id));
ospf_abr_announce_network_to_area(&p, area->default_cost, area);
@@ -1762,8 +1759,7 @@ DEFUN (no_ospf_area_default_cost,
p.prefixlen = 0;
if (IS_DEBUG_OSPF_EVENT)
zlog_debug(
- "ospf_abr_announce_stub_defaults(): "
- "announcing 0.0.0.0/0 to area %s",
+ "ospf_abr_announce_stub_defaults(): announcing 0.0.0.0/0 to area %s",
inet_ntoa(area->area_id));
ospf_abr_announce_network_to_area(&p, area->default_cost, area);
@@ -2712,8 +2708,7 @@ static void show_ip_ospf_area(struct vty *vty, struct ospf_area *area,
area->act_ints);
} else
vty_out(vty,
- " Number of interfaces in this area: Total: %d, "
- "Active: %d\n",
+ " Number of interfaces in this area: Total: %d, Active: %d\n",
listcount(area->oiflist), area->act_ints);
if (area->external_routing == OSPF_AREA_NSSA) {
@@ -2871,8 +2866,7 @@ static void show_ip_ospf_area(struct vty *vty, struct ospf_area *area,
} else {
/* Show number of fully adjacent neighbors. */
vty_out(vty,
- " Number of fully adjacent neighbors in this area:"
- " %d\n",
+ " Number of fully adjacent neighbors in this area: %d\n",
area->full_nbrs);
/* Show authentication type. */
@@ -2886,8 +2880,7 @@ static void show_ip_ospf_area(struct vty *vty, struct ospf_area *area,
if (!OSPF_IS_AREA_BACKBONE(area))
vty_out(vty,
- " Number of full virtual adjacencies going through"
- " this area: %d\n",
+ " Number of full virtual adjacencies going through this area: %d\n",
area->full_vls);
/* Show SPF calculation times. */
@@ -3173,8 +3166,7 @@ static int show_ip_ospf_common(struct vty *vty, struct ospf *ospf,
"injectingExternalRoutingInformation");
else
vty_out(vty,
- " This router is an ASBR "
- "(injecting external routing information)\n");
+ " This router is an ASBR (injecting external routing information)\n");
}
/* Show Number of AS-external-LSAs. */
@@ -10205,8 +10197,7 @@ static int config_write_virtual_link(struct vty *vty, struct ospf *ospf)
->auth_crypt,
n2, ck))
vty_out(vty,
- " area %s virtual-link %s"
- " message-digest-key %d md5 %s\n",
+ " area %s virtual-link %s message-digest-key %d md5 %s\n",
buf, inet_ntoa(vl_data->vl_peer),
ck->key_id, ck->auth_key);
}
@@ -10385,8 +10376,7 @@ static int ospf_config_write_one(struct vty *vty, struct ospf *ospf)
/* auto-cost reference-bandwidth configuration. */
if (ospf->ref_bandwidth != OSPF_DEFAULT_REF_BANDWIDTH) {
vty_out(vty,
- "! Important: ensure reference bandwidth "
- "is consistent across all routers\n");
+ "! Important: ensure reference bandwidth is consistent across all routers\n");
vty_out(vty, " auto-cost reference-bandwidth %d\n",
ospf->ref_bandwidth);
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-11-28 08:27:38 +0000