proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-16 02:30:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

isisd: warn if there is an MTU issue on circuits

Browse Source 
Instead of later tripping over an assert, add a proper warning for
interfaces whose MTU is too low.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
Christian Franke 2016-08-15 13:36:59 +02:00 committed by Donald Sharp
parent f1d489ea29
commit 83cd1f1aab
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
isisd/isis_circuit.c
View File

@ -1230,7 +1230,8 @@ isis_circuit_create (struct isis_area *area, struct interface *ifp)
if (circuit && circuit->area) if (circuit && circuit->area)
return NULL; return NULL;
circuit = isis_csm_state_change (ISIS_ENABLE, circuit, area); circuit = isis_csm_state_change (ISIS_ENABLE, circuit, area);
assert (circuit->state == C_STATE_CONF || circuit->state == C_STATE_UP); if (circuit->state != C_STATE_CONF && circuit->state != C_STATE_UP)
return circuit;
isis_circuit_if_bind (circuit, ifp); isis_circuit_if_bind (circuit, ifp);
return circuit; return circuit;
} }

9
isisd/isis_vty.c
View File

@ -86,9 +86,16 @@ DEFUN (ip_router_isis,
if (!area) if (!area)
area = isis_area_create (area_tag); area = isis_area_create (area_tag);
if (!circuit || !circuit->area) if (!circuit || !circuit->area) {
circuit = isis_circuit_create (area, ifp); circuit = isis_circuit_create (area, ifp);
if (circuit->state != C_STATE_CONF && circuit->state != C_STATE_UP)
{
vty_out(vty, "Couldn't bring up interface, please check log.%s", VTY_NEWLINE);
return CMD_WARNING;
}
}
bool ip = circuit->ip_router, ipv6 = circuit->ipv6_router; bool ip = circuit->ip_router, ipv6 = circuit->ipv6_router;
if (af[2] != '\0') if (af[2] != '\0')
ipv6 = true; ipv6 = true;