From: Maria Matejka <mq@ucw.cz>
Date: Mon, 7 Nov 2022 09:25:52 +0000 (+0100)
Subject: Merge commit '32425297' into thread-next
X-Git-Tag: v3.0-alpha1~79
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40bae8e1b788a535466ac673629fc93b6a258576;p=thirdparty%2Fbird.git

Merge commit '32425297' into thread-next
---

40bae8e1b788a535466ac673629fc93b6a258576
diff --cc sysdep/linux/netlink.c
index 3443957b4,d9e81c104..8168d0dc6
--- a/sysdep/linux/netlink.c
+++ b/sysdep/linux/netlink.c
@@@ -1809,26 -1705,26 +1809,26 @@@ nl_parse_route(struct nl_parse_state *s
  
  #ifdef HAVE_MPLS_KERNEL
        if (a[RTA_VIA])
 -	ra->nh.gw = rta_get_via(a[RTA_VIA]);
 +	nhad.nh.gw = rta_get_via(a[RTA_VIA]);
  #endif
  
+       if (i->rtm_flags & RTNH_F_ONLINK)
 -	ra->nh.flags |= RNF_ONLINK;
++	nhad.nh.flags |= RNF_ONLINK;
+ 
 -      if (ipa_nonzero(ra->nh.gw))
 +      if (ipa_nonzero(nhad.nh.gw))
  	{
  	  /* Silently skip strange 6to4 routes */
  	  const net_addr_ip6 sit = NET_ADDR_IP6(IP6_NONE, 96);
 -	  if ((i->rtm_family == AF_INET6) && ipa_in_netX(ra->nh.gw, (net_addr *) &sit))
 +	  if ((i->rtm_family == AF_INET6) && ipa_in_netX(nhad.nh.gw, (net_addr *) &sit))
  	    return;
  
- 	  if (i->rtm_flags & RTNH_F_ONLINK)
- 	    nhad.nh.flags |= RNF_ONLINK;
- 
  	  neighbor *nbr;
 -	  nbr = neigh_find(&p->p, ra->nh.gw, ra->nh.iface,
 -			   (ra->nh.flags & RNF_ONLINK) ? NEF_ONLINK : 0);
 +	  nbr = neigh_find(&p->p, nhad.nh.gw, nhad.nh.iface,
 +			   (nhad.nh.flags & RNF_ONLINK) ? NEF_ONLINK : 0);
  	  if (!nbr || (nbr->scope == SCOPE_HOST))
  	    {
 -	      log(L_ERR "KRT: Received route %N with strange next-hop %I", net->n.addr,
 -                  ra->nh.gw);
 +	      log(L_ERR "KRT: Received route %N with strange next-hop %I", net,
 +                  nhad.nh.gw);
  	      return;
  	    }
  	}