mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2025-03-14 10:27:03 +00:00
Code Releases Activity

Merge commit '924868543c2010f3ef2cfcb7ba6bac5988ab3264' into integrated

Browse Source 
Conflicts:

	proto/ospf/iface.c
This commit is contained in:
Ondrej Zajicek 2013-07-30 21:34:47 +02:00
commit cad9834b74
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
proto/bgp/bgp.c
View File

@ -840,7 +840,6 @@ bgp_start(struct proto *P)
lock->iface = p->cf->iface;
lock->type = OBJLOCK_TCP;
lock->port = BGP_PORT;
lock->iface = NULL;
lock->hook = bgp_start_locked;
lock->data = p;
olock_acquire(lock);

2
proto/ospf/iface.c
View File

@ -538,7 +538,7 @@ ospf_iface_new(struct ospf_area *oa, struct ifa *addr, struct ospf_iface_patt *i
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;

2
sysdep/linux/netlink.c
View File

@ -873,9 +873,11 @@ nl_parse_route(struct nlmsghdr *h, int scan)
ra.dest = RTD_ROUTER;
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;
#endif
ng = neigh_find2(&p->p, &ra.gw, ra.iface,
(i->rtm_flags & RTNH_F_ONLINK) ? NEF_ONLINK : 0);