summaryrefslogtreecommitdiffstats
path: root/ospfd
diff options
context:
space:
mode:
authorRenato Westphal <renato@opensourcerouting.org>2021-05-31 15:27:51 +0200
committerRenato Westphal <renato@opensourcerouting.org>2021-06-08 16:41:33 +0200
commit98cb53f96a8671764ce73c4d707d5924b859b14b (patch)
treebfdce354b6379ea85e3946aed9fc39a524ca340e /ospfd
parentospfd: fix logging of what triggered the SPF run (diff)
downloadfrr-98cb53f96a8671764ce73c4d707d5924b859b14b.tar.xz
frr-98cb53f96a8671764ce73c4d707d5924b859b14b.zip
zebra, ospfd: fix typos in the graceful restart code
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Diffstat (limited to 'ospfd')
-rw-r--r--ospfd/ospf_gr_helper.c32
-rw-r--r--ospfd/ospf_packet.c6
2 files changed, 19 insertions, 19 deletions
diff --git a/ospfd/ospf_gr_helper.c b/ospfd/ospf_gr_helper.c
index 3a130f87f..b32318b83 100644
--- a/ospfd/ospf_gr_helper.c
+++ b/ospfd/ospf_gr_helper.c
@@ -52,7 +52,7 @@
static const char * const ospf_exit_reason_desc[] = {
"Unknown reason",
- "Helper inprogress",
+ "Helper in progress",
"Topology Change",
"Grace timer expiry",
"Successful graceful restart",
@@ -366,7 +366,7 @@ static int ospf_handle_grace_timer_expiry(struct thread *thread)
* Grace LSA received from RESTARTER.
*
* nbr
- * ospf neighbour which requets the router to act as
+ * OSPF neighbour which requests the router to act as
* HELPER.
*
* Returns:
@@ -398,11 +398,11 @@ int ospf_process_grace_lsa(struct ospf *ospf, struct ospf_lsa *lsa,
if (IS_DEBUG_OSPF_GR_HELPER)
zlog_debug(
- "%s, Grace LSA received from %pI4, grace interval:%u, restartreason :%s",
+ "%s, Grace LSA received from %pI4, grace interval:%u, restart reason:%s",
__func__, &restart_addr, grace_interval,
ospf_restart_reason2str(restart_reason));
- /* Incase of broadcast links, if RESTARTER is DR_OTHER,
+ /* In case of broadcast links, if RESTARTER is DR_OTHER,
* grace LSA might be received from DR, so need to get
* actual neighbour info , here RESTARTER.
*/
@@ -465,7 +465,7 @@ int ospf_process_grace_lsa(struct ospf *ospf, struct ospf_lsa *lsa,
return OSPF_GR_NOT_HELPER;
}
- /* Check the retranmission list of this
+ /* Check the retransmission list of this
* neighbour, check any change in lsas.
*/
if (ospf->strict_lsa_check && !ospf_ls_retransmit_isempty(restarter)
@@ -483,7 +483,7 @@ int ospf_process_grace_lsa(struct ospf *ospf, struct ospf_lsa *lsa,
if (ntohs(lsa->data->ls_age) >= grace_interval) {
if (IS_DEBUG_OSPF_GR_HELPER)
zlog_debug(
- "%s, Grace LSA age(%d) is more than the graceinterval(%d)",
+ "%s, Grace LSA age(%d) is more than the grace interval(%d)",
__func__, lsa->data->ls_age, grace_interval);
restarter->gr_helper_info.rejected_reason =
OSPF_HELPER_LSA_AGE_MORE;
@@ -532,7 +532,7 @@ int ospf_process_grace_lsa(struct ospf *ospf, struct ospf_lsa *lsa,
restarter->gr_helper_info.gr_restart_reason = restart_reason;
restarter->gr_helper_info.rejected_reason = OSPF_HELPER_REJECTED_NONE;
- /* Incremnet the active restarer count */
+ /* Increment the active restarter count */
ospf->active_restarter_cnt++;
if (IS_DEBUG_OSPF_GR_HELPER)
@@ -552,7 +552,7 @@ int ospf_process_grace_lsa(struct ospf *ospf, struct ospf_lsa *lsa,
* retransmission list.
*
* nbr
- * ospf neighbor
+ * OSPF neighbor
*
* Returns:
* TRUE - if any change in the lsa.
@@ -603,7 +603,7 @@ static bool ospf_check_change_in_rxmt_list(struct ospf_neighbor *nbr)
* ospf
* ospf pointer
* lsa
- * topo change occured due to this lsa type (1 to 5 and 7)
+ * topo change occurred due to this lsa type (1 to 5 and 7)
*
* Returns:
* Nothing
@@ -617,7 +617,7 @@ void ospf_helper_handle_topo_chg(struct ospf *ospf, struct ospf_lsa *lsa)
return;
/* Topo change not required to be handled if strict
- * LSA check is disbaled for this router.
+ * LSA check is disabled for this router.
*/
if (!ospf->strict_lsa_check)
return;
@@ -707,14 +707,14 @@ void ospf_gr_helper_exit(struct ospf_neighbor *nbr,
ospf->active_restarter_cnt--;
/* If the exit not triggered due to grace timer
- * expairy , stop the grace timer.
+ * expiry, stop the grace timer.
*/
if (reason != OSPF_GR_HELPER_GRACE_TIMEOUT)
THREAD_OFF(nbr->gr_helper_info.t_grace_timer);
/* check exit triggered due to successful completion
* of graceful restart.
- * If no, bringdown the neighbour.
+ * If no, bring down the neighbour.
*/
if (reason != OSPF_GR_HELPER_COMPLETED) {
if (IS_DEBUG_OSPF_GR_HELPER)
@@ -737,7 +737,7 @@ void ospf_gr_helper_exit(struct ospf_neighbor *nbr,
}
/*
- * Process Maxage Grace LSA.
+ * Process MaxAge Grace LSA.
* It is a indication for successful completion of GR.
* If router acting as HELPER, It exits from helper role.
*
@@ -748,7 +748,7 @@ void ospf_gr_helper_exit(struct ospf_neighbor *nbr,
* Grace LSA received from RESTARTER.
*
* nbr
- * ospf neighbour which requets the router to act as
+ * OSPF neighbour which requests the router to act as
* HELPER.
*
* Returns:
@@ -803,7 +803,7 @@ void ospf_process_maxage_grace_lsa(struct ospf *ospf, struct ospf_lsa *lsa,
* Disable/Enable HELPER support on router level.
*
* ospf
- * OSPFpointer.
+ * OSPF pointer.
*
* status
* TRUE/FALSE
@@ -844,7 +844,7 @@ void ospf_gr_helper_support_set(struct ospf *ospf, bool support)
lookup.advRtrAddr.s_addr =
nbr->router_id.s_addr;
/* check if helper support enabled for the
- * correspodning routerid.If enabled, dont
+ * corresponding routerid.If enabled, dont
* dont exit from helper role.
*/
if (hash_lookup(ospf->enable_rtr_list, &lookup))
diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c
index 2de673175..2ba5b3796 100644
--- a/ospfd/ospf_packet.c
+++ b/ospfd/ospf_packet.c
@@ -1862,9 +1862,9 @@ static void ospf_ls_upd(struct ospf *ospf, struct ip *iph,
return;
}
- /* Get list of LSAs from Link State Update packet. - Also perorms Stages
- * 1 (validate LSA checksum) and 2 (check for LSA consistent type)
- * of section 13.
+ /* Get list of LSAs from Link State Update packet. - Also performs
+ * Stages 1 (validate LSA checksum) and 2 (check for LSA consistent
+ * type) of section 13.
*/
lsas = ospf_ls_upd_list_lsa(nbr, s, oi, size);