Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Temporary OSPFv3 development commit

Browse source
This commit is contained in:
Ondrej Zajicek 2009-08-28 13:45:43 +02:00
parent 061ab802a6
commit d2ceaf4ec8
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nest/neighbor.c
View file

@ -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. * IP address, neigh_find() returns %NULL.
*/ */
/*
neighbor * neighbor *
neigh_find(struct proto *p, ip_addr *a, unsigned flags) neigh_find(struct proto *p, ip_addr *a, unsigned flags)
{ {
return neigh_find2(p, a, NULL, flags); return neigh_find2(p, a, NULL, flags);
} }
*/
neighbor * neighbor *
neigh_find2(struct proto *p, ip_addr *a, unsigned flags) neigh_find(struct proto *p, ip_addr *a, unsigned flags)
{ {
neighbor *n; neighbor *n;
int class, scope = SCOPE_HOST; int class, scope = SCOPE_HOST;

4
proto/ospf/iface.c
View file

@ -145,6 +145,7 @@ ospf_iface_chstate(struct ospf_iface *ifa, u8 state)
#ifdef OSPFv2 #ifdef OSPFv2
ifa->dr_sk->saddr = AllDRouters; ifa->dr_sk->saddr = AllDRouters;
#else /* OSPFv3 */ #else /* OSPFv3 */
// ifa->dr_sk->saddr = AllDRouters;
ifa->dr_sk->saddr = ifa->lladdr; ifa->dr_sk->saddr = ifa->lladdr;
#endif #endif
@ -322,8 +323,9 @@ ospf_open_mc_socket(struct ospf_iface *ifa)
mcsk->dport = OSPF_PROTO; mcsk->dport = OSPF_PROTO;
#ifdef OSPFv2 #ifdef OSPFv2
mcsk->saddr = AllDRouters; mcsk->saddr = AllSPFRouters;
#else /* OSPFv3 */ #else /* OSPFv3 */
// mcsk->saddr = AllSPFRouters;
mcsk->saddr = ifa->lladdr; mcsk->saddr = ifa->lladdr;
#endif #endif