Quagga: Fix interface move from VRF to default VRF

Ensure that during interface lookup (non-vty context), if the interface is
found in a different VRF, it is "moved" into the requested VRF.

Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>

Ticket: CM-9579
Reviewed By: CCR-4194
Testing Done: Manual
This commit is contained in:
vivek 2016-02-28 03:06:35 +00:00
parent 67cc8c5e5f
commit 53eadacfc0

View File

@ -479,10 +479,12 @@ if_get_by_name_len_vrf (const char *name, size_t namelen, vrf_id_t vrf_id, int v
* from the kernel by way of zclient, believe it and update * from the kernel by way of zclient, believe it and update
* the ifp accordingly. * the ifp accordingly.
*/ */
if (vrf_id == VRF_DEFAULT) if (vty)
return ifp; {
if (vty) if (vrf_id == VRF_DEFAULT)
return NULL; return ifp;
return NULL;
}
else else
{ {
if_update_vrf (ifp, name, namelen, vrf_id); if_update_vrf (ifp, name, namelen, vrf_id);