From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Tue, 30 Jul 2013 19:34:47 +0000 (+0200)
Subject: Merge commit '924868543c2010f3ef2cfcb7ba6bac5988ab3264' into integrated
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cad9834b74275b6c25b84cd1a89824517760a392;p=thirdparty%2Fbird.git

Merge commit '924868543c2010f3ef2cfcb7ba6bac5988ab3264' into integrated

Conflicts:

	proto/ospf/iface.c
---

cad9834b74275b6c25b84cd1a89824517760a392
diff --cc proto/ospf/iface.c
index 19f4c585f,3da8f56cb..11eb4f847
--- a/proto/ospf/iface.c
+++ b/proto/ospf/iface.c
@@@ -534,13 -533,18 +534,13 @@@ ospf_iface_new(struct ospf_area *oa, st
    ifa->rxbuf = ip->rxbuf;
    ifa->check_link = ip->check_link;
    ifa->ecmp_weight = ip->ecmp_weight;
 -
 -#ifdef OSPFv2
    ifa->autype = ip->autype;
    ifa->passwords = ip->passwords;
 +  ifa->instance_id = ip->instance_id;
 +
-   ifa->ptp_netmask = !(addr->flags & IA_PEER);
+   ifa->ptp_netmask = addr ? !(addr->flags & IA_PEER) : 0;
    if (ip->ptp_netmask < 2)
      ifa->ptp_netmask = ip->ptp_netmask;
 -#endif
 -
 -#ifdef OSPFv3
 -  ifa->instance_id = ip->instance_id;
 -#endif
  
    ifa->type = ospf_iface_classify(ip->type, addr);
  
diff --cc sysdep/linux/netlink.c
index 3f6af5bd4,1d24ae0ff..2b434c4c4
--- a/sysdep/linux/netlink.c
+++ b/sysdep/linux/netlink.c
@@@ -871,8 -840,10 +871,9 @@@ nl_parse_route(struct nlmsghdr *h, int 
  	{
  	  neighbor *ng;
  	  ra.dest = RTD_ROUTER;
 -	  memcpy(&ra.gw, RTA_DATA(a[RTA_GATEWAY]), sizeof(ra.gw));
 -	  ipa_ntoh(ra.gw);
 +	  ra.gw = rtax_get_ipa(a[RTA_GATEWAY], ipv4);
  
+ #ifdef IPV6
  	  /* Silently skip strange 6to4 routes */
  	  if (ipa_in_net(ra.gw, IPA_NONE, 96))
  	    return;