"router-id for the OSPF process\n"
"OSPF router-id in IP address format\n")
{
- int ret;
+ struct ospf *ospf = vty->index;
struct in_addr router_id;
+ int ret;
ret = inet_aton (argv[0], &router_id);
if (!ret)
return CMD_WARNING;
}
- /* ospf_top->router_id = router_id; */
- ospf_top->router_id_static = router_id;
+ ospf->router_id_static = router_id;
- if (ospf_top->t_router_id_update == NULL)
- ospf_top->t_router_id_update =
+ if (ospf->t_router_id_update == NULL)
+ ospf->t_router_id_update =
thread_add_timer (master, ospf_router_id_update_timer, NULL,
OSPF_ROUTER_ID_UPDATE_DELAY);
"OSPF specific commands\n"
"router-id for the OSPF process\n")
{
- ospf_top->router_id_static.s_addr = 0;
+ struct ospf *ospf = vty->index;
+
+ ospf->router_id_static.s_addr = 0;
- ospf_router_id_update ();
+ ospf_router_id_update (ospf);
return CMD_SUCCESS;
}
}
struct ospf_vl_data *
-ospf_find_vl_data (struct ospf_vl_config_data *vl_config)
+ospf_find_vl_data (struct ospf *ospf, struct ospf_vl_config_data *vl_config)
{
struct ospf_area *area;
struct ospf_vl_data *vl_data;
VTY_NEWLINE);
return NULL;
}
- area = ospf_area_get (area_id, vl_config->format);
+ area = ospf_area_get (ospf, area_id, vl_config->format);
if (area->external_routing != OSPF_AREA_DEFAULT)
{
vl_data = ospf_vl_data_new (area, vl_config->vl_peer);
if (vl_data->vl_oi == NULL)
{
- vl_data->vl_oi = ospf_vl_new (vl_data);
- ospf_vl_add (vl_data);
- ospf_spf_calculate_schedule ();
+ vl_data->vl_oi = ospf_vl_new (ospf, vl_data);
+ ospf_vl_add (ospf, vl_data);
+ ospf_spf_calculate_schedule (ospf);
}
}
return vl_data;
/* The business end of all of the above */
int
-ospf_vl_set (struct ospf_vl_config_data *vl_config)
+ospf_vl_set (struct ospf *ospf, struct ospf_vl_config_data *vl_config)
{
struct ospf_vl_data *vl_data;
int ret;
- vl_data = ospf_find_vl_data (vl_config);
+ vl_data = ospf_find_vl_data (ospf, vl_config);
if (!vl_data)
return CMD_WARNING;
"area (A.B.C.D|<0-4294967295>) virtual-link A.B.C.D",
VLINK_HELPSTR_IPADDR)
{
+ struct ospf *ospf = vty->index;
struct ospf_vl_config_data vl_config;
char auth_key[OSPF_AUTH_SIMPLE_SIZE+1];
char md5_key[OSPF_AUTH_MD5_SIZE+1];
{
/* Thats all folks! - BUGS B. strikes again!!!*/
- return ospf_vl_set (&vl_config);
+ return ospf_vl_set (ospf, &vl_config);
}
/* Deal with other parameters */
/* Action configuration */
- return ospf_vl_set (&vl_config);
+ return ospf_vl_set (ospf, &vl_config);
}
NO_STR
VLINK_HELPSTR_IPADDR)
{
+ struct ospf *ospf = vty->index;
struct ospf_area *area;
struct ospf_vl_config_data vl_config;
struct ospf_vl_data *vl_data = NULL;
return CMD_WARNING;
}
- area = ospf_area_lookup_by_area_id (vl_config.area_id);
+ area = ospf_area_lookup_by_area_id (ospf, vl_config.area_id);
if (!area)
{
vty_out (vty, "Area does not exist%s", VTY_NEWLINE);
/* Basic VLink no command */
/* Thats all folks! - BUGS B. strikes again!!!*/
if ((vl_data = ospf_vl_lookup (area, vl_config.vl_peer)))
- ospf_vl_delete (vl_data);
+ ospf_vl_delete (ospf, vl_data);
- ospf_area_check_free (vl_config.area_id);
+ ospf_area_check_free (ospf, vl_config.area_id);
return CMD_SUCCESS;
}
/* Deal with other parameters */
for (i=2; i < argc; i++)
{
-
/* vty_out (vty, "argv[%d] - %s%s", i, argv[i], VTY_NEWLINE); */
switch (argv[i][0])
/* Action configuration */
- return ospf_vl_set (&vl_config);
+ return ospf_vl_set (ospf, &vl_config);
}
ALIAS (area_vlink,
"Enable shortcutting through the area\n"
"Disable shortcutting through the area\n")
{
+ struct ospf *ospf = vty->index;
struct ospf_area *area;
struct in_addr area_id;
int mode;
VTY_GET_OSPF_AREA_ID_NO_BB ("shortcut", area_id, format, argv[0]);
- area = ospf_area_get (area_id, format);
+ area = ospf_area_get (ospf, area_id, format);
if (strncmp (argv[1], "de", 2) == 0)
mode = OSPF_SHORTCUT_DEFAULT;
else
return CMD_WARNING;
- ospf_area_shortcut_set (area, mode);
+ ospf_area_shortcut_set (ospf, area, mode);
- if (ospf_top->abr_type != OSPF_ABR_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%s",
VTY_NEWLINE);
"Deconfigure enabled shortcutting through the area\n"
"Deconfigure disabled shortcutting through the area\n")
{
+ struct ospf *ospf = vty->index;
struct ospf_area *area;
struct in_addr area_id;
int format;
VTY_GET_OSPF_AREA_ID_NO_BB ("shortcut", area_id, format, argv[0]);
- area = ospf_area_lookup_by_area_id (area_id);
+ area = ospf_area_lookup_by_area_id (ospf, area_id);
if (!area)
return CMD_SUCCESS;
- ospf_area_shortcut_unset (area);
+ ospf_area_shortcut_unset (ospf, area);
return CMD_SUCCESS;
}
"Set the summary-default cost of a NSSA or stub area\n"
"Stub's advertised default summary cost\n")
{
+ struct ospf *ospf = vty->index;
struct ospf_area *area;
struct in_addr area_id;
u_int32_t cost;
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);
- area = ospf_area_get (area_id, format);
+ area = ospf_area_get (ospf, area_id, format);
if (area->external_routing == OSPF_AREA_DEFAULT)
{
"Set the summary-default cost of a NSSA or stub area\n"
"Stub's advertised default summary cost\n")
{
+ struct ospf *ospf = vty->index;
struct ospf_area *area;
struct in_addr area_id;
u_int32_t cost;
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);
- area = ospf_area_lookup_by_area_id (area_id);
+ area = ospf_area_lookup_by_area_id (ospf, area_id);
if (area == NULL)
return CMD_SUCCESS;
area->default_cost = 1;
- ospf_area_check_free (area_id);
+ ospf_area_check_free (ospf, area_id);
return CMD_SUCCESS;
}
"Set the filter for networks announced to other areas\n"
"Name of the access-list\n")
{
+ struct ospf *ospf = vty->index;
struct ospf_area *area;
struct in_addr area_id;
int format;
VTY_GET_OSPF_AREA_ID_NO_BB ("export-list", area_id, format, argv[0]);
- area = ospf_area_get (area_id, format);
- ospf_area_export_list_set (area, argv[1]);
+ area = ospf_area_get (ospf, area_id, format);
+ ospf_area_export_list_set (ospf, area, argv[1]);
return CMD_SUCCESS;
}
"Unset the filter for networks announced to other areas\n"
"Name of the access-list\n")
{
+ struct ospf *ospf = vty->index;
struct ospf_area *area;
struct in_addr area_id;
int format;
VTY_GET_OSPF_AREA_ID_NO_BB ("export-list", area_id, format, argv[0]);
- area = ospf_area_lookup_by_area_id (area_id);
+ area = ospf_area_lookup_by_area_id (ospf, area_id);
if (area == NULL)
return CMD_SUCCESS;
- ospf_area_export_list_unset (area);
+ ospf_area_export_list_unset (ospf, area);
return CMD_SUCCESS;
}
"Set the filter for networks from other areas announced to the specified one\n"
"Name of the access-list\n")
{
+ struct ospf *ospf = vty->index;
struct ospf_area *area;
struct in_addr area_id;
int format;
VTY_GET_OSPF_AREA_ID_NO_BB ("import-list", area_id, format, argv[0]);
- area = ospf_area_get (area_id, format);
- ospf_area_import_list_set (area, argv[1]);
+ area = ospf_area_get (ospf, area_id, format);
+ ospf_area_import_list_set (ospf, area, argv[1]);
return CMD_SUCCESS;
}
"Unset the filter for networks announced to other areas\n"
"Name of the access-list\n")
{
+ struct ospf *ospf = vty->index;
struct ospf_area *area;
struct in_addr area_id;
int format;
VTY_GET_OSPF_AREA_ID_NO_BB ("import-list", area_id, format, argv[0]);
- area = ospf_area_lookup_by_area_id (area_id);
+ area = ospf_area_lookup_by_area_id (ospf, area_id);
if (area == NULL)
return CMD_SUCCESS;
- ospf_area_import_list_unset (area);
+ ospf_area_import_list_unset (ospf, area);
return CMD_SUCCESS;
}
"Filter networks sent to this area\n"
"Filter networks sent from this area\n")
{
+ struct ospf *ospf = vty->index;
struct ospf_area *area;
struct in_addr area_id;
struct prefix_list *plist;
VTY_GET_OSPF_AREA_ID (area_id, format, argv[0]);
- area = ospf_area_get (area_id, format);
+ area = ospf_area_get (ospf, area_id, format);
plist = prefix_list_lookup (AFI_IP, argv[1]);
if (strncmp (argv[2], "in", 2) == 0)
{
free (PREFIX_NAME_IN (area));
PREFIX_NAME_IN (area) = strdup (argv[1]);
- ospf_schedule_abr_task ();
+ ospf_schedule_abr_task (ospf);
}
else
{
free (PREFIX_NAME_OUT (area));
PREFIX_NAME_OUT (area) = strdup (argv[1]);
- ospf_schedule_abr_task ();
+ ospf_schedule_abr_task (ospf);
}
return CMD_SUCCESS;
"Filter networks sent to this area\n"
"Filter networks sent from this area\n")
{
+ struct ospf *ospf = vty->index;
struct ospf_area *area;
struct in_addr area_id;
struct prefix_list *plist;
VTY_GET_OSPF_AREA_ID (area_id, format, argv[0]);
- area = ospf_area_lookup_by_area_id (area_id);
+ area = ospf_area_lookup_by_area_id (ospf, area_id);
plist = prefix_list_lookup (AFI_IP, argv[1]);
if (strncmp (argv[2], "in", 2) == 0)
{
PREFIX_NAME_IN (area) = NULL;
- ospf_schedule_abr_task ();
+ ospf_schedule_abr_task (ospf);
}
else
{
PREFIX_NAME_OUT (area) = NULL;
- ospf_schedule_abr_task ();
+ ospf_schedule_abr_task (ospf);
}
return CMD_SUCCESS;
"Enable authentication\n"
"Use message-digest authentication\n")
{
+ struct ospf *ospf = vty->index;
struct ospf_area *area;
struct in_addr area_id;
int format;
VTY_GET_OSPF_AREA_ID (area_id, format, argv[0]);
- area = ospf_area_get (area_id, format);
+ area = ospf_area_get (ospf, area_id, format);
area->auth_type = OSPF_AUTH_CRYPTOGRAPHIC;
return CMD_SUCCESS;
"OSPF area ID as a decimal value\n"
"Enable authentication\n")
{
+ struct ospf *ospf = vty->index;
struct ospf_area *area;
struct in_addr area_id;
int format;
VTY_GET_OSPF_AREA_ID (area_id, format, argv[0]);
- area = ospf_area_get (area_id, format);
+ area = ospf_area_get (ospf, area_id, format);
area->auth_type = OSPF_AUTH_SIMPLE;
return CMD_SUCCESS;
"OSPF area ID as a decimal value\n"
"Enable authentication\n")
{
+ struct ospf *ospf = vty->index;
struct ospf_area *area;
struct in_addr area_id;
int format;
VTY_GET_OSPF_AREA_ID (area_id, format, argv[0]);
- area = ospf_area_lookup_by_area_id (area_id);
+ area = ospf_area_lookup_by_area_id (ospf, area_id);
if (area == NULL)
return CMD_SUCCESS;
area->auth_type = OSPF_AUTH_NULL;
- ospf_area_check_free (area_id);
+ ospf_area_check_free (ospf, area_id);
return CMD_SUCCESS;
}
"Shortcut ABR\n"
"Standard behavior (RFC2328)\n")
{
+ struct ospf *ospf = vty->index;
u_char abr_type = OSPF_ABR_UNKNOWN;
if (strncmp (argv[0], "c", 1) == 0)
return CMD_WARNING;
/* If ABR type value is changed, schedule ABR task. */
- if (ospf_top->abr_type != abr_type)
+ if (ospf->abr_type != abr_type)
{
- ospf_top->abr_type = abr_type;
- ospf_schedule_abr_task ();
+ ospf->abr_type = abr_type;
+ ospf_schedule_abr_task (ospf);
}
return CMD_SUCCESS;
"Alternative ABR, IBM implementation\n"
"Shortcut ABR\n")
{
+ struct ospf *ospf = vty->index;
u_char abr_type = OSPF_ABR_UNKNOWN;
if (strncmp (argv[0], "c", 1) == 0)
return CMD_WARNING;
/* If ABR type value is changed, schedule ABR task. */
- if (ospf_top->abr_type == abr_type)
+ if (ospf->abr_type == abr_type)
{
- ospf_top->abr_type = OSPF_ABR_STAND;
- ospf_schedule_abr_task ();
+ ospf->abr_type = OSPF_ABR_STAND;
+ ospf_schedule_abr_task (ospf);
}
return CMD_SUCCESS;
if (!CHECK_FLAG (ospf->config, OSPF_RFC1583_COMPATIBLE))
{
SET_FLAG (ospf->config, OSPF_RFC1583_COMPATIBLE);
- ospf_spf_calculate_schedule ();
+ ospf_spf_calculate_schedule (ospf);
}
return CMD_SUCCESS;
}
if (CHECK_FLAG (ospf->config, OSPF_RFC1583_COMPATIBLE))
{
UNSET_FLAG (ospf->config, OSPF_RFC1583_COMPATIBLE);
- ospf_spf_calculate_schedule ();
+ ospf_spf_calculate_schedule (ospf);
}
return CMD_SUCCESS;
}
"Adjust routing timers\n"
"OSPF SPF timers\n")
{
- ospf_top->spf_delay = OSPF_SPF_DELAY_DEFAULT;
- ospf_top->spf_holdtime = OSPF_SPF_HOLDTIME_DEFAULT;
+ struct ospf *ospf = vty->index;
+
+ ospf->spf_delay = OSPF_SPF_DELAY_DEFAULT;
+ ospf->spf_holdtime = OSPF_SPF_HOLDTIME_DEFAULT;
return CMD_SUCCESS;
}
"Use reference bandwidth method to assign OSPF cost\n"
"The reference bandwidth in terms of Mbits per second\n")
{
+ struct ospf *ospf = vty->index;
u_int32_t refbw;
listnode node;
}
/* If reference bandwidth is changed. */
- if ((refbw * 1000) == ospf_top->ref_bandwidth)
+ if ((refbw * 1000) == ospf->ref_bandwidth)
return CMD_SUCCESS;
- ospf_top->ref_bandwidth = refbw * 1000;
+ ospf->ref_bandwidth = refbw * 1000;
vty_out (vty, "%% OSPF: Reference bandwidth is changed.%s", VTY_NEWLINE);
vty_out (vty, " Please ensure reference bandwidth is consistent across all routers%s", VTY_NEWLINE);
- for (node = listhead (ospf_top->iflist); node; nextnode (node))
+ for (node = listhead (ospf->iflist); node; nextnode (node))
ospf_if_recalculate_output_cost (getdata (node));
return CMD_SUCCESS;
"Calculate OSPF interface cost according to bandwidth\n"
"Use reference bandwidth method to assign OSPF cost\n")
{
+ struct ospf *ospf = vty->index;
listnode node;
- if (ospf_top->ref_bandwidth == OSPF_DEFAULT_REF_BANDWIDTH)
+ if (ospf->ref_bandwidth == OSPF_DEFAULT_REF_BANDWIDTH)
return CMD_SUCCESS;
- ospf_top->ref_bandwidth = OSPF_DEFAULT_REF_BANDWIDTH;
+ ospf->ref_bandwidth = OSPF_DEFAULT_REF_BANDWIDTH;
vty_out (vty, "%% OSPF: Reference bandwidth is changed.%s", VTY_NEWLINE);
vty_out (vty, " Please ensure reference bandwidth is consistent across all routers%s", VTY_NEWLINE);
-
- for (node = listhead (ospf_top->iflist); node; nextnode (node))
+ for (node = listhead (ospf->iflist); node; nextnode (node))
ospf_if_recalculate_output_cost (getdata (node));
return CMD_SUCCESS;
}
-\f
-DEFUN (clear_ip_ospf_neighbor,
- clear_ip_ospf_neighbor_cmd,
- "clear ip ospf neighbor A.B.C.D",
- "Reset functions\n"
- "IP\n"
- "Clear OSPF\n"
- "Neighbor list\n"
- "Neighbor ID\n")
-{
- listnode node;
- struct ospf_neighbor *nbr;
- struct in_addr router_id;
- int ret;
-
- ret = inet_aton (argv[0], &router_id);
- if (!ret)
- {
- vty_out (vty, "Please specify Neighbor ID by A.B.C.D%s", VTY_NEWLINE);
- return CMD_WARNING;
- }
-
- for (node = listhead (ospf_top->oiflist); node; nextnode (node))
- {
- struct ospf_interface *oi = getdata (node);
-
- nbr = ospf_nbr_lookup_by_routerid (oi->nbrs, &router_id);
-
- if (nbr)
- {
- OSPF_NSM_EVENT_SCHEDULE (nbr, NSM_SeqNumberMismatch);
- vty_out (vty, "clear neighbor %s%s", argv[0], VTY_NEWLINE);
- break;
- }
- }
-
- return CMD_SUCCESS;
-}
-
char *ospf_abr_type_descr_str[] =
{
"Unknown",
{
listnode node;
struct ospf_area * area;
+ struct ospf *ospf = ospf_top;
/* Check OSPF is enable. */
- if (ospf_top == NULL)
+ if (ospf == NULL)
{
vty_out (vty, " OSPF Routing Process not enabled%s", VTY_NEWLINE);
return CMD_SUCCESS;
/* Show Router ID. */
vty_out (vty, " OSPF Routing Process, Router ID: %s%s",
- inet_ntoa (ospf_top->router_id),
+ inet_ntoa (ospf->router_id),
VTY_NEWLINE);
/* Show capability. */
vty_out (vty, " Supports only single TOS (TOS0) routes%s", VTY_NEWLINE);
vty_out (vty, " This implementation conforms to RFC2328%s", VTY_NEWLINE);
vty_out (vty, " RFC1583Compatibility flag is %s%s",
- CHECK_FLAG (ospf_top->config, OSPF_RFC1583_COMPATIBLE) ?
+ CHECK_FLAG (ospf->config, OSPF_RFC1583_COMPATIBLE) ?
"enabled" : "disabled", VTY_NEWLINE);
#ifdef HAVE_OPAQUE_LSA
vty_out (vty, " OpaqueCapability flag is %s%s%s",
- CHECK_FLAG (ospf_top->config, OSPF_OPAQUE_CAPABLE) ?
+ CHECK_FLAG (ospf->config, OSPF_OPAQUE_CAPABLE) ?
"enabled" : "disabled",
- IS_OPAQUE_LSA_ORIGINATION_BLOCKED (ospf_top->opaque) ?
+ IS_OPAQUE_LSA_ORIGINATION_BLOCKED (ospf->opaque) ?
" (origination blocked)" : "",
VTY_NEWLINE);
#endif /* HAVE_OPAQUE_LSA */
/* Show SPF timers. */
vty_out (vty, " SPF schedule delay %d secs, Hold time between two SPFs %d secs%s",
- ospf_top->spf_delay, ospf_top->spf_holdtime, VTY_NEWLINE);
+ ospf->spf_delay, ospf->spf_holdtime, VTY_NEWLINE);
/* Show refresh parameters. */
vty_out (vty, " Refresh timer %d secs%s",
- ospf_top->lsa_refresh_interval, VTY_NEWLINE);
+ ospf->lsa_refresh_interval, VTY_NEWLINE);
/* Show ABR/ASBR flags. */
- if (CHECK_FLAG (ospf_top->flags, OSPF_FLAG_ABR))
+ if (CHECK_FLAG (ospf->flags, OSPF_FLAG_ABR))
vty_out (vty, " This router is an ABR, ABR type is: %s%s",
- ospf_abr_type_descr_str[ospf_top->abr_type], VTY_NEWLINE);
+ ospf_abr_type_descr_str[ospf->abr_type], VTY_NEWLINE);
- if (CHECK_FLAG (ospf_top->flags, OSPF_FLAG_ASBR))
+ if (CHECK_FLAG (ospf->flags, OSPF_FLAG_ASBR))
vty_out (vty, " This router is an ASBR "
"(injecting external routing information)%s", VTY_NEWLINE);
/* Show Number of AS-external-LSAs. */
vty_out (vty, " Number of external LSA %ld%s",
- ospf_lsdb_count_all (ospf_top->lsdb), VTY_NEWLINE);
+ ospf_lsdb_count_all (ospf->lsdb), VTY_NEWLINE);
/* Show number of areas attached. */
vty_out (vty, " Number of areas attached to this router: %d%s%s",
- listcount (ospf_top->areas), VTY_NEWLINE, VTY_NEWLINE);
+ listcount (ospf->areas), VTY_NEWLINE, VTY_NEWLINE);
/* Show each area status. */
- for (node = listhead (ospf_top->areas); node; nextnode (node))
+ for (node = listhead (ospf->areas); node; nextnode (node))
if ((area = getdata (node)) != NULL)
show_ip_ospf_area (vty, area);
\f
void
-show_ip_ospf_interface_sub (struct vty *vty, struct interface *ifp)
+show_ip_ospf_interface_sub (struct vty *vty, struct ospf *ospf,
+ struct interface *ifp)
{
struct ospf_neighbor *nbr;
int oi_count;
VTY_NEWLINE);
vty_out (vty, " Router ID %s, Network Type %s, Cost: %d%s",
- inet_ntoa (ospf_top->router_id), ospf_network_type_str[oi->type],
+ inet_ntoa (ospf->router_id), ospf_network_type_str[oi->type],
oi->output_cost, VTY_NEWLINE);
vty_out (vty, " Transmit Delay is %d sec, State %s, Priority %d%s",
vty_out (vty, " No Hellos (Passive interface)%s", VTY_NEWLINE);
vty_out (vty, " Neighbor Count is %d, Adjacent neighbor count is %d%s",
- ospf_nbr_count (oi->nbrs, 0), ospf_nbr_count (oi->nbrs, NSM_Full),
+ ospf_nbr_count (oi, 0), ospf_nbr_count (oi, NSM_Full),
VTY_NEWLINE);
}
}
"Interface name\n")
{
struct interface *ifp;
+ struct ospf *ospf = ospf_top;
listnode node;
/* Show All Interfaces. */
if (argc == 0)
for (node = listhead (iflist); node; nextnode (node))
- show_ip_ospf_interface_sub (vty, node->data);
+ show_ip_ospf_interface_sub (vty, ospf, node->data);
/* Interface name is specified. */
else
{
if ((ifp = if_lookup_by_name (argv[0])) == NULL)
vty_out (vty, "No such interface name%s", VTY_NEWLINE);
else
- show_ip_ospf_interface_sub (vty, ifp);
+ show_ip_ospf_interface_sub (vty, ospf, ifp);
}
return CMD_SUCCESS;
"OSPF information\n"
"Neighbor list\n")
{
+ struct ospf *ospf = ospf_top;
listnode node;
- if (!ospf_top)
+ if (ospf == NULL)
{
vty_out (vty, " OSPF Routing Process not enabled%s", VTY_NEWLINE);
return CMD_SUCCESS;
"Time Address Interface RXmtL "
"RqstL DBsmL%s", VTY_NEWLINE, VTY_NEWLINE);
- for (node = listhead (ospf_top->oiflist); node; nextnode (node))
+ for (node = listhead (ospf->oiflist); node; nextnode (node))
show_ip_ospf_neighbor_sub (vty, getdata (node));
return CMD_SUCCESS;
"Neighbor list\n"
"include down status neighbor\n")
{
+ struct ospf *ospf = vty->index;
listnode node;
- if (!ospf_top)
+ if (ospf == NULL)
{
vty_out (vty, " OSPF Routing Process not enabled%s", VTY_NEWLINE);
return CMD_SUCCESS;
"Time Address Interface RXmtL "
"RqstL DBsmL%s", VTY_NEWLINE, VTY_NEWLINE);
- for (node = listhead (ospf_top->oiflist); node; nextnode (node))
+ for (node = listhead (ospf->oiflist); node; nextnode (node))
{
struct ospf_interface *oi = getdata (node);
listnode nbr_node;
"Neighbor list\n"
"Interface name\n")
{
+ struct ospf *ospf = ospf_top;
struct ospf_interface *oi;
struct in_addr addr;
int ret;
- if (!ospf_top)
+ if (ospf == NULL)
{
vty_out (vty, " OSPF Routing Process not enabled%s", VTY_NEWLINE);
return CMD_SUCCESS;
return CMD_WARNING;
}
- if ((oi = ospf_if_is_configured (&addr)) == NULL)
+ if ((oi = ospf_if_is_configured (ospf, &addr)) == NULL)
vty_out (vty, "No such interface address%s", VTY_NEWLINE);
else
{
"Neighbor list\n"
"Neighbor ID\n")
{
+ struct ospf *ospf = ospf_top;
listnode node;
struct ospf_neighbor *nbr;
struct in_addr router_id;
return CMD_WARNING;
}
- for (node = listhead (ospf_top->oiflist); node; nextnode (node))
+ for (node = listhead (ospf->oiflist); node; nextnode (node))
{
struct ospf_interface *oi = getdata (node);
"Neighbor list\n"
"detail of all neighbors\n")
{
+ struct ospf *ospf = ospf_top;
listnode node;
- if (!ospf_top)
+ if (ospf == NULL)
return CMD_SUCCESS;
- for (node = listhead (ospf_top->oiflist); node; nextnode (node))
+ for (node = listhead (ospf->oiflist); node; nextnode (node))
{
struct ospf_interface *oi = getdata (node);
struct route_node *rn;
"detail of all neighbors\n"
"include down status neighbor\n")
{
+ struct ospf *ospf = ospf_top;
listnode node;
- if (!ospf_top)
+ if (ospf == NULL)
return CMD_SUCCESS;
- for (node = listhead (ospf_top->oiflist); node; nextnode (node))
+ for (node = listhead (ospf->oiflist); node; nextnode (node))
{
struct ospf_interface *oi = getdata (node);
struct route_node *rn;
return CMD_WARNING;
}
- if ((oi = ospf_if_is_configured (&addr)) == NULL)
+ if (ospf_top == NULL)
+ return CMD_WARNING;
+
+ if ((oi = ospf_if_is_configured (ospf_top, &addr)) == NULL)
vty_out (vty, "No such interface address%s", VTY_NEWLINE);
else
{
"(null)",
"Neighboring Router ID",
"Designated Router address",
- "Network/subnet number",
+ "Net",
"Neighboring Router ID",
};
show_lsa_detail (struct vty *vty, int type,
struct in_addr *id, struct in_addr *adv_router)
{
+ struct ospf *ospf = ospf_top;
listnode node;
switch (type)
vty_out (vty, " %s %s%s",
show_database_desc[type],
VTY_NEWLINE, VTY_NEWLINE);
- show_lsa_detail_proc (vty, AS_LSDB (ospf_top, type), id, adv_router);
+ show_lsa_detail_proc (vty, AS_LSDB (ospf, type), id, adv_router);
break;
default:
- for (node = listhead (ospf_top->areas); node; nextnode (node))
+ for (node = listhead (ospf->areas); node; nextnode (node))
{
struct ospf_area *area = node->data;
vty_out (vty, "%s %s (Area %s)%s%s",
show_lsa_detail_adv_router (struct vty *vty, int type,
struct in_addr *adv_router)
{
+ struct ospf *ospf = ospf_top;
listnode node;
switch (type)
vty_out (vty, " %s %s%s",
show_database_desc[type],
VTY_NEWLINE, VTY_NEWLINE);
- show_lsa_detail_adv_router_proc (vty, AS_LSDB (ospf_top, type),
+ show_lsa_detail_adv_router_proc (vty, AS_LSDB (ospf, type),
adv_router);
break;
default:
- for (node = listhead (ospf_top->areas); node; nextnode (node))
+ for (node = listhead (ospf->areas); node; nextnode (node))
{
struct ospf_area *area = node->data;
vty_out (vty, "%s %s (Area %s)%s%s",
void
show_ip_ospf_database_summary (struct vty *vty, int self)
{
+ struct ospf *ospf = ospf_top;
listnode node;
int type;
- for (node = listhead (ospf_top->areas); node; nextnode (node))
+ for (node = listhead (ospf->areas); node; nextnode (node))
{
struct ospf_area *area = node->data;
for (type = OSPF_MIN_LSA; type < OSPF_MAX_LSA; type++)
default:
continue;
}
- if (ospf_lsdb_count_self (ospf_top->lsdb, type) ||
- (!self && ospf_lsdb_count (ospf_top->lsdb, type)))
+ if (ospf_lsdb_count_self (ospf->lsdb, type) ||
+ (!self && ospf_lsdb_count (ospf->lsdb, type)))
{
vty_out (vty, " %s%s%s",
show_database_desc[type],
VTY_NEWLINE, VTY_NEWLINE);
vty_out (vty, "%s%s", show_database_header[type],
VTY_NEWLINE);
- foreach_lsa (AS_LSDB (ospf_top, type), vty, self, show_lsa_summary);
+ foreach_lsa (AS_LSDB (ospf, type), vty, self, show_lsa_summary);
vty_out (vty, "%s", VTY_NEWLINE);
}
}
void
show_ip_ospf_database_maxage (struct vty *vty)
{
+ struct ospf *ospf = ospf_top;
listnode node;
struct ospf_lsa *lsa;
vty_out (vty, "%s MaxAge Link States:%s%s",
VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE);
- for (node = listhead (ospf_top->maxage_lsa); node; nextnode (node))
+ for (node = listhead (ospf->maxage_lsa); node; nextnode (node))
if ((lsa = node->data) != NULL)
{
vty_out (vty, "Link type: %d%s", lsa->data->type, VTY_NEWLINE);
"OSPF information\n"
"Database summary\n")
{
+ struct ospf *ospf = ospf_top;
int type, ret;
struct in_addr id, adv_router;
- if (ospf_top == NULL)
+ if (ospf == NULL)
return CMD_SUCCESS;
vty_out (vty, "%s OSPF Router with ID (%s)%s%s", VTY_NEWLINE,
- inet_ntoa (ospf_top->router_id), VTY_NEWLINE, VTY_NEWLINE);
+ inet_ntoa (ospf->router_id), VTY_NEWLINE, VTY_NEWLINE);
/* Show all LSA. */
if (argc == 0)
else if (argc == 3)
{
if (strncmp (argv[2], "s", 1) == 0)
- adv_router = ospf_top->router_id;
+ adv_router = ospf->router_id;
else
{
ret = inet_aton (argv[2], &adv_router);
"Advertising Router link states\n"
"Advertising Router (as an IP address)\n")
{
+ struct ospf *ospf = ospf_top;
int type, ret;
struct in_addr adv_router;
- if (ospf_top == NULL)
+ if (ospf == NULL)
return CMD_SUCCESS;
vty_out (vty, "%s OSPF Router with ID (%s)%s%s", VTY_NEWLINE,
- inet_ntoa (ospf_top->router_id), VTY_NEWLINE, VTY_NEWLINE);
+ inet_ntoa (ospf->router_id), VTY_NEWLINE, VTY_NEWLINE);
if (argc != 2)
return CMD_WARNING;
/* `show ip ospf database LSA adv-router ADV_ROUTER'. */
if (strncmp (argv[1], "s", 1) == 0)
- adv_router = ospf_top->router_id;
+ adv_router = ospf->router_id;
else
{
ret = inet_aton (argv[1], &adv_router);
struct ospf_if_params *params;
struct ospf_interface *oi;
struct route_node *rn;
+ struct ospf *ospf = ospf_top;
params = IF_DEF_PARAMS (ifp);
/* Update timer values in neighbor structure. */
if (argc == 2)
{
- oi = ospf_if_lookup_by_local_addr (ifp, addr);
- if (oi)
- ospf_nbr_timer_update (oi);
+ if (ospf)
+ {
+ oi = ospf_if_lookup_by_local_addr (ospf, ifp, addr);
+ if (oi)
+ ospf_nbr_timer_update (oi);
+ }
}
else
{
struct ospf_if_params *params;
struct ospf_interface *oi;
struct route_node *rn;
+ struct ospf *ospf = ospf_top;
ifp = vty->index;
params = IF_DEF_PARAMS (ifp);
/* Update timer values in neighbor structure. */
if (argc == 1)
{
- oi = ospf_if_lookup_by_local_addr (ifp, addr);
- if (oi)
- ospf_nbr_timer_update (oi);
+ if (ospf)
+ {
+ oi = ospf_if_lookup_by_local_addr (ospf, ifp, addr);
+ if (oi)
+ ospf_nbr_timer_update (oi);
+ }
}
else
{
"Routing Information Protocol (RIP)\n"
"Border Gateway Protocol (BGP)\n")
{
+ struct ospf *ospf = vty->index;
int source;
/* Get distribute source. */
if (!str2distribute_source (argv[1], &source))
return CMD_WARNING;
- return ospf_distribute_list_out_set (source, argv[0]);
+ return ospf_distribute_list_out_set (ospf, source, argv[0]);
}
DEFUN (no_ospf_distribute_list_out,
"Routing Information Protocol (RIP)\n"
"Border Gateway Protocol (BGP)\n")
{
+ struct ospf *ospf = vty->index;
int source;
if (!str2distribute_source (argv[1], &source))
return CMD_WARNING;
- return ospf_distribute_list_out_unset (source, argv[0]);
+ return ospf_distribute_list_out_unset (ospf, source, argv[0]);
}
/* Default information originate. */
"Control distribution of default information\n"
"Distribute a default route\n")
{
+ struct ospf *ospf = vty->index;
struct prefix_ipv4 p;
struct in_addr nexthop;
p.prefix.s_addr = 0;
p.prefixlen = 0;
- ospf_external_lsa_flush (DEFAULT_ROUTE, &p, 0, nexthop);
+ ospf_external_lsa_flush (ospf, DEFAULT_ROUTE, &p, 0, nexthop);
if (EXTERNAL_INFO (DEFAULT_ROUTE)) {
ospf_external_info_delete (DEFAULT_ROUTE, p);
"Set metric of redistributed routes\n"
"Default metric\n")
{
+ struct ospf *ospf = vty->index;
int metric = -1;
if (!str2metric (argv[0], &metric))
return CMD_WARNING;
- ospf_top->default_metric = metric;
+ ospf->default_metric = metric;
return CMD_SUCCESS;
}
NO_STR
"Set metric of redistributed routes\n")
{
- ospf_top->default_metric = -1;
+ struct ospf *ospf = vty->index;
+
+ ospf->default_metric = -1;
+
return CMD_SUCCESS;
}
"Define an administrative distance\n"
"OSPF Administrative distance\n")
{
- ospf_top->distance_all = atoi (argv[0]);
+ struct ospf *ospf = vty->index;
+
+ ospf->distance_all = atoi (argv[0]);
+
return CMD_SUCCESS;
}
"Define an administrative distance\n"
"OSPF Administrative distance\n")
{
- ospf_top->distance_all = 0;
+ struct ospf *ospf = vty->index;
+
+ ospf->distance_all = 0;
+
return CMD_SUCCESS;
}
"OSPF Administrative distance\n"
"OSPF Distance\n")
{
- ospf_top->distance_intra = 0;
- ospf_top->distance_inter = 0;
- ospf_top->distance_external = 0;
+ struct ospf *ospf = vty->index;
+
+ ospf->distance_intra = 0;
+ ospf->distance_inter = 0;
+ ospf->distance_external = 0;
+
return CMD_SUCCESS;
}
"Intra-area routes\n"
"Distance for intra-area routes\n")
{
- ospf_top->distance_intra = atoi (argv[0]);
+ struct ospf *ospf = vty->index;
+
+ ospf->distance_intra = atoi (argv[0]);
+
return CMD_SUCCESS;
}
"Inter-area routes\n"
"Distance for inter-area routes\n")
{
- ospf_top->distance_intra = atoi (argv[0]);
- ospf_top->distance_inter = atoi (argv[1]);
+ struct ospf *ospf = vty->index;
+
+ ospf->distance_intra = atoi (argv[0]);
+ ospf->distance_inter = atoi (argv[1]);
+
return CMD_SUCCESS;
}
"External routes\n"
"Distance for external routes\n")
{
- ospf_top->distance_intra = atoi (argv[0]);
- ospf_top->distance_external = atoi (argv[1]);
+ struct ospf *ospf = vty->index;
+
+ ospf->distance_intra = atoi (argv[0]);
+ ospf->distance_external = atoi (argv[1]);
+
return CMD_SUCCESS;
}
"External routes\n"
"Distance for external routes\n")
{
- ospf_top->distance_intra = atoi (argv[0]);
- ospf_top->distance_inter = atoi (argv[1]);
- ospf_top->distance_external = atoi (argv[2]);
+ struct ospf *ospf = vty->index;
+
+ ospf->distance_intra = atoi (argv[0]);
+ ospf->distance_inter = atoi (argv[1]);
+ ospf->distance_external = atoi (argv[2]);
+
return CMD_SUCCESS;
}
"Inter-area routes\n"
"Distance for inter-area routes\n")
{
- ospf_top->distance_intra = atoi (argv[0]);
- ospf_top->distance_external = atoi (argv[1]);
- ospf_top->distance_inter = atoi (argv[2]);
+ struct ospf *ospf = vty->index;
+
+ ospf->distance_intra = atoi (argv[0]);
+ ospf->distance_external = atoi (argv[1]);
+ ospf->distance_inter = atoi (argv[2]);
+
return CMD_SUCCESS;
}
"Inter-area routes\n"
"Distance for inter-area routes\n")
{
- ospf_top->distance_inter = atoi (argv[0]);
+ struct ospf *ospf = vty->index;
+
+ ospf->distance_inter = atoi (argv[0]);
+
return CMD_SUCCESS;
}
"Intra-area routes\n"
"Distance for intra-area routes\n")
{
- ospf_top->distance_inter = atoi (argv[0]);
- ospf_top->distance_intra = atoi (argv[1]);
+ struct ospf *ospf = vty->index;
+
+ ospf->distance_inter = atoi (argv[0]);
+ ospf->distance_intra = atoi (argv[1]);
+
return CMD_SUCCESS;
}
"External routes\n"
"Distance for external routes\n")
{
- ospf_top->distance_inter = atoi (argv[0]);
- ospf_top->distance_external = atoi (argv[1]);
+ struct ospf *ospf = vty->index;
+
+ ospf->distance_inter = atoi (argv[0]);
+ ospf->distance_external = atoi (argv[1]);
+
return CMD_SUCCESS;
}
"External routes\n"
"Distance for external routes\n")
{
- ospf_top->distance_inter = atoi (argv[0]);
- ospf_top->distance_intra = atoi (argv[1]);
- ospf_top->distance_external = atoi (argv[2]);
+ struct ospf *ospf = vty->index;
+
+ ospf->distance_inter = atoi (argv[0]);
+ ospf->distance_intra = atoi (argv[1]);
+ ospf->distance_external = atoi (argv[2]);
+
return CMD_SUCCESS;
}
"Intra-area routes\n"
"Distance for intra-area routes\n")
{
- ospf_top->distance_inter = atoi (argv[0]);
- ospf_top->distance_external = atoi (argv[1]);
- ospf_top->distance_intra = atoi (argv[2]);
+ struct ospf *ospf = vty->index;
+
+ ospf->distance_inter = atoi (argv[0]);
+ ospf->distance_external = atoi (argv[1]);
+ ospf->distance_intra = atoi (argv[2]);
+
return CMD_SUCCESS;
}
"External routes\n"
"Distance for external routes\n")
{
- ospf_top->distance_external = atoi (argv[0]);
+ struct ospf *ospf = vty->index;
+
+ ospf->distance_external = atoi (argv[0]);
+
return CMD_SUCCESS;
}
"Intra-area routes\n"
"Distance for intra-area routes\n")
{
- ospf_top->distance_external = atoi (argv[0]);
- ospf_top->distance_intra = atoi (argv[1]);
+ struct ospf *ospf = vty->index;
+
+ ospf->distance_external = atoi (argv[0]);
+ ospf->distance_intra = atoi (argv[1]);
+
return CMD_SUCCESS;
}
"Inter-area routes\n"
"Distance for inter-area routes\n")
{
- ospf_top->distance_external = atoi (argv[0]);
- ospf_top->distance_inter = atoi (argv[1]);
+ struct ospf *ospf = vty->index;
+
+ ospf->distance_external = atoi (argv[0]);
+ ospf->distance_inter = atoi (argv[1]);
+
return CMD_SUCCESS;
}
"Inter-area routes\n"
"Distance for inter-area routes\n")
{
- ospf_top->distance_external = atoi (argv[0]);
- ospf_top->distance_intra = atoi (argv[1]);
- ospf_top->distance_inter = atoi (argv[2]);
+ struct ospf *ospf = vty->index;
+
+ ospf->distance_external = atoi (argv[0]);
+ ospf->distance_intra = atoi (argv[1]);
+ ospf->distance_inter = atoi (argv[2]);
+
return CMD_SUCCESS;
}
"Intra-area routes\n"
"Distance for intra-area routes\n")
{
- ospf_top->distance_external = atoi (argv[0]);
- ospf_top->distance_inter = atoi (argv[1]);
- ospf_top->distance_intra = atoi (argv[2]);
+ struct ospf *ospf = vty->index;
+
+ ospf->distance_external = atoi (argv[0]);
+ ospf->distance_inter = atoi (argv[1]);
+ ospf->distance_intra = atoi (argv[2]);
+
return CMD_SUCCESS;
}
"IP source prefix\n")
{
ospf_distance_set (vty, argv[0], argv[1], NULL);
+
return CMD_SUCCESS;
}
"show all the ABR's and ASBR's\n"
"for this area\n")
{
- if (ospf_top == NULL)
+ struct ospf *ospf = ospf_top;
+
+ if (ospf == NULL)
{
vty_out (vty, "OSPF is not enabled%s", VTY_NEWLINE);
return CMD_SUCCESS;
}
- if (ospf_top->new_table == NULL)
+ if (ospf->new_table == NULL)
{
vty_out (vty, "No OSPF routing information exist%s", VTY_NEWLINE);
return CMD_SUCCESS;
show_ip_ospf_route_network (vty, ospf_top->new_table); */
/* Show Router routes. */
- show_ip_ospf_route_router (vty, ospf_top->new_rtrs);
+ show_ip_ospf_route_router (vty, ospf->new_rtrs);
return CMD_SUCCESS;
}
"OSPF information\n"
"OSPF routing table\n")
{
- if (ospf_top == NULL)
+ struct ospf *ospf = ospf_top;
+
+ if (ospf == NULL)
{
vty_out (vty, "OSPF is not enabled%s", VTY_NEWLINE);
return CMD_SUCCESS;
}
- if (ospf_top->new_table == NULL)
+ if (ospf->new_table == NULL)
{
vty_out (vty, "No OSPF routing information exist%s", VTY_NEWLINE);
return CMD_SUCCESS;
}
/* Show Network routes. */
- show_ip_ospf_route_network (vty, ospf_top->new_table);
+ show_ip_ospf_route_network (vty, ospf->new_table);
/* Show Router routes. */
- show_ip_ospf_route_router (vty, ospf_top->new_rtrs);
+ show_ip_ospf_route_router (vty, ospf->new_rtrs);
/* Show AS External routes. */
- show_ip_ospf_route_external (vty, ospf_top->old_external_route);
+ show_ip_ospf_route_external (vty, ospf->old_external_route);
return CMD_SUCCESS;
}
}
int
-config_write_network_area (struct vty *vty)
+config_write_network_area (struct vty *vty, struct ospf *ospf)
{
struct route_node *rn;
u_char buf[INET_ADDRSTRLEN];
/* `network area' print. */
- for (rn = route_top (ospf_top->networks); rn; rn = route_next (rn))
+ for (rn = route_top (ospf->networks); rn; rn = route_next (rn))
if (rn->info)
{
struct ospf_network *n = rn->info;
}
int
-config_write_ospf_area (struct vty *vty)
+config_write_ospf_area (struct vty *vty, struct ospf *ospf)
{
listnode node;
u_char buf[INET_ADDRSTRLEN];
/* Area configuration print. */
- for (node = listhead (ospf_top->areas); node; nextnode (node))
+ for (node = listhead (ospf->areas); node; nextnode (node))
{
struct ospf_area *area = getdata (node);
struct route_node *rn1;
}
int
-config_write_ospf_nbr_nbma (struct vty *vty)
+config_write_ospf_nbr_nbma (struct vty *vty, struct ospf *ospf)
{
struct ospf_nbr_nbma *nbr_nbma;
struct route_node *rn;
/* Static Neighbor configuration print. */
- for (rn = route_top (ospf_top->nbr_nbma); rn; rn = route_next (rn))
+ for (rn = route_top (ospf->nbr_nbma); rn; rn = route_next (rn))
if ((nbr_nbma = rn->info))
{
vty_out (vty, " neighbor %s", inet_ntoa (nbr_nbma->addr));
}
int
-config_write_virtual_link (struct vty *vty)
+config_write_virtual_link (struct vty *vty, struct ospf *ospf)
{
listnode node;
u_char buf[INET_ADDRSTRLEN];
/* Virtual-Link print */
- for (node = listhead (ospf_top->vlinks); node; nextnode (node))
+ for (node = listhead (ospf->vlinks); node; nextnode (node))
{
listnode n2;
struct crypt_key *ck;
char *distribute_str[] = { "system", "kernel", "connected", "static", "rip",
"ripng", "ospf", "ospf6", "bgp"};
int
-config_write_ospf_redistribute (struct vty *vty)
+config_write_ospf_redistribute (struct vty *vty, struct ospf *ospf)
{
int type;
if (type != zclient->redist_default && zclient->redist[type])
{
vty_out (vty, " redistribute %s", distribute_str[type]);
- if (ospf_top->dmetric[type].value >= 0)
+ if (ospf->dmetric[type].value >= 0)
vty_out (vty, " metric %d", ospf_top->dmetric[type].value);
- if (ospf_top->dmetric[type].type == EXTERNAL_METRIC_TYPE_1)
+ if (ospf->dmetric[type].type == EXTERNAL_METRIC_TYPE_1)
vty_out (vty, " metric-type 1");
if (ROUTEMAP_NAME (type))
}
int
-config_write_ospf_default_metric (struct vty *vty)
+config_write_ospf_default_metric (struct vty *vty, struct ospf *ospf)
{
- if (ospf_top->default_metric != -1)
- vty_out (vty, " default-metric %d%s", ospf_top->default_metric,
+ if (ospf->default_metric != -1)
+ vty_out (vty, " default-metric %d%s", ospf->default_metric,
VTY_NEWLINE);
return 0;
}
int
-config_write_ospf_distribute (struct vty *vty)
+config_write_ospf_distribute (struct vty *vty, struct ospf *ospf)
{
int type;
- if (ospf_top)
+ if (ospf)
{
/* distribute-list print. */
for (type = 0; type < ZEBRA_ROUTE_MAX; type++)
- if (ospf_top->dlist[type].name)
+ if (ospf->dlist[type].name)
vty_out (vty, " distribute-list %s out %s%s",
- ospf_top->dlist[type].name,
+ ospf->dlist[type].name,
distribute_str[type], VTY_NEWLINE);
/* default-information print. */
- if (ospf_top->default_originate != DEFAULT_ORIGINATE_NONE)
+ if (ospf->default_originate != DEFAULT_ORIGINATE_NONE)
{
- if (ospf_top->default_originate == DEFAULT_ORIGINATE_ZEBRA)
+ if (ospf->default_originate == DEFAULT_ORIGINATE_ZEBRA)
vty_out (vty, " default-information originate");
else
vty_out (vty, " default-information originate always");
- if (ospf_top->dmetric[DEFAULT_ROUTE].value >= 0)
+ if (ospf->dmetric[DEFAULT_ROUTE].value >= 0)
vty_out (vty, " metric %d",
- ospf_top->dmetric[DEFAULT_ROUTE].value);
- if (ospf_top->dmetric[DEFAULT_ROUTE].type == EXTERNAL_METRIC_TYPE_1)
+ ospf->dmetric[DEFAULT_ROUTE].value);
+ if (ospf->dmetric[DEFAULT_ROUTE].type == EXTERNAL_METRIC_TYPE_1)
vty_out (vty, " metric-type 1");
if (ROUTEMAP_NAME (DEFAULT_ROUTE))
}
int
-config_write_ospf_distance (struct vty *vty)
+config_write_ospf_distance (struct vty *vty, struct ospf *ospf)
{
struct route_node *rn;
struct ospf_distance *odistance;
- if (ospf_top->distance_all)
- vty_out (vty, " distance %d%s", ospf_top->distance_all, VTY_NEWLINE);
+ if (ospf->distance_all)
+ vty_out (vty, " distance %d%s", ospf->distance_all, VTY_NEWLINE);
- if (ospf_top->distance_intra
- || ospf_top->distance_inter
- || ospf_top->distance_external)
+ if (ospf->distance_intra
+ || ospf->distance_inter
+ || ospf->distance_external)
{
vty_out (vty, " distance ospf");
- if (ospf_top->distance_intra)
- vty_out (vty, " intra-area %d", ospf_top->distance_intra);
- if (ospf_top->distance_inter)
- vty_out (vty, " inter-area %d", ospf_top->distance_inter);
- if (ospf_top->distance_external)
- vty_out (vty, " external %d", ospf_top->distance_external);
+ if (ospf->distance_intra)
+ vty_out (vty, " intra-area %d", ospf->distance_intra);
+ if (ospf->distance_inter)
+ vty_out (vty, " inter-area %d", ospf->distance_inter);
+ if (ospf->distance_external)
+ vty_out (vty, " external %d", ospf->distance_external);
vty_out (vty, "%s", VTY_NEWLINE);
}
- for (rn = route_top (ospf_top->distance_table); rn; rn = route_next (rn))
+ for (rn = route_top (ospf->distance_table); rn; rn = route_next (rn))
if ((odistance = rn->info) != NULL)
{
vty_out (vty, " distance %d %s/%d %s%s", odistance->distance,
int
ospf_config_write (struct vty *vty)
{
+ struct ospf *ospf = ospf_top;
listnode node;
int write = 0;
- if (ospf_top != NULL)
+ if (ospf != NULL)
{
/* `router ospf' print. */
vty_out (vty, "router ospf%s", VTY_NEWLINE);
write++;
- if (!ospf_top->networks)
+ if (!ospf->networks)
return write;
/* Router ID print. */
- if (ospf_top->router_id_static.s_addr != 0)
+ if (ospf->router_id_static.s_addr != 0)
vty_out (vty, " ospf router-id %s%s",
- inet_ntoa (ospf_top->router_id_static), VTY_NEWLINE);
+ inet_ntoa (ospf->router_id_static), VTY_NEWLINE);
/* ABR type print. */
- if (ospf_top->abr_type != OSPF_ABR_STAND)
+ if (ospf->abr_type != OSPF_ABR_STAND)
vty_out (vty, " ospf abr-type %s%s",
- ospf_abr_type_str[ospf_top->abr_type], VTY_NEWLINE);
+ ospf_abr_type_str[ospf->abr_type], VTY_NEWLINE);
/* RFC1583 compatibility flag print -- Compatible with CISCO 12.1. */
- if (CHECK_FLAG (ospf_top->config, OSPF_RFC1583_COMPATIBLE))
+ if (CHECK_FLAG (ospf->config, OSPF_RFC1583_COMPATIBLE))
vty_out (vty, " compatible rfc1583%s", VTY_NEWLINE);
/* auto-cost reference-bandwidth configuration. */
- if (ospf_top->ref_bandwidth != OSPF_DEFAULT_REF_BANDWIDTH)
+ if (ospf->ref_bandwidth != OSPF_DEFAULT_REF_BANDWIDTH)
vty_out (vty, " auto-cost reference-bandwidth %d%s",
- ospf_top->ref_bandwidth / 1000, VTY_NEWLINE);
+ ospf->ref_bandwidth / 1000, VTY_NEWLINE);
/* SPF timers print. */
- if (ospf_top->spf_delay != OSPF_SPF_DELAY_DEFAULT ||
- ospf_top->spf_holdtime != OSPF_SPF_HOLDTIME_DEFAULT)
+ if (ospf->spf_delay != OSPF_SPF_DELAY_DEFAULT ||
+ ospf->spf_holdtime != OSPF_SPF_HOLDTIME_DEFAULT)
vty_out (vty, " timers spf %d %d%s",
- ospf_top->spf_delay, ospf_top->spf_holdtime, VTY_NEWLINE);
+ ospf->spf_delay, ospf->spf_holdtime, VTY_NEWLINE);
/* SPF refresh parameters print. */
- if (ospf_top->lsa_refresh_interval != OSPF_LSA_REFRESH_INTERVAL_DEFAULT)
+ if (ospf->lsa_refresh_interval != OSPF_LSA_REFRESH_INTERVAL_DEFAULT)
vty_out (vty, " refresh timer %d%s",
- ospf_top->lsa_refresh_interval, VTY_NEWLINE);
+ ospf->lsa_refresh_interval, VTY_NEWLINE);
/* Redistribute information print. */
- config_write_ospf_redistribute (vty);
+ config_write_ospf_redistribute (vty, ospf);
/* passive-interface print. */
- for (node = listhead (ospf_top->iflist); node; nextnode (node))
+ for (node = listhead (ospf->iflist); node; nextnode (node))
{
struct interface *ifp = getdata (node);
ifp->name, VTY_NEWLINE);
}
- for (node = listhead (ospf_top->oiflist); node; nextnode (node))
+ for (node = listhead (ospf->oiflist); node; nextnode (node))
{
struct ospf_interface *oi = getdata (node);
/* Network area print. */
- config_write_network_area (vty);
+ config_write_network_area (vty, ospf);
/* Area config print. */
- config_write_ospf_area (vty);
+ config_write_ospf_area (vty, ospf);
/* static neighbor print. */
- config_write_ospf_nbr_nbma (vty);
+ config_write_ospf_nbr_nbma (vty, ospf);
/* Virtual-Link print. */
- config_write_virtual_link (vty);
+ config_write_virtual_link (vty, ospf);
/* Default metric configuration. */
- config_write_ospf_default_metric (vty);
+ config_write_ospf_default_metric (vty, ospf);
/* Distribute-list and default-information print. */
- config_write_ospf_distribute (vty);
+ config_write_ospf_distribute (vty, ospf);
/* Distance configuration. */
- config_write_ospf_distance (vty);
+ config_write_ospf_distance (vty, ospf);
#ifdef HAVE_OPAQUE_LSA
- ospf_opaque_config_write_router (vty, ospf_top);
+ ospf_opaque_config_write_router (vty, ospf);
#endif /* HAVE_OPAQUE_LSA */
}
ospf_vty_zebra_init ();
}
+
projects / mirror_frr.git / blobdiff