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

Fixes OSPFv2 build.

Browse source
This commit is contained in:
Ondrej Zajicek 2009-12-03 23:20:02 +01:00
parent bb3c7c6d22
commit 9895502392
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
proto/ospf/ospf.c
View file

@ -1049,6 +1049,8 @@ ospf_sh_iface(struct proto *p, char *iff)
* values * values
*/ */
#ifdef OSPFv3
static struct ospf_lsa_header * static struct ospf_lsa_header *
fake_lsa_from_prefix_lsa(struct ospf_lsa_header *dst, struct ospf_lsa_header *src, fake_lsa_from_prefix_lsa(struct ospf_lsa_header *dst, struct ospf_lsa_header *src,
struct ospf_lsa_prefix *px) struct ospf_lsa_prefix *px)
@ -1062,6 +1064,8 @@ fake_lsa_from_prefix_lsa(struct ospf_lsa_header *dst, struct ospf_lsa_header *sr
return dst; return dst;
} }
#endif
static int static int
lsa_compare_for_state(const void *p1, const void *p2) lsa_compare_for_state(const void *p1, const void *p2)
{ {

4
proto/ospf/topology.c
View file

@ -635,14 +635,14 @@ static inline int
check_sum_net_lsaid_collision(struct fib_node *fn, struct top_hash_entry *en) check_sum_net_lsaid_collision(struct fib_node *fn, struct top_hash_entry *en)
{ {
struct ospf_lsa_sum *sum = en->lsa_body; struct ospf_lsa_sum *sum = en->lsa_body;
return (fn->pxlen != ipa_mklen(sum->netmask)) return fn->pxlen != ipa_mklen(sum->netmask);
} }
static inline int static inline int
check_ext_lsaid_collision(struct fib_node *fn, struct top_hash_entry *en) check_ext_lsaid_collision(struct fib_node *fn, struct top_hash_entry *en)
{ {
struct ospf_lsa_ext *ext = en->lsa_body; struct ospf_lsa_ext *ext = en->lsa_body;
return (fn->pxlen != ipa_mklen(ext->netmask)) return fn->pxlen != ipa_mklen(ext->netmask);
} }
#else /* OSPFv3 */ #else /* OSPFv3 */