diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2015-04-12 10:47:17 +0200 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2015-04-12 10:47:17 +0200 |
| commit | 304ac2e861a5ea28683489aff38ff37ff6873bb4 (patch) | |
| tree | 4a774721a3ecf2cb8f44bd7f612c4b0d2aca76de | |
| parent | d924d5a5626397da7e71fddfb1c0fd22c2714f2c (diff) | |
Minor fixes
| -rw-r--r-- | proto/ospf/ospf.h | 2 | ||||
| -rw-r--r-- | sysdep/bsd/krt-sock.c | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/proto/ospf/ospf.h b/proto/ospf/ospf.h index c324f431..a4e525ec 100644 --- a/proto/ospf/ospf.h +++ b/proto/ospf/ospf.h @@ -916,9 +916,11 @@ static inline void ospf_send_to_des(struct ospf_iface *ifa) ospf_send_to_bdr(ifa); } +#ifndef PARSER #define DROP(DSC,VAL) do { err_dsc = DSC; err_val = VAL; goto drop; } while(0) #define DROP1(DSC) do { err_dsc = DSC; goto drop; } while(0) #define SKIP(DSC) do { err_dsc = DSC; goto skip; } while(0) +#endif static inline uint ospf_pkt_hdrlen(struct ospf_proto *p) { return ospf_is_v2(p) ? (sizeof(struct ospf_packet) + sizeof(union ospf_auth)) : sizeof(struct ospf_packet); } diff --git a/sysdep/bsd/krt-sock.c b/sysdep/bsd/krt-sock.c index 0e65c51c..73f69df5 100644 --- a/sysdep/bsd/krt-sock.c +++ b/sysdep/bsd/krt-sock.c @@ -247,7 +247,7 @@ krt_send_route(struct krt_proto *p, int cmd, rte *e) #ifdef IPV6 /* Embed interface ID to link-local address */ - if (ipa_has_link_scope(gw)) + if (ipa_is_link_local(gw)) _I0(gw) = 0xfe800000 | (i->index & 0x0000ffff); #endif @@ -468,7 +468,7 @@ krt_read_route(struct ks_msg *msg, struct krt_proto *p, int scan) #ifdef IPV6 /* Clean up embedded interface ID returned in link-local address */ - if (ipa_has_link_scope(a.gw)) + if (ipa_is_link_local(a.gw)) _I0(a.gw) = 0xfe800000; #endif @@ -662,10 +662,10 @@ krt_read_addr(struct ks_msg *msg, int scan) #ifdef IPV6 /* Clean up embedded interface ID returned in link-local address */ - if (ipa_has_link_scope(iaddr)) + if (ipa_is_link_local(iaddr)) _I0(iaddr) = 0xfe800000; - if (ipa_has_link_scope(ibrd)) + if (ipa_is_link_local(ibrd)) _I0(ibrd) = 0xfe800000; #endif |