diff options
| author | Russ White <russ@riw.us> | 2019-11-26 09:48:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-26 09:48:20 -0500 |
| commit | 2f7b0479e9cacadd76ccf2e5ada56b51e2e6f241 (patch) | |
| tree | 5c99b31993c7ca8d83a032b92d67f6141571953e /ospfd/ospf_packet.c | |
| parent | d656cf7fd1b256d6ae4ba9ee80dd8cc95e1d7952 (diff) | |
| parent | 6d24b7cc08d6c95a538415bdc58614c076f1f9a7 (diff) | |
Merge pull request #5408 from donaldsharp/scan7
Scan7
Diffstat (limited to 'ospfd/ospf_packet.c')
| -rw-r--r-- | ospfd/ospf_packet.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c index 8634589b11..80ffc3f361 100644 --- a/ospfd/ospf_packet.c +++ b/ospfd/ospf_packet.c @@ -3746,8 +3746,6 @@ int ospf_hello_reply_timer(struct thread *thread) nbr = THREAD_ARG(thread); nbr->t_hello_reply = NULL; - assert(nbr->oi); - if (IS_DEBUG_OSPF(nsm, NSM_TIMERS)) zlog_debug("NSM[%s:%s]: Timer (hello-reply timer expire)", IF_NAME(nbr->oi), inet_ntoa(nbr->router_id)); @@ -4335,7 +4333,7 @@ void ospf_proactively_arp(struct ospf_neighbor *nbr) char ping_nbr[OSPF_PING_NBR_STR_MAX]; int ret; - if (!nbr || !nbr->oi || !nbr->oi->ifp) + if (!nbr) return; snprintf(ping_nbr, sizeof(ping_nbr), |