diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2009-08-28 13:45:43 +0200 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2009-08-28 13:45:43 +0200 |
| commit | d2ceaf4ec82837239a35ace00399ce3aa845849e (patch) | |
| tree | 94382673d95157f0fe7c1397cf4c6beb540746d1 | |
| parent | 061ab802a67cfc336785f6daeecdcbd4910734ed (diff) | |
| download | bird-d2ceaf4ec82837239a35ace00399ce3aa845849e.tar bird-d2ceaf4ec82837239a35ace00399ce3aa845849e.zip | |
Temporary OSPFv3 development commit
| -rw-r--r-- | nest/neighbor.c | 4 | ||||
| -rw-r--r-- | proto/ospf/iface.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/nest/neighbor.c b/nest/neighbor.c index 01dd2ad..7aaf8d7 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 c902a87..439a29c 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 |