From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Fri, 28 Aug 2009 11:45:43 +0000 (+0200)
Subject: Temporary OSPFv3 development commit
X-Git-Tag: v1.2.0~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2ceaf4ec82837239a35ace00399ce3aa845849e;p=thirdparty%2Fbird.git

Temporary OSPFv3 development commit
---

diff --git a/nest/neighbor.c b/nest/neighbor.c
index 01dd2adaf..7aaf8d72c 100644
--- a/nest/neighbor.c
+++ b/nest/neighbor.c
@@ -100,14 +100,16 @@ if_connected(ip_addr *a, struct iface *i) /* -1=error, 1=match, 0=no match */
  * IP address, neigh_find() returns %NULL.
  */
 
+/*
 neighbor *
 neigh_find(struct proto *p, ip_addr *a, unsigned flags)
 {
   return neigh_find2(p, a, NULL, flags);
 }
+*/
 
 neighbor *
-neigh_find2(struct proto *p, ip_addr *a, unsigned flags)
+neigh_find(struct proto *p, ip_addr *a, unsigned flags)
 {
   neighbor *n;
   int class, scope = SCOPE_HOST;
diff --git a/proto/ospf/iface.c b/proto/ospf/iface.c
index c902a878d..439a29c55 100644
--- a/proto/ospf/iface.c
+++ b/proto/ospf/iface.c
@@ -145,6 +145,7 @@ ospf_iface_chstate(struct ospf_iface *ifa, u8 state)
 #ifdef OSPFv2
 	    ifa->dr_sk->saddr = AllDRouters;
 #else /* OSPFv3 */
+	    // ifa->dr_sk->saddr = AllDRouters;
 	    ifa->dr_sk->saddr = ifa->lladdr;
 #endif
 
@@ -322,8 +323,9 @@ ospf_open_mc_socket(struct ospf_iface *ifa)
   mcsk->dport = OSPF_PROTO;
 
 #ifdef OSPFv2
-  mcsk->saddr = AllDRouters;
+  mcsk->saddr = AllSPFRouters;
 #else /* OSPFv3 */
+  // mcsk->saddr = AllSPFRouters;
   mcsk->saddr = ifa->lladdr;
 #endif