Commit d2ceaf4e authored by Ondřej Zajíček's avatar Ondřej Zajíček

Temporary OSPFv3 development commit

parent 061ab802
...@@ -100,14 +100,16 @@ if_connected(ip_addr *a, struct iface *i) /* -1=error, 1=match, 0=no match */ ...@@ -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;
......
...@@ -145,6 +145,7 @@ ospf_iface_chstate(struct ospf_iface *ifa, u8 state) ...@@ -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) ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment