mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-05-31 00:10:43 +00:00
Merge pull request #1390 from donaldsharp/pim_ifp_flap_crash
pimd: Fix crash with debug and ifp changes
This commit is contained in:
commit
6292fd1af9
@ -599,7 +599,9 @@ void pim_scan_individual_oil(struct channel_oil *c_oil, int in_vif_index)
|
|||||||
zlog_debug(
|
zlog_debug(
|
||||||
"%s %s: (S,G)=(%s,%s) input interface changed from %s vif_index=%d to %s vif_index=%d",
|
"%s %s: (S,G)=(%s,%s) input interface changed from %s vif_index=%d to %s vif_index=%d",
|
||||||
__FILE__, __PRETTY_FUNCTION__, source_str, group_str,
|
__FILE__, __PRETTY_FUNCTION__, source_str, group_str,
|
||||||
old_iif->name, c_oil->oil.mfcc_parent, new_iif->name,
|
(old_iif) ? old_iif->name : "<old_iif?>",
|
||||||
|
c_oil->oil.mfcc_parent,
|
||||||
|
(new_iif) ? new_iif->name : "<new_iif?>",
|
||||||
input_iface_vif_index);
|
input_iface_vif_index);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -618,7 +620,8 @@ void pim_scan_individual_oil(struct channel_oil *c_oil, int in_vif_index)
|
|||||||
zlog_debug(
|
zlog_debug(
|
||||||
"%s %s: (S,G)=(%s,%s) new iif loops to existing oif: %s vif_index=%d",
|
"%s %s: (S,G)=(%s,%s) new iif loops to existing oif: %s vif_index=%d",
|
||||||
__FILE__, __PRETTY_FUNCTION__, source_str,
|
__FILE__, __PRETTY_FUNCTION__, source_str,
|
||||||
group_str, new_iif->name,
|
group_str,
|
||||||
|
(new_iif) ? new_iif->name : "<new_iif?>",
|
||||||
input_iface_vif_index);
|
input_iface_vif_index);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user