version 1.1.1.2, 2012/10/09 09:22:28
|
version 1.1.1.3, 2013/07/21 23:54:39
|
Line 2054 validate_metric_style_narrow (struct vty *vty, struct
|
Line 2054 validate_metric_style_narrow (struct vty *vty, struct
|
{ |
{ |
if ((area->is_type & IS_LEVEL_1) && |
if ((area->is_type & IS_LEVEL_1) && |
(circuit->is_type & IS_LEVEL_1) && |
(circuit->is_type & IS_LEVEL_1) && |
(circuit->metrics[0].metric_default > MAX_NARROW_LINK_METRIC)) | (circuit->te_metric[0] > MAX_NARROW_LINK_METRIC)) |
{ |
{ |
vty_out (vty, "ISIS circuit %s metric is invalid%s", |
vty_out (vty, "ISIS circuit %s metric is invalid%s", |
circuit->interface->name, VTY_NEWLINE); |
circuit->interface->name, VTY_NEWLINE); |
Line 2062 validate_metric_style_narrow (struct vty *vty, struct
|
Line 2062 validate_metric_style_narrow (struct vty *vty, struct
|
} |
} |
if ((area->is_type & IS_LEVEL_2) && |
if ((area->is_type & IS_LEVEL_2) && |
(circuit->is_type & IS_LEVEL_2) && |
(circuit->is_type & IS_LEVEL_2) && |
(circuit->metrics[1].metric_default > MAX_NARROW_LINK_METRIC)) | (circuit->te_metric[1] > MAX_NARROW_LINK_METRIC)) |
{ |
{ |
vty_out (vty, "ISIS circuit %s metric is invalid%s", |
vty_out (vty, "ISIS circuit %s metric is invalid%s", |
circuit->interface->name, VTY_NEWLINE); |
circuit->interface->name, VTY_NEWLINE); |
Line 2092 DEFUN (metric_style,
|
Line 2092 DEFUN (metric_style,
|
area->newmetric = 1; |
area->newmetric = 1; |
area->oldmetric = 0; |
area->oldmetric = 0; |
} |
} |
else if (strncmp (argv[0], "t", 1) == 0) | else |
{ |
{ |
area->newmetric = 1; |
|
area->oldmetric = 1; |
|
} |
|
else if (strncmp (argv[0], "n", 1) == 0) |
|
{ |
|
ret = validate_metric_style_narrow (vty, area); |
ret = validate_metric_style_narrow (vty, area); |
if (ret != CMD_SUCCESS) |
if (ret != CMD_SUCCESS) |
return ret; |
return ret; |
|
|
area->newmetric = 0; | if (strncmp (argv[0], "t", 1) == 0) |
area->oldmetric = 1; | { |
| area->newmetric = 1; |
| area->oldmetric = 1; |
| } |
| else if (strncmp (argv[0], "n", 1) == 0) |
| { |
| area->newmetric = 0; |
| area->oldmetric = 1; |
| } |
} |
} |
|
|
return CMD_SUCCESS; |
return CMD_SUCCESS; |
Line 2855 isis_config_write (struct vty *vty)
|
Line 2858 isis_config_write (struct vty *vty)
|
vty_out (vty, " metric-style wide%s", VTY_NEWLINE); |
vty_out (vty, " metric-style wide%s", VTY_NEWLINE); |
else |
else |
vty_out (vty, " metric-style transition%s", VTY_NEWLINE); |
vty_out (vty, " metric-style transition%s", VTY_NEWLINE); |
|
write++; |
|
} |
|
else |
|
{ |
|
vty_out (vty, " metric-style narrow%s", VTY_NEWLINE); |
write++; |
write++; |
} |
} |
/* ISIS - overload-bit */ |
/* ISIS - overload-bit */ |