diff options
author | Jan Maria Matejka <mq@ucw.cz> | 2018-06-19 14:32:16 +0200 |
---|---|---|
committer | Jan Maria Matejka <mq@ucw.cz> | 2018-06-19 14:32:16 +0200 |
commit | 1ef23f05ee00394e6a2748f658b73c20d3ff7c45 (patch) | |
tree | 2c23f431e18d7b0b27da6734f6c12a2428c09631 /proto/ospf | |
parent | 13c0be19d3d2acc9c1636bbab9222aabdf27d7ac (diff) | |
parent | caa9d03d65ce827ce536d54b26988e70767e032f (diff) |
Merge branch 'int-new' into HEAD
Diffstat (limited to 'proto/ospf')
-rw-r--r-- | proto/ospf/rt.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/proto/ospf/rt.c b/proto/ospf/rt.c index c0fe218a..b4f9b067 100644 --- a/proto/ospf/rt.c +++ b/proto/ospf/rt.c @@ -108,7 +108,7 @@ orta_pref(const orta *nf) static int orta_prio(const orta *nf) { - /* RFC 3103 2.5 (6e) priorities */ + /* RFC 3101 2.5 (6e) priorities */ u32 opts = nf->options & (ORTA_NSSA | ORTA_PROP); /* A Type-7 LSA with the P-bit set */ @@ -217,7 +217,7 @@ orta_compare_asbr(const struct ospf_proto *p, const orta *new, const orta *old) /* * Compare a routing table entry with a new one, for AS external routes - * (RFC 2328 16.4) and NSSA routes (RFC 3103 2.5), Returns integer <, = or > + * (RFC 2328 16.4) and NSSA routes (RFC 3101 2.5), Returns integer <, = or > * than 0 if the new orta is less, equal or more preferred than the old orta. */ static int @@ -1078,7 +1078,7 @@ decide_nssa_lsa(struct ospf_proto *p, ort *nf, struct ospf_lsa_ext_local *rt) return 1; } -/* RFC 3103 3.2 - translating Type-7 LSAs into Type-5 LSAs */ +/* RFC 3101 3.2 - translating Type-7 LSAs into Type-5 LSAs */ static inline void check_nssa_lsa(struct ospf_proto *p, ort *nf) { @@ -1101,12 +1101,12 @@ check_nssa_lsa(struct ospf_proto *p, ort *nf) } } - /* RFC 3103 3.2 (3) - originate the aggregated address range */ + /* RFC 3101 3.2 (3) - originate the aggregated address range */ if (anet && anet->active && !anet->hidden && oa->translate) ospf_originate_ext_lsa(p, NULL, nf, LSA_M_RTCALC, anet->metric, (anet->metric & LSA_EXT3_EBIT), IPA_NONE, anet->tag, 0); - /* RFC 3103 3.2 (2) - originate the same network */ + /* RFC 3101 3.2 (2) - originate the same network */ else if (decide_nssa_lsa(p, nf, &rt)) ospf_originate_ext_lsa(p, NULL, nf, LSA_M_RTCALC, rt.metric, rt.ebit, rt.fwaddr, rt.tag, 0); } @@ -1284,7 +1284,7 @@ ospf_rt_abr2(struct ospf_proto *p) struct ospf_area *oa; struct top_hash_entry *en; - /* RFC 3103 3.1 - type-7 translator election */ + /* RFC 3101 3.1 - type-7 translator election */ struct ospf_area *bb = p->backbone; WALK_LIST(oa, p->area_list) if (oa_is_nssa(oa)) |