mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-05-21 15:32:54 +00:00
Merge pull request #13800 from idryzhov/fix-rip-ripd-crash
fix crashes in rip and ripng
This commit is contained in:
commit
eb28d67ed7
@ -3597,18 +3597,10 @@ static int rip_vrf_new(struct vrf *vrf)
|
|||||||
|
|
||||||
static int rip_vrf_delete(struct vrf *vrf)
|
static int rip_vrf_delete(struct vrf *vrf)
|
||||||
{
|
{
|
||||||
struct rip *rip;
|
|
||||||
|
|
||||||
if (IS_RIP_DEBUG_EVENT)
|
if (IS_RIP_DEBUG_EVENT)
|
||||||
zlog_debug("%s: VRF deleted: %s(%u)", __func__, vrf->name,
|
zlog_debug("%s: VRF deleted: %s(%u)", __func__, vrf->name,
|
||||||
vrf->vrf_id);
|
vrf->vrf_id);
|
||||||
|
|
||||||
rip = rip_lookup_by_vrf_name(vrf->name);
|
|
||||||
if (!rip)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
rip_clean(rip);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2624,17 +2624,10 @@ static int ripng_vrf_new(struct vrf *vrf)
|
|||||||
|
|
||||||
static int ripng_vrf_delete(struct vrf *vrf)
|
static int ripng_vrf_delete(struct vrf *vrf)
|
||||||
{
|
{
|
||||||
struct ripng *ripng;
|
|
||||||
|
|
||||||
if (IS_RIPNG_DEBUG_EVENT)
|
if (IS_RIPNG_DEBUG_EVENT)
|
||||||
zlog_debug("%s: VRF deleted: %s(%u)", __func__, vrf->name,
|
zlog_debug("%s: VRF deleted: %s(%u)", __func__, vrf->name,
|
||||||
vrf->vrf_id);
|
vrf->vrf_id);
|
||||||
|
|
||||||
ripng = ripng_lookup_by_vrf_name(vrf->name);
|
|
||||||
if (!ripng)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
ripng_clean(ripng);
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user