diff options
| -rw-r--r-- | proto/ospf/dbdes.c | 5 | ||||
| -rw-r--r-- | proto/ospf/hello.c | 4 | ||||
| -rw-r--r-- | proto/ospf/lsalib.c | 3 | ||||
| -rw-r--r-- | proto/ospf/ospf.c | 2 | ||||
| -rw-r--r-- | proto/ospf/ospf.h | 8 |
5 files changed, 14 insertions, 8 deletions
diff --git a/proto/ospf/dbdes.c b/proto/ospf/dbdes.c index b39595d9..5a5f76f8 100644 --- a/proto/ospf/dbdes.c +++ b/proto/ospf/dbdes.c @@ -127,7 +127,7 @@ ospf_prepare_dbdes(struct ospf_proto *p, struct ospf_neighbor *n) { struct ospf_dbdes2_packet *ps = (void *) pkt; ps->iface_mtu = htons(iface_mtu); - ps->options = ifa->oa->options | OPT_O; + ps->options = ifa->oa->options & DBDES2_OPT_MASK; ps->imms = 0; /* Will be set later */ ps->ddseq = htonl(n->dds); length = sizeof(struct ospf_dbdes2_packet); @@ -135,7 +135,8 @@ ospf_prepare_dbdes(struct ospf_proto *p, struct ospf_neighbor *n) else /* OSPFv3 */ { struct ospf_dbdes3_packet *ps = (void *) pkt; - ps->options = htonl(ifa->oa->options | (ifa->autype == OSPF_AUTH_CRYPT ? OPT_AT : 0)); + u32 options = ifa->oa->options | (ifa->autype == OSPF_AUTH_CRYPT ? OPT_AT : 0); + ps->options = htonl(options & DBDES3_OPT_MASK); ps->iface_mtu = htons(iface_mtu); ps->padding = 0; ps->imms = 0; /* Will be set later */ diff --git a/proto/ospf/hello.c b/proto/ospf/hello.c index 9e427c4f..d094f934 100644 --- a/proto/ospf/hello.c +++ b/proto/ospf/hello.c @@ -81,7 +81,7 @@ ospf_send_hello(struct ospf_iface *ifa, int kind, struct ospf_neighbor *dirn) ps->netmask = htonl(u32_mkmask(ifa->addr->prefix.pxlen)); ps->helloint = ntohs(ifa->helloint); - ps->options = ifa->oa->options; + ps->options = ifa->oa->options & HELLO2_OPT_MASK; ps->priority = ifa->priority; ps->deadint = htonl(ifa->deadint); ps->dr = htonl(ipa_to_u32(ifa->drip)); @@ -96,7 +96,7 @@ ospf_send_hello(struct ospf_iface *ifa, int kind, struct ospf_neighbor *dirn) u32 options = ifa->oa->options | (ifa->autype == OSPF_AUTH_CRYPT ? OPT_AT : 0); ps->iface_id = htonl(ifa->iface_id); - ps->options = ntohl(options | (ifa->priority << 24)); + ps->options = ntohl((options & HELLO3_OPT_MASK) | (ifa->priority << 24)); ps->helloint = ntohs(ifa->helloint); ps->deadint = htons(ifa->deadint); ps->dr = htonl(ifa->drid); diff --git a/proto/ospf/lsalib.c b/proto/ospf/lsalib.c index 7767700f..7aae96ba 100644 --- a/proto/ospf/lsalib.c +++ b/proto/ospf/lsalib.c @@ -98,8 +98,7 @@ lsa_is_acceptable(u32 type, struct ospf_neighbor *n, struct ospf_proto *p) { if (ospf_is_v2(p)) { - if (type == LSA_T_NSSA) - return !!(n->options & OPT_N); + /* Do not check NSSA-LSA here, as OPT_N is only in HELLO packets */ if (lsa_is_opaque(type)) return !!(n->options & OPT_O); diff --git a/proto/ospf/ospf.c b/proto/ospf/ospf.c index abd4cd84..57e578da 100644 --- a/proto/ospf/ospf.c +++ b/proto/ospf/ospf.c @@ -146,7 +146,7 @@ static inline uint ospf_opts(struct ospf_proto *p) { if (ospf_is_v2(p)) - return 0; + return OPT_O; return ((ospf_is_ip6(p) && !p->af_mc) ? OPT_V6 : 0) | (!p->stub_router ? OPT_R : 0) | (p->af_ext ? OPT_AF : 0); diff --git a/proto/ospf/ospf.h b/proto/ospf/ospf.h index 3fd1c363..823b5e53 100644 --- a/proto/ospf/ospf.h +++ b/proto/ospf/ospf.h @@ -484,11 +484,17 @@ struct ospf_neighbor #define OPT_R 0x0010 /* OSPFv3, originator is active router */ #define OPT_DC 0x0020 /* Related to demand circuits, not used */ #define OPT_O 0x0040 /* OSPFv2 Opaque LSA (RFC 5250) */ -#define OPT_DN 0x0080 /* OSPFv2 VPN loop prevention (RFC 4576)*/ +#define OPT_DN 0x0080 /* OSPFv2 VPN loop prevention (RFC 4576) */ #define OPT_AF 0x0100 /* OSPFv3 Address Families (RFC 5838) */ #define OPT_L_V3 0x0200 /* OSPFv3, link-local signaling */ #define OPT_AT 0x0400 /* OSPFv3, authentication trailer */ +#define HELLO2_OPT_MASK (OPT_E | OPT_N | OPT_L_V2) +#define DBDES2_OPT_MASK (OPT_E | OPT_L_V2 | OPT_O) + +#define HELLO3_OPT_MASK (OPT_V6 | OPT_E | OPT_N | OPT_R | OPT_AF | OPT_L_V3 | OPT_AT ) +#define DBDES3_OPT_MASK (OPT_V6 | OPT_E | OPT_R | OPT_AF | OPT_L_V3 | OPT_AT ) + /* Router-LSA VEB flags are are stored together with links (OSPFv2) or options (OSPFv3) */ #define OPT_RT_B (0x01 << 24) #define OPT_RT_E (0x02 << 24) |