Commit b5e76398 authored by Ondrej Zajicek's avatar Ondrej Zajicek
Browse files

OSPF: Fixes some issues with link detection 

Thanks to Bernardo Figueiredo and Israel G. Lugo for the bugreport.
parent c7b99a93

proto/ospf/iface.c

+5 −2
Original line number Diff line number Diff line
@@ -493,8 +493,11 @@ ospf_iface_add(struct object_lock *lock) 
    ifa->flood_queue = mb_allocz(ifa->pool, ifa->flood_queue_size * sizeof(void *));

  }



  /* Do iface UP, unless there is no link and we use link detection */

  ospf_iface_sm(ifa, (ifa->check_link && !(ifa->iface->flags & IF_LINK_UP)) ? ISM_LOOP : ISM_UP);

  /* Do iface UP, unless there is no link (then wait in LOOP state) */

  if (!ifa->check_link || (ifa->iface->flags & IF_LINK_UP))

    ospf_iface_sm(ifa, ISM_UP);

  else

    ospf_iface_chstate(ifa, OSPF_IS_LOOP);

}



static inline void

proto/ospf/packet.c

+4 −0
Original line number Diff line number Diff line
@@ -231,6 +231,10 @@ ospf_rx_hook(sock *sk, int len) 
  const char *err_dsc = NULL;

  uint err_val = 0;



  /* Should not happen */

  if (ifa->state <= OSPF_IS_LOOP)

    return 1;



  int src_local, dst_local, dst_mcast;

  src_local = ipa_in_net(sk->faddr, ifa->addr->prefix, ifa->addr->pxlen);

  dst_local = ipa_equal(sk->laddr, ifa->addr->ip);

CRA Git | Maintained and supported by SUSTech CRA and CCSE