zebra, ospfd: fix typos in the graceful restart code

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>

diff --git a/ospfd/ospf_gr_helper.c b/ospfd/ospf_gr_helper.c
index 3a130f87fe1f6a659cd62a2eda00b4ec66160910..b32318b832a568eaee533640b21ed54c6d3b31cf 100644 (file)
--- 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 2de6731758cd42315e41b2fa4bf145254cc8fd0f..2ba5b3796dd46a2be0dd1fc2bf595bc23234b0cc 100644 (file)
--- 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);
 

diff --git a/zebra/zebra_gr.c b/zebra/zebra_gr.c
index ca6a33cd52ec8425301c93048c75e1ca7d3b45b7..5373f27882956353dd4253b157212c8666772c0d 100644 (file)
--- a/zebra/zebra_gr.c
+++ b/zebra/zebra_gr.c
@@ -118,7 +118,7 @@ static struct client_gr_info *zebra_gr_client_info_create(struct zserv *client)
 }
 
 /*
- * A helper function to delte and destory client info.
+ * A helper function to delete and destroy client info.
  */
 static void zebra_gr_client_info_delte(struct zserv *client,
                                       struct client_gr_info *info)
@@ -162,7 +162,7 @@ int32_t zebra_gr_client_disconnect(struct zserv *client)
 
        client->restart_time = monotime(&tv);
 
-       /* For all the GR instance start the starle removal timer. */
+       /* For all the GR instance start the stale removal timer. */
        TAILQ_FOREACH (info, &client->gr_info_queue, gr_info) {
                if (ZEBRA_CLIENT_GR_ENABLED(info->capabilities)
                    && (info->t_stale_removal == NULL)) {
@@ -298,7 +298,7 @@ void zebra_gr_client_reconnect(struct zserv *client)
 /*
  * Update the graceful restart information
  * for the client instance.
- * This function handles all the capabilties that are received.
+ * This function handles all the capabilities that are received.
  */
 static void zebra_client_update_info(struct zserv *client, struct zapi_cap *api)
 {
@@ -334,7 +334,7 @@ static void zebra_client_update_info(struct zserv *client, struct zapi_cap *api)
                if (!info)
                        info = zebra_gr_client_info_create(client);
 
-               /* Udpate other parameters */
+               /* Update other parameters */
                if (!info->gr_enable) {
                        client->gr_instance_count++;
 
@@ -460,7 +460,7 @@ static int32_t zebra_gr_route_stale_delete_timer_expiry(struct thread *thread)
 
        cnt = zebra_gr_delete_stale_routes(info);
 
-       /* Retsart the timer */
+       /* Restart the timer */
        if (cnt > 0) {
                LOG_GR("%s: Client %s processed %d routes. Start timer again",
                       __func__, zebra_route_string(client->proto), cnt);
@@ -471,7 +471,7 @@ static int32_t zebra_gr_route_stale_delete_timer_expiry(struct thread *thread)
                                 &info->t_stale_removal);
        } else {
                /* No routes to delete for the VRF */
-               LOG_GR("%s: Client %s all starle routes processed", __func__,
+               LOG_GR("%s: Client %s all stale routes processed", __func__,
                       zebra_route_string(client->proto));
 
                XFREE(MTYPE_TMP, info->current_prefix);
@@ -668,7 +668,7 @@ static void zebra_gr_process_client_stale_routes(struct zserv *client,
         * Cancel the stale timer and process the routes
         */
        if (info->t_stale_removal) {
-               LOG_GR("%s: Client %s cancled stale delete timer vrf %d",
+               LOG_GR("%s: Client %s canceled stale delete timer vrf %d",
                       __func__, zebra_route_string(client->proto),
                       info->vrf_id);
                THREAD_OFF(info->t_stale_removal);