diff options
| author | Jafar Al-Gharaibeh <Jafaral@users.noreply.github.com> | 2017-10-31 00:21:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-31 00:21:52 -0500 |
| commit | 6292fd1af9aec87b25fadd4729e00473bb3018b6 (patch) | |
| tree | ebe38d0cd292ed1144383c217f829fd58aec8f87 | |
| parent | e4715aed63b9b791f35baa8abeb473870bb62213 (diff) | |
| parent | 97f03dde1e27d07065a8886f076b8b662a9093d6 (diff) | |
Merge pull request #1390 from donaldsharp/pim_ifp_flap_crash
pimd: Fix crash with debug and ifp changes
| -rw-r--r-- | pimd/pim_zebra.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c index bee6521b6c..04466258bb 100644 --- a/pimd/pim_zebra.c +++ b/pimd/pim_zebra.c @@ -599,7 +599,9 @@ void pim_scan_individual_oil(struct channel_oil *c_oil, int in_vif_index) zlog_debug( "%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, - 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); } @@ -618,7 +620,8 @@ void pim_scan_individual_oil(struct channel_oil *c_oil, int in_vif_index) zlog_debug( "%s %s: (S,G)=(%s,%s) new iif loops to existing oif: %s vif_index=%d", __FILE__, __PRETTY_FUNCTION__, source_str, - group_str, new_iif->name, + group_str, + (new_iif) ? new_iif->name : "<new_iif?>", input_iface_vif_index); } } |