Temporary OSPFv3 development commit

diff --git a/nest/neighbor.c b/nest/neighbor.c
index 01dd2adaf486b900c55527893fb8d582e9383797..7aaf8d72caceb8885fdc74522a2b50116fca3ed9 100644 (file)
--- 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 c902a878d3b5809911f42f292d2176a395e65223..439a29c55486437371175bc7cc33a045cd233f6a 100644 (file)
--- 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