summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOndrej Zajicek <santiago@crfreenet.org>2010-04-26 19:08:57 +0200
committerOndrej Zajicek <santiago@crfreenet.org>2010-04-26 19:08:57 +0200
commit9d1ee1388771a3caa6c23163571a80457adfab2c (patch)
tree3d412b928c229cf7ec1cdaaf5df6a8107306be21
parent4e5fb4b60c59db3248fd12db2bc6f0424d798122 (diff)
downloadbird-9d1ee1388771a3caa6c23163571a80457adfab2c.tar
bird-9d1ee1388771a3caa6c23163571a80457adfab2c.zip
Neighbors on OSPF broadcast networks should be identified by IP address, not RID.
Allows simple support for multiple interfaces to the same network.
-rw-r--r--proto/ospf/packet.c25
1 files changed, 22 insertions, 3 deletions
diff --git a/proto/ospf/packet.c b/proto/ospf/packet.c
index e78eeea..74ce550 100644
--- a/proto/ospf/packet.c
+++ b/proto/ospf/packet.c
@@ -242,6 +242,19 @@ ospf_pkt_checkauth(struct ospf_neighbor *n, struct ospf_iface *ifa, struct ospf_
#endif
+#ifdef OSPFv2
+static inline struct ospf_neighbor *
+find_neigh_by_ip(struct ospf_iface *ifa, ip_addr ip)
+{
+ struct ospf_neighbor *n;
+ WALK_LIST(n, ifa->neigh_list)
+ if (ipa_equal(n->ip, ip))
+ return n;
+ return NULL;
+}
+#endif
+
+
/**
* ospf_rx_hook
@@ -419,10 +432,16 @@ ospf_rx_hook(sock *sk, int size)
return 1;
}
- /* This is deviation from RFC 2328 - neighbours should be identified by
- * IP address on broadcast and NBMA networks.
- */
+#ifdef OSPFv2
+ /* In OSPFv2, neighbors are identified by either IP or Router ID, base on network type */
+ struct ospf_neighbor *n;
+ if ((ifa->type == OSPF_IT_BCAST) || (ifa->type == OSPF_IT_NBMA))
+ n = find_neigh_by_ip(ifa, sk->faddr);
+ else
+ n = find_neigh(ifa, rid);
+#else
struct ospf_neighbor *n = find_neigh(ifa, rid);
+#endif
if(!n && (ps->type != HELLO_P))
{