version 1.1.1.2, 2012/10/09 09:22:29
|
version 1.1.1.3, 2013/07/21 23:54:40
|
Line 1742 DEFUN (no_ospf_area_default_cost,
|
Line 1742 DEFUN (no_ospf_area_default_cost,
|
struct ospf *ospf = vty->index; |
struct ospf *ospf = vty->index; |
struct ospf_area *area; |
struct ospf_area *area; |
struct in_addr area_id; |
struct in_addr area_id; |
u_int32_t cost; |
|
int format; |
int format; |
struct prefix_ipv4 p; |
struct prefix_ipv4 p; |
|
|
VTY_GET_OSPF_AREA_ID_NO_BB ("default-cost", area_id, format, argv[0]); |
VTY_GET_OSPF_AREA_ID_NO_BB ("default-cost", area_id, format, argv[0]); |
VTY_GET_INTEGER_RANGE ("stub default cost", cost, argv[1], 0, 16777215); | VTY_CHECK_INTEGER_RANGE ("stub default cost", argv[1], 0, OSPF_LS_INFINITY); |
|
|
area = ospf_area_lookup_by_area_id (ospf, area_id); |
area = ospf_area_lookup_by_area_id (ospf, area_id); |
if (area == NULL) |
if (area == NULL) |
Line 1933 DEFUN (no_ospf_area_filter_list,
|
Line 1932 DEFUN (no_ospf_area_filter_list,
|
struct ospf *ospf = vty->index; |
struct ospf *ospf = vty->index; |
struct ospf_area *area; |
struct ospf_area *area; |
struct in_addr area_id; |
struct in_addr area_id; |
struct prefix_list *plist; |
|
int format; |
int format; |
|
|
VTY_GET_OSPF_AREA_ID (area_id, format, argv[0]); |
VTY_GET_OSPF_AREA_ID (area_id, format, argv[0]); |
Line 1941 DEFUN (no_ospf_area_filter_list,
|
Line 1939 DEFUN (no_ospf_area_filter_list,
|
if ((area = ospf_area_lookup_by_area_id (ospf, area_id)) == NULL) |
if ((area = ospf_area_lookup_by_area_id (ospf, area_id)) == NULL) |
return CMD_SUCCESS; |
return CMD_SUCCESS; |
|
|
plist = prefix_list_lookup (AFI_IP, argv[1]); |
|
if (strncmp (argv[2], "in", 2) == 0) |
if (strncmp (argv[2], "in", 2) == 0) |
{ |
{ |
if (PREFIX_NAME_IN (area)) |
if (PREFIX_NAME_IN (area)) |
Line 2322 DEFUN (ospf_neighbor,
|
Line 2319 DEFUN (ospf_neighbor,
|
if (argc > 1) |
if (argc > 1) |
ospf_nbr_nbma_priority_set (ospf, nbr_addr, priority); |
ospf_nbr_nbma_priority_set (ospf, nbr_addr, priority); |
if (argc > 2) |
if (argc > 2) |
ospf_nbr_nbma_poll_interval_set (ospf, nbr_addr, priority); | ospf_nbr_nbma_poll_interval_set (ospf, nbr_addr, interval); |
|
|
return CMD_SUCCESS; |
return CMD_SUCCESS; |
} |
} |
Line 2394 DEFUN (no_ospf_neighbor,
|
Line 2391 DEFUN (no_ospf_neighbor,
|
{ |
{ |
struct ospf *ospf = vty->index; |
struct ospf *ospf = vty->index; |
struct in_addr nbr_addr; |
struct in_addr nbr_addr; |
int ret; |
|
|
|
VTY_GET_IPV4_ADDRESS ("neighbor address", nbr_addr, argv[0]); |
VTY_GET_IPV4_ADDRESS ("neighbor address", nbr_addr, argv[0]); |
|
|
ret = ospf_nbr_nbma_unset (ospf, nbr_addr); | (void)ospf_nbr_nbma_unset (ospf, nbr_addr); |
|
|
return CMD_SUCCESS; |
return CMD_SUCCESS; |
} |
} |
Line 4035 show_ip_ospf_database_summary (struct vty *vty, struct
|
Line 4031 show_ip_ospf_database_summary (struct vty *vty, struct
|
static void |
static void |
show_ip_ospf_database_maxage (struct vty *vty, struct ospf *ospf) |
show_ip_ospf_database_maxage (struct vty *vty, struct ospf *ospf) |
{ |
{ |
struct listnode *node; | struct route_node *rn; |
struct ospf_lsa *lsa; |
struct ospf_lsa *lsa; |
|
|
vty_out (vty, "%s MaxAge Link States:%s%s", |
vty_out (vty, "%s MaxAge Link States:%s%s", |
VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE); |
VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE); |
|
|
for (ALL_LIST_ELEMENTS_RO (ospf->maxage_lsa, node, lsa)) | for (rn = route_top (ospf->maxage_lsa); rn; rn = route_next (rn)) |
{ |
{ |
vty_out (vty, "Link type: %d%s", lsa->data->type, VTY_NEWLINE); | struct ospf_lsa *lsa; |
vty_out (vty, "Link State ID: %s%s", | |
inet_ntoa (lsa->data->id), VTY_NEWLINE); | if ((lsa = rn->info) != NULL) |
vty_out (vty, "Advertising Router: %s%s", | { |
inet_ntoa (lsa->data->adv_router), VTY_NEWLINE); | vty_out (vty, "Link type: %d%s", lsa->data->type, VTY_NEWLINE); |
vty_out (vty, "LSA lock count: %d%s", lsa->lock, VTY_NEWLINE); | vty_out (vty, "Link State ID: %s%s", |
vty_out (vty, "%s", VTY_NEWLINE); | inet_ntoa (lsa->data->id), VTY_NEWLINE); |
| vty_out (vty, "Advertising Router: %s%s", |
| inet_ntoa (lsa->data->adv_router), VTY_NEWLINE); |
| vty_out (vty, "LSA lock count: %d%s", lsa->lock, VTY_NEWLINE); |
| vty_out (vty, "%s", VTY_NEWLINE); |
| } |
} |
} |
} |
} |
|
|
Line 5403 DEFUN (ip_ospf_priority,
|
Line 5404 DEFUN (ip_ospf_priority,
|
"Address of interface") |
"Address of interface") |
{ |
{ |
struct interface *ifp = vty->index; |
struct interface *ifp = vty->index; |
u_int32_t priority; | long priority; |
struct route_node *rn; |
struct route_node *rn; |
struct in_addr addr; |
struct in_addr addr; |
int ret; |
int ret; |
Line 6037 DEFUN (ospf_distribute_list_out,
|
Line 6038 DEFUN (ospf_distribute_list_out,
|
int source; |
int source; |
|
|
/* Get distribute source. */ |
/* Get distribute source. */ |
source = proto_redistnum(AFI_IP, argv[0]); | source = proto_redistnum(AFI_IP, argv[1]); |
if (source < 0 || source == ZEBRA_ROUTE_OSPF) |
if (source < 0 || source == ZEBRA_ROUTE_OSPF) |
return CMD_WARNING; |
return CMD_WARNING; |
|
|
Line 6056 DEFUN (no_ospf_distribute_list_out,
|
Line 6057 DEFUN (no_ospf_distribute_list_out,
|
struct ospf *ospf = vty->index; |
struct ospf *ospf = vty->index; |
int source; |
int source; |
|
|
source = proto_redistnum(AFI_IP, argv[0]); | source = proto_redistnum(AFI_IP, argv[1]); |
if (source < 0 || source == ZEBRA_ROUTE_OSPF) |
if (source < 0 || source == ZEBRA_ROUTE_OSPF) |
return CMD_WARNING; |
return CMD_WARNING; |
|
|
Line 7020 DEFUN (ospf_max_metric_router_lsa_admin,
|
Line 7021 DEFUN (ospf_max_metric_router_lsa_admin,
|
if (!CHECK_FLAG (area->stub_router_state, OSPF_AREA_IS_STUB_ROUTED)) |
if (!CHECK_FLAG (area->stub_router_state, OSPF_AREA_IS_STUB_ROUTED)) |
ospf_router_lsa_update_area (area); |
ospf_router_lsa_update_area (area); |
} |
} |
|
|
|
/* Allows for areas configured later to get the property */ |
|
ospf->stub_router_admin_set = OSPF_STUB_ROUTER_ADMINISTRATIVE_SET; |
|
|
return CMD_SUCCESS; |
return CMD_SUCCESS; |
} |
} |
|
|
Line 7047 DEFUN (no_ospf_max_metric_router_lsa_admin,
|
Line 7052 DEFUN (no_ospf_max_metric_router_lsa_admin,
|
ospf_router_lsa_update_area (area); |
ospf_router_lsa_update_area (area); |
} |
} |
} |
} |
|
ospf->stub_router_admin_set = OSPF_STUB_ROUTER_ADMINISTRATIVE_UNSET; |
return CMD_SUCCESS; |
return CMD_SUCCESS; |
} |
} |
|
|